arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-15 06:45:48 +00:00
Code Issues Projects Releases Wiki Activity

fix bug with saving settings

Browse Source 
added 'enable popup message'
This commit is contained in:
arcan1s
2014-05-29 00:30:23 +04:00
parent fe580ef806
commit 71823471cc
20 changed files with 881 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/ptm/contents/code/configdef.py
View File

@ -46,6 +46,7 @@ class ConfigDefinition:
settings.set('font_style', str(self.configpage['appearance'].ui.comboBox_style.currentText()))
settings.set('font_weight', self.configpage['appearance'].ui.spinBox_weight.value())
settings.set('popup', self.configpage['advanced'].ui.checkBox_popup.checkState())
settings.set('custom_time', str(self.configpage['advanced'].ui.lineEdit_timeFormat.text()))
settings.set('custom_uptime', str(self.configpage['advanced'].ui.lineEdit_uptimeFormat.text()))
settings.set('temp_units', str(self.configpage['advanced'].ui.comboBox_tempUnits.currentText()))
@ -140,6 +141,7 @@ class ConfigDefinition:
self.configpage['appearance'].ui.comboBox_style.setCurrentIndex(1)
self.configpage['appearance'].ui.spinBox_weight.setValue(settings.get('font_weight', 400).toInt()[0])
self.configpage['advanced'].ui.checkBox_popup.setCheckState(settings.get('popup', 2).toInt()[0])
self.configpage['advanced'].ui.lineEdit_timeFormat.setText(str(settings.get('custom_time', '$hh:$mm')))
self.configpage['advanced'].ui.lineEdit_uptimeFormat.setText(str(settings.get('custom_uptime', '$ds,$hs,$ms')))
index = self.configpage['advanced'].ui.comboBox_tempUnits.findText(str(settings.get('temp_units', "Celsius")))
@ -263,4 +265,4 @@ class ConfigDefinition:
page['dataengine'] = parent.addPage(self.configpage['dataengine'], i18n("DataEngine"))
page['dataengine'].setIcon(KIcon("utilities-system-monitor"))
parent.okClicked.connect(self.configAccepted)
QObject.connect(parent, SIGNAL("okClicked()"), self.configAccepted)

16
sources/ptm/contents/code/main.py
View File

@ -53,17 +53,19 @@ def getTemp(temp, unit):
class CustomPlasmaLabel(Plasma.Label):
"""new Label with defined clicked() event"""
def __init__(self, applet, name):
def __init__(self, applet, name, enablePopup):
"""class definition"""
Plasma.Label.__init__(self, applet)
self.enablePopup = enablePopup
self.name = name
self.notify = ptmnotify.PTMNotify(self)
def mousePressEvent(self, event):
"""mouse click event"""
if (event.button() == Qt.LeftButton):
self.notify.init(self.name)
if (self.enablePopup > 0):
if (event.button() == Qt.LeftButton):
self.notify.init(self.name)
@ -169,8 +171,8 @@ class pyTextWidget(plasmascript.Applet):
configpage['tooltip'] = tooltipconfig.TooltipWindow(self)
configpage['widget'] = widget.WidgetWindow(self)
confdef = configdef.ConfigDefinition(self, configpage, self.ptm['defaults'])
confdef.createConfigurationInterface(parent)
self.confdef = configdef.ConfigDefinition(self, configpage, self.ptm['defaults'])
self.confdef.createConfigurationInterface(parent)
def initTooltip(self):
@ -559,10 +561,10 @@ class pyTextWidget(plasmascript.Applet):
# external functions
def addLabel(self, name=None, text=None, add=True):
def addLabel(self, name=None, text=None, add=True, enablePopup=2):
"""function to add new label"""
if (add):
self.ptm['labels'][name] = CustomPlasmaLabel(self.applet, name)
self.ptm['labels'][name] = CustomPlasmaLabel(self.applet, name, enablePopup)
self.ptm['layout'].addItem(self.ptm['labels'][name])
self.setText(name, text)
else:

5
sources/ptm/contents/code/reinit.py
View File

@ -40,13 +40,14 @@ class Reinit():
ptmVars['adv']['acDev'] = str(settings.get('ac_device', '/sys/class/power_supply/AC/online'))
ptmVars['adv']['acOnline'] = str(settings.get('ac_online', '(*)'))
ptmVars['adv']['acOffline'] = str(settings.get('ac_offline', '( )'))
ptmVars['adv']['tempUnits'] = str(settings.get('temp_units', 'Celsius'))
ptmVars['adv']['batDev'] = str(settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity'))
ptmVars['adv']['customTime'] = str(settings.get('custom_time', '$hh:$mm'))
ptmVars['adv']['customUptime'] = str(settings.get('custom_uptime', '$dd,$hh,$mm'))
ptmVars['adv']['netdevBool'] = settings.get('netdevBool', 0).toInt()[0]
ptmVars['adv']['netdev'] = str(settings.get('custom_netdev', 'lo'))
ptmVars['adv']['netDir'] = str(settings.get('netdir', '/sys/class/net'))
ptmVars['adv']['tempUnits'] = str(settings.get('temp_units', 'Celsius'))
ptmVars['adv']['popup'] = settings.get('popup', 2).toInt()[0]
ptmVars['app'] = {}
ptmVars['app']['format'] = ["<pre><p align=\"center\"><span style=\" font-family:'" + str(settings.get('font_family', 'Terminus')) +\
@ -84,7 +85,7 @@ class Reinit():
if (ptmVars['bools'][label] > 0):
ptmVars['formats'][label] = str(settings.get(self.defaults['confFormat'][label], self.defaults['format'][label]))
text = ptmVars['app']['format'][0] + ptmVars['formats'][label] + ptmVars['app']['format'][1]
self.parent.addLabel(label, text, True)
self.parent.addLabel(label, text, True, ptmVars['adv']['popup'])
if ((label in ['cpu', 'cpuclock', 'mem', 'net', 'swap']) and (ptmVars['bools'][label] == 2)):
if (label == 'net'):
ptmVars['tooltip']['required'].append("down")