diff --git a/sources/contents/code/configdef.py b/sources/contents/code/configdef.py index 2eec61e..1bbafd1 100644 --- a/sources/contents/code/configdef.py +++ b/sources/contents/code/configdef.py @@ -37,11 +37,11 @@ class ConfigDefinition: settings.set('font_weight', self.parent.font_weight) # 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.label_uptime.setText('') 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) if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat): self.parent.label_cpu0.setText('') @@ -55,7 +55,7 @@ class ConfigDefinition: else: self.parent.label_cpu.setText('') 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) if (self.parent.cpuclockFormat.split('$ccpu')[0] != self.parent.cpuclockFormat): self.parent.label_cpuclock0.setText('') @@ -69,32 +69,32 @@ class ConfigDefinition: else: self.parent.label_cpuclock.setText('') 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.label_temp.setText('') 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.label_gpu.setText('') 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.label_gputemp.setText('') 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) if (self.parent.memInMb == False): self.parent.systemmonitor.disconnectSource("mem/physical/free", self.parent) self.parent.systemmonitor.disconnectSource("mem/physical/used", self.parent) self.parent.label_mem.setText('') 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) if (self.parent.swapInMb == False): self.parent.systemmonitor.disconnectSource("mem/swap/free", self.parent) self.parent.label_swap.setText('') self.parent.layout.removeItem(self.parent.label_swap) - if (self.parent.hddBool == 1): + if (self.parent.hddBool > 0): for mount in self.parent.mountPoints: self.parent.systemmonitor.disconnectSource("partitions" + mount + "/filllevel", self.parent) exec ('self.parent.label_hdd_' + ''.join(mount.split('/')) + '.setText("")') @@ -103,30 +103,28 @@ class ConfigDefinition: self.parent.label_hdd1.setText('') self.parent.layout.removeItem(self.parent.label_hdd0) 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.label_hddtemp.setText('') 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+"/receiver/data", self.parent) self.parent.label_netDown.setText('') self.parent.label_netUp.setText('') self.parent.layout.removeItem(self.parent.label_netUp) 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.layout.removeItem(self.parent.label_bat) self.parent.label_order = "------------" 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 = 1') + exec ('self.parent.' + self.parent.dict_orders[label] + 'Bool = ' + str(self.configpage.checkboxes[self.parent.dict_orders[label]].checkState())) + if (self.configpage.checkboxes[self.parent.dict_orders[label]].checkState() > 0): 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:] - else: - exec ('self.parent.' + self.parent.dict_orders[label] + 'Bool = 0') 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 ('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]) for label in self.parent.dict_orders.keys(): exec ('bool = self.parent.' + self.parent.dict_orders[label] + 'Bool') - if (bool == 1): - self.configpage.checkboxes[self.parent.dict_orders[label]].setCheckState(2) + self.configpage.checkboxes[self.parent.dict_orders[label]].setCheckState(bool) + if (bool > 0): 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'): 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: diff --git a/sources/contents/code/configwindow.py b/sources/contents/code/configwindow.py index ee51635..e218dec 100644 --- a/sources/contents/code/configwindow.py +++ b/sources/contents/code/configwindow.py @@ -43,7 +43,7 @@ class ConfigWindow(QWidget): """function to enable label""" count = self.sliders['bat'].maximum() 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.sliders[label].setEnabled(True) if (label == 'bat'): diff --git a/sources/contents/code/dataengine.py b/sources/contents/code/dataengine.py index 7383859..4055b4c 100644 --- a/sources/contents/code/dataengine.py +++ b/sources/contents/code/dataengine.py @@ -16,46 +16,46 @@ class DataEngine: def connectToEngine(self): """function to initializate engine""" 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") - if (self.parent.uptimeBool == 1): + if (self.parent.uptimeBool > 0): 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) if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat): for core in range(self.parent.numCores): 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) if (self.parent.cpuclockFormat.split('$ccpucl')[0] != self.parent.cpuclockFormat): for core in range(self.parent.numCores): 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) - if (self.parent.gpuBool == 1): + if (self.parent.gpuBool > 0): 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) - if (self.parent.memBool == 1): + if (self.parent.memBool > 0): if (self.parent.memInMb): self.parent.systemmonitor.connectSource("mem/physical/application", self.parent, self.parent.interval) else: 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/application", self.parent, int(self.parent.interval*0.5)) - if (self.parent.swapBool == 1): + if (self.parent.swapBool > 0): if (self.parent.swapInMb): self.parent.systemmonitor.connectSource("mem/swap/used", self.parent, self.parent.interval) else: 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)) - if (self.parent.hddBool == 1): + if (self.parent.hddBool > 0): for mount in self.parent.mountPoints: 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) - if (self.parent.netBool == 1): + if (self.parent.netBool > 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+"/receiver/data", self.parent, self.parent.interval) diff --git a/sources/contents/code/main.py b/sources/contents/code/main.py index 6aab6bd..cc23366 100644 --- a/sources/contents/code/main.py +++ b/sources/contents/code/main.py @@ -117,11 +117,11 @@ class pyTextWidget(plasmascript.Applet): def updateLabel(self): """function to update label""" - if ((self.memBool == 1) and (self.memInMb == False)): + if ((self.memBool > 0) and (self.memInMb == False)): self.memText() - if ((self.swapBool == 1) and (self.swapInMb == False)): + if ((self.swapBool > 0) and (self.swapInMb == False)): self.swapText() - if (self.batBool == 1): + if (self.batBool > 0): self.batText() diff --git a/sources/contents/code/reinit.py b/sources/contents/code/reinit.py index 3aa4b4d..c0ab80d 100644 --- a/sources/contents/code/reinit.py +++ b/sources/contents/code/reinit.py @@ -30,22 +30,22 @@ class Reinit(): else: exec ('self.parent.' + label + 'Bool = int(settings.get("' + label + 'Bool", 0))') # small function for update if errors exist - summ = 0 - for label in self.parent.dict_orders.values(): - exec ('summ += self.parent.' + label + 'Bool') - if (len(self.parent.label_order) != summ): - for label in self.parent.dict_orders.values(): - if ((label == 'cpu') or (label == 'mem') or (label == 'swap') or (label == 'net')): - exec ('self.parent.' + label + 'Bool = 1') - else: - exec ('self.parent.' + label + 'Bool = 0') - exec ('settings.set("' + label + 'Bool", self.parent.' + label + 'Bool)') - self.parent.label_order = '1345' - settings.set('label_order', self.parent.label_order) +# summ = 0 +# for label in self.parent.dict_orders.values(): +# exec ('summ += self.parent.' + label + 'Bool') +# if (len(self.parent.label_order) != summ): +# for label in self.parent.dict_orders.values(): +# if ((label == 'cpu') or (label == 'mem') or (label == 'swap') or (label == 'net')): +# exec ('self.parent.' + label + 'Bool = 1') +# else: +# exec ('self.parent.' + label + 'Bool = 0') +# exec ('settings.set("' + label + 'Bool", self.parent.' + label + 'Bool)') +# self.parent.label_order = '1345' +# settings.set('label_order', self.parent.label_order) for order in self.parent.label_order: if (order == "1"): - if (self.parent.cpuBool == 1): + if (self.parent.cpuBool > 0): self.parent.cpuFormat = str(settings.get('cpuFormat', '[cpu: $cpu%]')) if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat): self.parent.label_cpu0 = Plasma.Label(self.parent.applet) @@ -79,7 +79,7 @@ class Reinit(): self.parent.label_cpu.setText(text) self.parent.layout.addItem(self.parent.label_cpu) elif (order == "2"): - if (self.parent.tempBool == 1): + if (self.parent.tempBool > 0): self.parent.tempdev = str(settings.get('temp_device', '