added ability to use vertical layout

This commit is contained in:
arcan1s
2014-05-29 18:13:32 +04:00
parent 25ff5a9189
commit e10f3396b9
19 changed files with 723 additions and 650 deletions

View File

@ -46,6 +46,7 @@ class ConfigDefinition:
settings.set('font_style', str(self.configpage['appearance'].ui.comboBox_style.currentText()))
settings.set('font_weight', self.configpage['appearance'].ui.spinBox_weight.value())
settings.set('layout', self.configpage['advanced'].ui.checkBox_layout.checkState())
settings.set('popup', self.configpage['advanced'].ui.checkBox_popup.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()))
@ -141,6 +142,7 @@ class ConfigDefinition:
self.configpage['appearance'].ui.comboBox_style.setCurrentIndex(1)
self.configpage['appearance'].ui.spinBox_weight.setValue(settings.get('font_weight', 400).toInt()[0])
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.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')))

View File

@ -24,7 +24,7 @@ from PyKDE4.kdeui import *
from PyKDE4.kio import *
from PyKDE4 import plasmascript
from PyKDE4.plasma import Plasma
import commands, os, shutil
import commands, os
import advanced
import appearance
@ -228,8 +228,6 @@ class pyTextWidget(plasmascript.Applet):
self.ptm['defaults']['disk'] = []
# labels
self.ptm['labels'] = {}
self.ptm['layout'] = QGraphicsLinearLayout(Qt.Horizontal, self.applet)
self.ptm['layout'].setContentsMargins(1, 1, 1, 1)
# names
self.ptm['names'] = {}
self.ptm['names']['disk'] = []
@ -598,6 +596,15 @@ class pyTextWidget(plasmascript.Applet):
self.ptm['vars']['app']['interval'], self.ptm['names'])
def createLayout(self, verticalLayout=0):
"""function to create layout"""
if (verticalLayout == 0):
self.ptm['layout'] = QGraphicsLinearLayout(Qt.Horizontal, self.applet)
else:
self.ptm['layout'] = QGraphicsLinearLayout(Qt.Vertical, self.applet)
self.ptm['layout'].setContentsMargins(1, 1, 1, 1)
def disconnectFromSource(self):
"""function to disconnect from sources"""
for label in self.ptm['defaults']['format'].keys():

View File

@ -43,6 +43,7 @@ class Reinit():
ptmVars['adv']['batDev'] = str(settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity'))
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']['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'))
@ -78,6 +79,7 @@ class Reinit():
ptmNames['temp'] = str(settings.get('temp_device', '')).split('@@')
self.parent.applySettings('names', ptmNames)
self.parent.createLayout(ptmVars['adv']['layout'])
ptmVars['formats'] = {}
ptmVars['tooltip']['required'] = []
for order in ptmVars['app']['order']: