add support of desktop label to ptm

This commit is contained in:
arcan1s 2014-07-09 13:12:52 +04:00
parent 7c3b47693e
commit 2ea73b2261
7 changed files with 204 additions and 62 deletions

View File

@ -98,6 +98,7 @@ class ConfigDefinition:
for i in range(self.configpage['dataengine'].ui.listWidget_customCommand.count()): for i in range(self.configpage['dataengine'].ui.listWidget_customCommand.count()):
item.append(self.configpage['dataengine'].ui.listWidget_customCommand.item(i).text()) item.append(self.configpage['dataengine'].ui.listWidget_customCommand.item(i).text())
deConfigFile.write("CUSTOM=" + str(item.join(QString('@@'))) + "\n") deConfigFile.write("CUSTOM=" + str(item.join(QString('@@'))) + "\n")
deConfigFile.write("DESKTOPCMD=" + str(self.configpage['dataengine'].ui.lineEdit_desktopCmd.text()) + "\n")
deConfigFile.write("GPUDEV=" + str(self.configpage['dataengine'].ui.comboBox_gpudev.currentText()) + "\n") deConfigFile.write("GPUDEV=" + str(self.configpage['dataengine'].ui.comboBox_gpudev.currentText()) + "\n")
deConfigFile.write("HDDDEV=" + str(self.configpage['dataengine'].ui.comboBox_hdddev.currentText()) + "\n") deConfigFile.write("HDDDEV=" + str(self.configpage['dataengine'].ui.comboBox_hdddev.currentText()) + "\n")
deConfigFile.write("HDDTEMPCMD=" + str(self.configpage['dataengine'].ui.lineEdit_hddtempCmd.text()) + "\n") deConfigFile.write("HDDTEMPCMD=" + str(self.configpage['dataengine'].ui.lineEdit_hddtempCmd.text()) + "\n")
@ -124,7 +125,7 @@ class ConfigDefinition:
# disconnecting from source and clear layout # disconnecting from source and clear layout
self.parent.disconnectFromSource() self.parent.disconnectFromSource()
labelOrder = "---------------" labelOrder = "----------------"
for label in self.defaults['order'].keys(): for label in self.defaults['order'].keys():
if (self.configpage['widget'].checkboxes[self.defaults['order'][label]].checkState() > 0): if (self.configpage['widget'].checkboxes[self.defaults['order'][label]].checkState() > 0):
pos = self.configpage['widget'].sliders[self.defaults['order'][label]].value() - 1 pos = self.configpage['widget'].sliders[self.defaults['order'][label]].value() - 1
@ -221,9 +222,9 @@ class ConfigDefinition:
self.configpage['tooltip'].ui.kcolorcombo_down.setColor(QColor(str(settings.get('down_color', '#00ffff')))) self.configpage['tooltip'].ui.kcolorcombo_down.setColor(QColor(str(settings.get('down_color', '#00ffff'))))
self.configpage['tooltip'].ui.kcolorcombo_up.setColor(QColor(str(settings.get('up_color', '#ff00ff')))) self.configpage['tooltip'].ui.kcolorcombo_up.setColor(QColor(str(settings.get('up_color', '#ff00ff'))))
deSettings = {'CUSTOM':'wget -qO- http://ifconfig.me/ip', 'GPUDEV':'auto', 'HDDDEV':'all', deSettings = {'CUSTOM':'wget -qO- http://ifconfig.me/ip', 'DESKTOPCMD':'qdbus org.kde.kwin /KWin currentDesktop',
'HDDTEMPCMD':'sudo hddtemp', 'MPDADDRESS':'localhost', 'MPDPORT':'6600', 'PKGCMD':'pacman -Qu', 'GPUDEV':'auto', 'HDDDEV':'all', 'HDDTEMPCMD':'sudo hddtemp', 'MPDADDRESS':'localhost',
'PKGNULL':'0', 'PLAYER':'amarok'} 'MPDPORT':'6600', 'PKGCMD':'pacman -Qu', 'PKGNULL':'0', 'PLAYER':'amarok'}
dataengineConfig = unicode(KGlobal.dirs().localkdedir()) + "/share/config/extsysmon.conf" dataengineConfig = unicode(KGlobal.dirs().localkdedir()) + "/share/config/extsysmon.conf"
try: try:
with open(dataengineConfig, 'r') as deConfigFile: with open(dataengineConfig, 'r') as deConfigFile:
@ -235,6 +236,7 @@ class ConfigDefinition:
for item in deSettings['CUSTOM'].split('@@'): for item in deSettings['CUSTOM'].split('@@'):
self.configpage['dataengine'].ui.listWidget_customCommand.addItem(item) self.configpage['dataengine'].ui.listWidget_customCommand.addItem(item)
index = self.configpage['dataengine'].ui.comboBox_gpudev.findText(deSettings['GPUDEV']) index = self.configpage['dataengine'].ui.comboBox_gpudev.findText(deSettings['GPUDEV'])
self.configpage['dataengine'].ui.lineEdit_desktopCmd.setText(deSettings['DESKTOPCMD'])
self.configpage['dataengine'].ui.comboBox_gpudev.setCurrentIndex(index) self.configpage['dataengine'].ui.comboBox_gpudev.setCurrentIndex(index)
self.configpage['dataengine'].ui.comboBox_hdddev.addItem("all") self.configpage['dataengine'].ui.comboBox_hdddev.addItem("all")
self.configpage['dataengine'].ui.comboBox_hdddev.addItem("disable") self.configpage['dataengine'].ui.comboBox_hdddev.addItem("disable")

View File

@ -59,6 +59,8 @@ class DataEngine:
dataEngines['system'].connectSource("cpu/cpu" + str(core) + "/clock", self.parent, interval) dataEngines['system'].connectSource("cpu/cpu" + str(core) + "/clock", self.parent, interval)
if (bools['custom'] > 0): if (bools['custom'] > 0):
dataEngines['ext'].connectSource("custom", self.parent, interval) dataEngines['ext'].connectSource("custom", self.parent, interval)
if (bools['desktop'] > 0):
dataEngines['ext'].connectSource("desktop", self.parent, interval)
if (bools['disk'] > 0): if (bools['disk'] > 0):
for item in names['disk']: for item in names['disk']:
dataEngines['system'].connectSource(item + "/Rate/rblk", self.parent, interval) dataEngines['system'].connectSource(item + "/Rate/rblk", self.parent, interval)
@ -138,6 +140,11 @@ class DataEngine:
updatedData['value'] = {} updatedData['value'] = {}
for singleData in data.keys(): for singleData in data.keys():
updatedData['value'][str(singleData.toLower())] = str(data[singleData].toUtf8()).decode("utf-8") updatedData['value'][str(singleData.toLower())] = str(data[singleData].toUtf8()).decode("utf-8")
elif (sourceName == "desktop"):
updatedData['name'] = "desktop"
updatedData['value'] = {}
updatedData['value']['current'] = data[QString(u'currentNumber')]
updatedData['value']['names'] = [str(desktop.toUtf8()).decode("utf-8") for desktop in data[QString(u'list')].split(';;')]
elif ((sourceName[:4] == "disk") and (sourceName[-4:] == "rblk")): elif ((sourceName[:4] == "disk") and (sourceName[-4:] == "rblk")):
updatedData['name'] = "disk-r" updatedData['name'] = "disk-r"
updatedData['type'] = '/'.join(str(sourceName).split('/')[0:2]) updatedData['type'] = '/'.join(str(sourceName).split('/')[0:2])
@ -311,6 +318,8 @@ class DataEngine:
dataEngines['system'].disconnectSource("cpu/cpu" + str(item) + "/clock", self.parent) dataEngines['system'].disconnectSource("cpu/cpu" + str(item) + "/clock", self.parent)
elif (name == "custom"): elif (name == "custom"):
dataEngines['ext'].disconnectSource("custom", self.parent) dataEngines['ext'].disconnectSource("custom", self.parent)
elif (name == "desktop"):
dataEngines['ext'].disconnectSource("desktop", self.parent)
elif (name == "disk"): elif (name == "disk"):
for item in keys['disk']: for item in keys['disk']:
dataEngines['system'].disconnectSource(item + "/Rate/rblk", self.parent) dataEngines['system'].disconnectSource(item + "/Rate/rblk", self.parent)

View File

@ -217,32 +217,34 @@ class pyTextWidget(plasmascript.Applet):
# defaults # defaults
self.ptm['defaults'] = {} self.ptm['defaults'] = {}
self.ptm['defaults']['confBool'] = {'bat':'batBool', 'cpu':'cpuBool', self.ptm['defaults']['confBool'] = {'bat':'batBool', 'cpu':'cpuBool',
'cpuclock':'cpuclockBool', 'custom':'customBool', 'disk':'diskBool', 'cpuclock':'cpuclockBool', 'custom':'customBool', 'desktop':'desktopBool',
'gpu':'gpuBool', 'gputemp':'gputempBool', 'hdd':'hddBool', 'disk':'diskBool', 'gpu':'gpuBool', 'gputemp':'gputempBool', 'hdd':'hddBool',
'hddtemp':'hddtempBool', 'mem':'memBool', 'net':'netBool', 'pkg':'pkgBool', 'hddtemp':'hddtempBool', 'mem':'memBool', 'net':'netBool', 'pkg':'pkgBool',
'player':'playerBool', 'ps':'psBool', 'swap':'swapBool', 'temp':'tempBool', 'player':'playerBool', 'ps':'psBool', 'swap':'swapBool', 'temp':'tempBool',
'uptime':'uptimeBool', 'time':'timeBool'} 'uptime':'uptimeBool', 'time':'timeBool'}
self.ptm['defaults']['confColor'] = {'cpu':'cpu_color', 'cpuclock':'cpuclock_color', self.ptm['defaults']['confColor'] = {'cpu':'cpu_color', 'cpuclock':'cpuclock_color',
'down':'down_color', 'mem':'mem_color', 'swap':'swap_color', 'up':'up_color'} 'down':'down_color', 'mem':'mem_color', 'swap':'swap_color', 'up':'up_color'}
self.ptm['defaults']['confFormat'] = {'bat':'batFormat', 'cpu':'cpuFormat', self.ptm['defaults']['confFormat'] = {'bat':'batFormat', 'cpu':'cpuFormat',
'cpuclock':'cpuclockFormat', 'custom':'customFormat', 'disk':'diskFormat', 'cpuclock':'cpuclockFormat', 'custom':'customFormat', 'desktop':'desktopFormat',
'gpu':'gpuFormat', 'gputemp':'gputempFormat', 'hdd':'hddFormat', 'disk':'diskFormat', 'gpu':'gpuFormat', 'gputemp':'gputempFormat', 'hdd':'hddFormat',
'hddtemp':'hddtempFormat', 'mem':'memFormat', 'net':'netFormat', 'hddtemp':'hddtempFormat', 'mem':'memFormat', 'net':'netFormat',
'pkg':'pkgFormat', 'player':'playerFormat', 'ps':'psFormat', 'swap':'swapFormat', 'pkg':'pkgFormat', 'player':'playerFormat', 'ps':'psFormat', 'swap':'swapFormat',
'temp':'tempFormat', 'time':'timeFormat', 'uptime':'uptimeFormat'} 'temp':'tempFormat', 'time':'timeFormat', 'uptime':'uptimeFormat'}
self.ptm['defaults']['bool'] = {'bat':0, 'cpu':2, 'cpuclock':0, 'custom':0, self.ptm['defaults']['bool'] = {'bat':0, 'cpu':2, 'cpuclock':0, 'custom':0,
'disk':0, 'gpu':0, 'gputemp':0, 'hdd':0, 'hddtemp':0, 'mem':2, 'net':2, 'desktop':0, 'disk':0, 'gpu':0, 'gputemp':0, 'hdd':0, 'hddtemp':0, 'mem':2,
'pkg':0, 'player':0, 'ps':0, 'swap':2, 'temp':0, 'time':0, 'uptime':0} 'net':2, 'pkg':0, 'player':0, 'ps':0, 'swap':2, 'temp':0, 'time':0, 'uptime':0}
self.ptm['defaults']['format'] = {'bat':'[bat: $bat%$ac]', 'cpu':'[cpu: $cpu%]', self.ptm['defaults']['format'] = {'bat':'[bat: $bat%$ac]', 'cpu':'[cpu: $cpu%]',
'cpuclock':'[mhz: $cpucl]', 'custom':'[$custom]', 'disk':'[disk: $hddr0/$hddw0 KB/s]', 'cpuclock':'[mhz: $cpucl]', 'custom':'[$custom]', 'desktop':'[$number/$total: $name]',
'gpu':'[gpu: $gpu%]', 'gputemp':'[gpu temp: $gputemp°C]', 'hdd':'[hdd: $hdd0%]', 'disk':'[disk: $hddr0/$hddw0 KB/s]', 'gpu':'[gpu: $gpu%]',
'gputemp':'[gpu temp: $gputemp°C]', 'hdd':'[hdd: $hdd0%]',
'hddtemp':'[hdd temp: $hddtemp0°C]', 'mem':'[mem: $mem%]', 'hddtemp':'[hdd temp: $hddtemp0°C]', 'mem':'[mem: $mem%]',
'net':'[$netdev: $down/$upKB/s]', 'pkg':'[upgrade: $pkgcount0]', 'net':'[$netdev: $down/$upKB/s]', 'pkg':'[upgrade: $pkgcount0]',
'player':'[$artist - $title]', 'ps':'[proc: $pscount]', 'swap':'[swap: $swap%]', 'player':'[$artist - $title]', 'ps':'[proc: $pscount]', 'swap':'[swap: $swap%]',
'temp':'[temp: $temp0°C]', 'time':'[$time]', 'uptime':'[uptime: $uptime]'} 'temp':'[temp: $temp0°C]', 'time':'[$time]', 'uptime':'[uptime: $uptime]'}
self.ptm['defaults']['order'] = {'1':'cpu', '2':'temp', '3':'mem', '4':'swap', '5':'net', self.ptm['defaults']['order'] = {'1':'cpu', '2':'temp', '3':'mem', '4':'swap', '5':'net',
'6':'bat', '7':'cpuclock', '8':'uptime', '9':'gpu', 'a':'gputemp', 'b':'hdd', '6':'bat', '7':'cpuclock', '8':'uptime', '9':'gpu', 'a':'gputemp', 'b':'hdd',
'c':'hddtemp', 'd':'player', 'e':'time', 'f':'custom', 'g':'ps', 'h':'pkg', 'i':'disk'} 'c':'hddtemp', 'd':'player', 'e':'time', 'f':'custom', 'g':'ps', 'h':'pkg', 'i':'disk',
'j':'desktop'}
# disk devices for r/w speed # disk devices for r/w speed
self.ptm['defaults']['disk'] = [] self.ptm['defaults']['disk'] = []
# labels # labels
@ -269,6 +271,7 @@ class pyTextWidget(plasmascript.Applet):
for i in range(numCores): for i in range(numCores):
self.ptm['values']['cpu'][i] = 0.0 self.ptm['values']['cpu'][i] = 0.0
self.ptm['values']['cpuclock'][i] = 0.0 self.ptm['values']['cpuclock'][i] = 0.0
self.ptm['values']['desktop'] = {'names':[], 'current':1}
self.ptm['values']['disk-r'] = {} self.ptm['values']['disk-r'] = {}
self.ptm['values']['disk-w'] = {} self.ptm['values']['disk-w'] = {}
self.ptm['values']['hdd'] = {} self.ptm['values']['hdd'] = {}
@ -316,6 +319,8 @@ class pyTextWidget(plasmascript.Applet):
self.cpuText() self.cpuText()
if (self.ptm['vars']['bools']['cpuclock'] > 0): if (self.ptm['vars']['bools']['cpuclock'] > 0):
self.cpuclockText() self.cpuclockText()
if (self.ptm['vars']['bools']['desktop'] > 0):
self.desktopText()
if (self.ptm['vars']['bools']['disk'] > 0): if (self.ptm['vars']['bools']['disk'] > 0):
self.diskText() self.diskText()
if (self.ptm['vars']['bools']['hdd'] > 0): if (self.ptm['vars']['bools']['hdd'] > 0):
@ -454,6 +459,26 @@ class pyTextWidget(plasmascript.Applet):
self.setText("cpuclock", text) self.setText("cpuclock", text)
def desktopText(self):
"""function to update desktop text"""
if self.debug: qDebug("[PTM] [main.py] [desktopText]")
line = self.ptm['vars']['formats']['desktop']
if (line.split('$name')[0] != line):
line = line.split('$name')[0] + \
self.ptm['values']['desktop']['names'][self.ptm['values']['desktop']['current']-1] + \
line.split('$name')[1]
if (line.split('$number')[0] != line):
line = line.split('$number')[0] + \
str(self.ptm['values']['desktop']['current']) + \
line.split('$number')[1]
if (line.split('$total')[0] != line):
line = line.split('$total')[0] + \
str(len(self.ptm['values']['desktop']['names'])) + \
line.split('$total')[1]
text = self.ptm['vars']['app']['format'][0] + line + self.ptm['vars']['app']['format'][1]
self.setText("desktop", text)
def diskText(self): def diskText(self):
"""function to update hdd speed text""" """function to update hdd speed text"""
if self.debug: qDebug("[PTM] [main.py] [diskText]") if self.debug: qDebug("[PTM] [main.py] [diskText]")

View File

@ -218,6 +218,8 @@ class PTMNotify:
return self.createText("processor") return self.createText("processor")
elif (name == "custom"): elif (name == "custom"):
return self.createText("system") return self.createText("system")
elif (name == "desktop"):
return self.createText("system")
elif (name == "disk"): elif (name == "disk"):
return self.createText("disk") return self.createText("disk")
elif (name == "gpu"): elif (name == "gpu"):

View File

@ -40,31 +40,34 @@ class WidgetWindow(QWidget):
self.parent = parent self.parent = parent
self.checkboxes = {'bat':self.ui.checkBox_bat, 'cpu':self.ui.checkBox_cpu, self.checkboxes = {'bat':self.ui.checkBox_bat, 'cpu':self.ui.checkBox_cpu,
'cpuclock':self.ui.checkBox_cpuclock, 'custom':self.ui.checkBox_custom, 'cpuclock':self.ui.checkBox_cpuclock, 'custom':self.ui.checkBox_custom,
'disk':self.ui.checkBox_hddSpeed, 'gpu':self.ui.checkBox_gpu, 'desktop':self.ui.checkBox_desktop, 'disk':self.ui.checkBox_hddSpeed,
'gputemp':self.ui.checkBox_gpuTemp, 'hdd':self.ui.checkBox_hdd, 'gpu':self.ui.checkBox_gpu, 'gputemp':self.ui.checkBox_gpuTemp,
'hddtemp':self.ui.checkBox_hddTemp, 'mem':self.ui.checkBox_mem, 'hdd':self.ui.checkBox_hdd, 'hddtemp':self.ui.checkBox_hddTemp,
'net':self.ui.checkBox_net, 'swap':self.ui.checkBox_swap, 'mem':self.ui.checkBox_mem, 'net':self.ui.checkBox_net,
'temp':self.ui.checkBox_temp, 'uptime':self.ui.checkBox_uptime, 'swap':self.ui.checkBox_swap, 'temp':self.ui.checkBox_temp,
'pkg':self.ui.checkBox_pkg, 'player':self.ui.checkBox_player, 'uptime':self.ui.checkBox_uptime, 'pkg':self.ui.checkBox_pkg,
'ps':self.ui.checkBox_ps, 'time':self.ui.checkBox_time} 'player':self.ui.checkBox_player, 'ps':self.ui.checkBox_ps,
'time':self.ui.checkBox_time}
self.lineedits = {'bat':self.ui.lineEdit_bat, 'cpu':self.ui.lineEdit_cpu, self.lineedits = {'bat':self.ui.lineEdit_bat, 'cpu':self.ui.lineEdit_cpu,
'cpuclock':self.ui.lineEdit_cpuclock, 'custom':self.ui.lineEdit_custom, 'cpuclock':self.ui.lineEdit_cpuclock, 'custom':self.ui.lineEdit_custom,
'disk':self.ui.lineEdit_hddSpeed, 'gpu':self.ui.lineEdit_gpu, 'desktop':self.ui.lineEdit_desktop, 'disk':self.ui.lineEdit_hddSpeed,
'gputemp':self.ui.lineEdit_gpuTemp, 'hdd':self.ui.lineEdit_hdd, 'gpu':self.ui.lineEdit_gpu, 'gputemp':self.ui.lineEdit_gpuTemp,
'hddtemp':self.ui.lineEdit_hddTemp, 'mem':self.ui.lineEdit_mem, 'hdd':self.ui.lineEdit_hdd, 'hddtemp':self.ui.lineEdit_hddTemp,
'net':self.ui.lineEdit_net, 'swap':self.ui.lineEdit_swap, 'mem':self.ui.lineEdit_mem, 'net':self.ui.lineEdit_net,
'temp':self.ui.lineEdit_temp, 'uptime':self.ui.lineEdit_uptime, 'swap':self.ui.lineEdit_swap, 'temp':self.ui.lineEdit_temp,
'pkg':self.ui.lineEdit_pkg, 'player':self.ui.lineEdit_player, 'uptime':self.ui.lineEdit_uptime, 'pkg':self.ui.lineEdit_pkg,
'ps':self.ui.lineEdit_ps, 'time':self.ui.lineEdit_time} 'player':self.ui.lineEdit_player, 'ps':self.ui.lineEdit_ps,
'time':self.ui.lineEdit_time}
self.sliders = {'bat':self.ui.slider_bat, 'cpu':self.ui.slider_cpu, self.sliders = {'bat':self.ui.slider_bat, 'cpu':self.ui.slider_cpu,
'cpuclock':self.ui.slider_cpuclock, 'custom':self.ui.slider_custom, 'cpuclock':self.ui.slider_cpuclock, 'custom':self.ui.slider_custom,
'disk':self.ui.slider_hddSpeed, 'gpu':self.ui.slider_gpu, 'desktop':self.ui.slider_desktop, 'disk':self.ui.slider_hddSpeed,
'gputemp':self.ui.slider_gpuTemp, 'hdd':self.ui.slider_hdd, 'gpu':self.ui.slider_gpu, 'gputemp':self.ui.slider_gpuTemp,
'hddtemp':self.ui.slider_hddTemp, 'mem':self.ui.slider_mem, 'hdd':self.ui.slider_hdd, 'hddtemp':self.ui.slider_hddTemp,
'net':self.ui.slider_net, 'swap':self.ui.slider_swap, 'mem':self.ui.slider_mem, 'net':self.ui.slider_net,
'temp':self.ui.slider_temp, 'uptime':self.ui.slider_uptime, 'swap':self.ui.slider_swap, 'temp':self.ui.slider_temp,
'pkg':self.ui.slider_pkg, 'player':self.ui.slider_player, 'uptime':self.ui.slider_uptime, 'pkg':self.ui.slider_pkg,
'ps':self.ui.slider_ps, 'time':self.ui.slider_time} 'player':self.ui.slider_player, 'ps':self.ui.slider_ps,
'time':self.ui.slider_time}
for item in self.sliders.values(): for item in self.sliders.values():
QObject.connect(item, SIGNAL("valueChanged(int)"), self.setSlider) QObject.connect(item, SIGNAL("valueChanged(int)"), self.setSlider)

View File

@ -99,7 +99,7 @@ del - remove item</string>
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<layout class="QHBoxLayout" name="layout_gpudev"> <layout class="QHBoxLayout" name="layout_gpudev">
<item> <item>
<widget class="QLabel" name="label_gpudev"> <widget class="QLabel" name="label_gpudev">
@ -152,7 +152,7 @@ del - remove item</string>
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<layout class="QHBoxLayout" name="layout_hdddev"> <layout class="QHBoxLayout" name="layout_hdddev">
<item> <item>
<widget class="QLabel" name="label_hdddev"> <widget class="QLabel" name="label_hdddev">
@ -185,7 +185,7 @@ del - remove item</string>
</item> </item>
</layout> </layout>
</item> </item>
<item row="3" column="0"> <item row="4" column="0">
<layout class="QHBoxLayout" name="layout_hddtempCmd"> <layout class="QHBoxLayout" name="layout_hddtempCmd">
<item> <item>
<widget class="QLabel" name="label_hddtempCmd"> <widget class="QLabel" name="label_hddtempCmd">
@ -209,7 +209,7 @@ del - remove item</string>
</item> </item>
</layout> </layout>
</item> </item>
<item row="4" column="0"> <item row="5" column="0">
<layout class="QHBoxLayout" name="layout_mpdaddress"> <layout class="QHBoxLayout" name="layout_mpdaddress">
<item> <item>
<widget class="QLabel" name="label_mpdaddress"> <widget class="QLabel" name="label_mpdaddress">
@ -233,7 +233,7 @@ del - remove item</string>
</item> </item>
</layout> </layout>
</item> </item>
<item row="5" column="0"> <item row="6" column="0">
<layout class="QHBoxLayout" name="layout_mpdport"> <layout class="QHBoxLayout" name="layout_mpdport">
<item> <item>
<widget class="QLabel" name="label_mpdport"> <widget class="QLabel" name="label_mpdport">
@ -288,7 +288,7 @@ del - remove item</string>
</item> </item>
</layout> </layout>
</item> </item>
<item row="6" column="0"> <item row="7" column="0">
<layout class="QVBoxLayout" name="layout_pkgCommand"> <layout class="QVBoxLayout" name="layout_pkgCommand">
<item> <item>
<layout class="QHBoxLayout" name="layout_pkgCommandSelect"> <layout class="QHBoxLayout" name="layout_pkgCommandSelect">
@ -403,7 +403,7 @@ del - remove item</string>
</item> </item>
</layout> </layout>
</item> </item>
<item row="7" column="0"> <item row="8" column="0">
<layout class="QHBoxLayout" name="layout_playerSelect"> <layout class="QHBoxLayout" name="layout_playerSelect">
<item> <item>
<widget class="QLabel" name="label_playerSelect"> <widget class="QLabel" name="label_playerSelect">
@ -456,7 +456,7 @@ del - remove item</string>
</item> </item>
</layout> </layout>
</item> </item>
<item row="8" column="0"> <item row="9" column="0">
<spacer name="spacer_dataengine"> <spacer name="spacer_dataengine">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -469,12 +469,53 @@ del - remove item</string>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="layout_desktopCmd">
<item>
<widget class="QLabel" name="label_desktopCmd">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Desktop check cmd</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_desktopCmd">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<tabstops>
<tabstop>scrollArea_dattaengine</tabstop>
<tabstop>lineEdit_customCommand</tabstop>
<tabstop>pushButton_customCommand</tabstop>
<tabstop>listWidget_customCommand</tabstop>
<tabstop>lineEdit_desktopCmd</tabstop>
<tabstop>comboBox_gpudev</tabstop>
<tabstop>comboBox_hdddev</tabstop>
<tabstop>lineEdit_hddtempCmd</tabstop>
<tabstop>lineEdit_mpdaddress</tabstop>
<tabstop>spinBox_mpdport</tabstop>
<tabstop>comboBox_pkgCommand</tabstop>
<tabstop>spinBox_pkgCommandNum</tabstop>
<tabstop>pushButton_pkgCommand</tabstop>
<tabstop>listWidget_pkgCommand</tabstop>
<tabstop>comboBox_playerSelect</tabstop>
</tabstops>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

View File

@ -54,9 +54,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>-103</y> <y>-139</y>
<width>666</width> <width>666</width>
<height>660</height> <height>696</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_7"> <layout class="QVBoxLayout" name="verticalLayout_7">
@ -104,7 +104,7 @@ $custom - custom time format</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -160,7 +160,7 @@ $custom - custom format</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -226,7 +226,7 @@ $cpuN - load CPU for core N, %</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -292,7 +292,7 @@ $cpuclN - CPU clock for core N, MHz</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -350,7 +350,7 @@ $cpuclN - CPU clock for core N, MHz</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -408,7 +408,7 @@ $cpuclN - CPU clock for core N, MHz</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -466,7 +466,7 @@ $cpuclN - CPU clock for core N, MHz</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -531,7 +531,7 @@ $memtotgb - total RAM, GB</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -596,7 +596,7 @@ $swaptotgb - total swap, GB</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -658,7 +658,7 @@ $hddtotgbN - total size of mount point N (from 0), GB. Example: $hddtotgb0</stri
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -717,7 +717,7 @@ $hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -775,7 +775,7 @@ $hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -838,7 +838,7 @@ $netdev - current network device</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -897,7 +897,7 @@ $ac - AC status</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -959,7 +959,7 @@ $title - song title</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -1019,7 +1019,7 @@ $ps - list of running processes comma separated</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -1077,7 +1077,7 @@ $ps - list of running processes comma separated</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -1135,7 +1135,7 @@ $ps - list of running processes comma separated</string>
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>18</number> <number>19</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -1153,6 +1153,66 @@ $ps - list of running processes comma separated</string>
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="layout_desktop">
<item>
<widget class="QCheckBox" name="checkBox_desktop">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Current desktop</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_desktop">
<property name="toolTip">
<string>$name - desktop name
$number - desktop number
$total - total number of desktops</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="slider_desktop">
<property name="maximumSize">
<size>
<width>120</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>19</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="value">
<number>19</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<spacer name="spacer_elements"> <spacer name="spacer_elements">
<property name="orientation"> <property name="orientation">