add support of stretch

This commit is contained in:
arcan1s
2014-06-04 22:49:47 +04:00
parent 52f85836a2
commit f1e22f122e
11 changed files with 744 additions and 661 deletions

View File

@ -57,6 +57,8 @@ class ConfigDefinition:
settings.set('layout', self.configpage['advanced'].ui.checkBox_layout.checkState())
settings.set('popup', self.configpage['advanced'].ui.checkBox_popup.checkState())
settings.set('left_stretch', self.configpage['advanced'].ui.checkBox_leftStretch.checkState())
settings.set('right_stretch', self.configpage['advanced'].ui.checkBox_rightStretch.checkState())
settings.set('custom_time', str(self.configpage['advanced'].ui.lineEdit_timeFormat.text()))
settings.set('custom_uptime', str(self.configpage['advanced'].ui.lineEdit_uptimeFormat.text()))
settings.set('temp_units', str(self.configpage['advanced'].ui.comboBox_tempUnits.currentText()))
@ -154,6 +156,8 @@ class ConfigDefinition:
self.configpage['advanced'].ui.checkBox_layout.setCheckState(settings.get('layout', 0).toInt()[0])
self.configpage['advanced'].ui.checkBox_popup.setCheckState(settings.get('popup', 2).toInt()[0])
self.configpage['advanced'].ui.checkBox_leftStretch.setCheckState(settings.get('left_stretch', 2).toInt()[0])
self.configpage['advanced'].ui.checkBox_rightStretch.setCheckState(settings.get('right_stretch', 2).toInt()[0])
self.configpage['advanced'].ui.lineEdit_timeFormat.setText(str(settings.get('custom_time', '$hh:$mm')))
self.configpage['advanced'].ui.lineEdit_uptimeFormat.setText(str(settings.get('custom_uptime', '$ds,$hs,$ms')))
index = self.configpage['advanced'].ui.comboBox_tempUnits.findText(str(settings.get('temp_units', "Celsius")))

View File

@ -649,7 +649,7 @@ class pyTextWidget(plasmascript.Applet):
self.ptm['vars']['app']['interval'], self.ptm['names'])
def createLayout(self, verticalLayout=0):
def createLayout(self, verticalLayout=0, leftStretch=2):
"""function to create layout"""
if self.debug: qDebug("[PTM] [main.py] [createLayout]")
if self.debug: qDebug("[PTM] [main.py] [createLayout] : Run function with vertical layout '%s'" %(verticalLayout))
@ -658,6 +658,8 @@ class pyTextWidget(plasmascript.Applet):
else:
self.ptm['layout'] = QGraphicsLinearLayout(Qt.Vertical, self.applet)
self.ptm['layout'].setContentsMargins(1, 1, 1, 1)
if (leftStretch == 2):
self.ptm['layout'].addStretch(1)
def disconnectFromSource(self):
@ -676,6 +678,9 @@ class pyTextWidget(plasmascript.Applet):
"""function to run reinit"""
if self.debug: qDebug("[PTM] [main.py] [reInit]")
self.reinit.reinit()
# add stretch
if (self.ptm['vars']['adv']['rightStretch'] == 2):
self.ptm['layout'].addStretch(1)
self.updateNetdev()
self.resize(10, 10)

View File

@ -53,9 +53,11 @@ class Reinit():
ptmVars['adv']['customTime'] = str(settings.get('custom_time', '$hh:$mm'))
ptmVars['adv']['customUptime'] = str(settings.get('custom_uptime', '$dd,$hh,$mm'))
ptmVars['adv']['layout'] = settings.get('layout', 0).toInt()[0]
ptmVars['adv']['leftStretch'] = settings.get('left_stretch', 2).toInt()[0]
ptmVars['adv']['netdevBool'] = settings.get('netdevBool', 0).toInt()[0]
ptmVars['adv']['netdev'] = str(settings.get('custom_netdev', 'lo'))
ptmVars['adv']['netDir'] = str(settings.get('netdir', '/sys/class/net'))
ptmVars['adv']['rightStretch'] = settings.get('right_stretch', 2).toInt()[0]
ptmVars['adv']['tempUnits'] = str(settings.get('temp_units', 'Celsius'))
ptmVars['adv']['popup'] = settings.get('popup', 2).toInt()[0]
@ -89,7 +91,7 @@ class Reinit():
if self.debug: qDebug("[PTM] [reinit.py] [reinit] : Returns names '%s'" %(ptmNames))
self.parent.applySettings('names', ptmNames)
self.parent.createLayout(ptmVars['adv']['layout'])
self.parent.createLayout(ptmVars['adv']['layout'], ptmVars['adv']['leftStretch'])
ptmVars['formats'] = {}
ptmVars['tooltip']['required'] = []
for order in ptmVars['app']['order']: