fix empty format menu entry in tray
authorOliver Maurhart <oliver.maurhart@ait.ac.at>
Thu, 24 Jul 2014 11:57:00 +0200
changeset 2159d777587cdab
parent 214 2e2261ce334b
child 216 358381a8c60a
fix empty format menu entry in tray
OpenSecurity/bin/opensecurity_tray.pyw
     1.1 --- a/OpenSecurity/bin/opensecurity_tray.pyw	Tue Jul 22 13:25:32 2014 +0200
     1.2 +++ b/OpenSecurity/bin/opensecurity_tray.pyw	Thu Jul 24 11:57:00 2014 +0200
     1.3 @@ -245,10 +245,17 @@
     1.4              self._icon_network = QtGui.QIcon()
     1.5              self._icon_network.addPixmap(QtGui.QPixmap(":/opensecurity/gfx/network-workgroup.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
     1.6  
     1.7 -            self._menu_format.clear()
     1.8 +            cleared = False
     1.9              for m in machines:
    1.10 +
    1.11 +                # do not insert Browsing VM
    1.12                  if u'SecurityDVM0' in m:
    1.13                      continue
    1.14 +
    1.15 +                if not cleared:
    1.16 +                    self._menu_format.clear()
    1.17 +                    cleared = True
    1.18 +
    1.19                  a = self._menu_format.addAction(m + '\\\\' + machines[m])
    1.20                  a.setIcon(self._icon_network)
    1.21                  a.triggered.connect(self.format_drive)
    1.22 @@ -295,13 +302,17 @@
    1.23          icon.addPixmap(QtGui.QPixmap(QtCore.QString.fromUtf8(':/opensecurity/gfx/opensecurity_mail_64.png')), QtGui.QIcon.Normal, QtGui.QIcon.Off)
    1.24          self.acMail.setIcon(icon)
    1.25          self.acAbout = menu.addAction('About')
    1.26 -        self.acExit = menu.addAction('Exit')
    1.27 +        
    1.28 +        # diabled as of TICKET #11
    1.29 +        # self.acExit = menu.addAction('Exit')
    1.30         
    1.31          self.acBrowser.triggered.connect(self.clicked_browser)
    1.32          self.acLaunch.triggered.connect(self.clicked_launch_application)
    1.33          self.acConfigure.triggered.connect(self.clicked_configure)
    1.34          self.acAbout.triggered.connect(self.clicked_about)
    1.35 -        self.acExit.triggered.connect(self.clicked_exit)
    1.36 +
    1.37 +        # disabled as for TICKET #11
    1.38 +        # self.acExit.triggered.connect(self.clicked_exit)
    1.39          self.acMail.triggered.connect(self.clicked_mail)
    1.40          
    1.41