master3.3
Denis Spiridonov 12 years ago
parent 2934d8a339
commit 402cb1d942

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 848 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

@ -44,6 +44,10 @@ data_files.append(('/usr/share/applications',
data_files.append(('/usr/share/calculate/themes/install', data_files.append(('/usr/share/calculate/themes/install',
['data/install/conf','data/install/welcome.jpg', ['data/install/conf','data/install/welcome.jpg',
'data/install/finish.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 = [] var_data_files = []

Loading…
Cancel
Save