Even more icon renaming.

prateekvishnu · Dec 30, 2006 · afbeb96 · afbeb96
1 parent ccde4ff
commit afbeb96
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py
@@ -145,14 +145,6 @@ def create_statusbar(self):
 
     def create_actions(self):
 
-        def get_icon(name, menu=True, toolbar=True):
-            icon = QtGui.QIcon()
-            if menu:
-                icon.addFile(":/images/16x16/%s.png" % name)
-            if toolbar:
-                icon.addFile(":/images/22x22/%s.png" % name)
-            return icon
-
         self.options_action = QtGui.QAction(icontheme.lookup('preferences-desktop'), _("&Options..."), self)
         self.connect(self.options_action, QtCore.SIGNAL("triggered()"), self.show_options)
 
@@ -241,13 +233,13 @@ def get_icon(name, menu=True, toolbar=True):
         self.cluster_action.setShortcut(QtGui.QKeySequence(_(u"Ctrl+U")))
         self.connect(self.cluster_action, QtCore.SIGNAL("triggered()"), self.cluster)
 
-        self.autotag_action = QtGui.QAction(QtGui.QIcon(":/images/magic-wand.png"), _(u"Auto Tag"), self)
+        self.autotag_action = QtGui.QAction(icontheme.lookup('picard-auto-tag'), _(u"Auto Tag"), self)
         self.autotag_action.setEnabled(False)
         # TR: Keyboard shortcut for "Auto Tag"
         self.autotag_action.setShortcut(QtGui.QKeySequence(_(u"Ctrl+T")))
         self.connect(self.autotag_action, QtCore.SIGNAL("triggered()"), self.autotag)
 
-        self.edit_tags_action = QtGui.QAction(QtGui.QIcon(":/images/tag.png"), _(u"Edit &Tags..."), self)
+        self.edit_tags_action = QtGui.QAction(icontheme.lookup('picard-edit-tags'), _(u"Edit &Tags..."), self)
         self.edit_tags_action.setEnabled(False)
         self.connect(self.edit_tags_action, QtCore.SIGNAL("triggered()"), self.edit_tags)
 

diff --git a/resources/images/magic-wand.png → resources/images/22x22/picard-auto-tag.png b/resources/images/magic-wand.png → resources/images/22x22/picard-auto-tag.png
diff --git a/resources/images/tag.png → resources/images/22x22/picard-edit-tags.png b/resources/images/tag.png → resources/images/22x22/picard-edit-tags.png
diff --git a/resources/picard.qrc b/resources/picard.qrc
@@ -7,7 +7,6 @@
     <file>images/Picard16.png</file>
     <file>images/Picard32.png</file>
     <file>images/22x22/picard-analyze.png</file>
-    <file>images/ToolbarListen.png</file>
     <file>images/16x16/media-optical.png</file>
     <file>images/22x22/media-optical.png</file>
     <file>images/22x22/list-remove.png</file>
@@ -19,9 +18,9 @@
     <file>images/match-80.png</file>
     <file>images/match-90.png</file>
     <file>images/match-100.png</file>
-    <file>images/magic-wand.png</file>
+    <file>images/22x22/picard-auto-tag.png</file>
     <file>images/track-saved.png</file>
-    <file>images/tag.png</file>
+    <file>images/22x22/picard-edit-tags.png</file>
     <file>images/16x16/edit-cut.png</file>
     <file>images/16x16/edit-paste.png</file>
     <file>images/16x16/document-open.png</file>