From f08ccbd45d9d0121cfde9dfa5fee022c75d16dfa Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 23 May 2013 01:49:05 +0400 Subject: [PATCH] New release (TRUE!) 1.3.1: * refactoring * bug fixes + multithreads - creating threads for gpu and hdd --- README | 8 +- pytextmonitor-1.3.1.plasmoid | Bin 13520 -> 16773 bytes source/contents/code/configaccepted.py | 137 ++++++ source/contents/code/dataengine.py | 195 ++++++++ source/contents/code/gpuchecker.py | 38 ++ source/contents/code/gputempchecker.py | 35 ++ source/contents/code/hddtempchecker.py | 29 ++ source/contents/code/main.py | 646 +------------------------ source/contents/code/reinit.py | 293 +++++++++++ source/contents/code/util.py | 36 -- 10 files changed, 757 insertions(+), 660 deletions(-) create mode 100644 source/contents/code/configaccepted.py create mode 100644 source/contents/code/dataengine.py create mode 100644 source/contents/code/gpuchecker.py create mode 100644 source/contents/code/gputempchecker.py create mode 100644 source/contents/code/hddtempchecker.py create mode 100644 source/contents/code/reinit.py delete mode 100644 source/contents/code/util.py diff --git a/README b/README index db3e9f4..0ec3a52 100644 --- a/README +++ b/README @@ -10,17 +10,19 @@ For edited output you must open Settings window and setup output format in lines label "$ccpu" means load CPU for each core, % label "$cpucl" - average cpu clock, MHz label "$ccpucl" - cpu clock for each core, MHz - label "$temp" - average temperature in system (if doesn't work please let me know) - label "$gpu" -GPU usage, % + label "$temp" - average temperature in system + label "$gpu" - GPU usage, %. `aticonfig` or `nvidia-smi` must be installed + label "$gputemp" - GPU temperature. `aticonfig` or `nvidia-smi` must be installed label "$mem" - usage memory, % label "$memmb" - usage memory, MB label "$swap" - swap, % label "$swapmb" - swap, MB - label "@@/@@" (in hdd label) - mount point ('/' in example) usage, %. Separator for mount points list is ';', for example "@@/;/home;/mnt/global@@" + label "@@/@@" (in hdd label) - mount point ('/' in example) usage, %. Separator for mount points list is ';', for example "@@/;/home;/mnt/global@@". `hddtemp` must be installed label "@@/dev/sda@@" (in hddtemp label) - HDD ('/dev/sda' in example) temperature label "$net" - download and upload speed, KB/s. You may also specify the number of devices (1 or 2) - without their names. And you may specify network device: something like @@eth0@@ label "$netdev" - current network device label "$bat" - battery charge, %. Battery device may be set below. File ("/sys/class/power_supply/BAT0/capacity" by default) must contain only battery charge in percent label "$ac" - status AC device. Return (*) if AC device is online or ( ) if offline. AC device may be set below. FIle ("/sys/class/power_supply/AC/online" by default) must contain '1' if AC is online + Label order will changed if you change slider position. HTML tags in label work normally. Attention: you don't may set to show $cpu in swap label for example. $cpu will work only in cpu label. diff --git a/pytextmonitor-1.3.1.plasmoid b/pytextmonitor-1.3.1.plasmoid index aa9ca66692f5e295ac93b88454e439b4d46449cf..ec7889760f4e1a82c23acc00fade852de3f6cfcc 100644 GIT binary patch delta 11029 zcmaKSWl&w)*6cX4l*`X7!k(yC*Dz1Hs~$Al7R#<5@-jetD`u+}C8*jCsRD7$Gzz$|H~g`@C7o z&3swPt{!k8Fvxuf5D3x)1Oh3^LO`OwylI;v%BU&w*{lC8gKXa6q9Wc_

{X(NFB$VtuJY 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 diff --git a/source/contents/code/configaccepted.py b/source/contents/code/configaccepted.py new file mode 100644 index 0000000..a3a8a55 --- /dev/null +++ b/source/contents/code/configaccepted.py @@ -0,0 +1,137 @@ +class ConfigAccepted: + def __init__(self, parent): + """class definition""" + self.parent = parent + + + def configAccepted(self): + """function to accept settings""" + # update local variables + self.parent.interval = int(self.parent.configpage.ui.spinBox_interval.value()) + self.parent.settings.set('interval', self.parent.interval) + self.parent.font_family = str(self.parent.configpage.ui.fontComboBox.currentFont().family()) + self.parent.settings.set('font_family', self.parent.font_family) + self.parent.font_size = int(self.parent.configpage.ui.spinBox_fontSize.value()) + self.parent.settings.set('font_size', self.parent.font_size) + self.parent.font_color = str(self.parent.configpage.ui.kcolorcombo.color().name()) + self.parent.settings.set('font_color', self.parent.font_color) + if (self.parent.configpage.ui.comboBox_style.currentIndex() == 0): + self.parent.font_style = 'normal' + else: + self.parent.font_style = 'italic' + self.parent.settings.set('font_style', self.parent.font_style) + self.parent.font_weight = int(self.parent.configpage.ui.spinBox_weight.value()) + self.parent.settings.set('font_weight', self.parent.font_weight) + + # disconnecting from source and clear layout + if (self.parent.uptimeBool == 1): + 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): + self.parent.systemmonitor.disconnectSource("cpu/system/TotalLoad", self.parent) + if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat): + self.parent.label_cpu0.setText('') + self.parent.layout.removeItem(self.parent.label_cpu0) + self.parent.label_cpu1.setText('') + self.parent.layout.removeItem(self.parent.label_cpu1) + for core in range(self.parent.numCores): + self.parent.systemmonitor.disconnectSource("cpu/cpu"+str(core)+"/TotalLoad", self.parent) + exec ("self.parent.label_coreCpu" + str(core) + ".setText('')") + exec ("self.parent.layout.removeItem(self.parent.label_coreCpu" + str(core) + ")") + else: + self.parent.label_cpu.setText('') + self.parent.layout.removeItem(self.parent.label_cpu) + if (self.parent.cpuclockBool == 1): + self.parent.systemmonitor.disconnectSource("cpu/system/AverageClock", self.parent) + if (self.parent.cpuclockFormat.split('$ccpu')[0] != self.parent.cpuclockFormat): + self.parent.label_cpuclock0.setText('') + self.parent.layout.removeItem(self.parent.label_cpuclock0) + self.parent.label_cpuclock1.setText('') + self.parent.layout.removeItem(self.parent.label_cpuclock1) + for core in range(self.parent.numCores): + self.parent.systemmonitor.disconnectSource("cpu/cpu"+str(core)+"/clock", self.parent) + exec ("self.parent.label_coreCpuclock" + str(core) + ".setText('')") + exec ("self.parent.layout.removeItem(self.parent.label_coreCpuclock" + str(core) + ")") + else: + self.parent.label_cpuclock.setText('') + self.parent.layout.removeItem(self.parent.label_cpuclock) + if (self.parent.tempBool == 1): + 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): + self.parent.gpuChecker.stop() + self.parent.label_gpu.setText('') + self.parent.layout.removeItem(self.parent.label_gpu) + if (self.parent.gputempBool == 1): + self.parent.gpuTempChecker.stop() + self.parent.label_gputemp.setText('') + self.parent.layout.removeItem(self.parent.label_gputemp) + if (self.parent.memBool == 1): + 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): + 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): + for mount in self.parent.mountPoints: + self.parent.systemmonitor.disconnectSource("partitions" + mount + "/filllevel", self.parent) + exec ('self.parent.label_hdd_' + ''.join(mount.split('/')) + '.setText("")') + exec ("self.parent.layout.removeItem(self.parent.label_hdd_" + ''.join(mount.split('/')) + ")") + self.parent.label_hdd0.setText('') + 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): + self.parent.hddTempChecker.stop() + self.parent.label_hddtemp.setText('') + self.parent.layout.removeItem(self.parent.label_hddtemp) + if (self.parent.netBool == 1): + 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): + 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.parent.configpage.checkboxes[self.parent.dict_orders[label]].checkState() == 2): + exec ('self.parent.' + self.parent.dict_orders[label] + 'Bool = 1') + pos = self.parent.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.parent.configpage.lineedits[self.parent.dict_orders[label]].text())') + exec ('self.parent.settings.set("' + self.parent.dict_orders[label] + 'NonFormat", self.parent.' + self.parent.dict_orders[label] + 'NonFormat)') + else: + exec ('self.parent.' + self.parent.dict_orders[label] + 'Format = str(self.parent.configpage.lineedits[self.parent.dict_orders[label]].text())') + exec ('self.parent.settings.set("' + self.parent.dict_orders[label] + 'Format", self.parent.' + self.parent.dict_orders[label] + 'Format)') + exec ('self.parent.settings.set("' + self.parent.dict_orders[label] + 'Bool", self.parent.' + self.parent.dict_orders[label] + 'Bool)') + if (self.parent.dict_orders[label] == 'net'): + self.parent.num_dev = int(self.parent.configpage.ui.comboBox_numNet.currentIndex()) + self.parent.settings.set('num_dev', self.parent.num_dev) + elif (self.parent.dict_orders[label] == 'bat'): + self.parent.battery_device = str(self.parent.configpage.ui.lineEdit_batdev.text()) + self.parent.ac_device = str(self.parent.configpage.ui.lineEdit_acdev.text()) + self.parent.settings.set('battery_device', self.parent.battery_device) + self.parent.settings.set('ac_device', self.parent.ac_device) + + self.parent.label_order = ''.join(self.parent.label_order.split('-')) + self.parent.settings.set('label_order', self.parent.label_order) + + # reinitializate + self.parent.reinit.reinit() diff --git a/source/contents/code/dataengine.py b/source/contents/code/dataengine.py new file mode 100644 index 0000000..dd52c9f --- /dev/null +++ b/source/contents/code/dataengine.py @@ -0,0 +1,195 @@ +from PyQt4.QtCore import * +from PyQt4.QtGui import * +from PyKDE4.plasma import Plasma +from PyKDE4 import plasmascript + + + +class DataEngine: + def __init__(self, parent): + """class definition""" + self.parent = parent + + + def connectToEngine(self): + """function to initializate engine""" + self.parent.systemmonitor = self.parent.dataEngine("systemmonitor") + if (self.parent.uptimeBool == 1): + self.parent.systemmonitor.connectSource("system/uptime", self.parent, self.parent.interval) + if (self.parent.cpuBool == 1): + 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): + 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.netBool == 1): + 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) + if (self.parent.tempBool == 1): + self.parent.systemmonitor.connectSource(self.parent.tempdev, self.parent, self.parent.interval) + if (self.parent.memBool == 1): + 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, 200) + self.parent.systemmonitor.connectSource("mem/physical/used", self.parent, 200) + self.parent.systemmonitor.connectSource("mem/physical/application", self.parent, 200) + if (self.parent.swapBool == 1): + 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, 200) + self.parent.systemmonitor.connectSource("mem/swap/used", self.parent, 200) + if (self.parent.hddBool == 1): + for mount in self.parent.mountPoints: + self.parent.systemmonitor.connectSource("partitions" + mount + "/filllevel", self.parent, self.parent.interval) + + + def dataUpdated(self, sourceName, data): + """function to refresh data""" + if (sourceName == "system/uptime"): + value = int(round(float(data[QString(u'value')]), 1)) + uptimeText = '%3sd%2sh%2sm' % (str(int(value/(24*60*60))), int(value/60/60)-int(value/24/60/60)*24, (value-value%60)/60%60) + if (self.parent.uptimeFormat.split('$uptime')[0] != self.parent.uptimeFormat): + line = self.parent.uptimeFormat.split('$uptime')[0] + uptimeText + self.parent.uptimeFormat.split('$uptime')[1] + else: + line = self.parent.uptimeFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_uptime.setText(text) + elif (sourceName == "cpu/system/TotalLoad"): + value = str(round(float(data[QString(u'value')]), 1)) + cpuText = "%5s" % (value) + if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat): + if (self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[0] != self.parent.cpuFormat.split('$ccpu')[0]): + line = self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[0] + cpuText + self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[1] + else: + line = self.parent.cpuFormat.split('$ccpu')[0] + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_cpu0.setText(text) + if (self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[0] != self.parent.cpuFormat.split('$ccpu')[1]): + line = self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[0] + cpuText + self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[1] + else: + line = self.parent.cpuFormat.split('$ccpu')[1] + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_cpu1.setText(text) + else: + if (self.parent.cpuFormat.split('$cpu')[0] != self.parent.cpuFormat): + line = self.parent.cpuFormat.split('$cpu')[0] + cpuText + self.parent.cpuFormat.split('$cpu')[1] + else: + line = self.parent.cpuFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_cpu.setText(text) + elif ((str(sourceName)[:7] == "cpu/cpu") and (str(sourceName).split('/')[2] == "TotalLoad")): + value = str(round(float(data[QString(u'value')]), 1)) + cpuText = "%5s" % (value) + text = self.parent.formatLine.split('$LINE')[0] + cpuText + self.parent.formatLine.split('$LINE')[1] + exec ('self.parent.label_coreCpu' + str(sourceName)[7] + '.setText(text)') + elif (sourceName == "cpu/system/AverageClock"): + value = str(data[QString(u'value')]).split('.')[0] + cpuclockText = "%4s" % (value) + if (self.parent.cpuclockFormat.split('$ccpucl')[0] != self.parent.cpuclockFormat): + if (self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] != self.parent.cpuclockFormat.split('$ccpucl')[0]): + line = self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] + cpuclockText + self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[1] + else: + line = self.parent.cpuclockFormat.split('$ccpucl')[0] + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_cpuclock0.setText(text) + if (self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] != self.parent.cpuclockFormat.split('$ccpucl')[1]): + line = self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] + cpuclockText + self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[1] + else: + line = self.parent.cpuclockFormat.split('$ccpucl')[1] + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_cpuclock1.setText(text) + else: + if (self.parent.cpuclockFormat.split('$cpucl')[0] != self.parent.cpuclockFormat): + line = self.parent.cpuclockFormat.split('$cpucl')[0] + cpuclockText + self.parent.cpuclockFormat.split('$cpucl')[1] + else: + line = self.parent.cpuclockFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_cpuclock.setText(text) + elif ((str(sourceName)[:7] == "cpu/cpu") and (str(sourceName).split('/')[2] == "clock")): + value = str(data[QString(u'value')]).split('.')[0] + cpuclockText = "%4s" % (value) + text = self.parent.formatLine.split('$LINE')[0] + cpuclockText + self.parent.formatLine.split('$LINE')[1] + exec ('self.parent.label_coreCpuclock' + str(sourceName)[7] + '.setText(text)') + elif (sourceName == "network/interfaces/"+self.parent.netdev+"/transmitter/data"): + value = str(data[QString(u'value')]).split('.')[0] + up_speed = "%4s" % (value) + if (self.parent.netFormat.split('$net')[0] != self.parent.netFormat): + line = '/' + up_speed + self.parent.netFormat.split('$net')[1] + else: + line = '' + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_netUp.setText(text) + elif (sourceName == "network/interfaces/"+self.parent.netdev+"/receiver/data"): + value = str(data[QString(u'value')]).split('.')[0] + down_speed = "%4s" % (value) + if (self.parent.netFormat.split('$net')[0] != self.parent.netFormat): + line = self.parent.netFormat.split('$net')[0] + down_speed + else: + line = self.parent.netFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_netDown.setText(text) + # update network device + self.parent.updateNetdev = self.parent.updateNetdev + 1 + if (self.parent.updateNetdev == 100): + self.parent.updateNetdev = 0 + if (self.parent.netNonFormat.split('@@')[0] == self.parent.netNonFormat): + 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.setupNetdev() + 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) + if (self.parent.netNonFormat.split('$netdev')[0] != self.parent.netNonFormat): + self.parent.netFormat = self.parent.netNonFormat.split('$netdev')[0] + self.parent.netdev + self.parent.netNonFormat.split('$netdev')[1] + else: + self.parent.netFormat = self.parent.netNonFormat + elif (sourceName == self.parent.tempdev): + value = str(round(float(data[QString(u'value')]), 1)) + tempText = "%4s" % (value) + if (self.parent.tempFormat.split('$temp')[0] != self.parent.tempFormat): + line = self.parent.tempFormat.split('$temp')[0] + tempText + self.parent.tempFormat.split('$temp')[1] + else: + line = self.parent.tempFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_temp.setText(text) + elif (str(sourceName).split('/')[0] == "partitions"): + value = str(round(float(data[QString(u'value')]), 1)) + hddText = "%5s" % (value) + text = self.parent.formatLine.split('$LINE')[0] + hddText + self.parent.formatLine.split('$LINE')[1] + exec ('self.parent.label_hdd_' + ''.join(str(sourceName).split('/')[1:-1]) + '.setText(text)') + elif (sourceName == "mem/physical/free"): + self.parent.mem_free = float(data[QString(u'value')]) + elif (sourceName == "mem/physical/used"): + self.parent.mem_uf = float(data[QString(u'value')]) + elif (sourceName == "mem/physical/application"): + if (self.parent.memInMb): + mem = str(round(float(data[QString(u'value')]) / 1024, 0)).split('.')[0] + mem = "%5s" % (mem) + if (self.parent.memFormat.split('$memmb')[0] != self.parent.memFormat): + line = self.parent.memFormat.split('$memmb')[0] + mem + self.parent.memFormat.split('$memmb')[1] + else: + line = self.parent.memFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_mem.setText(text) + else: + self.parent.mem_used = float(data[QString(u'value')]) + elif (sourceName == "mem/swap/free"): + self.parent.swap_free = float(data[QString(u'value')]) + elif (sourceName == "mem/swap/used"): + if (self.parent.swapInMb): + mem = str(round(float(data[QString(u'value')]) / 1024, 0)).split('.')[0] + mem = "%5s" % (mem) + if (self.parent.swapFormat.split('$swapmb')[0] != self.parent.swapFormat): + line = self.parent.swapFormat.split('$swapmb')[0] + mem + self.parent.swapFormat.split('$swapmb')[1] + else: + line = self.parent.swapFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_swap.setText(text) + else: + self.parent.swap_used = float(data[QString(u'value')]) diff --git a/source/contents/code/gpuchecker.py b/source/contents/code/gpuchecker.py new file mode 100644 index 0000000..01162de --- /dev/null +++ b/source/contents/code/gpuchecker.py @@ -0,0 +1,38 @@ +import commands, time +from PyQt4.QtCore import QThread + + + +class GpuThread(QThread): + def __init__(self, interval, gpudev): + """thread definition""" + QThread.__init__(self) + self.stopped = False + self.interval = interval / 1000 + self.label_exit = 2 + self.gpudev = gpudev + self.gpu = '----' + + + def run(self): + """operating function""" + while ((not self.stopped) and (self.label_exit > 0)): + time.sleep(self.interval) + # dirty hack + self.label_exit = self.label_exit - 1 + if (self.gpudev == 'nvidia'): + commandOut = commands.getoutput("nvidia-smi -q -d UTILIZATION | grep Gpu | tail -n1") + if (commandOut.split()[2] == 'N/A'): + self.gpu = ' N/A' + else: + self.gpu = "%5s" % (str(round(float(commandOut.split()[2][:-1]), 1))) + elif (self.gpudev == 'ati'): + commandOut = commands.getoutput("aticonfig --od-getclocks | grep load | tail -n1") + self.gpu = "%5s" % (str(round(float(commandOut.split()[3][:-1]), 1))) + else: + self.gpu = '-----' + + + def stop(self): + """stop signal""" + self.stopped = True diff --git a/source/contents/code/gputempchecker.py b/source/contents/code/gputempchecker.py new file mode 100644 index 0000000..65c2533 --- /dev/null +++ b/source/contents/code/gputempchecker.py @@ -0,0 +1,35 @@ +import commands, time, os +from PyQt4.QtCore import QThread + + + +class GpuTempThread(QThread): + def __init__(self, interval, gpudev): + """thread definition""" + QThread.__init__(self) + self.stopped = False + self.interval = interval / 1000 + self.label_exit = 2 + self.gpudev = gpudev + self.gputemp = '----' + + + def run(self): + """operating function""" + while ((not self.stopped) and (self.label_exit > 0)): + time.sleep(self.interval) + # dirty hack + self.label_exit = self.label_exit - 1 + if (self.gpudev == 'nvidia'): + commandOut = commands.getoutput("nvidia-smi -q -d TEMPERATURE | grep Gpu | tail -n1") + self.gputemp = "%4s" % (str(round(float(commandOut.split()[2]), 1))) + elif (self.gpudev == 'ati'): + commandOut = commands.getoutput("aticonfig --od-gettemperature | grep Temperature | tail -n1") + self.gputemp = "%4s" % (str(round(float(commandOut.split()[4]), 1))) + else: + self.gputemp = '----' + + + def stop(self): + """stop signal""" + self.stopped = True diff --git a/source/contents/code/hddtempchecker.py b/source/contents/code/hddtempchecker.py new file mode 100644 index 0000000..b1a0000 --- /dev/null +++ b/source/contents/code/hddtempchecker.py @@ -0,0 +1,29 @@ +import commands, time +from PyQt4.QtCore import QThread + + + +class HddTempThread(QThread): + def __init__(self, interval, hdd): + """thread definition""" + QThread.__init__(self) + self.stopped = False + self.interval = interval / 1000 + self.label_exit = 2 + self.hdd = hdd + self.hddtemp = '----' + + + def run(self): + """operating function""" + while ((not self.stopped) and (self.label_exit > 0)): + time.sleep(self.interval) + # dirty hack + self.label_exit = self.label_exit - 1 + commandOut = commands.getoutput("hddtemp " + self.hdd) + self.hddtemp = "%4s" % (str(round(float(commandOut.split(':')[2][:-3]), 1))) + + + def stop(self): + """stop signal""" + self.stopped = True diff --git a/source/contents/code/main.py b/source/contents/code/main.py index 1727dcc..3ae74d9 100644 --- a/source/contents/code/main.py +++ b/source/contents/code/main.py @@ -5,14 +5,15 @@ from PyQt4.QtGui import * from PyKDE4.kdecore import * from PyKDE4.kdeui import * from PyKDE4.kio import * -from PyKDE4.plasma import Plasma from PyKDE4 import plasmascript -from PyQt4 import QtCore -from configwindow import * -from config import * -from util import * +from PyKDE4.plasma import Plasma import commands, os, time +import configaccepted +import configwindow +import dataengine +import reinit + class pyTextWidget(plasmascript.Applet): @@ -25,144 +26,17 @@ class pyTextWidget(plasmascript.Applet): """function to initializate widget""" self._name = str(self.package().metadata().pluginName()) self.layout = QGraphicsLinearLayout(Qt.Horizontal, self.applet) + self.configAccepted = configaccepted.ConfigAccepted(self) + self.dataengine = dataengine.DataEngine(self) + self.reinit = reinit.Reinit(self) self.setupVar() - self.reinit() + self.reinit.reinit() self.setHasConfigurationInterface(True) - - - def configAccepted(self): - """function to accept settings""" - # update local variables - self.interval = int(self.configpage.ui.spinBox_interval.value()) - self.settings.set('interval', self.interval) - self.font_family = str(self.configpage.ui.fontComboBox.currentFont().family()) - self.settings.set('font_family', self.font_family) - self.font_size = int(self.configpage.ui.spinBox_fontSize.value()) - self.settings.set('font_size', self.font_size) - self.font_color = str(self.configpage.ui.kcolorcombo.color().name()) - self.settings.set('font_color', self.font_color) - if (self.configpage.ui.comboBox_style.currentIndex() == 0): - self.font_style = 'normal' - else: - self.font_style = 'italic' - self.settings.set('font_style', self.font_style) - self.font_weight = int(self.configpage.ui.spinBox_weight.value()) - self.settings.set('font_weight', self.font_weight) - - # disconnecting from source and clear layout - if (self.uptimeBool == 1): - self.systemmonitor.disconnectSource("system/uptime", self) - self.label_uptime.setText('') - self.layout.removeItem(self.label_uptime) - if (self.cpuBool == 1): - self.systemmonitor.disconnectSource("cpu/system/TotalLoad", self) - if (self.cpuFormat.split('$ccpu')[0] != self.cpuFormat): - self.label_cpu0.setText('') - self.layout.removeItem(self.label_cpu0) - self.label_cpu1.setText('') - self.layout.removeItem(self.label_cpu1) - for core in range(self.numCores): - self.systemmonitor.disconnectSource("cpu/cpu"+str(core)+"/TotalLoad", self) - exec ("self.label_coreCpu" + str(core) + ".setText('')") - exec ("self.layout.removeItem(self.label_coreCpu" + str(core) + ")") - else: - self.label_cpu.setText('') - self.layout.removeItem(self.label_cpu) - if (self.cpuclockBool == 1): - self.systemmonitor.disconnectSource("cpu/system/AverageClock", self) - if (self.cpuclockFormat.split('$ccpu')[0] != self.cpuclockFormat): - self.label_cpuclock0.setText('') - self.layout.removeItem(self.label_cpuclock0) - self.label_cpuclock1.setText('') - self.layout.removeItem(self.label_cpuclock1) - for core in range(self.numCores): - self.systemmonitor.disconnectSource("cpu/cpu"+str(core)+"/clock", self) - exec ("self.label_coreCpuclock" + str(core) + ".setText('')") - exec ("self.layout.removeItem(self.label_coreCpuclock" + str(core) + ")") - else: - self.label_cpuclock.setText('') - self.layout.removeItem(self.label_cpuclock) - if (self.tempBool == 1): - self.systemmonitor.disconnectSource(self.tempdev, self) - self.label_temp.setText('') - self.layout.removeItem(self.label_temp) - if (self.gpuBool == 1): - self.label_gpu.setText('') - self.layout.removeItem(self.label_gpu) - if (self.gputempBool == 1): - self.label_gputemp.setText('') - self.layout.removeItem(self.label_gputemp) - if (self.memBool == 1): - self.systemmonitor.disconnectSource("mem/physical/application", self) - if (self.memInMb == False): - self.systemmonitor.disconnectSource("mem/physical/free", self) - self.systemmonitor.disconnectSource("mem/physical/used", self) - self.label_mem.setText('') - self.layout.removeItem(self.label_mem) - if (self.swapBool == 1): - self.systemmonitor.disconnectSource("mem/swap/used", self) - if (self.swapInMb == False): - self.systemmonitor.disconnectSource("mem/swap/free", self) - self.label_swap.setText('') - self.layout.removeItem(self.label_swap) - if (self.hddBool == 1): - for mount in self.mountPoints: - self.systemmonitor.disconnectSource("partitions" + mount + "/filllevel", self) - exec ('self.label_hdd_' + ''.join(mount.split('/')) + '.setText("")') - exec ("self.layout.removeItem(self.label_hdd_" + ''.join(mount.split('/')) + ")") - self.label_hdd0.setText('') - self.label_hdd1.setText('') - self.layout.removeItem(self.label_hdd0) - self.layout.removeItem(self.label_hdd1) - if (self.hddtempBool == 1): - self.label_hddtemp.setText('') - self.layout.removeItem(self.label_hddtemp) - if (self.netBool == 1): - self.systemmonitor.disconnectSource("network/interfaces/"+self.netdev+"/transmitter/data", self) - self.systemmonitor.disconnectSource("network/interfaces/"+self.netdev+"/receiver/data", self) - self.label_netDown.setText('') - self.label_netUp.setText('') - self.layout.removeItem(self.label_netUp) - self.layout.removeItem(self.label_netDown) - if (self.batBool == 1): - self.label_bat.setText('') - self.layout.removeItem(self.label_bat) - - self.label_order = "------------" - - for label in self.dict_orders.keys(): - if (self.configpage.checkboxes[self.dict_orders[label]].checkState() == 2): - exec ('self.' + self.dict_orders[label] + 'Bool = 1') - pos = self.configpage.sliders[self.dict_orders[label]].value() - 1 - self.label_order = self.label_order[:pos] + label + self.label_order[pos+1:] - else: - exec ('self.' + self.dict_orders[label] + 'Bool = 0') - if (self.dict_orders[label] == 'net'): - exec ('self.' + self.dict_orders[label] + 'NonFormat = str(self.configpage.lineedits[self.dict_orders[label]].text())') - exec ('self.settings.set("' + self.dict_orders[label] + 'NonFormat", self.' + self.dict_orders[label] + 'NonFormat)') - else: - exec ('self.' + self.dict_orders[label] + 'Format = str(self.configpage.lineedits[self.dict_orders[label]].text())') - exec ('self.settings.set("' + self.dict_orders[label] + 'Format", self.' + self.dict_orders[label] + 'Format)') - exec ('self.settings.set("' + self.dict_orders[label] + 'Bool", self.' + self.dict_orders[label] + 'Bool)') - if (self.dict_orders[label] == 'net'): - self.num_dev = int(self.configpage.ui.comboBox_numNet.currentIndex()) - self.settings.set('num_dev', self.num_dev) - elif (self.dict_orders[label] == 'bat'): - self.battery_device = str(self.configpage.ui.lineEdit_batdev.text()) - self.ac_device = str(self.configpage.ui.lineEdit_acdev.text()) - self.settings.set('battery_device', self.battery_device) - self.settings.set('ac_device', self.ac_device) - - self.label_order = ''.join(self.label_order.split('-')) - self.settings.set('label_order', self.label_order) - - # reinitializate - self.reinit() - - + + def createConfigurationInterface(self, parent): """function to setup configuration window""" - self.configpage = ConfigWindow(self, self.settings) + self.configpage = configwindow.ConfigWindow(self, self.settings) font = QFont(str(self.settings.get('font_family', 'Terminus')), int(self.settings.get('font_size', 12)), 50) self.configpage.ui.spinBox_interval.setValue(int(self.settings.get('interval', 2000))) @@ -195,280 +69,7 @@ class pyTextWidget(plasmascript.Applet): page = parent.addPage(self.configpage, i18n(self.name())) page.setIcon(KIcon(self.icon())) - parent.okClicked.connect(self.configAccepted) - - - def reinit(self): - """function to reinitializate widget""" - self.settings = Config(self) - self.interval = int(self.settings.get('interval', 2000)) - self.font_family = str(self.settings.get('font_family', 'Terminus')) - self.font_size = int(self.settings.get('font_size', 12)) - self.font_color = str(self.settings.get('font_color', '#000000')) - self.font_style = str(self.settings.get('font_style', 'normal')) - self.font_weight = int(self.settings.get('font_weight', 400)) - self.formatLine = "

$LINE
" - self.label_order = str(self.settings.get('label_order', '1345')) - for label in self.dict_orders.values(): - if ((label == 'cpu') or (label == 'mem') or (label == 'swap') or (label == 'net')): - exec ('self.' + label + 'Bool = int(self.settings.get("' + label + 'Bool", 1))') - else: - exec ('self.' + label + 'Bool = int(self.settings.get("' + label + 'Bool", 0))') - # small function for update if errors exist - summ = 0 - for label in self.dict_orders.values(): - exec ('summ += self.' + label + 'Bool') - if (len(self.label_order) != summ): - for label in self.dict_orders.values(): - if ((label == 'cpu') or (label == 'mem') or (label == 'swap') or (label == 'net')): - exec ('self.' + label + 'Bool = 1') - else: - exec ('self.' + label + 'Bool = 0') - exec ('self.settings.set("' + label + 'Bool", self.' + label + 'Bool)') - self.label_order = '1345' - self.settings.set('label_order', self.label_order) - - for order in self.label_order: - if (order == "1"): - if (self.cpuBool == 1): - self.cpuFormat = str(self.settings.get('cpuFormat', '[cpu: $cpu%]')) - if (self.cpuFormat.split('$ccpu')[0] != self.cpuFormat): - self.label_cpu0 = Plasma.Label(self.applet) - self.label_cpu1 = Plasma.Label(self.applet) - if (self.cpuFormat.split('$ccpu')[0].split('$cpu')[0] != self.cpuFormat.split('$ccpu')[0]): - line = self.cpuFormat.split('$ccpu')[0].split('$cpu')[0] + '-----' + self.cpuFormat.split('$ccpu')[0].split('$cpu')[1] - else: - line = self.cpuFormat.split('$ccpu')[0] - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_cpu0.setText(text) - self.layout.addItem(self.label_cpu0) - text = self.formatLine.split('$LINE')[0] + "-----" + self.formatLine.split('$LINE')[1] - for core in range(self.numCores): - #text = self.formatLine.split('$LINE')[0] + "Core" + str(core) + "\n-----" + self.formatLine.split('$LINE')[1] - exec ('self.label_coreCpu' + str(core) + ' = Plasma.Label(self.applet)') - exec ('self.label_coreCpu' + str(core) + '.setText(text)') - exec ('self.layout.addItem(self.label_coreCpu' + str(core) + ')') - if (self.cpuFormat.split('$ccpu')[1].split('$cpu')[0] != self.cpuFormat.split('$ccpu')[1]): - line = self.cpuFormat.split('$ccpu')[1].split('$cpu')[0] + '-----' + self.cpuFormat.split('$ccpu')[1].split('$cpu')[1] - else: - line = self.cpuFormat.split('$ccpu')[1] - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_cpu1.setText(text) - self.layout.addItem(self.label_cpu1) - else: - self.label_cpu = Plasma.Label(self.applet) - if (self.cpuFormat.split('$cpu')[0] != self.cpuFormat): - line = self.cpuFormat.split('$cpu')[0] + '-----' + self.cpuFormat.split('$cpu')[1] - else: - line = self.cpuFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_cpu.setText(text) - self.layout.addItem(self.label_cpu) - elif (order == "2"): - if (self.tempBool == 1): - self.tempFormat = str(self.settings.get('tempFormat', '[temp: $temp°C]')) - self.label_temp = Plasma.Label(self.applet) - if (self.tempFormat.split('$temp')[0] != self.tempFormat): - line = self.tempFormat.split('$temp')[0] + '----' + self.tempFormat.split('$temp')[1] - else: - line = self.tempFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_temp.setText(text) - self.layout.addItem(self.label_temp) - elif (order == "3"): - if (self.memBool == 1): - self.memFormat = str(self.settings.get('memFormat', '[mem: $mem%]')) - if (self.memFormat.split('$memmb')[0] != self.memFormat): - self.memInMb = True - text = self.formatLine.split('$LINE')[0] + self.memFormat.split('$memmb')[0] + '-----' + self.memFormat.split('$memmb')[1] + self.formatLine.split('$LINE')[1] - elif (self.memFormat.split('$mem')[0] != self.memFormat): - self.memInMb = False - self.mem_used = 0.0 - self.mem_free = 1.0 - self.mem_uf = 0.0 - line = self.memFormat.split('$mem')[0] + '-----' + self.memFormat.split('$mem')[1] - else: - line = self.memFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_mem = Plasma.Label(self.applet) - self.label_mem.setText(text) - self.layout.addItem(self.label_mem) - elif (order == "4"): - if (self.swapBool == 1): - self.swapFormat = str(self.settings.get('swapFormat', '[swap: $swap%]')) - if (self.swapFormat.split('$swapmb')[0] != self.swapFormat): - self.swapInMb = True - text = self.formatLine.split('$LINE')[0] + self.swapFormat.split('$swapmb')[0] + '-----' + self.swapFormat.split('$swapmb')[1] + self.formatLine.split('$LINE')[1] - elif (self.swapFormat.split('$swap')[0] != self.swapFormat): - self.swapInMb = False - self.swap_free = 1.0 - self.swap_used = 0.0 - line = self.swapFormat.split('$swap')[0] + '-----' + self.swapFormat.split('$swap')[1] - else: - line = self.swapFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_swap = Plasma.Label(self.applet) - self.label_swap.setText(text) - self.layout.addItem(self.label_swap) - elif (order == "5"): - if (self.netBool == 1): - self.netNonFormat = str(self.settings.get('netNonFormat', '[net: $netKB/s]')) - if (self.netNonFormat.split('@@')[0] != self.netNonFormat): - self.netdev = self.netNonFormat.split('@@')[1] - self.netNonFormat = self.netNonFormat.split('@@')[0] + self.netNonFormat.split('@@')[2] - else: - self.num_dev = int(self.settings.get('num_dev', 0)) - self.setupNetdev() - if (self.netNonFormat.split('$netdev')[0] != self.netNonFormat): - self.netFormat = self.netNonFormat.split('$netdev')[0] + self.netdev + self.netNonFormat.split('$netdev')[1] - else: - self.netFormat = self.netNonFormat - self.label_netDown = Plasma.Label(self.applet) - if (self.netFormat.split('$net')[0] != self.netFormat): - line = self.netFormat.split('$net')[0] + '----' - else: - line = self.netFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_netDown.setText(text) - self.layout.addItem(self.label_netDown) - self.label_netUp = Plasma.Label(self.applet) - if (self.netFormat.split('$net')[0] != self.netFormat): - line = '/----' + self.netFormat.split('$net')[1] - else: - line = '' - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_netUp.setText(text) - self.layout.addItem(self.label_netUp) - elif (order == "6"): - if (self.batBool == 1): - self.batFormat = str(self.settings.get('batFormat', '[bat: $bat%$ac]')) - self.battery_device= str(self.settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity')) - self.ac_device = str(self.settings.get('ac_device', '/sys/class/power_supply/AC/online')) - self.label_bat = Plasma.Label(self.applet) - line = self.batFormat - if (line.split('$ac')[0] != line): - line = line.split('$ac')[0] + '(-)' + line.split('$ac')[1] - if (line.split('$bat')[0] != line): - line = line.split('$bat')[0] + '---' + line.split('$bat')[1] - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_bat.setText(text) - self.layout.addItem(self.label_bat) - elif (order == "7"): - if (self.cpuclockBool == 1): - self.cpuclockFormat = str(self.settings.get('cpuclockFormat', '[mhz: $cpucl]')) - if (self.cpuclockFormat.split('$ccpucl')[0] != self.cpuclockFormat): - self.label_cpuclock0 = Plasma.Label(self.applet) - self.label_cpuclock1 = Plasma.Label(self.applet) - if (self.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] != self.cpuclockFormat.split('$ccpucl')[0]): - line = self.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] + '----' + self.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[1] - else: - line = self.cpuclockFormat.split('$ccpucl')[0] - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_cpuclock0.setText(text) - self.layout.addItem(self.label_cpuclock0) - text = self.formatLine.split('$LINE')[0] + "----" + self.formatLine.split('$LINE')[1] - for core in range(self.numCores): - exec ('self.label_coreCpuclock' + str(core) + ' = Plasma.Label(self.applet)') - exec ('self.label_coreCpuclock' + str(core) + '.setText(text)') - exec ('self.layout.addItem(self.label_coreCpuclock' + str(core) + ')') - if (self.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] != self.cpuclockFormat.split('$ccpucl')[1]): - line = self.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] + '----' + self.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[1] - else: - line = self.cpuclockFormat.split('$ccpucl')[1] - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_cpuclock1.setText(text) - self.layout.addItem(self.label_cpuclock1) - else: - self.label_cpuclock = Plasma.Label(self.applet) - if (self.cpuclockFormat.split('$cpucl')[0] != self.cpuclockFormat): - line = self.cpuclockFormat.split('$cpucl')[0] + '----' + self.cpuclockFormat.split('$cpucl')[1] - else: - line = self.cpuclockFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_cpuclock.setText(text) - self.layout.addItem(self.label_cpuclock) - elif (order == "8"): - if (self.uptimeBool == 1): - self.uptimeFormat = str(self.settings.get('uptimeFormat', '[uptime: $uptime]')) - self.label_uptime = Plasma.Label(self.applet) - if (self.uptimeFormat.split('$uptime')[0] != self.uptimeFormat): - line = self.uptimeFormat.split('$uptime')[0] + '---d--h--m' + self.uptimeFormat.split('$uptime')[1] - else: - line = self.uptimeFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_uptime.setText(text) - self.layout.addItem(self.label_uptime) - elif (order == "9"): - if (self.gpuBool == 1): - self.gpuFormat = str(self.settings.get('gpuFormat', '[gpu: $gpu%]')) - self.label_gpu = Plasma.Label(self.applet) - if (self.gpuFormat.split('$gpu')[0] != self.gpuFormat): - line = self.gpuFormat.split('$gpu')[0] + '-----' + self.gpuFormat.split('$gpu')[1] - else: - line = self.gpuFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_gpu.setText(text) - self.layout.addItem(self.label_gpu) - elif (order == "a"): - if (self.gputempBool == 1): - self.gputempFormat = str(self.settings.get('gputempFormat', '[gpu temp: $gputemp°C]')) - self.label_gputemp = Plasma.Label(self.applet) - if (self.gputempFormat.split('$gputemp')[0] != self.gputempFormat): - line = self.gputempFormat.split('$gputemp')[0] + '----' + self.gputempFormat.split('$gputemp')[1] - else: - line = self.gputempFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_gputemp.setText(text) - self.layout.addItem(self.label_gputemp) - elif (order == "b"): - if (self.hddBool == 1): - self.hddFormat = str(self.settings.get('hddFormat', '[hdd: @@/@@%]')) - if (self.hddFormat.split('@@')[0] != self.hddFormat): - self.mountPoints = self.hddFormat.split('@@')[1].split(';') - line = self.hddFormat.split('@@')[0] - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_hdd0 = Plasma.Label(self.applet) - self.label_hdd0.setText(text) - self.layout.addItem(self.label_hdd0) - text = self.formatLine.split('$LINE')[0] + "-----" + self.formatLine.split('$LINE')[1] - for mount in self.mountPoints: - exec ('self.label_hdd_' + ''.join(mount.split('/')) + ' = Plasma.Label(self.applet)') - exec ('self.label_hdd_' + ''.join(mount.split('/')) + '.setText(text)') - exec ('self.layout.addItem(self.label_hdd_' + ''.join(mount.split('/')) + ')') - line = self.hddFormat.split('@@')[2] - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_hdd1 = Plasma.Label(self.applet) - self.label_hdd1.setText(text) - self.layout.addItem(self.label_hdd1) - else: - line = self.hddFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_hdd0.setText(text) - self.layout.addItem(self.label_hdd0) - elif (order == "c"): - if (self.hddtempBool == 1): - self.hddtempFormat = str(self.settings.get('hddtempFormat', '[hdd temp: @@/dev/sda@@°C]')) - self.label_hddtemp = Plasma.Label(self.applet) - if (self.hddtempFormat.split('@@')[0] != self.hddtempFormat): - line = self.hddtempFormat.split('@@')[0] + '----' + self.hddtempFormat.split('@@')[2] - else: - line = self.hddtempFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_hddtemp.setText(text) - self.layout.addItem(self.label_hddtemp) - self.applet.setLayout(self.layout) - self.theme = Plasma.Svg(self) - self.theme.setImagePath("widgets/background") - self.setBackgroundHints(Plasma.Applet.DefaultBackground) - self.resize(10,10) - - # start timer - self.connectToEngine() - self.timer = QtCore.QTimer() - self.timer.setInterval(self.interval) - self.startPolling() + parent.okClicked.connect(self.configAccepted.configAccepted) def setupNetdev(self): @@ -535,7 +136,7 @@ class pyTextWidget(plasmascript.Applet): def startPolling(self): try: self.timer.start() - QtCore.QObject.connect(self.timer, QtCore.SIGNAL("timeout()"), self.updateLabel) + QObject.connect(self.timer, SIGNAL("timeout()"), self.updateLabel) self.updateLabel() self.showTooltip('') except Exception as (strerror): @@ -549,14 +150,17 @@ class pyTextWidget(plasmascript.Applet): """function to update label""" if (self.gpuBool == 1): self.gpuText() + self.gpuChecker.label_exit = 2 if (self.gputempBool == 1): self.gputempText() + self.gpuTempChecker.label_exit = 2 if ((self.memBool == 1) and (self.memInMb == False)): self.memText() if ((self.swapBool == 1) and (self.swapInMb == False)): self.swapText() if (self.hddtempBool == 1): self.hddtempText() + self.hddTempChecker.label_exit = 2 if (self.batBool == 1): self.batText() @@ -590,19 +194,8 @@ class pyTextWidget(plasmascript.Applet): def gpuText(self): """function to set gpu text""" - if (self.gpudev == 'nvidia'): - commandOut = commands.getoutput("nvidia-smi -q -d UTILIZATION | grep Gpu | tail -n1") - if (commandOut.split()[2] == 'N/A'): - gpu = ' N/A' - else: - gpu = "%5s" % (str(round(float(commandOut.split()[2][:-1]), 1))) - elif (self.gpudev == 'ati'): - commandOut = commands.getoutput("aticonfig --od-getclocks | grep load | tail -n1") - gpu = "%5s" % (str(round(float(commandOut.split()[3][:-1]), 1))) - else: - gpu = '-----' if (self.gpuFormat.split('$gpu')[0] != self.gpuFormat): - line = self.gpuFormat.split('$gpu')[0] + gpu + self.gpuFormat.split('$gpu')[1] + line = self.gpuFormat.split('$gpu')[0] + self.gpuChecker.gpu + self.gpuFormat.split('$gpu')[1] else: line = self.gpuFormat text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] @@ -611,16 +204,8 @@ class pyTextWidget(plasmascript.Applet): def gputempText(self): """function to set gpu temperature text""" - if (self.gpudev == 'nvidia'): - commandOut = commands.getoutput("nvidia-smi -q -d TEMPERATURE | grep Gpu | tail -n1") - gputemp = "%4s" % (str(round(float(commandOut.split()[2]), 1))) - elif (self.gpudev == 'ati'): - commandOut = commands.getoutput("aticonfig --od-gettemperature | grep Temperature | tail -n1") - gputemp = "%4s" % (str(round(float(commandOut.split()[4]), 1))) - else: - gputemp = '----' if (self.gputempFormat.split('$gputemp')[0] != self.gputempFormat): - line = self.gputempFormat.split('$gputemp')[0] + gputemp + self.gputempFormat.split('$gputemp')[1] + line = self.gputempFormat.split('$gputemp')[0] + self.gpuTempChecker.gputemp + self.gputempFormat.split('$gputemp')[1] else: line = self.gputempFormat text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] @@ -629,10 +214,8 @@ class pyTextWidget(plasmascript.Applet): def hddtempText(self): """function to set hdd temperature text""" - commandOut = commands.getoutput("hddtemp "+self.hddtempFormat.split('@@')[1]) - hddtemp = "%4s" % (str(round(float(commandOut.split(':')[2][:-3]), 1))) if (self.hddtempFormat.split('@@')[0] != self.hddtempFormat): - line = self.hddtempFormat.split('@@')[0] + hddtemp + self.hddtempFormat.split('@@')[2] + line = self.hddtempFormat.split('@@')[0] + self.hddTempChecker.hddtemp + self.hddtempFormat.split('@@')[2] else: line = self.hddtempFormat text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] @@ -663,191 +246,12 @@ class pyTextWidget(plasmascript.Applet): line = self.swapFormat text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] self.label_swap.setText(text) - - - def connectToEngine(self): - """function to initializate engine""" - self.systemmonitor = self.dataEngine("systemmonitor") - if (self.uptimeBool == 1): - self.systemmonitor.connectSource("system/uptime", self, self.interval) - if (self.cpuBool == 1): - self.systemmonitor.connectSource("cpu/system/TotalLoad", self, self.interval) - if (self.cpuFormat.split('$ccpu')[0] != self.cpuFormat): - for core in range(self.numCores): - self.systemmonitor.connectSource("cpu/cpu"+str(core)+"/TotalLoad", self, self.interval) - if (self.cpuclockBool == 1): - self.systemmonitor.connectSource("cpu/system/AverageClock", self, self.interval) - if (self.cpuclockFormat.split('$ccpucl')[0] != self.cpuclockFormat): - for core in range(self.numCores): - self.systemmonitor.connectSource("cpu/cpu"+str(core)+"/clock", self, self.interval) - if (self.netBool == 1): - self.updateNetdev = 0 - self.systemmonitor.connectSource("network/interfaces/"+self.netdev+"/transmitter/data", self, self.interval) - self.systemmonitor.connectSource("network/interfaces/"+self.netdev+"/receiver/data", self, self.interval) - if (self.tempBool == 1): - self.systemmonitor.connectSource(self.tempdev, self, self.interval) - if (self.memBool == 1): - if (self.memInMb): - self.systemmonitor.connectSource("mem/physical/application", self, self.interval) - else: - self.systemmonitor.connectSource("mem/physical/free", self, 200) - self.systemmonitor.connectSource("mem/physical/used", self, 200) - self.systemmonitor.connectSource("mem/physical/application", self, 200) - if (self.swapBool == 1): - if (self.swapInMb): - self.systemmonitor.connectSource("mem/swap/used", self, self.interval) - else: - self.systemmonitor.connectSource("mem/swap/free", self, 200) - self.systemmonitor.connectSource("mem/swap/used", self, 200) - if (self.hddBool == 1): - for mount in self.mountPoints: - self.systemmonitor.connectSource("partitions" + mount + "/filllevel", self, self.interval) - + + @pyqtSignature("dataUpdated(const QString &, const Plasma::DataEngine::Data &)") def dataUpdated(self, sourceName, data): - """function to refresh data""" - if (sourceName == "system/uptime"): - value = int(round(float(data[QString(u'value')]), 1)) - uptimeText = '%3sd%2sh%2sm' % (str(int(value/(24*60*60))), int(value/60/60)-int(value/24/60/60)*24, (value-value%60)/60%60) - if (self.uptimeFormat.split('$uptime')[0] != self.uptimeFormat): - line = self.uptimeFormat.split('$uptime')[0] + uptimeText + self.uptimeFormat.split('$uptime')[1] - else: - line = self.uptimeFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_uptime.setText(text) - elif (sourceName == "cpu/system/TotalLoad"): - value = str(round(float(data[QString(u'value')]), 1)) - cpuText = "%5s" % (value) - if (self.cpuFormat.split('$ccpu')[0] != self.cpuFormat): - if (self.cpuFormat.split('$ccpu')[0].split('$cpu')[0] != self.cpuFormat.split('$ccpu')[0]): - line = self.cpuFormat.split('$ccpu')[0].split('$cpu')[0] + cpuText + self.cpuFormat.split('$ccpu')[0].split('$cpu')[1] - else: - line = self.cpuFormat.split('$ccpu')[0] - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_cpu0.setText(text) - if (self.cpuFormat.split('$ccpu')[1].split('$cpu')[0] != self.cpuFormat.split('$ccpu')[1]): - line = self.cpuFormat.split('$ccpu')[1].split('$cpu')[0] + cpuText + self.cpuFormat.split('$ccpu')[1].split('$cpu')[1] - else: - line = self.cpuFormat.split('$ccpu')[1] - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_cpu1.setText(text) - else: - if (self.cpuFormat.split('$cpu')[0] != self.cpuFormat): - line = self.cpuFormat.split('$cpu')[0] + cpuText + self.cpuFormat.split('$cpu')[1] - else: - line = self.cpuFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_cpu.setText(text) - elif ((str(sourceName)[:7] == "cpu/cpu") and (str(sourceName).split('/')[2] == "TotalLoad")): - value = str(round(float(data[QString(u'value')]), 1)) - cpuText = "%5s" % (value) - text = self.formatLine.split('$LINE')[0] + cpuText + self.formatLine.split('$LINE')[1] - #text = self.formatLine.split('$LINE')[0] + "Core" + str(sourceName)[7] + "\n" + cpuText + self.formatLine.split('$LINE')[1] - exec ('self.label_coreCpu' + str(sourceName)[7] + '.setText(text)') - elif (sourceName == "cpu/system/AverageClock"): - value = str(data[QString(u'value')]).split('.')[0] - cpuclockText = "%4s" % (value) - if (self.cpuclockFormat.split('$ccpucl')[0] != self.cpuclockFormat): - if (self.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] != self.cpuclockFormat.split('$ccpucl')[0]): - line = self.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] + cpuclockText + self.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[1] - else: - line = self.cpuclockFormat.split('$ccpucl')[0] - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_cpuclock0.setText(text) - if (self.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] != self.cpuclockFormat.split('$ccpucl')[1]): - line = self.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] + cpuclockText + self.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[1] - else: - line = self.cpuclockFormat.split('$ccpucl')[1] - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_cpuclock1.setText(text) - else: - if (self.cpuclockFormat.split('$cpucl')[0] != self.cpuclockFormat): - line = self.cpuclockFormat.split('$cpucl')[0] + cpuclockText + self.cpuclockFormat.split('$cpucl')[1] - else: - line = self.cpuclockFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_cpuclock.setText(text) - elif ((str(sourceName)[:7] == "cpu/cpu") and (str(sourceName).split('/')[2] == "clock")): - value = str(data[QString(u'value')]).split('.')[0] - cpuclockText = "%4s" % (value) - text = self.formatLine.split('$LINE')[0] + cpuclockText + self.formatLine.split('$LINE')[1] - exec ('self.label_coreCpuclock' + str(sourceName)[7] + '.setText(text)') - elif (sourceName == "network/interfaces/"+self.netdev+"/transmitter/data"): - value = str(data[QString(u'value')]).split('.')[0] - up_speed = "%4s" % (value) - if (self.netFormat.split('$net')[0] != self.netFormat): - line = '/' + up_speed + self.netFormat.split('$net')[1] - else: - line = '' - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_netUp.setText(text) - elif (sourceName == "network/interfaces/"+self.netdev+"/receiver/data"): - value = str(data[QString(u'value')]).split('.')[0] - down_speed = "%4s" % (value) - if (self.netFormat.split('$net')[0] != self.netFormat): - line = self.netFormat.split('$net')[0] + down_speed - else: - line = self.netFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_netDown.setText(text) - # update network device - self.updateNetdev = self.updateNetdev + 1 - if (self.updateNetdev == 100): - self.updateNetdev = 0 - if (self.netNonFormat.split('@@')[0] == self.netNonFormat): - self.systemmonitor.disconnectSource("network/interfaces/"+self.netdev+"/transmitter/data", self) - self.systemmonitor.disconnectSource("network/interfaces/"+self.netdev+"/receiver/data", self) - self.setupNetdev() - self.systemmonitor.connectSource("network/interfaces/"+self.netdev+"/transmitter/data", self, self.interval) - self.systemmonitor.connectSource("network/interfaces/"+self.netdev+"/receiver/data", self, self.interval) - if (self.netNonFormat.split('$netdev')[0] != self.netNonFormat): - self.netFormat = self.netNonFormat.split('$netdev')[0] + self.netdev + self.netNonFormat.split('$netdev')[1] - else: - self.netFormat = self.netNonFormat - elif (sourceName == self.tempdev): - value = str(round(float(data[QString(u'value')]), 1)) - tempText = "%4s" % (value) - if (self.tempFormat.split('$temp')[0] != self.tempFormat): - line = self.tempFormat.split('$temp')[0] + tempText + self.tempFormat.split('$temp')[1] - else: - line = self.tempFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_temp.setText(text) - elif (str(sourceName).split('/')[0] == "partitions"): - value = str(round(float(data[QString(u'value')]), 1)) - hddText = "%5s" % (value) - text = self.formatLine.split('$LINE')[0] + hddText + self.formatLine.split('$LINE')[1] - exec ('self.label_hdd_' + ''.join(str(sourceName).split('/')[1:-1]) + '.setText(text)') - elif (sourceName == "mem/physical/free"): - self.mem_free = float(data[QString(u'value')]) - elif (sourceName == "mem/physical/used"): - self.mem_uf = float(data[QString(u'value')]) - elif (sourceName == "mem/physical/application"): - if (self.memInMb): - mem = str(round(float(data[QString(u'value')]) / 1024, 0)).split('.')[0] - mem = "%5s" % (mem) - if (self.memFormat.split('$memmb')[0] != self.memFormat): - line = self.memFormat.split('$memmb')[0] + mem + self.memFormat.split('$memmb')[1] - else: - line = self.memFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_mem.setText(text) - else: - self.mem_used = float(data[QString(u'value')]) - elif (sourceName == "mem/swap/free"): - self.swap_free = float(data[QString(u'value')]) - elif (sourceName == "mem/swap/used"): - if (self.swapInMb): - mem = str(round(float(data[QString(u'value')]) / 1024, 0)).split('.')[0] - mem = "%5s" % (mem) - if (self.swapFormat.split('$swapmb')[0] != self.swapFormat): - line = self.swapFormat.split('$swapmb')[0] + mem + self.swapFormat.split('$swapmb')[1] - else: - line = self.swapFormat - text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] - self.label_swap.setText(text) - else: - self.swap_used = float(data[QString(u'value')]) + """function to update label""" + self.dataengine.dataUpdated(sourceName, data) diff --git a/source/contents/code/reinit.py b/source/contents/code/reinit.py new file mode 100644 index 0000000..75d2b3a --- /dev/null +++ b/source/contents/code/reinit.py @@ -0,0 +1,293 @@ +from PyQt4.QtCore import * +from PyKDE4.plasma import Plasma +import config +import gpuchecker +import gputempchecker +import hddtempchecker + + + +class Reinit(): + def __init__(self, parent): + """class definition""" + self.parent = parent + + def reinit(self): + """function to reinitializate widget""" + self.parent.settings = config.Config(self.parent) + self.parent.interval = int(self.parent.settings.get('interval', 2000)) + self.parent.font_family = str(self.parent.settings.get('font_family', 'Terminus')) + self.parent.font_size = int(self.parent.settings.get('font_size', 12)) + self.parent.font_color = str(self.parent.settings.get('font_color', '#000000')) + self.parent.font_style = str(self.parent.settings.get('font_style', 'normal')) + self.parent.font_weight = int(self.parent.settings.get('font_weight', 400)) + self.parent.formatLine = "
$LINE
" + self.parent.label_order = str(self.parent.settings.get('label_order', '1345')) + 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 = int(self.parent.settings.get("' + label + 'Bool", 1))') + else: + exec ('self.parent.' + label + 'Bool = int(self.parent.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 ('self.parent.settings.set("' + label + 'Bool", self.parent.' + label + 'Bool)') + self.parent.label_order = '1345' + self.parent.settings.set('label_order', self.parent.label_order) + + for order in self.parent.label_order: + if (order == "1"): + if (self.parent.cpuBool == 1): + self.parent.cpuFormat = str(self.parent.settings.get('cpuFormat', '[cpu: $cpu%]')) + if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat): + self.parent.label_cpu0 = Plasma.Label(self.parent.applet) + self.parent.label_cpu1 = Plasma.Label(self.parent.applet) + if (self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[0] != self.parent.cpuFormat.split('$ccpu')[0]): + line = self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[0] + '-----' + self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[1] + else: + line = self.parent.cpuFormat.split('$ccpu')[0] + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_cpu0.setText(text) + self.parent.layout.addItem(self.parent.label_cpu0) + text = self.parent.formatLine.split('$LINE')[0] + "-----" + self.parent.formatLine.split('$LINE')[1] + for core in range(self.parent.numCores): + exec ('self.parent.label_coreCpu' + str(core) + ' = Plasma.Label(self.parent.applet)') + exec ('self.parent.label_coreCpu' + str(core) + '.setText(text)') + exec ('self.parent.layout.addItem(self.parent.label_coreCpu' + str(core) + ')') + if (self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[0] != self.parent.cpuFormat.split('$ccpu')[1]): + line = self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[0] + '-----' + self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[1] + else: + line = self.parent.cpuFormat.split('$ccpu')[1] + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_cpu1.setText(text) + self.parent.layout.addItem(self.parent.label_cpu1) + else: + self.parent.label_cpu = Plasma.Label(self.parent.applet) + if (self.parent.cpuFormat.split('$cpu')[0] != self.parent.cpuFormat): + line = self.parent.cpuFormat.split('$cpu')[0] + '-----' + self.parent.cpuFormat.split('$cpu')[1] + else: + line = self.parent.cpuFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_cpu.setText(text) + self.parent.layout.addItem(self.parent.label_cpu) + elif (order == "2"): + if (self.parent.tempBool == 1): + self.parent.tempFormat = str(self.parent.settings.get('tempFormat', '[temp: $temp°C]')) + self.parent.label_temp = Plasma.Label(self.parent.applet) + if (self.parent.tempFormat.split('$temp')[0] != self.parent.tempFormat): + line = self.parent.tempFormat.split('$temp')[0] + '----' + self.parent.tempFormat.split('$temp')[1] + else: + line = self.parent.tempFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_temp.setText(text) + self.parent.layout.addItem(self.parent.label_temp) + elif (order == "3"): + if (self.parent.memBool == 1): + self.parent.memFormat = str(self.parent.settings.get('memFormat', '[mem: $mem%]')) + if (self.parent.memFormat.split('$memmb')[0] != self.parent.memFormat): + self.parent.memInMb = True + text = self.parent.formatLine.split('$LINE')[0] + self.parent.memFormat.split('$memmb')[0] + '-----' + self.parent.memFormat.split('$memmb')[1] + self.parent.formatLine.split('$LINE')[1] + elif (self.parent.memFormat.split('$mem')[0] != self.parent.memFormat): + self.parent.memInMb = False + self.parent.mem_used = 0.0 + self.parent.mem_free = 1.0 + self.parent.mem_uf = 0.0 + line = self.parent.memFormat.split('$mem')[0] + '-----' + self.parent.memFormat.split('$mem')[1] + else: + line = self.parent.memFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_mem = Plasma.Label(self.parent.applet) + self.parent.label_mem.setText(text) + self.parent.layout.addItem(self.parent.label_mem) + elif (order == "4"): + if (self.parent.swapBool == 1): + self.parent.swapFormat = str(self.parent.settings.get('swapFormat', '[swap: $swap%]')) + if (self.parent.swapFormat.split('$swapmb')[0] != self.parent.swapFormat): + self.parent.swapInMb = True + text = self.parent.formatLine.split('$LINE')[0] + self.parent.swapFormat.split('$swapmb')[0] + '-----' + self.parent.swapFormat.split('$swapmb')[1] + self.parent.formatLine.split('$LINE')[1] + elif (self.parent.swapFormat.split('$swap')[0] != self.parent.swapFormat): + self.parent.swapInMb = False + self.parent.swap_free = 1.0 + self.parent.swap_used = 0.0 + line = self.parent.swapFormat.split('$swap')[0] + '-----' + self.parent.swapFormat.split('$swap')[1] + else: + line = self.parent.swapFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_swap = Plasma.Label(self.parent.applet) + self.parent.label_swap.setText(text) + self.parent.layout.addItem(self.parent.label_swap) + elif (order == "5"): + if (self.parent.netBool == 1): + self.parent.netNonFormat = str(self.parent.settings.get('netNonFormat', '[net: $netKB/s]')) + if (self.parent.netNonFormat.split('@@')[0] != self.parent.netNonFormat): + self.parent.netdev = self.parent.netNonFormat.split('@@')[1] + self.parent.netNonFormat = self.parent.netNonFormat.split('@@')[0] + self.parent.netNonFormat.split('@@')[2] + else: + self.parent.num_dev = int(self.parent.settings.get('num_dev', 0)) + self.parent.setupNetdev() + if (self.parent.netNonFormat.split('$netdev')[0] != self.parent.netNonFormat): + self.parent.netFormat = self.parent.netNonFormat.split('$netdev')[0] + self.parent.netdev + self.parent.netNonFormat.split('$netdev')[1] + else: + self.parent.netFormat = self.parent.netNonFormat + self.parent.label_netDown = Plasma.Label(self.parent.applet) + if (self.parent.netFormat.split('$net')[0] != self.parent.netFormat): + line = self.parent.netFormat.split('$net')[0] + '----' + else: + line = self.parent.netFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_netDown.setText(text) + self.parent.layout.addItem(self.parent.label_netDown) + self.parent.label_netUp = Plasma.Label(self.parent.applet) + if (self.parent.netFormat.split('$net')[0] != self.parent.netFormat): + line = '/----' + self.parent.netFormat.split('$net')[1] + else: + line = '' + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_netUp.setText(text) + self.parent.layout.addItem(self.parent.label_netUp) + elif (order == "6"): + if (self.parent.batBool == 1): + self.parent.batFormat = str(self.parent.settings.get('batFormat', '[bat: $bat%$ac]')) + self.parent.battery_device= str(self.parent.settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity')) + self.parent.ac_device = str(self.parent.settings.get('ac_device', '/sys/class/power_supply/AC/online')) + self.parent.label_bat = Plasma.Label(self.parent.applet) + line = self.parent.batFormat + if (line.split('$ac')[0] != line): + line = line.split('$ac')[0] + '(-)' + line.split('$ac')[1] + if (line.split('$bat')[0] != line): + line = line.split('$bat')[0] + '---' + line.split('$bat')[1] + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_bat.setText(text) + self.parent.layout.addItem(self.parent.label_bat) + elif (order == "7"): + if (self.parent.cpuclockBool == 1): + self.parent.cpuclockFormat = str(self.parent.settings.get('cpuclockFormat', '[mhz: $cpucl]')) + if (self.parent.cpuclockFormat.split('$ccpucl')[0] != self.parent.cpuclockFormat): + self.parent.label_cpuclock0 = Plasma.Label(self.parent.applet) + self.parent.label_cpuclock1 = Plasma.Label(self.parent.applet) + if (self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] != self.parent.cpuclockFormat.split('$ccpucl')[0]): + line = self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] + '----' + self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[1] + else: + line = self.parent.cpuclockFormat.split('$ccpucl')[0] + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_cpuclock0.setText(text) + self.parent.layout.addItem(self.parent.label_cpuclock0) + text = self.parent.formatLine.split('$LINE')[0] + "----" + self.parent.formatLine.split('$LINE')[1] + for core in range(self.parent.numCores): + exec ('self.parent.label_coreCpuclock' + str(core) + ' = Plasma.Label(self.parent.applet)') + exec ('self.parent.label_coreCpuclock' + str(core) + '.setText(text)') + exec ('self.parent.layout.addItem(self.parent.label_coreCpuclock' + str(core) + ')') + if (self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] != self.parent.cpuclockFormat.split('$ccpucl')[1]): + line = self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] + '----' + self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[1] + else: + line = self.parent.cpuclockFormat.split('$ccpucl')[1] + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_cpuclock1.setText(text) + self.parent.layout.addItem(self.parent.label_cpuclock1) + else: + self.parent.label_cpuclock = Plasma.Label(self.parent.applet) + if (self.parent.cpuclockFormat.split('$cpucl')[0] != self.parent.cpuclockFormat): + line = self.parent.cpuclockFormat.split('$cpucl')[0] + '----' + self.parent.cpuclockFormat.split('$cpucl')[1] + else: + line = self.parent.cpuclockFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_cpuclock.setText(text) + self.parent.layout.addItem(self.parent.label_cpuclock) + elif (order == "8"): + if (self.parent.uptimeBool == 1): + self.parent.uptimeFormat = str(self.parent.settings.get('uptimeFormat', '[uptime: $uptime]')) + self.parent.label_uptime = Plasma.Label(self.parent.applet) + if (self.parent.uptimeFormat.split('$uptime')[0] != self.parent.uptimeFormat): + line = self.parent.uptimeFormat.split('$uptime')[0] + '---d--h--m' + self.parent.uptimeFormat.split('$uptime')[1] + else: + line = self.parent.uptimeFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_uptime.setText(text) + self.parent.layout.addItem(self.parent.label_uptime) + elif (order == "9"): + if (self.parent.gpuBool == 1): + self.parent.gpuFormat = str(self.parent.settings.get('gpuFormat', '[gpu: $gpu%]')) + self.parent.label_gpu = Plasma.Label(self.parent.applet) + if (self.parent.gpuFormat.split('$gpu')[0] != self.parent.gpuFormat): + line = self.parent.gpuFormat.split('$gpu')[0] + '-----' + self.parent.gpuFormat.split('$gpu')[1] + else: + line = self.parent.gpuFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_gpu.setText(text) + self.parent.layout.addItem(self.parent.label_gpu) + elif (order == "a"): + if (self.parent.gputempBool == 1): + self.parent.gputempFormat = str(self.parent.settings.get('gputempFormat', '[gpu temp: $gputemp°C]')) + self.parent.label_gputemp = Plasma.Label(self.parent.applet) + if (self.parent.gputempFormat.split('$gputemp')[0] != self.parent.gputempFormat): + line = self.parent.gputempFormat.split('$gputemp')[0] + '----' + self.parent.gputempFormat.split('$gputemp')[1] + else: + line = self.parent.gputempFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_gputemp.setText(text) + self.parent.layout.addItem(self.parent.label_gputemp) + elif (order == "b"): + if (self.parent.hddBool == 1): + self.parent.hddFormat = str(self.parent.settings.get('hddFormat', '[hdd: @@/@@%]')) + if (self.parent.hddFormat.split('@@')[0] != self.parent.hddFormat): + self.parent.mountPoints = self.parent.hddFormat.split('@@')[1].split(';') + line = self.parent.hddFormat.split('@@')[0] + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_hdd0 = Plasma.Label(self.parent.applet) + self.parent.label_hdd0.setText(text) + self.parent.layout.addItem(self.parent.label_hdd0) + text = self.parent.formatLine.split('$LINE')[0] + "-----" + self.parent.formatLine.split('$LINE')[1] + for mount in self.parent.mountPoints: + exec ('self.parent.label_hdd_' + ''.join(mount.split('/')) + ' = Plasma.Label(self.parent.applet)') + exec ('self.parent.label_hdd_' + ''.join(mount.split('/')) + '.setText(text)') + exec ('self.parent.layout.addItem(self.parent.label_hdd_' + ''.join(mount.split('/')) + ')') + line = self.parent.hddFormat.split('@@')[2] + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_hdd1 = Plasma.Label(self.parent.applet) + self.parent.label_hdd1.setText(text) + self.parent.layout.addItem(self.parent.label_hdd1) + else: + line = self.parent.hddFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_hdd0.setText(text) + self.parent.layout.addItem(self.parent.label_hdd0) + elif (order == "c"): + if (self.parent.hddtempBool == 1): + self.parent.hddtempFormat = str(self.parent.settings.get('hddtempFormat', '[hdd temp: @@/dev/sda@@°C]')) + self.parent.label_hddtemp = Plasma.Label(self.parent.applet) + if (self.parent.hddtempFormat.split('@@')[0] != self.parent.hddtempFormat): + line = self.parent.hddtempFormat.split('@@')[0] + '----' + self.parent.hddtempFormat.split('@@')[2] + else: + line = self.parent.hddtempFormat + text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1] + self.parent.label_hddtemp.setText(text) + self.parent.layout.addItem(self.parent.label_hddtemp) + self.parent.applet.setLayout(self.parent.layout) + self.parent.theme = Plasma.Svg(self.parent) + self.parent.theme.setImagePath("widgets/background") + self.parent.setBackgroundHints(Plasma.Applet.DefaultBackground) + self.parent.resize(10,10) + + # create threading + self.parent.dataengine.connectToEngine() + self.parent.timer = QTimer() + self.parent.timer.setInterval(self.parent.interval) + if (self.parent.gpuBool == 1): + self.parent.gpuChecker = gpuchecker.GpuThread(self.parent.interval, self.parent.gpudev) + self.parent.gpuChecker.start() + if (self.parent.gputempBool == 1): + self.parent.gpuTempChecker = gputempchecker.GpuTempThread(self.parent.interval, self.parent.gpudev) + self.parent.gpuTempChecker.start() + if (self.parent.hddtempBool ==1): + self.parent.hddTempChecker = hddtempchecker.HddTempThread(self.parent.interval, self.parent.hddtempFormat.split('@@')[1]) + self.parent.hddTempChecker.start() + self.parent.startPolling() diff --git a/source/contents/code/util.py b/source/contents/code/util.py deleted file mode 100644 index 32b87db..0000000 --- a/source/contents/code/util.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- - -import os -from shutil import copyfile -from PyKDE4.kdecore import * - - - -class Util(): - def __init__(self, applet): - self.applet = applet - - def createDirectory(self, name): - if not os.path.isdir(name): - try: - os.mkdir(name) - except: - print 'Failed to create directory: ' + name - - def kdeHome(self): - return unicode(KGlobal.dirs().localkdedir()) - - def createNotifyrc(self): - print '[%s] creating notifyrc' % (self.applet._name) - self.createDirectory(self.kdeHome() + 'share/apps/%s' % self.applet._name) - - source = self.applet.package().path() + 'contents/misc/%s.notifyrc' % self.applet._name - destination = self.kdeHome() + 'share/apps/%s/%s.notifyrc' % (self.applet._name, self.applet._name) - copyfile(source, destination) - - def createConfig(self): - self.createDirectory(self.kdeHome() + 'share/apps/%s' % self.applet._name) - - source = self.applet.package().path() + 'contents/misc/%s.ini' % self.applet._name - destination = self.kdeHome() + 'share/apps/%s/%s.ini' % (self.applet._name, self.applet._name) - copyfile(source, destination) \ No newline at end of file