1.1 --- a/OpenSecurity/bin/opensecurity_tray.pyw	Mon Mar 31 15:28:48 2014 +0200
     1.2 +++ b/OpenSecurity/bin/opensecurity_tray.pyw	Tue Apr 01 13:43:59 2014 +0200
     1.3 @@ -46,8 +46,10 @@
     1.4      from cygwin import Cygwin
     1.5  
     1.6  from ui import AboutDialog
     1.7 +from ui import ConfigureDialog
     1.8  from ui import opensecurity_rc
     1.9  
    1.10 +
    1.11  # ------------------------------------------------------------
    1.12  # code
    1.13  
    1.14 @@ -125,6 +127,12 @@
    1.15          QtGui.QApplication.instance().processEvents()
    1.16              
    1.17              
    1.18 +    def clicked_configure(self):
    1.19 +        """clicked configure"""
    1.20 +        d = ConfigureDialog()
    1.21 +        d.exec_()
    1.22 +    
    1.23 +
    1.24      def clicked_exit(self):
    1.25          """clicked exit"""
    1.26          sys.exit(0)
    1.27 @@ -150,7 +158,7 @@
    1.28          # add known apps
    1.29          self.acBrowser = QtGui.QAction('Secure Browsing', self.parent())
    1.30          icon = QtGui.QIcon()
    1.31 -        icon.addPixmap(QtGui.QPixmap(QtCore.QString.fromUtf8(':/opensecurity/gfx/opensecurity_icon_64.png')), QtGui.QIcon.Normal, QtGui.QIcon.Off)
    1.32 +        icon.addPixmap(QtGui.QPixmap(QtCore.QString.fromUtf8(':/opensecurity/gfx/opensecurity_browsing_64.png')), QtGui.QIcon.Normal, QtGui.QIcon.Off)
    1.33          self.acBrowser.setIcon(icon)
    1.34          menu.addAction(self.acBrowser)
    1.35          menu.addSeparator()
    1.36 @@ -158,9 +166,14 @@
    1.37          # add standard menu items
    1.38          self.acLaunch = QtGui.QAction('Launch Application', self.parent())
    1.39          icon = QtGui.QIcon()
    1.40 -        icon.addPixmap(QtGui.QPixmap(QtCore.QString.fromUtf8(':/opensecurity/gfx/opensecurity_icon_64.png')), QtGui.QIcon.Normal, QtGui.QIcon.Off)
    1.41 +        icon.addPixmap(QtGui.QPixmap(QtCore.QString.fromUtf8(':/opensecurity/gfx/opensecurity_launch_64.png')), QtGui.QIcon.Normal, QtGui.QIcon.Off)
    1.42          self.acLaunch.setIcon(icon)
    1.43          menu.addAction(self.acLaunch)
    1.44 +        self.acConfigure = QtGui.QAction('Configuration', self.parent())
    1.45 +        icon = QtGui.QIcon()
    1.46 +        icon.addPixmap(QtGui.QPixmap(QtCore.QString.fromUtf8(':/opensecurity/gfx/opensecurity_configure_64.png')), QtGui.QIcon.Normal, QtGui.QIcon.Off)
    1.47 +        self.acConfigure.setIcon(icon)
    1.48 +        menu.addAction(self.acConfigure)
    1.49          menu.addSeparator()
    1.50  
    1.51          self.acAbout = menu.addAction('About')
    1.52 @@ -168,6 +181,7 @@
    1.53          
    1.54          self.acBrowser.triggered.connect(self.clicked_browser)
    1.55          self.acLaunch.triggered.connect(self.clicked_launch_application)
    1.56 +        self.acConfigure.triggered.connect(self.clicked_configure)
    1.57          self.acAbout.triggered.connect(self.clicked_about)
    1.58          self.acExit.triggered.connect(self.clicked_exit)
    1.59          
    1.60 @@ -176,12 +190,6 @@
    1.61      
    1.62      a = QtGui.QApplication(sys.argv)
    1.63  
    1.64 -#    # prebuild the pixmap cache: fetch all jpg, png and jpeg images and load them
    1.65 -#    image_path = os.path.join(Environment("OpenSecurity").data_path, 'gfx')
    1.66 -#    for file in os.listdir(image_path):
    1.67 -#        if file.lower().rpartition('.')[2] in ('jpg', 'png', 'jpeg'):
    1.68 -#            QtGui.QPixmapCache.insert(file.lower().rpartition('.')[0], QtGui.QPixmap(os.path.join(image_path, file)))
    1.69 -
    1.70      w = QtGui.QWidget()
    1.71      icon = QtGui.QIcon()
    1.72      icon.addPixmap(QtGui.QPixmap(QtCore.QString.fromUtf8(":/opensecurity/gfx/opensecurity_icon_64.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)