Edited configuration interface

* changed (bool == 1) to (bool > 0)
This commit is contained in:
arcan1s 2013-10-03 00:18:29 +04:00
parent d8a9ca1fe6
commit 7aabdf9485
7 changed files with 1196 additions and 1176 deletions

View File

@ -37,11 +37,11 @@ class ConfigDefinition:
settings.set('font_weight', self.parent.font_weight) settings.set('font_weight', self.parent.font_weight)
# disconnecting from source and clear layout # disconnecting from source and clear layout
if (self.parent.uptimeBool == 1): if (self.parent.uptimeBool > 0):
self.parent.systemmonitor.disconnectSource("system/uptime", self.parent) self.parent.systemmonitor.disconnectSource("system/uptime", self.parent)
self.parent.label_uptime.setText('') self.parent.label_uptime.setText('')
self.parent.layout.removeItem(self.parent.label_uptime) self.parent.layout.removeItem(self.parent.label_uptime)
if (self.parent.cpuBool == 1): if (self.parent.cpuBool > 0):
self.parent.systemmonitor.disconnectSource("cpu/system/TotalLoad", self.parent) self.parent.systemmonitor.disconnectSource("cpu/system/TotalLoad", self.parent)
if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat): if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat):
self.parent.label_cpu0.setText('') self.parent.label_cpu0.setText('')
@ -55,7 +55,7 @@ class ConfigDefinition:
else: else:
self.parent.label_cpu.setText('') self.parent.label_cpu.setText('')
self.parent.layout.removeItem(self.parent.label_cpu) self.parent.layout.removeItem(self.parent.label_cpu)
if (self.parent.cpuclockBool == 1): if (self.parent.cpuclockBool > 0):
self.parent.systemmonitor.disconnectSource("cpu/system/AverageClock", self.parent) self.parent.systemmonitor.disconnectSource("cpu/system/AverageClock", self.parent)
if (self.parent.cpuclockFormat.split('$ccpu')[0] != self.parent.cpuclockFormat): if (self.parent.cpuclockFormat.split('$ccpu')[0] != self.parent.cpuclockFormat):
self.parent.label_cpuclock0.setText('') self.parent.label_cpuclock0.setText('')
@ -69,32 +69,32 @@ class ConfigDefinition:
else: else:
self.parent.label_cpuclock.setText('') self.parent.label_cpuclock.setText('')
self.parent.layout.removeItem(self.parent.label_cpuclock) self.parent.layout.removeItem(self.parent.label_cpuclock)
if (self.parent.tempBool == 1): if (self.parent.tempBool > 0):
self.parent.systemmonitor.disconnectSource(self.parent.tempdev, self.parent) self.parent.systemmonitor.disconnectSource(self.parent.tempdev, self.parent)
self.parent.label_temp.setText('') self.parent.label_temp.setText('')
self.parent.layout.removeItem(self.parent.label_temp) self.parent.layout.removeItem(self.parent.label_temp)
if (self.parent.gpuBool == 1): if (self.parent.gpuBool > 0):
self.parent.extsysmon.disconnectSource("gpu", self.parent) self.parent.extsysmon.disconnectSource("gpu", self.parent)
self.parent.label_gpu.setText('') self.parent.label_gpu.setText('')
self.parent.layout.removeItem(self.parent.label_gpu) self.parent.layout.removeItem(self.parent.label_gpu)
if (self.parent.gputempBool == 1): if (self.parent.gputempBool > 0):
self.parent.extsysmon.disconnectSource("gputemp", self.parent) self.parent.extsysmon.disconnectSource("gputemp", self.parent)
self.parent.label_gputemp.setText('') self.parent.label_gputemp.setText('')
self.parent.layout.removeItem(self.parent.label_gputemp) self.parent.layout.removeItem(self.parent.label_gputemp)
if (self.parent.memBool == 1): if (self.parent.memBool > 0):
self.parent.systemmonitor.disconnectSource("mem/physical/application", self.parent) self.parent.systemmonitor.disconnectSource("mem/physical/application", self.parent)
if (self.parent.memInMb == False): if (self.parent.memInMb == False):
self.parent.systemmonitor.disconnectSource("mem/physical/free", self.parent) self.parent.systemmonitor.disconnectSource("mem/physical/free", self.parent)
self.parent.systemmonitor.disconnectSource("mem/physical/used", self.parent) self.parent.systemmonitor.disconnectSource("mem/physical/used", self.parent)
self.parent.label_mem.setText('') self.parent.label_mem.setText('')
self.parent.layout.removeItem(self.parent.label_mem) self.parent.layout.removeItem(self.parent.label_mem)
if (self.parent.swapBool == 1): if (self.parent.swapBool > 0):
self.parent.systemmonitor.disconnectSource("mem/swap/used", self.parent) self.parent.systemmonitor.disconnectSource("mem/swap/used", self.parent)
if (self.parent.swapInMb == False): if (self.parent.swapInMb == False):
self.parent.systemmonitor.disconnectSource("mem/swap/free", self.parent) self.parent.systemmonitor.disconnectSource("mem/swap/free", self.parent)
self.parent.label_swap.setText('') self.parent.label_swap.setText('')
self.parent.layout.removeItem(self.parent.label_swap) self.parent.layout.removeItem(self.parent.label_swap)
if (self.parent.hddBool == 1): if (self.parent.hddBool > 0):
for mount in self.parent.mountPoints: for mount in self.parent.mountPoints:
self.parent.systemmonitor.disconnectSource("partitions" + mount + "/filllevel", self.parent) self.parent.systemmonitor.disconnectSource("partitions" + mount + "/filllevel", self.parent)
exec ('self.parent.label_hdd_' + ''.join(mount.split('/')) + '.setText("")') exec ('self.parent.label_hdd_' + ''.join(mount.split('/')) + '.setText("")')
@ -103,30 +103,28 @@ class ConfigDefinition:
self.parent.label_hdd1.setText('') self.parent.label_hdd1.setText('')
self.parent.layout.removeItem(self.parent.label_hdd0) self.parent.layout.removeItem(self.parent.label_hdd0)
self.parent.layout.removeItem(self.parent.label_hdd1) self.parent.layout.removeItem(self.parent.label_hdd1)
if (self.parent.hddtempBool == 1): if (self.parent.hddtempBool > 0):
self.parent.extsysmon.disconnectSource("hddtemp", self.parent) self.parent.extsysmon.disconnectSource("hddtemp", self.parent)
self.parent.label_hddtemp.setText('') self.parent.label_hddtemp.setText('')
self.parent.layout.removeItem(self.parent.label_hddtemp) self.parent.layout.removeItem(self.parent.label_hddtemp)
if (self.parent.netBool == 1): if (self.parent.netBool > 0):
self.parent.systemmonitor.disconnectSource("network/interfaces/"+self.parent.netdev+"/transmitter/data", self.parent) self.parent.systemmonitor.disconnectSource("network/interfaces/"+self.parent.netdev+"/transmitter/data", self.parent)
self.parent.systemmonitor.disconnectSource("network/interfaces/"+self.parent.netdev+"/receiver/data", self.parent) self.parent.systemmonitor.disconnectSource("network/interfaces/"+self.parent.netdev+"/receiver/data", self.parent)
self.parent.label_netDown.setText('') self.parent.label_netDown.setText('')
self.parent.label_netUp.setText('') self.parent.label_netUp.setText('')
self.parent.layout.removeItem(self.parent.label_netUp) self.parent.layout.removeItem(self.parent.label_netUp)
self.parent.layout.removeItem(self.parent.label_netDown) self.parent.layout.removeItem(self.parent.label_netDown)
if (self.parent.batBool == 1): if (self.parent.batBool > 0):
self.parent.label_bat.setText('') self.parent.label_bat.setText('')
self.parent.layout.removeItem(self.parent.label_bat) self.parent.layout.removeItem(self.parent.label_bat)
self.parent.label_order = "------------" self.parent.label_order = "------------"
for label in self.parent.dict_orders.keys(): for label in self.parent.dict_orders.keys():
if (self.configpage.checkboxes[self.parent.dict_orders[label]].checkState() == 2): exec ('self.parent.' + self.parent.dict_orders[label] + 'Bool = ' + str(self.configpage.checkboxes[self.parent.dict_orders[label]].checkState()))
exec ('self.parent.' + self.parent.dict_orders[label] + 'Bool = 1') if (self.configpage.checkboxes[self.parent.dict_orders[label]].checkState() > 0):
pos = self.configpage.sliders[self.parent.dict_orders[label]].value() - 1 pos = self.configpage.sliders[self.parent.dict_orders[label]].value() - 1
self.parent.label_order = self.parent.label_order[:pos] + label + self.parent.label_order[pos+1:] self.parent.label_order = self.parent.label_order[:pos] + label + self.parent.label_order[pos+1:]
else:
exec ('self.parent.' + self.parent.dict_orders[label] + 'Bool = 0')
if (self.parent.dict_orders[label] == 'net'): if (self.parent.dict_orders[label] == 'net'):
exec ('self.parent.' + self.parent.dict_orders[label] + 'NonFormat = str(self.configpage.lineedits[self.parent.dict_orders[label]].text())') exec ('self.parent.' + self.parent.dict_orders[label] + 'NonFormat = str(self.configpage.lineedits[self.parent.dict_orders[label]].text())')
exec ('settings.set("' + self.parent.dict_orders[label] + 'NonFormat", self.parent.' + self.parent.dict_orders[label] + 'NonFormat)') exec ('settings.set("' + self.parent.dict_orders[label] + 'NonFormat", self.parent.' + self.parent.dict_orders[label] + 'NonFormat)')
@ -167,11 +165,9 @@ class ConfigDefinition:
self.configpage.ui.spinBox_weight.setValue(settings.get('font_weight', 400).toInt()[0]) self.configpage.ui.spinBox_weight.setValue(settings.get('font_weight', 400).toInt()[0])
for label in self.parent.dict_orders.keys(): for label in self.parent.dict_orders.keys():
exec ('bool = self.parent.' + self.parent.dict_orders[label] + 'Bool') exec ('bool = self.parent.' + self.parent.dict_orders[label] + 'Bool')
if (bool == 1): self.configpage.checkboxes[self.parent.dict_orders[label]].setCheckState(bool)
self.configpage.checkboxes[self.parent.dict_orders[label]].setCheckState(2) if (bool > 0):
self.configpage.sliders[self.parent.dict_orders[label]].setValue(self.parent.label_order.find(label)+1) self.configpage.sliders[self.parent.dict_orders[label]].setValue(self.parent.label_order.find(label)+1)
else:
self.configpage.checkboxes[self.parent.dict_orders[label]].setCheckState(0)
if (self.parent.dict_orders[label] == 'net'): if (self.parent.dict_orders[label] == 'net'):
self.configpage.lineedits[self.parent.dict_orders[label]].setText(str(settings.get(self.parent.dict_orders[label] + 'NonFormat', self.parent.dict_defFormat[self.parent.dict_orders[label]]))) self.configpage.lineedits[self.parent.dict_orders[label]].setText(str(settings.get(self.parent.dict_orders[label] + 'NonFormat', self.parent.dict_defFormat[self.parent.dict_orders[label]])))
else: else:

View File

@ -43,7 +43,7 @@ class ConfigWindow(QWidget):
"""function to enable label""" """function to enable label"""
count = self.sliders['bat'].maximum() count = self.sliders['bat'].maximum()
for label in self.checkboxes.keys(): for label in self.checkboxes.keys():
if ((self.checkboxes[label].checkState() == 2) and (self.sliders[label].isEnabled() == False)): if ((self.checkboxes[label].checkState() > 0) and (self.sliders[label].isEnabled() == False)):
self.lineedits[label].setEnabled(True) self.lineedits[label].setEnabled(True)
self.sliders[label].setEnabled(True) self.sliders[label].setEnabled(True)
if (label == 'bat'): if (label == 'bat'):

View File

@ -16,46 +16,46 @@ class DataEngine:
def connectToEngine(self): def connectToEngine(self):
"""function to initializate engine""" """function to initializate engine"""
self.parent.systemmonitor = self.parent.dataEngine("systemmonitor") self.parent.systemmonitor = self.parent.dataEngine("systemmonitor")
if ((self.parent.gputempBool == 1) or (self.parent.gpuBool == 1) or (self.parent.hddtempBool == 1)): if ((self.parent.gputempBool > 0) or (self.parent.gpuBool > 0) or (self.parent.hddtempBool > 0)):
self.parent.extsysmon = self.parent.dataEngine("ext-sysmon") self.parent.extsysmon = self.parent.dataEngine("ext-sysmon")
if (self.parent.uptimeBool == 1): if (self.parent.uptimeBool > 0):
self.parent.systemmonitor.connectSource("system/uptime", self.parent, self.parent.interval) self.parent.systemmonitor.connectSource("system/uptime", self.parent, self.parent.interval)
if (self.parent.cpuBool == 1): if (self.parent.cpuBool > 0):
self.parent.systemmonitor.connectSource("cpu/system/TotalLoad", self.parent, self.parent.interval) self.parent.systemmonitor.connectSource("cpu/system/TotalLoad", self.parent, self.parent.interval)
if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat): if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat):
for core in range(self.parent.numCores): for core in range(self.parent.numCores):
self.parent.systemmonitor.connectSource("cpu/cpu"+str(core)+"/TotalLoad", self.parent, self.parent.interval) self.parent.systemmonitor.connectSource("cpu/cpu"+str(core)+"/TotalLoad", self.parent, self.parent.interval)
if (self.parent.cpuclockBool == 1): if (self.parent.cpuclockBool > 0):
self.parent.systemmonitor.connectSource("cpu/system/AverageClock", self.parent, self.parent.interval) self.parent.systemmonitor.connectSource("cpu/system/AverageClock", self.parent, self.parent.interval)
if (self.parent.cpuclockFormat.split('$ccpucl')[0] != self.parent.cpuclockFormat): if (self.parent.cpuclockFormat.split('$ccpucl')[0] != self.parent.cpuclockFormat):
for core in range(self.parent.numCores): for core in range(self.parent.numCores):
self.parent.systemmonitor.connectSource("cpu/cpu"+str(core)+"/clock", self.parent, self.parent.interval) self.parent.systemmonitor.connectSource("cpu/cpu"+str(core)+"/clock", self.parent, self.parent.interval)
if (self.parent.tempBool == 1): if (self.parent.tempBool > 0):
self.parent.systemmonitor.connectSource(self.parent.tempdev, self.parent, self.parent.interval) self.parent.systemmonitor.connectSource(self.parent.tempdev, self.parent, self.parent.interval)
if (self.parent.gpuBool == 1): if (self.parent.gpuBool > 0):
self.parent.extsysmon.connectSource("gpu", self.parent, self.parent.interval) self.parent.extsysmon.connectSource("gpu", self.parent, self.parent.interval)
if (self.parent.gputempBool == 1): if (self.parent.gputempBool > 0):
self.parent.extsysmon.connectSource("gputemp", self.parent, self.parent.interval) self.parent.extsysmon.connectSource("gputemp", self.parent, self.parent.interval)
if (self.parent.memBool == 1): if (self.parent.memBool > 0):
if (self.parent.memInMb): if (self.parent.memInMb):
self.parent.systemmonitor.connectSource("mem/physical/application", self.parent, self.parent.interval) self.parent.systemmonitor.connectSource("mem/physical/application", self.parent, self.parent.interval)
else: else:
self.parent.systemmonitor.connectSource("mem/physical/free", self.parent, int(self.parent.interval*0.5)) self.parent.systemmonitor.connectSource("mem/physical/free", self.parent, int(self.parent.interval*0.5))
self.parent.systemmonitor.connectSource("mem/physical/used", self.parent, int(self.parent.interval*0.5)) self.parent.systemmonitor.connectSource("mem/physical/used", self.parent, int(self.parent.interval*0.5))
self.parent.systemmonitor.connectSource("mem/physical/application", self.parent, int(self.parent.interval*0.5)) self.parent.systemmonitor.connectSource("mem/physical/application", self.parent, int(self.parent.interval*0.5))
if (self.parent.swapBool == 1): if (self.parent.swapBool > 0):
if (self.parent.swapInMb): if (self.parent.swapInMb):
self.parent.systemmonitor.connectSource("mem/swap/used", self.parent, self.parent.interval) self.parent.systemmonitor.connectSource("mem/swap/used", self.parent, self.parent.interval)
else: else:
self.parent.systemmonitor.connectSource("mem/swap/free", self.parent, int(self.parent.interval*0.5)) self.parent.systemmonitor.connectSource("mem/swap/free", self.parent, int(self.parent.interval*0.5))
self.parent.systemmonitor.connectSource("mem/swap/used", self.parent, int(self.parent.interval*0.5)) self.parent.systemmonitor.connectSource("mem/swap/used", self.parent, int(self.parent.interval*0.5))
if (self.parent.hddBool == 1): if (self.parent.hddBool > 0):
for mount in self.parent.mountPoints: for mount in self.parent.mountPoints:
self.parent.systemmonitor.connectSource("partitions" + mount + "/filllevel", self.parent, self.parent.interval) self.parent.systemmonitor.connectSource("partitions" + mount + "/filllevel", self.parent, self.parent.interval)
if (self.parent.hddtempBool == 1): if (self.parent.hddtempBool > 0):
self.parent.extsysmon.connectSource("hddtemp", self.parent, self.parent.interval) self.parent.extsysmon.connectSource("hddtemp", self.parent, self.parent.interval)
if (self.parent.netBool == 1): if (self.parent.netBool > 0):
self.parent.updateNetdev = 0 self.parent.updateNetdev = 0
self.parent.systemmonitor.connectSource("network/interfaces/"+self.parent.netdev+"/transmitter/data", self.parent, self.parent.interval) self.parent.systemmonitor.connectSource("network/interfaces/"+self.parent.netdev+"/transmitter/data", self.parent, self.parent.interval)
self.parent.systemmonitor.connectSource("network/interfaces/"+self.parent.netdev+"/receiver/data", self.parent, self.parent.interval) self.parent.systemmonitor.connectSource("network/interfaces/"+self.parent.netdev+"/receiver/data", self.parent, self.parent.interval)

View File

@ -117,11 +117,11 @@ class pyTextWidget(plasmascript.Applet):
def updateLabel(self): def updateLabel(self):
"""function to update label""" """function to update label"""
if ((self.memBool == 1) and (self.memInMb == False)): if ((self.memBool > 0) and (self.memInMb == False)):
self.memText() self.memText()
if ((self.swapBool == 1) and (self.swapInMb == False)): if ((self.swapBool > 0) and (self.swapInMb == False)):
self.swapText() self.swapText()
if (self.batBool == 1): if (self.batBool > 0):
self.batText() self.batText()

View File

@ -30,22 +30,22 @@ class Reinit():
else: else:
exec ('self.parent.' + label + 'Bool = int(settings.get("' + label + 'Bool", 0))') exec ('self.parent.' + label + 'Bool = int(settings.get("' + label + 'Bool", 0))')
# small function for update if errors exist # small function for update if errors exist
summ = 0 # summ = 0
for label in self.parent.dict_orders.values(): # for label in self.parent.dict_orders.values():
exec ('summ += self.parent.' + label + 'Bool') # exec ('summ += self.parent.' + label + 'Bool')
if (len(self.parent.label_order) != summ): # if (len(self.parent.label_order) != summ):
for label in self.parent.dict_orders.values(): # for label in self.parent.dict_orders.values():
if ((label == 'cpu') or (label == 'mem') or (label == 'swap') or (label == 'net')): # if ((label == 'cpu') or (label == 'mem') or (label == 'swap') or (label == 'net')):
exec ('self.parent.' + label + 'Bool = 1') # exec ('self.parent.' + label + 'Bool = 1')
else: # else:
exec ('self.parent.' + label + 'Bool = 0') # exec ('self.parent.' + label + 'Bool = 0')
exec ('settings.set("' + label + 'Bool", self.parent.' + label + 'Bool)') # exec ('settings.set("' + label + 'Bool", self.parent.' + label + 'Bool)')
self.parent.label_order = '1345' # self.parent.label_order = '1345'
settings.set('label_order', self.parent.label_order) # settings.set('label_order', self.parent.label_order)
for order in self.parent.label_order: for order in self.parent.label_order:
if (order == "1"): if (order == "1"):
if (self.parent.cpuBool == 1): if (self.parent.cpuBool > 0):
self.parent.cpuFormat = str(settings.get('cpuFormat', '[cpu: $cpu%]')) self.parent.cpuFormat = str(settings.get('cpuFormat', '[cpu: $cpu%]'))
if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat): if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat):
self.parent.label_cpu0 = Plasma.Label(self.parent.applet) self.parent.label_cpu0 = Plasma.Label(self.parent.applet)
@ -79,7 +79,7 @@ class Reinit():
self.parent.label_cpu.setText(text) self.parent.label_cpu.setText(text)
self.parent.layout.addItem(self.parent.label_cpu) self.parent.layout.addItem(self.parent.label_cpu)
elif (order == "2"): elif (order == "2"):
if (self.parent.tempBool == 1): if (self.parent.tempBool > 0):
self.parent.tempdev = str(settings.get('temp_device', '<select device>')) self.parent.tempdev = str(settings.get('temp_device', '<select device>'))
self.parent.tempFormat = str(settings.get('tempFormat', '[temp: $temp&deg;C]')) self.parent.tempFormat = str(settings.get('tempFormat', '[temp: $temp&deg;C]'))
self.parent.label_temp = Plasma.Label(self.parent.applet) self.parent.label_temp = Plasma.Label(self.parent.applet)
@ -91,7 +91,7 @@ class Reinit():
self.parent.label_temp.setText(text) self.parent.label_temp.setText(text)
self.parent.layout.addItem(self.parent.label_temp) self.parent.layout.addItem(self.parent.label_temp)
elif (order == "3"): elif (order == "3"):
if (self.parent.memBool == 1): if (self.parent.memBool > 0):
self.parent.memFormat = str(settings.get('memFormat', '[mem: $mem%]')) self.parent.memFormat = str(settings.get('memFormat', '[mem: $mem%]'))
if (self.parent.memFormat.split('$memmb')[0] != self.parent.memFormat): if (self.parent.memFormat.split('$memmb')[0] != self.parent.memFormat):
self.parent.memInMb = True self.parent.memInMb = True
@ -109,7 +109,7 @@ class Reinit():
self.parent.label_mem.setText(text) self.parent.label_mem.setText(text)
self.parent.layout.addItem(self.parent.label_mem) self.parent.layout.addItem(self.parent.label_mem)
elif (order == "4"): elif (order == "4"):
if (self.parent.swapBool == 1): if (self.parent.swapBool > 0):
self.parent.swapFormat = str(settings.get('swapFormat', '[swap: $swap%]')) self.parent.swapFormat = str(settings.get('swapFormat', '[swap: $swap%]'))
if (self.parent.swapFormat.split('$swapmb')[0] != self.parent.swapFormat): if (self.parent.swapFormat.split('$swapmb')[0] != self.parent.swapFormat):
self.parent.swapInMb = True self.parent.swapInMb = True
@ -126,7 +126,7 @@ class Reinit():
self.parent.label_swap.setText(text) self.parent.label_swap.setText(text)
self.parent.layout.addItem(self.parent.label_swap) self.parent.layout.addItem(self.parent.label_swap)
elif (order == "5"): elif (order == "5"):
if (self.parent.netBool == 1): if (self.parent.netBool > 0):
self.parent.netNonFormat = str(settings.get('netNonFormat', '[net: $netKB/s]')) self.parent.netNonFormat = str(settings.get('netNonFormat', '[net: $netKB/s]'))
if (self.parent.netNonFormat.split('@@')[0] != self.parent.netNonFormat): if (self.parent.netNonFormat.split('@@')[0] != self.parent.netNonFormat):
self.parent.netdev = self.parent.netNonFormat.split('@@')[1] self.parent.netdev = self.parent.netNonFormat.split('@@')[1]
@ -154,7 +154,7 @@ class Reinit():
self.parent.label_netUp.setText(text) self.parent.label_netUp.setText(text)
self.parent.layout.addItem(self.parent.label_netUp) self.parent.layout.addItem(self.parent.label_netUp)
elif (order == "6"): elif (order == "6"):
if (self.parent.batBool == 1): if (self.parent.batBool > 0):
self.parent.batFormat = str(settings.get('batFormat', '[bat: $bat%$ac]')) self.parent.batFormat = str(settings.get('batFormat', '[bat: $bat%$ac]'))
self.parent.battery_device= str(settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity')) self.parent.battery_device= str(settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity'))
self.parent.ac_device = str(settings.get('ac_device', '/sys/class/power_supply/AC/online')) self.parent.ac_device = str(settings.get('ac_device', '/sys/class/power_supply/AC/online'))
@ -168,7 +168,7 @@ class Reinit():
self.parent.label_bat.setText(text) self.parent.label_bat.setText(text)
self.parent.layout.addItem(self.parent.label_bat) self.parent.layout.addItem(self.parent.label_bat)
elif (order == "7"): elif (order == "7"):
if (self.parent.cpuclockBool == 1): if (self.parent.cpuclockBoo> 0):
self.parent.cpuclockFormat = str(settings.get('cpuclockFormat', '[mhz: $cpucl]')) self.parent.cpuclockFormat = str(settings.get('cpuclockFormat', '[mhz: $cpucl]'))
if (self.parent.cpuclockFormat.split('$ccpucl')[0] != self.parent.cpuclockFormat): if (self.parent.cpuclockFormat.split('$ccpucl')[0] != self.parent.cpuclockFormat):
self.parent.label_cpuclock0 = Plasma.Label(self.parent.applet) self.parent.label_cpuclock0 = Plasma.Label(self.parent.applet)
@ -202,7 +202,7 @@ class Reinit():
self.parent.label_cpuclock.setText(text) self.parent.label_cpuclock.setText(text)
self.parent.layout.addItem(self.parent.label_cpuclock) self.parent.layout.addItem(self.parent.label_cpuclock)
elif (order == "8"): elif (order == "8"):
if (self.parent.uptimeBool == 1): if (self.parent.uptimeBool > 0):
self.parent.uptimeFormat = str(settings.get('uptimeFormat', '[uptime: $uptime]')) self.parent.uptimeFormat = str(settings.get('uptimeFormat', '[uptime: $uptime]'))
self.parent.label_uptime = Plasma.Label(self.parent.applet) self.parent.label_uptime = Plasma.Label(self.parent.applet)
if (self.parent.uptimeFormat.split('$uptime')[0] != self.parent.uptimeFormat): if (self.parent.uptimeFormat.split('$uptime')[0] != self.parent.uptimeFormat):
@ -213,7 +213,7 @@ class Reinit():
self.parent.label_uptime.setText(text) self.parent.label_uptime.setText(text)
self.parent.layout.addItem(self.parent.label_uptime) self.parent.layout.addItem(self.parent.label_uptime)
elif (order == "9"): elif (order == "9"):
if (self.parent.gpuBool == 1): if (self.parent.gpuBool > 0):
self.parent.gpuFormat = str(settings.get('gpuFormat', '[gpu: $gpu%]')) self.parent.gpuFormat = str(settings.get('gpuFormat', '[gpu: $gpu%]'))
self.parent.label_gpu = Plasma.Label(self.parent.applet) self.parent.label_gpu = Plasma.Label(self.parent.applet)
if (self.parent.gpuFormat.split('$gpu')[0] != self.parent.gpuFormat): if (self.parent.gpuFormat.split('$gpu')[0] != self.parent.gpuFormat):
@ -224,7 +224,7 @@ class Reinit():
self.parent.label_gpu.setText(text) self.parent.label_gpu.setText(text)
self.parent.layout.addItem(self.parent.label_gpu) self.parent.layout.addItem(self.parent.label_gpu)
elif (order == "a"): elif (order == "a"):
if (self.parent.gputempBool == 1): if (self.parent.gputempBool > 0):
self.parent.gputempFormat = str(settings.get('gputempFormat', '[gpu temp: $gputemp&deg;C]')) self.parent.gputempFormat = str(settings.get('gputempFormat', '[gpu temp: $gputemp&deg;C]'))
self.parent.label_gputemp = Plasma.Label(self.parent.applet) self.parent.label_gputemp = Plasma.Label(self.parent.applet)
if (self.parent.gputempFormat.split('$gputemp')[0] != self.parent.gputempFormat): if (self.parent.gputempFormat.split('$gputemp')[0] != self.parent.gputempFormat):
@ -235,7 +235,7 @@ class Reinit():
self.parent.label_gputemp.setText(text) self.parent.label_gputemp.setText(text)
self.parent.layout.addItem(self.parent.label_gputemp) self.parent.layout.addItem(self.parent.label_gputemp)
elif (order == "b"): elif (order == "b"):
if (self.parent.hddBool == 1): if (self.parent.hddBool > 0):
self.parent.hddFormat = str(settings.get('hddFormat', '[hdd: @@/@@%]')) self.parent.hddFormat = str(settings.get('hddFormat', '[hdd: @@/@@%]'))
if (self.parent.hddFormat.split('@@')[0] != self.parent.hddFormat): if (self.parent.hddFormat.split('@@')[0] != self.parent.hddFormat):
self.parent.mountPoints = self.parent.hddFormat.split('@@')[1].split(';') self.parent.mountPoints = self.parent.hddFormat.split('@@')[1].split(';')
@ -260,7 +260,7 @@ class Reinit():
self.parent.label_hdd0.setText(text) self.parent.label_hdd0.setText(text)
self.parent.layout.addItem(self.parent.label_hdd0) self.parent.layout.addItem(self.parent.label_hdd0)
elif (order == "c"): elif (order == "c"):
if (self.parent.hddtempBool == 1): if (self.parent.hddtempBool > 0):
self.parent.hddtempFormat = str(settings.get('hddtempFormat', '[hdd temp: @@/dev/sda@@&deg;C]')) self.parent.hddtempFormat = str(settings.get('hddtempFormat', '[hdd temp: @@/dev/sda@@&deg;C]'))
self.parent.label_hddtemp = Plasma.Label(self.parent.applet) self.parent.label_hddtemp = Plasma.Label(self.parent.applet)
if (self.parent.hddtempFormat.split('@@')[0] != self.parent.hddtempFormat): if (self.parent.hddtempFormat.split('@@')[0] != self.parent.hddtempFormat):

View File

@ -0,0 +1,12 @@
# -*- coding: utf-8 -*-
class ToolTip:
def __init__(self, parent):
"""class definition"""
self.parent = parent
def createToolTip(self):
"""function to create tool tip for label"""

File diff suppressed because it is too large Load Diff