Merge remote branch 'origin/develop'

consolegui/application/TrayIcon.py

@@ -188,7 +188,6 @@ class TrayIcon (QtGui.QSystemTrayIcon):
 #            elif reply == QtGui.QMessageBox.Yes:
 #                self.update_thread.close()
 #                self.update_thread.wait()
-
         self._parent._closeEvent()
     
     def activ(self, reason):
@@ -239,7 +238,6 @@ class TrayIcon (QtGui.QSystemTrayIcon):
         else:
             show_msg(_('Update is already running'))
 
-
 class LeftButtonMenu(QtGui.QMenu):
     def __init__(self, parent, MainWgt):
         QtGui.QMenu.__init__(self)
@@ -278,7 +276,7 @@ class LeftButtonMenu(QtGui.QMenu):
 #        self.addAction(self.sys_update)
 #
 #        self.addSeparator()
-        
+
         # Add exit action
         exit_icons = ['application-exit', 'system-log-out']
         exit_icon = QtGui.QIcon()
@@ -297,7 +295,7 @@ class LeftButtonMenu(QtGui.QMenu):
 
         self.addAction(self.exit_action)
 #        self.setWindowOpacity(0.6)
-        
+
 #        bg_color_alpha = 'rgba(0,0,0,150)'
 #        self.setStyleSheet( self.styleSheet() + \
 #                    'QMenu {'\
@@ -313,7 +311,7 @@ class LeftButtonMenu(QtGui.QMenu):
 class RightButtonMenu(QtGui.QMenu):
     def __init__(self, parent, MainWgt):
         QtGui.QMenu.__init__(self)
-        
+
         # Add about program
         About_icon = (QtGui.QIcon('/usr/share/pixmaps/calculate3.png'))
         themeName = QtGui.QIcon.themeName()
@@ -352,7 +350,7 @@ class RightButtonMenu(QtGui.QMenu):
         self.addAction(self.bug_action)
 
         self.addSeparator()
-        
+
         # Add tools
         tools_icons = ['preferences-other', 'preferences-system']
         tools_icon = QtGui.QIcon()

setup.py

@@ -44,6 +44,10 @@ data_files.append(('/usr/share/applications',
 data_files.append(('/usr/share/calculate/themes/install',
                    ['data/install/conf','data/install/welcome.jpg',
                     'data/install/finish.jpg']))
+for size in [16,22,48,64,72,96,128]:
+    data_files.append(('/usr/share/icons/Calculate/%dx%d' %(size,size),
+                   glob.glob('data/%dx%d/cl-core.png' %(size,size))))
+
 
 var_data_files = []