bugfix: modified icon management and corrected usage of references

QtPyLoT.py

@@ -29,7 +29,7 @@ from PySide.QtCore import QCoreApplication, QSettings, Signal, QFile, \
     QFileInfo, Qt
 from PySide.QtGui import QMainWindow, QInputDialog, QIcon, QFileDialog, \
     QWidget, QHBoxLayout, QStyle, QKeySequence, QLabel, QFrame, QAction, \
-    QDialog, QErrorMessage, QApplication
+    QDialog, QErrorMessage, QApplication, QPixmap
 from obspy.core import UTCDateTime
 
 from pylot.core.read import Data, FilterOptions
@@ -38,12 +38,11 @@ from pylot.core.util import _getVersionString, FILTERDEFAULTS, fnConstructor, \
     NewEventDlg, createEvent, MPLWidget, PropertiesDlg, HelpForm, \
     DatastructureError, createAction, getLogin, createCreationInfo, PickDlg
 from pylot.core.util.structure import DATASTRUCTURE
-import qrc_resources
+import icons_rc
 
 # Version information
 __version__ = _getVersionString()
 
-
 class MainWindow(QMainWindow):
     closing = Signal()
 
@@ -101,8 +100,11 @@ class MainWindow(QMainWindow):
         except:
             self.startTime = UTCDateTime()
 
+        pylot_icon = QIcon()
+        pylot_icon.addPixmap(QPixmap(':/icons/pylot.ico'))
+
         self.setWindowTitle("PyLoT - do seismic processing the python way")
-        self.setWindowIcon(QIcon(":/icon.ico"))
+        self.setWindowIcon(pylot_icon)
 
         xlab = self.startTime.strftime('seconds since %Y/%m/%d %H:%M:%S (%Z)')
 
@@ -123,7 +125,15 @@ class MainWindow(QMainWindow):
         saveIcon = self.style().standardIcon(QStyle.SP_DriveHDIcon)
         helpIcon = self.style().standardIcon(QStyle.SP_DialogHelpButton)
         newIcon = self.style().standardIcon(QStyle.SP_FileIcon)
-        pickIcon = QIcon(':/pick.png')
+
+        # create resource icons
+        p_icon = QIcon()
+        p_icon.addPixmap(QPixmap(':/icons/picon.png'))
+        s_icon = QIcon()
+        s_icon.addPixmap(QPixmap(':/icons/sicon.png'))
+        print_icon = QIcon()
+        print_icon.addPixmap(QPixmap(':/icons/printer.png'))
+
         newEventAction = self.createAction(self, "&New event ...",
                                            self.createNewEvent,
                                            QKeySequence.New, newIcon,
@@ -163,14 +173,14 @@ class MainWindow(QMainWindow):
                                              "Alt+F", QIcon(None),
                                              """Adjust filter parameters.""")
         self.selectPAction = self.createAction(self, "&P", self.alterPhase, "Alt+P",
-                                          QIcon(":/picon.png"),
+                                          p_icon,
                                           "Toggle P phase.", True)
         self.selectSAction = self.createAction(self, "&S", self.alterPhase, "Alt+S",
-                                          QIcon(":/sicon.png"),
+                                          s_icon,
                                           "Toggle S phase", True)
         printAction = self.createAction(self, "&Print event ...",
                                         self.printEvent, QKeySequence.Print,
-                                        QIcon(":/printer.png"),
+                                        print_icon,
                                         "Print waveform overview.")
         helpAction = self.createAction(self, "&Help ...", self.helpHelp,
                                        QKeySequence.HelpContents, helpIcon,
@@ -517,13 +527,16 @@ class MainWindow(QMainWindow):
 
 def main():
     # create the Qt application
-    pylot_app = QApplication(sys.argv[0])
+    pylot_app = QApplication(sys.argv)
+
+    app_icon = QIcon()
+    app_icon.addPixmap(QPixmap(':/icons/pick.png'))
 
     # set Application Information
     pylot_app.setOrganizationName("Ruhr-University Bochum / MAGS2")
     pylot_app.setOrganizationDomain("rub.de")
     pylot_app.setApplicationName("PyLoT")
-    pylot_app.setWindowIcon(QIcon(":/icon.ico"))
+    pylot_app.setWindowIcon(app_icon)
 
     # create the main window
     pylot_form = MainWindow()

icons.qrc

@@ -5,6 +5,7 @@
 		<file>icons/picon.png</file>
 		<file>icons/sicon.png</file>
 		<file>icons/pick.png</file>
+        <file>icons/filter.png</file>
     </qresource>
     <qresource prefix="/help">
         <file>help/index.html</file>

pylot/core/util/widgets.py

@@ -262,10 +262,14 @@ class PickDlg(QDialog):
 
     def setupUi(self):
 
+        # create icons
+        filter_icon = QIcon()
+        filter_icon.addPixmap(QPixmap(':/icons/filter.png'))
+
         # create actions
         self.filterAction = createAction(parent=self, text='Filter',
                                          slot=self.filterWFData,
-                                         icon=QIcon(':/filter.png'),
+                                         icon=filter_icon,
                                          tip='Filter waveforms',
                                          checkable=True)
         self.selectPhase = QComboBox()