[pyzo] 12/19: Prefix the icons that we introduced. Closes #395

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Fri Jul 1 16:22:03 UTC 2016 

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository pyzo.

commit 78f403f0af4119d1bc5b785aa294761b5eeea986
Author: Almar Klein <almar.klein at gmail.com>
Date:   Mon Jun 27 16:19:32 2016 +0200

    Prefix the icons that we introduced. Closes #395
---
 pyzo/core/main.py                                           |   4 ++--
 pyzo/resources/icons/README.md                              |   2 ++
 .../{application_eraser.png => pyzo_application_eraser.png} | Bin
 ...application_refresh.png => pyzo_application_refresh.png} | Bin
 .../{application_shell.png => pyzo_application_shell.png}   | Bin
 .../{application_wrench.png => pyzo_application_wrench.png} | Bin
 .../icons/{debug_continue.png => pyzo_debug_continue.png}   | Bin
 .../resources/icons/{debug_next.png => pyzo_debug_next.png} | Bin
 .../resources/icons/{debug_quit.png => pyzo_debug_quit.png} | Bin
 .../icons/{debug_return.png => pyzo_debug_return.png}       | Bin
 .../resources/icons/{debug_step.png => pyzo_debug_step.png} | Bin
 pyzo/resources/icons/{disk_as.png => pyzo_disk_as.png}      | Bin
 pyzo/resources/icons/{filter.png => pyzo_filter.png}        | Bin
 pyzo/resources/icons/{folder_hg.png => pyzo_folder_hg.png}  | Bin
 .../icons/{folder_parent.png => pyzo_folder_parent.png}     | Bin
 .../resources/icons/{folder_svn.png => pyzo_folder_svn.png} | Bin
 .../icons/{overlay_disk.png => pyzo_overlay_disk.png}       | Bin
 .../resources/icons/{overlay_hg.png => pyzo_overlay_hg.png} | Bin
 .../icons/{overlay_link.png => pyzo_overlay_link.png}       | Bin
 .../icons/{overlay_star.png => pyzo_overlay_star.png}       | Bin
 .../icons/{overlay_svn.png => pyzo_overlay_svn.png}         | Bin
 .../{overlay_thumbnail.png => pyzo_overlay_thumbnail.png}   | Bin
 .../icons/{page_delete_all.png => pyzo_page_delete_all.png} | Bin
 .../resources/icons/{page_white.png => pyzo_page_white.png} | Bin
 .../{page_white_dirty.png => pyzo_page_white_dirty.png}     | Bin
 .../icons/{page_white_py.png => pyzo_page_white_py.png}     | Bin
 .../icons/{page_white_pyx.png => pyzo_page_white_pyx.png}   | Bin
 .../icons/{plugin_refresh.png => pyzo_plugin_refresh.png}   | Bin
 pyzo/resources/icons/{run_cell.png => pyzo_run_cell.png}    | Bin
 pyzo/resources/icons/{run_file.png => pyzo_run_file.png}    | Bin
 .../icons/{run_file_script.png => pyzo_run_file_script.png} | Bin
 pyzo/resources/icons/{run_lines.png => pyzo_run_lines.png}  | Bin
 .../icons/{run_mainfile.png => pyzo_run_mainfile.png}       | Bin
 ...run_mainfile_script.png => pyzo_run_mainfile_script.png} | Bin
 pyzo/resources/icons/{star2.png => pyzo_star2.png}          | Bin
 pyzo/resources/icons/{star3.png => pyzo_star3.png}          | Bin
 36 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pyzo/core/main.py b/pyzo/core/main.py
index 6b6919d..9721622 100644
--- a/pyzo/core/main.py
+++ b/pyzo/core/main.py
@@ -495,12 +495,12 @@ def loadIcons():
     dummyIcon = IconArtist().finish()
     pyzo.icons = ssdf.new()
     for fname in os.listdir(iconDir):
-        if fname.startswith('pyzo'):
-            continue
         if fname.endswith('.png'):
             try:
                 # Short and full name
                 name = fname.split('.')[0]
+                name = name.replace('pyzo_', '')  # discart prefix
+                print(fname, name)
                 ffname = os.path.join(iconDir,fname)
                 # Create icon
                 icon = QtGui.QIcon() 
diff --git a/pyzo/resources/icons/README.md b/pyzo/resources/icons/README.md
new file mode 100644
index 0000000..4780c35
--- /dev/null
+++ b/pyzo/resources/icons/README.md
@@ -0,0 +1,2 @@
+These icons are all from the famfamfam freely available icon set (http://www.famfamfam.com/),
+except the ones with the "pyzo_" prefix, which are created by us (usually based on an existing icon).
diff --git a/pyzo/resources/icons/application_eraser.png b/pyzo/resources/icons/pyzo_application_eraser.png
similarity index 100%
rename from pyzo/resources/icons/application_eraser.png
rename to pyzo/resources/icons/pyzo_application_eraser.png
diff --git a/pyzo/resources/icons/application_refresh.png b/pyzo/resources/icons/pyzo_application_refresh.png
similarity index 100%
rename from pyzo/resources/icons/application_refresh.png
rename to pyzo/resources/icons/pyzo_application_refresh.png
diff --git a/pyzo/resources/icons/application_shell.png b/pyzo/resources/icons/pyzo_application_shell.png
similarity index 100%
rename from pyzo/resources/icons/application_shell.png
rename to pyzo/resources/icons/pyzo_application_shell.png
diff --git a/pyzo/resources/icons/application_wrench.png b/pyzo/resources/icons/pyzo_application_wrench.png
similarity index 100%
rename from pyzo/resources/icons/application_wrench.png
rename to pyzo/resources/icons/pyzo_application_wrench.png
diff --git a/pyzo/resources/icons/debug_continue.png b/pyzo/resources/icons/pyzo_debug_continue.png
similarity index 100%
rename from pyzo/resources/icons/debug_continue.png
rename to pyzo/resources/icons/pyzo_debug_continue.png
diff --git a/pyzo/resources/icons/debug_next.png b/pyzo/resources/icons/pyzo_debug_next.png
similarity index 100%
rename from pyzo/resources/icons/debug_next.png
rename to pyzo/resources/icons/pyzo_debug_next.png
diff --git a/pyzo/resources/icons/debug_quit.png b/pyzo/resources/icons/pyzo_debug_quit.png
similarity index 100%
rename from pyzo/resources/icons/debug_quit.png
rename to pyzo/resources/icons/pyzo_debug_quit.png
diff --git a/pyzo/resources/icons/debug_return.png b/pyzo/resources/icons/pyzo_debug_return.png
similarity index 100%
rename from pyzo/resources/icons/debug_return.png
rename to pyzo/resources/icons/pyzo_debug_return.png
diff --git a/pyzo/resources/icons/debug_step.png b/pyzo/resources/icons/pyzo_debug_step.png
similarity index 100%
rename from pyzo/resources/icons/debug_step.png
rename to pyzo/resources/icons/pyzo_debug_step.png
diff --git a/pyzo/resources/icons/disk_as.png b/pyzo/resources/icons/pyzo_disk_as.png
similarity index 100%
rename from pyzo/resources/icons/disk_as.png
rename to pyzo/resources/icons/pyzo_disk_as.png
diff --git a/pyzo/resources/icons/filter.png b/pyzo/resources/icons/pyzo_filter.png
similarity index 100%
rename from pyzo/resources/icons/filter.png
rename to pyzo/resources/icons/pyzo_filter.png
diff --git a/pyzo/resources/icons/folder_hg.png b/pyzo/resources/icons/pyzo_folder_hg.png
similarity index 100%
rename from pyzo/resources/icons/folder_hg.png
rename to pyzo/resources/icons/pyzo_folder_hg.png
diff --git a/pyzo/resources/icons/folder_parent.png b/pyzo/resources/icons/pyzo_folder_parent.png
similarity index 100%
rename from pyzo/resources/icons/folder_parent.png
rename to pyzo/resources/icons/pyzo_folder_parent.png
diff --git a/pyzo/resources/icons/folder_svn.png b/pyzo/resources/icons/pyzo_folder_svn.png
similarity index 100%
rename from pyzo/resources/icons/folder_svn.png
rename to pyzo/resources/icons/pyzo_folder_svn.png
diff --git a/pyzo/resources/icons/overlay_disk.png b/pyzo/resources/icons/pyzo_overlay_disk.png
similarity index 100%
rename from pyzo/resources/icons/overlay_disk.png
rename to pyzo/resources/icons/pyzo_overlay_disk.png
diff --git a/pyzo/resources/icons/overlay_hg.png b/pyzo/resources/icons/pyzo_overlay_hg.png
similarity index 100%
rename from pyzo/resources/icons/overlay_hg.png
rename to pyzo/resources/icons/pyzo_overlay_hg.png
diff --git a/pyzo/resources/icons/overlay_link.png b/pyzo/resources/icons/pyzo_overlay_link.png
similarity index 100%
rename from pyzo/resources/icons/overlay_link.png
rename to pyzo/resources/icons/pyzo_overlay_link.png
diff --git a/pyzo/resources/icons/overlay_star.png b/pyzo/resources/icons/pyzo_overlay_star.png
similarity index 100%
rename from pyzo/resources/icons/overlay_star.png
rename to pyzo/resources/icons/pyzo_overlay_star.png
diff --git a/pyzo/resources/icons/overlay_svn.png b/pyzo/resources/icons/pyzo_overlay_svn.png
similarity index 100%
rename from pyzo/resources/icons/overlay_svn.png
rename to pyzo/resources/icons/pyzo_overlay_svn.png
diff --git a/pyzo/resources/icons/overlay_thumbnail.png b/pyzo/resources/icons/pyzo_overlay_thumbnail.png
similarity index 100%
rename from pyzo/resources/icons/overlay_thumbnail.png
rename to pyzo/resources/icons/pyzo_overlay_thumbnail.png
diff --git a/pyzo/resources/icons/page_delete_all.png b/pyzo/resources/icons/pyzo_page_delete_all.png
similarity index 100%
rename from pyzo/resources/icons/page_delete_all.png
rename to pyzo/resources/icons/pyzo_page_delete_all.png
diff --git a/pyzo/resources/icons/page_white.png b/pyzo/resources/icons/pyzo_page_white.png
similarity index 100%
rename from pyzo/resources/icons/page_white.png
rename to pyzo/resources/icons/pyzo_page_white.png
diff --git a/pyzo/resources/icons/page_white_dirty.png b/pyzo/resources/icons/pyzo_page_white_dirty.png
similarity index 100%
rename from pyzo/resources/icons/page_white_dirty.png
rename to pyzo/resources/icons/pyzo_page_white_dirty.png
diff --git a/pyzo/resources/icons/page_white_py.png b/pyzo/resources/icons/pyzo_page_white_py.png
similarity index 100%
rename from pyzo/resources/icons/page_white_py.png
rename to pyzo/resources/icons/pyzo_page_white_py.png
diff --git a/pyzo/resources/icons/page_white_pyx.png b/pyzo/resources/icons/pyzo_page_white_pyx.png
similarity index 100%
rename from pyzo/resources/icons/page_white_pyx.png
rename to pyzo/resources/icons/pyzo_page_white_pyx.png
diff --git a/pyzo/resources/icons/plugin_refresh.png b/pyzo/resources/icons/pyzo_plugin_refresh.png
similarity index 100%
rename from pyzo/resources/icons/plugin_refresh.png
rename to pyzo/resources/icons/pyzo_plugin_refresh.png
diff --git a/pyzo/resources/icons/run_cell.png b/pyzo/resources/icons/pyzo_run_cell.png
similarity index 100%
rename from pyzo/resources/icons/run_cell.png
rename to pyzo/resources/icons/pyzo_run_cell.png
diff --git a/pyzo/resources/icons/run_file.png b/pyzo/resources/icons/pyzo_run_file.png
similarity index 100%
rename from pyzo/resources/icons/run_file.png
rename to pyzo/resources/icons/pyzo_run_file.png
diff --git a/pyzo/resources/icons/run_file_script.png b/pyzo/resources/icons/pyzo_run_file_script.png
similarity index 100%
rename from pyzo/resources/icons/run_file_script.png
rename to pyzo/resources/icons/pyzo_run_file_script.png
diff --git a/pyzo/resources/icons/run_lines.png b/pyzo/resources/icons/pyzo_run_lines.png
similarity index 100%
rename from pyzo/resources/icons/run_lines.png
rename to pyzo/resources/icons/pyzo_run_lines.png
diff --git a/pyzo/resources/icons/run_mainfile.png b/pyzo/resources/icons/pyzo_run_mainfile.png
similarity index 100%
rename from pyzo/resources/icons/run_mainfile.png
rename to pyzo/resources/icons/pyzo_run_mainfile.png
diff --git a/pyzo/resources/icons/run_mainfile_script.png b/pyzo/resources/icons/pyzo_run_mainfile_script.png
similarity index 100%
rename from pyzo/resources/icons/run_mainfile_script.png
rename to pyzo/resources/icons/pyzo_run_mainfile_script.png
diff --git a/pyzo/resources/icons/star2.png b/pyzo/resources/icons/pyzo_star2.png
similarity index 100%
rename from pyzo/resources/icons/star2.png
rename to pyzo/resources/icons/pyzo_star2.png
diff --git a/pyzo/resources/icons/star3.png b/pyzo/resources/icons/pyzo_star3.png
similarity index 100%
rename from pyzo/resources/icons/star3.png
rename to pyzo/resources/icons/pyzo_star3.png

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyzo.git

More information about the debian-science-commits mailing list