# HG changeset patch
# User Oliver Maurhart <oliver.maurhart@ait.ac.at>
# Date 1406195820 -7200
# Node ID 9d777587cdab27d3440cb5dc767b60ba6b9e72ec
# Parent  2e2261ce334bc8f4f509bf1607eac48c9902e827
fix empty format menu entry in tray

diff -r 2e2261ce334b -r 9d777587cdab OpenSecurity/bin/opensecurity_tray.pyw
--- a/OpenSecurity/bin/opensecurity_tray.pyw	Tue Jul 22 13:25:32 2014 +0200
+++ b/OpenSecurity/bin/opensecurity_tray.pyw	Thu Jul 24 11:57:00 2014 +0200
@@ -245,10 +245,17 @@
             self._icon_network = QtGui.QIcon()
             self._icon_network.addPixmap(QtGui.QPixmap(":/opensecurity/gfx/network-workgroup.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
 
-            self._menu_format.clear()
+            cleared = False
             for m in machines:
+
+                # do not insert Browsing VM
                 if u'SecurityDVM0' in m:
                     continue
+
+                if not cleared:
+                    self._menu_format.clear()
+                    cleared = True
+
                 a = self._menu_format.addAction(m + '\\\\' + machines[m])
                 a.setIcon(self._icon_network)
                 a.triggered.connect(self.format_drive)
@@ -295,13 +302,17 @@
         icon.addPixmap(QtGui.QPixmap(QtCore.QString.fromUtf8(':/opensecurity/gfx/opensecurity_mail_64.png')), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.acMail.setIcon(icon)
         self.acAbout = menu.addAction('About')
-        self.acExit = menu.addAction('Exit')
+        
+        # diabled as of TICKET #11
+        # self.acExit = menu.addAction('Exit')
        
         self.acBrowser.triggered.connect(self.clicked_browser)
         self.acLaunch.triggered.connect(self.clicked_launch_application)
         self.acConfigure.triggered.connect(self.clicked_configure)
         self.acAbout.triggered.connect(self.clicked_about)
-        self.acExit.triggered.connect(self.clicked_exit)
+
+        # disabled as for TICKET #11
+        # self.acExit.triggered.connect(self.clicked_exit)
         self.acMail.triggered.connect(self.clicked_mail)