Release 1.3.6

* fix bug #1
* fix bug #2
This commit is contained in:
arcan1s
2013-09-29 05:57:06 +04:00
parent 013cf8d335
commit e7babdfde4
8 changed files with 18 additions and 16 deletions

View File

@ -147,7 +147,7 @@ class ConfigDefinition:
settings.set('label_order', self.parent.label_order)
# reinitializate
self.parent.reinit.reinit()
self.parent.reinit.reinit(confAccept=True)
def createConfigurationInterface(self, parent):

View File

@ -153,7 +153,7 @@ class DataEngine:
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.netdev = 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):

View File

@ -36,7 +36,7 @@ class pyTextWidget(plasmascript.Applet):
QObject.connect(self.timer, SIGNAL("timeout()"), self.updateLabel)
self.setupVar()
self.reinit.reinit()
self.reinit.reinit(confAccept=False)
self.setHasConfigurationInterface(True)
@ -60,24 +60,25 @@ class pyTextWidget(plasmascript.Applet):
def mouseDoubleClickEvent(self, event):
"""function to doubleclick event"""
os.system("ksysguard")
os.system("ksysguard &")
def setupNetdev(self):
"""function to setup network device"""
self.netdev = "lo"
netdev = "lo"
try:
interfaces = []
for line in commands.getoutput("ifconfig -a").split("\n"):
if ((line != '') and (line[0] != ' ') and (line.split(":")[0].split()[0] != 'lo')):
interfaces.append(line.split(":")[0].split()[0])
for line in commands.getoutput("ifconfig -a -s").split("\n"):
if ((line.split()[0] != 'Iface') and (line.split()[0] != 'lo')):
interfaces.append(line.split()[0])
for device in interfaces:
if (commands.getoutput("ifconfig " + device + " | grep 'inet '") != ''):
self.netdev = device
netdev = device
break
except:
pass
return netdev
def setupVar(self):

View File

@ -11,7 +11,7 @@ class Reinit():
"""class definition"""
self.parent = parent
def reinit(self):
def reinit(self, confAccept=False):
"""function to reinitializate widget"""
settings = config.Config(self.parent)
self.parent.interval = settings.get('interval', 2000).toInt()[0]
@ -132,7 +132,7 @@ class Reinit():
self.parent.netdev = self.parent.netNonFormat.split('@@')[1]
self.parent.netNonFormat = self.parent.netNonFormat.split('@@')[0] + self.parent.netNonFormat.split('@@')[2]
else:
self.parent.setupNetdev()
self.parent.netdev = 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:
@ -270,7 +270,8 @@ class Reinit():
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)
if not confAccept:
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)