Added a few 16x16 icons for menus.

Author: lalinsky

AUTHORS.txt

@@ -0,0 +1,5 @@
+Lukáš Lalinský <[email protected]>
+Robert Kaye <[email protected]>
+
+The icons in this program are from the Tango Desktop Project
+<http://tango.freedesktop.org/>.

COPYING COPYING.txt

@@ -149,8 +149,15 @@ def createStatusBar(self):
         self.statusBar().showMessage(_("Ready"))
 
     def createActions(self):
+        
+        def get_icon(name):
+            icon = QtGui.QIcon()
+            icon.addFile(":/images/16x16/%s.png" % name)
+            icon.addFile(":/images/22x22/%s.png" % name)
+            return icon
+        
         self.options_action = QtGui.QAction(
-            QtGui.QIcon(":/images/ToolbarOptions.png"), _("&Options..."), self)
+            get_icon("preferences-system"), _("&Options..."), self)
         self.connect(self.options_action, QtCore.SIGNAL("triggered()"),
                      self.show_options)
 
@@ -179,17 +186,15 @@ def createActions(self):
                      self.show_about)
 
         self.add_files_action = QtGui.QAction(
-            QtGui.QIcon(":/images/ToolbarAddFiles.png"), _(u"&Add Files..."),
-            self)
+            get_icon("document-open"), _(u"&Add Files..."), self)
         self.add_files_action.setStatusTip(_(u"Add files to the tagger"))
         # TR: Keyboard shortcut for "Add Files..."
         self.add_files_action.setShortcut(QtGui.QKeySequence(_(u"Ctrl+O")))
         self.connect(self.add_files_action, QtCore.SIGNAL("triggered()"),
                      self.add_files)
 
         self.add_directory_action = QtGui.QAction(
-            QtGui.QIcon(":/images/ToolbarAddDir.png"),
-            _(u"A&dd Directory..."), self)
+            get_icon("folder"), _(u"A&dd Directory..."), self)
         self.add_directory_action.setStatusTip(
             _(u"Add a directory to the tagger"))
         # TR: Keyboard shortcut for "Add Directory..."
@@ -198,7 +203,7 @@ def createActions(self):
                      self.addDirectory)
 
         self.save_action = QtGui.QAction(
-            QtGui.QIcon(":/images/ToolbarSave.png"), _(u"&Save"), self)
+            get_icon("document-save"), _(u"&Save"), self)
         self.add_directory_action.setStatusTip(_(u"Save selected files"))
         # TR: Keyboard shortcut for "Save"
         self.save_action.setShortcut(QtGui.QKeySequence(_(u"Ctrl+S")))

picard/resources.py

@@ -7,15 +7,11 @@
     <file>images/note.png</file>
     <file>images/Picard16.png</file>
     <file>images/Picard32.png</file>
-    <file>images/ToolbarAddDir.png</file>
-    <file>images/ToolbarAddFiles.png</file>
     <file>images/ToolbarAnalyze.png</file>
     <file>images/ToolbarCluster.png</file>
     <file>images/ToolbarListen.png</file>
     <file>images/ToolbarLookup.png</file>
-    <file>images/ToolbarOptions.png</file>
     <file>images/ToolbarRemove.png</file>
-    <file>images/ToolbarSave.png</file>
     <file>images/search.png</file>
     <file>images/ToolbarSubmit.png</file>
     <file>images/remove.png</file>
@@ -31,5 +27,13 @@
     <file>images/tag.png</file>
     <file>images/16x16/edit-cut.png</file>
     <file>images/16x16/edit-paste.png</file>
+    <file>images/16x16/document-open.png</file>
+    <file>images/22x22/document-open.png</file>
+    <file>images/16x16/folder.png</file>
+    <file>images/22x22/folder.png</file>
+    <file>images/16x16/preferences-system.png</file>
+    <file>images/22x22/preferences-system.png</file>
+    <file>images/16x16/document-save.png</file>
+    <file>images/22x22/document-save.png</file>
 </qresource>
 </RCC>