diff --git a/consolegui/application/TrayIcon.py b/consolegui/application/TrayIcon.py index 1008c11..9596e58 100644 --- a/consolegui/application/TrayIcon.py +++ b/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() diff --git a/data/128x128/cl-core.png b/data/128x128/cl-core.png new file mode 100644 index 0000000..864305c Binary files /dev/null and b/data/128x128/cl-core.png differ diff --git a/data/16x16/cl-core.png b/data/16x16/cl-core.png new file mode 100644 index 0000000..2097f7c Binary files /dev/null and b/data/16x16/cl-core.png differ diff --git a/data/22x22/cl-core.png b/data/22x22/cl-core.png new file mode 100644 index 0000000..b32fa68 Binary files /dev/null and b/data/22x22/cl-core.png differ diff --git a/data/48x48/cl-core.png b/data/48x48/cl-core.png new file mode 100644 index 0000000..0f56ccc Binary files /dev/null and b/data/48x48/cl-core.png differ diff --git a/data/64x64/cl-core.png b/data/64x64/cl-core.png new file mode 100644 index 0000000..c74d7af Binary files /dev/null and b/data/64x64/cl-core.png differ diff --git a/data/72x72/cl-core.png b/data/72x72/cl-core.png new file mode 100644 index 0000000..0ae4970 Binary files /dev/null and b/data/72x72/cl-core.png differ diff --git a/data/96x96/cl-core.png b/data/96x96/cl-core.png new file mode 100644 index 0000000..4ee82aa Binary files /dev/null and b/data/96x96/cl-core.png differ diff --git a/setup.py b/setup.py index 02ce832..5959b3c 100755 --- a/setup.py +++ b/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 = []