diff --git a/sources/ptm/contents/code/configdef.py b/sources/ptm/contents/code/configdef.py index 2f114cb..0a1d380 100644 --- a/sources/ptm/contents/code/configdef.py +++ b/sources/ptm/contents/code/configdef.py @@ -196,7 +196,8 @@ class ConfigDefinition: labelOrder = str(settings.get('label_order', '1345')) for label in self.defaults['order'].keys(): - bool = self.defaults['bool'][self.defaults['order'][label]] + bool = settings.get(self.defaults['confBool'][self.defaults['order'][label]], + self.defaults['bool'][self.defaults['order'][label]]).toInt()[0] self.configpage.checkboxes[self.defaults['order'][label]].setCheckState(bool) if (bool > 0): self.configpage.sliders[self.defaults['order'][label]].setValue(labelOrder.find(label) + 1) diff --git a/sources/ptm/contents/code/dataengine.py b/sources/ptm/contents/code/dataengine.py index b36d02a..f524cfb 100644 --- a/sources/ptm/contents/code/dataengine.py +++ b/sources/ptm/contents/code/dataengine.py @@ -152,9 +152,9 @@ class DataEngine: updatedData['value'] = value # update network device self.updateNetdev = self.updateNetdev + 1 - if (self.updateNetdev == 100): + if (self.updateNetdev == 30): self.updateNetdev = 0 - if (adv['netdevBool'] > 0): + if (adv['netdevBool'] == 0): systemDataEngine.disconnectSource("network/interfaces/" + names['net'] + "/transmitter/data", self.parent) systemDataEngine.disconnectSource("network/interfaces/" + names['net'] + "/receiver/data", self.parent) names['net'] = self.parent.setNetdev() diff --git a/sources/ptm/contents/code/main.py b/sources/ptm/contents/code/main.py index e8e45fa..0e750f3 100644 --- a/sources/ptm/contents/code/main.py +++ b/sources/ptm/contents/code/main.py @@ -244,7 +244,7 @@ class pyTextWidget(plasmascript.Applet): line = self.ptm['vars']['formats']['bat'] if (line.split('$bat')[0] != line): try: - with open (self.ptm['adv']['batDev'], 'r') as batFile: + with open (self.ptm['vars']['adv']['batDev'], 'r') as batFile: bat = batFile.readline()[:-1] except: bat = "off" @@ -252,7 +252,7 @@ class pyTextWidget(plasmascript.Applet): line = line.split('$bat')[0] + bat + line.split('$bat')[1] if (line.split('$ac')[0] != line): try: - with open (self.ptm['adv']['acDev'], 'r') as batFile: + with open (self.ptm['vars']['adv']['acDev'], 'r') as batFile: bat = batFile.readline()[:-1] if (bat == '1'): bat = "(*)" @@ -298,7 +298,7 @@ class pyTextWidget(plasmascript.Applet): line = self.ptm['vars']['formats']['hdd'] for i in range(len(self.ptm['names']['hdd'])): if (line.split('$hdd' + str(i))[0] != line): - line = line.split('$hdd' + str(i))[0] + self.ptm['values']['hdd'][self.ptm['names']['hdd'][i]] + line.split('$hdd' + str(i))[1] + line = line.split('$hdd' + str(i))[0] + str(self.ptm['values']['hdd'][self.ptm['names']['hdd'][i]]) + line.split('$hdd' + str(i))[1] text = self.ptm['vars']['app']['format'].split('$LINE')[0] + line + self.ptm['vars']['app']['format'].split('$LINE')[1] self.setText("hdd", text) @@ -317,7 +317,8 @@ class pyTextWidget(plasmascript.Applet): """function to set mem text""" line = self.ptm['vars']['formats']['mem'] if (line.split('$memmb')[0] != line): - line = line.split('$memmb')[0] + self.ptm['values']['mem']['app'] + line.split('$memmb')[1] + mem = "%i" % (self.ptm['values']['mem']['app']) + line = line.split('$memmb')[0] + mem + line.split('$memmb')[1] if (line.split('$mem')[0] != line): try: mem = 100 * self.ptm['values']['mem']['app'] / (self.ptm['values']['mem']['free'] + self.ptm['values']['mem']['used']) @@ -348,7 +349,8 @@ class pyTextWidget(plasmascript.Applet): """function to set swap text""" line = self.ptm['vars']['formats']['swap'] if (line.split('$swapmb')[0] != line): - line = line.split('$swapmb')[0] + self.ptm['values']['swap']['used'] + line.split('$swapmb')[1] + mem = "%i" % (self.ptm['values']['swap']['used']) + line = line.split('$swapmb')[0] + mem + line.split('$swapmb')[1] if (line.split('$swap')[0] != line): try: mem = 100 * self.ptm['values']['swap']['used'] / (self.ptm['values']['swap']['free'] + self.ptm['values']['swap']['used']) @@ -433,13 +435,13 @@ class pyTextWidget(plasmascript.Applet): interfaces = QDir.entryList(QDir(netdir), QDir.Dirs | QDir.NoDotAndDotDot) for device in interfaces: if (str(device) != "lo"): - try: + #try: + if True: with open(netdir + '/' + str(device) + '/operstate', 'r') as stateFile: if (stateFile.readline() == "up\n"): netdev = str(device) - except: - pass - self.ptm['names']['net'] = netdev + #except: + #pass return netdev