release 1.7.2

edited readme, changelog

CHANGELOG

@@ -1,3 +1,11 @@
+Ver.1.7.2:
++ added tags $dd, $d, $hh, $h, $mm, $m to custom uptime format
++ added scalling to tooltips
++ added dataengine configuration from ptm
++ added custom command to dataengine
+- removed custom command from ptm
+- removed tags $ds, $hs, $ms
+
 Ver.1.7.1:
 - removed error label
 * fix bug with zero values in tooltip

PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=kdeplasma-applets-pytextmonitor
 _pkgname=pytextmonitor
-pkgver=1.7.1
+pkgver=1.7.2
 pkgrel=1
 pkgdesc="Minimalistic Plasmoid script written on Python2. It looks like widgets in awesome-wm"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ optdepends=("hddtemp: for HDD temperature monitor"
 makedepends=('automoc4' 'cmake')
 source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
 install=${pkgname}.install
-md5sums=('bdc5020484c0d5cf9404cdedfb51b341')
+md5sums=('b1a23c5d38d196297235b5acd5f099ca')
 backup=('usr/share/config/extsysmon.conf')
 
 build () {

README.md

@@ -10,68 +10,71 @@ PyTextMonitor is a minimalistic Plasmoid script written on Python2. It looks lik
 Configuration
 -------------
 For edited output you must open Settings window and setup output format in lines:
-* label `$time` - time in default format. For example, `fri Nov 6 04:48:01 2013`
+* tag `$time` - time in default format. For example, `fri Nov 6 04:48:01 2013`
-* label `$isotime` - time in iso format
+* tag `$isotime` - time in iso format
-* label `$shorttime` - time in short locale format
+* tag `$shorttime` - time in short locale format
-* label `$longtime` - time in long locale format
+* tag `$longtime` - time in long locale format
-* label `$custom` - custom time format
+* tag `$custom` - custom time format
-* label `$uptime` - uptime, <i>---d--h--m</i>
+* tag `$uptime` - uptime, <i>---d--h--m</i>
-* label `$custom` - custom uptime format
+* tag `$custom` - custom uptime format
-* label `$cpu` - total load cpu, <i>%</i>
+* tag `$cpu` - total load cpu, <i>%</i>
-* label `$cpuN` - load CPU for core N, <i>%</i>. N should be in range 0 to 8
+* tag `$cpuN` - load CPU for core N, <i>%</i>. N should be in range 0 to 8
-* label `$cpucl` - average cpu clock, <i>MHz</i>
+* tag `$cpucl` - average cpu clock, <i>MHz</i>
-* label `$cpuclN` - cpu clock for core N, <i>MHz</i>. N should be in range 0 to 8
+* tag `$cpuclN` - cpu clock for core N, <i>MHz</i>. N should be in range 0 to 8
-* label `$tempN` - temperature for device N. For example, `$temp0`
+* tag `$tempN` - temperature for device N. For example, `$temp0`
-* label `$gpu` - GPU usage, <i>%</i>. `aticonfig` or `nvidia-smi` must be installed
+* tag `$gpu` - GPU usage, <i>%</i>. `aticonfig` or `nvidia-smi` must be installed
-* label `$gputemp` - GPU temperature. `aticonfig` or `nvidia-smi` must be installed
+* tag `$gputemp` - GPU temperature. `aticonfig` or `nvidia-smi` must be installed
-* label `$mem` - usage memory, <i>%</i>
+* tag `$mem` - usage memory, <i>%</i>
-* label `$memmb` - usage memory, <i>MB</i>
+* tag `$memmb` - usage memory, <i>MB</i>
-* label `$swap` - swap, <i>%</i>
+* tag `$swap` - swap, <i>%</i>
-* label `$swapmb` - swap, <i>MB</i>
+* tag `$swapmb` - swap, <i>MB</i>
-* label `$hddN` - usage for mount point N, <i>%</i>. For example, `$hdd0`
+* tag `$hddN` - usage for mount point N, <i>%</i>. For example, `$hdd0`
-* label `$hddtempN` - temperature for HDD N. For example, `$hddtemp0`
+* tag `$hddtempN` - temperature for HDD N. For example, `$hddtemp0`
-* label `$down` - download speed, <i>KB/s</i>
+* tag `$down` - download speed, <i>KB/s</i>
-* label `$up` - upload speed, <i>KB/s</i>
+* tag `$up` - upload speed, <i>KB/s</i>
-* label `$netdev` - current network device
+* tag `$netdev` - current network device
-* label `$bat` - battery charge, <i>%</i>
+* tag `$bat` - battery charge, <i>%</i>
-* label `$ac` - status AC device. Return <i>(*)</i> if AC device is online or <i>( )</i> if offline
+* tag `$ac` - status AC device. Return <i>(*)</i> if AC device is online or <i>( )</i> if offline
-* label `$album` - current song album. One of supported music players must be installed
+* tag `$album` - current song album. One of supported music players must be installed
-* label `$artist` - current song artist. One of supported music players must be installed
+* tag `$artist` - current song artist. One of supported music players must be installed
-* label `$progress` - current song progress. One of supported music players must be installed (mpd does not support yet)
+* tag `$progress` - current song progress. One of supported music players must be installed (mpd does not support yet)
-* label `$time` - current song duration. One of supported music players must be installed
+* tag `$time` - current song duration. One of supported music players must be installed
-* label `$title` - current song title. One of supported music players must be installed
+* tag `$title` - current song title. One of supported music players must be installed
-* label `$custom` - returns output for custom command
+* tag `$custom` - returns output for custom command
 
 Label order will changed if you change slider position. HTML tags in label work normally.
 
-**NOTE** you don't may set to show $cpu in swap label for example. <b>$cpu will work only in cpu label</b>.
+**NOTE** you don't may set to show $cpu in swap label for example. **$cpu will work only in cpu label**.
 
 Advanced settings
 -----------------
 **Custom time**
 
-* label `$dddd` - weekday in long format
+* tag `$dddd` - weekday in long format
-* label `$ddd` - weekday in short format
+* tag `$ddd` - weekday in short format
-* label `$dd` - day
+* tag `$dd` - day
-* label `$d` - day without zero
+* tag `$d` - day without zero
-* label `$MMMM` - month in long format
+* tag `$MMMM` - month in long format
-* label `$MMM` - month in short format
+* tag `$MMM` - month in short format
-* label `$MM` - month
+* tag `$MM` - month
-* label `$M` - month without zero
+* tag `$M` - month without zero
-* label `$yyyy` - year
+* tag `$yyyy` - year
-* label `$yy` - year in short format
+* tag `$yy` - year in short format
-* label `$hh` - hours
+* tag `$hh` - hours
-* label `$h` - hours without zero
+* tag `$h` - hours without zero
-* label `$mm` - minutes
+* tag `$mm` - minutes
-* label `$m` - minutes without zero
+* tag `$m` - minutes without zero
-* label `$ss` - seconds
+* tag `$ss` - seconds
-* label `$s` - seconds without zero
+* tag `$s` - seconds without zero
 
 **Custom uptime**
 
-* label `$ds` - uptime days
+* tag `$dd` - uptime days
-* label `$hs` - uptime hours
+* tag `$dd` - uptime days without zero
-* label `$ms` - uptime minutes
+* tag `$hh` - uptime hours
+* tag `$h` - uptime hours without zero
+* tag `$mm` - uptime minutes
+* tag `$m` - uptime minutes without zero
 
 **Temperature devices**
 
@@ -105,16 +108,34 @@ File with AC information. File (`/sys/class/power_supply/AC/online` by default)
 
 Select one of supported music playes for player label.
 
+Tooltip settings
+----------------
+Since version 1.7.0 CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make the needed checkboxes a fully checked. The number of stored values can be set in the tab. Colors of graphs are configurable too.
+
+DataEngine settings
+-------------------
+**GPU device**
+
+Select one of supported GPU devices. `auto` will enable auto selection. Default is `auto`.
+
+**HDD**
+
+Select one of HDDs for HDD temperature monitor. `all` will enable monitor for all devices. Default is `all`.
+
+**MPD address**
+
+Address of MPD server. Default is `localhost`.
+
+**MPD port**
+
+Port of MPD server. Default is `6600`.
+
 **Custom command**
 
 *NOTE* This can cause the computer freeze.
 
 A command, which will be run for custom label.
 
-Tooltip settings
-----------------
-Since version 1.7.0 CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make the needed checkboxes a fully checked. The number of stored values can be set in the tab. Colors of graphs are configurable too.
-
 DataEngine configuration
 ------------------------
 You may edit DataEngine configuration. It is `/usr/share/config/extsysmon.conf` or `$HOME/share/config/extsysmon.conf` depending on the type of installation. Uncomment needed line and edit it.

sources/CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_policy (SET CMP0015 NEW)
 project (pytextmonitor)
 set (PROJECT_VERSION_MAJOR 1)
 set (PROJECT_VERSION_MINOR 7)
-set (PROJECT_VERSION_PATCH 1)
+set (PROJECT_VERSION_PATCH 2)
 set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 
 message (STATUS "Version: ${PROJECT_VERSION}")

sources/ext-sysmon/extsysmon.conf

@@ -11,3 +11,6 @@
 # Set MPD settings
 #MPDADDRESS=localhost
 #MPDPORT=6600
+
+# Custom command
+#CUSTOM=wget -qO- http://ifconfig.me/ip

sources/ext-sysmon/extsysmon.cpp

@@ -43,6 +43,7 @@ QStringList ExtendedSysMon::sources() const
   source.append(QString("gputemp"));
   source.append(QString("hddtemp"));
   source.append(QString("player"));
+  source.append(QString("custom"));
   return source;
 }
 
@@ -73,6 +74,8 @@ bool ExtendedSysMon::readConfiguration()
   mpdAddress = QString("localhost");
   mpdPort = QString("6600");
   
+  customCommand = QString("wget -qO- http://ifconfig.me/ip");
+  
   QString fileStr;
   // FIXME: define configuration file
   QString confFileName = QString(getenv("HOME")) + QString("/.kde4/share/config/extsysmon.conf");
@@ -111,6 +114,8 @@ bool ExtendedSysMon::readConfiguration()
           mpdAddress = fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed();
         else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("MPDPORT"))
           mpdPort = fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed();
+       else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("CUSTOM"))
+          customCommand = fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed();
       }
     }
     if (confFile.atEnd())
@@ -350,6 +355,14 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
     key = QString("mpd_title");
     setData(source, key, value);
   }
+  else if (source == QString("custom")) {
+    QProcess custom;
+    custom.start(QString("bash -c \"") + QString(customCommand) + QString("\""));
+    custom.waitForFinished(-1);
+    value = QTextCodec::codecForMib(106)->toUnicode(custom.readAllStandardOutput()).trimmed();
+    key = QString("custom");
+    setData(source, key, value);
+  }
 
   return true;
 }

sources/ext-sysmon/extsysmon.h

@@ -35,9 +35,9 @@ protected:
 // main configuration
   QStringList hddDev;
   QString gpuDev;
-// configuration
   QString mpdAddress;
   QString mpdPort;
+  QString customCommand;
 };
 
 #endif /* EXTSYSMON_H */

sources/ptm/contents/code/configdef.py

@@ -21,7 +21,7 @@ from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from PyKDE4.kdecore import *
 from PyKDE4.kdeui import *
-import commands
+import commands, os
 import config
 
 
@@ -78,8 +78,6 @@ class ConfigDefinition:
         settings.set('ac_device', self.parent.ac_device)
         self.parent.player_name = self.configpage.ui.comboBox_playerSelect.currentIndex()
         settings.set('player_name', self.parent.player_name)
-        self.parent.custom_command = str(self.configpage.ui.lineEdit_customCommand.text())
-        settings.set('custom_command', self.parent.custom_command)
 
         self.parent.tooltipNum = self.configpage.ui.spinBox_tooltipNum.value()
         settings.set('tooltip_num', self.parent.tooltipNum)
@@ -87,6 +85,17 @@ class ConfigDefinition:
             exec ('self.parent.tooltipColors["' + label + '"] = str(self.configpage.kcolorcombo_' + label + '.color().name())')
             exec ('settings.set("' + label + '_color", self.parent.tooltipColors["' + label + '"])')
         
+        dataengineConfig = unicode(KGlobal.dirs().localkdedir()) + "/share/config/extsysmon.conf"
+        try:
+            with open(dataengineConfig, 'w') as deConfigFile:
+                deConfigFile.write("GPUDEV=" + str(self.configpage.ui.comboBox_gpudev.currentText()) + "\n")
+                deConfigFile.write("HDDDEV=" + str(self.configpage.ui.comboBox_hdddev.currentText()) + "\n")
+                deConfigFile.write("MPDADDRESS=" + str(self.configpage.ui.lineEdit_mpdaddress.text()) + "\n")
+                deConfigFile.write("MPDPORT=" + str(self.configpage.ui.spinBox_mpdport.value()) + "\n")
+                deConfigFile.write("CUSTOM=" + str(self.configpage.ui.lineEdit_customCommand.text()) + "\n")
+        except:
+            pass
+        
         # disconnecting from source and clear layout
         if (self.parent.uptimeBool > 0):
             self.parent.systemmonitor.disconnectSource("system/uptime",  self.parent)
@@ -126,15 +135,13 @@ class ConfigDefinition:
             self.parent.layout.removeItem(self.parent.label_gputemp)
         if (self.parent.memBool > 0):
             self.parent.systemmonitor.disconnectSource("mem/physical/application", self.parent)
-            if (self.parent.memInMb == False):
+            self.parent.systemmonitor.disconnectSource("mem/physical/free", self.parent)
-                self.parent.systemmonitor.disconnectSource("mem/physical/free", self.parent)
+            self.parent.systemmonitor.disconnectSource("mem/physical/used", self.parent)
-                self.parent.systemmonitor.disconnectSource("mem/physical/used", self.parent)
             self.parent.label_mem.setText('')
             self.parent.layout.removeItem(self.parent.label_mem)
         if (self.parent.swapBool > 0):
             self.parent.systemmonitor.disconnectSource("mem/swap/used", self.parent)
-            if (self.parent.swapInMb == False):
+            self.parent.systemmonitor.disconnectSource("mem/swap/free", self.parent)
-                self.parent.systemmonitor.disconnectSource("mem/swap/free", self.parent)
             self.parent.label_swap.setText('')
             self.parent.layout.removeItem(self.parent.label_swap)
         if (self.parent.hddBool > 0):
@@ -253,7 +260,6 @@ class ConfigDefinition:
         self.configpage.ui.lineEdit_batdev.setText(str(settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity')))
         self.configpage.ui.lineEdit_acdev.setText(str(settings.get('ac_device', '/sys/class/power_supply/AC/online')))
         self.configpage.ui.comboBox_playerSelect.setCurrentIndex(settings.get('player_name', 0).toInt()[0])
-        self.configpage.ui.lineEdit_customCommand.setText(str(settings.get('custom_command', 'wget -qO- http://ifconfig.me/ip')))
         
         self.configpage.ui.spinBox_tooltipNum.setValue(settings.get('tooltip_num', 100).toInt()[0])
         self.configpage.ui.kcolorcombo_cpu.setColor(QColor(str(settings.get('cpu_color', '#ff0000'))))
@@ -263,6 +269,32 @@ class ConfigDefinition:
         self.configpage.ui.kcolorcombo_down.setColor(QColor(str(settings.get('down_color', '#00ffff'))))
         self.configpage.ui.kcolorcombo_up.setColor(QColor(str(settings.get('up_color', '#ff00ff'))))
         
+        deSettings = {'GPUDEV':'auto', 'HDDDEV':'all', 'MPDADDRESS':'localhost', 
+            'MPDPORT':'6600', 'CUSTOM':'wget -qO- http://ifconfig.me/ip'}
+        dataengineConfig = unicode(KGlobal.dirs().localkdedir()) + "/share/config/extsysmon.conf"
+        try:
+            with open(dataengineConfig, 'r') as deConfigFile:
+                for line in deConfigFile:
+                    if ((line[0] != '#') and (line.split('=')[0] != line)):
+                        deSettings[line.split('=')[0]] = line.split('=')[1][:-1]
+        except:
+            pass
+        index = self.configpage.ui.comboBox_gpudev.findText(deSettings['GPUDEV'])
+        self.configpage.ui.comboBox_gpudev.setCurrentIndex(index)
+        self.configpage.ui.comboBox_hdddev.addItem("all")
+        commandOut = commands.getoutput("find /dev -name '[hs]d[a-z]'")
+        for item in commandOut.split("\n"):
+            try:
+                self.configpage.ui.comboBox_hdddev.addItem(item)
+            except:
+                pass
+        index = self.configpage.ui.comboBox_hdddev.findText(deSettings['HDDDEV'])
+        self.configpage.ui.comboBox_hdddev.setCurrentIndex(index)
+        self.configpage.ui.lineEdit_mpdaddress.setText(deSettings['MPDADDRESS'])
+        self.configpage.ui.spinBox_mpdport.setValue(int(deSettings['MPDPORT']))
+        self.configpage.ui.spinBox_mpdport.setValue(int(deSettings['MPDPORT']))
+        self.configpage.ui.lineEdit_customCommand.setText(deSettings['CUSTOM'])
+        
         for label in self.parent.dict_orders.keys():
             exec ('bool = self.parent.' + self.parent.dict_orders[label] + 'Bool')
             self.configpage.checkboxes[self.parent.dict_orders[label]].setCheckState(bool)

sources/ptm/contents/code/dataengine.py

@@ -65,18 +65,12 @@ class DataEngine:
         if (self.parent.gputempBool > 0):
             self.parent.extsysmon.connectSource("gputemp", self.parent, self.parent.interval)
         if (self.parent.memBool > 0):
-            if (self.parent.memInMb):
+            self.parent.systemmonitor.connectSource("mem/physical/free", self.parent, int(self.parent.interval*0.5))
-                self.parent.systemmonitor.connectSource("mem/physical/application", self.parent, self.parent.interval)
+            self.parent.systemmonitor.connectSource("mem/physical/used", self.parent, int(self.parent.interval*0.5))
-            else:
+            self.parent.systemmonitor.connectSource("mem/physical/application", self.parent, int(self.parent.interval*0.5))
-                self.parent.systemmonitor.connectSource("mem/physical/free", self.parent, int(self.parent.interval*0.5))
-                self.parent.systemmonitor.connectSource("mem/physical/used", self.parent, int(self.parent.interval*0.5))
-                self.parent.systemmonitor.connectSource("mem/physical/application", self.parent, int(self.parent.interval*0.5))
         if (self.parent.swapBool > 0):
-            if (self.parent.swapInMb):
+            self.parent.systemmonitor.connectSource("mem/swap/free", self.parent, int(self.parent.interval*0.5))
-                self.parent.systemmonitor.connectSource("mem/swap/used", self.parent, self.parent.interval)
+            self.parent.systemmonitor.connectSource("mem/swap/used", self.parent, int(self.parent.interval*0.5))
-            else:
-                self.parent.systemmonitor.connectSource("mem/swap/free", self.parent, int(self.parent.interval*0.5))
-                self.parent.systemmonitor.connectSource("mem/swap/used", self.parent, int(self.parent.interval*0.5))
         if (self.parent.hddBool > 0):
             for item in self.parent.mountNames:
                 self.parent.systemmonitor.connectSource("partitions" + item + "/filllevel", self.parent, self.parent.interval)
@@ -88,6 +82,8 @@ class DataEngine:
             self.parent.systemmonitor.connectSource("network/interfaces/"+self.parent.netdev+"/receiver/data", self.parent, self.parent.interval)
         if (self.parent.playerBool > 0):
             self.parent.extsysmon.connectSource("player", self.parent, self.parent.interval)
+        if (self.parent.customBool > 0):
+            self.parent.extsysmon.connectSource("custom", self.parent, self.parent.interval)
     
     def dataUpdated(self, sourceName, data):
         """function to update data"""
@@ -103,12 +99,18 @@ class DataEngine:
                     line = line.split('$uptime')[0] + uptimeText + line.split('$uptime')[1]
                 elif (line.split('$custom')[0] != line):
                     uptimeText = self.parent.custom_uptime
-                    if (uptimeText.split('$ds')[0] != uptimeText):
+                    if (uptimeText.split('$dd')[0] != uptimeText):
-                        uptimeText = "%s%3i%s" % (uptimeText.split('$ds')[0], days, uptimeText.split('$ds')[1])
+                        uptimeText = "%s%03i%s" % (uptimeText.split('$dd')[0], days, uptimeText.split('$dd')[1])
-                    if (uptimeText.split('$hs')[0] != uptimeText):
+                    if (uptimeText.split('$d')[0] != uptimeText):
-                        uptimeText = "%s%2i%s" % (uptimeText.split('$hs')[0], hours, uptimeText.split('$hs')[1])
+                        uptimeText = "%s%3i%s" % (uptimeText.split('$d')[0], days, uptimeText.split('$d')[1])
-                    if (uptimeText.split('$ms')[0] != uptimeText):
+                    if (uptimeText.split('$hh')[0] != uptimeText):
-                        uptimeText = "%s%2i%s" % (uptimeText.split('$ms')[0], minutes, uptimeText.split('$ms')[1])
+                        uptimeText = "%s%02i%s" % (uptimeText.split('$hh')[0], hours, uptimeText.split('$hh')[1])
+                    if (uptimeText.split('$h')[0] != uptimeText):
+                        uptimeText = "%s%2i%s" % (uptimeText.split('$h')[0], hours, uptimeText.split('$h')[1])
+                    if (uptimeText.split('$mm')[0] != uptimeText):
+                        uptimeText = "%s%02i%s" % (uptimeText.split('$mm')[0], minutes, uptimeText.split('$mm')[1])
+                    if (uptimeText.split('$m')[0] != uptimeText):
+                        uptimeText = "%s%2i%s" % (uptimeText.split('$m')[0], minutes, uptimeText.split('$m')[1])
                     line = line.split('$custom')[0] + uptimeText + line.split('$custom')[1]
                 text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                 self.parent.label_uptime.setText(text)
@@ -159,10 +161,11 @@ class DataEngine:
                 value = str(round(float(data[QString(u'value')]), 1))
                 self.parent.mount['/'+'/'.join(str(sourceName).split('/')[1:-1])] = "%5s" % (value)
             elif (sourceName == "mem/physical/free"):
-                self.parent.mem_free = float(data[QString(u'value')])
+                self.parent.memValues['free'] = float(data[QString(u'value')])
             elif (sourceName == "mem/physical/used"):
-                self.parent.mem_uf = float(data[QString(u'value')])
+                self.parent.memValues['total'] = self.parent.memValues['free'] + float(data[QString(u'value')])
             elif (sourceName == "mem/physical/application"):
+                self.parent.memValues['used'] = float(data[QString(u'value')])
                 if (self.parent.memInMb):
                     mem = str(round(float(data[QString(u'value')]) / 1024, 0)).split('.')[0]
                     mem = "%5s" % (mem)
@@ -172,13 +175,13 @@ class DataEngine:
                         line = self.parent.memFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_mem.setText(text)
-                else:
-                    self.parent.mem_used = float(data[QString(u'value')])
                 if (self.parent.memBool == 2):
                     self.parent.tooltipAgent.addValue('mem', float(data[QString(u'value')]), self.parent.tooltipNum)
             elif (sourceName == "mem/swap/free"):
-                self.parent.swap_free = float(data[QString(u'value')])
+                self.parent.swapValues['free'] = float(data[QString(u'value')])
+                self.parent.swapValues['total'] = self.parent.swapValues['free'] + self.parent.swapValues['used']
             elif (sourceName == "mem/swap/used"):
+                self.parent.swapValues['used'] = float(data[QString(u'value')])
                 if (self.parent.swapInMb):
                     mem = str(round(float(data[QString(u'value')]) / 1024, 0)).split('.')[0]
                     mem = "%5s" % (mem)
@@ -188,8 +191,6 @@ class DataEngine:
                         line = self.parent.swapFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_swap.setText(text)
-                else:
-                    self.parent.swap_used = float(data[QString(u'value')])
                 if (self.parent.swapBool == 2):
                     self.parent.tooltipAgent.addValue('swap', float(data[QString(u'value')]), self.parent.tooltipNum)
             elif (sourceName == "gpu"):
@@ -280,6 +281,14 @@ class DataEngine:
                     line = self.parent.timeFormat
                 text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                 self.parent.label_time.setText(text)
+            elif (sourceName == "custom"):
+                value = str(data[QString(u'custom')].toUtf8()).decode("utf-8")
+                if (self.parent.customFormat.split('$custom')[0] != self.parent.customFormat):
+                    line = self.parent.customFormat.split('$custom')[0] + value + self.parent.customFormat.split('$custom')[1]
+                else:
+                    line = self.parent.customFormat
+                text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
+                self.parent.label_custom.setText(text)
             
             self.parent.update()
         except:

sources/ptm/contents/code/main.py

@@ -98,8 +98,11 @@ class pyTextWidget(plasmascript.Applet):
     
     def updateTooltip(self):
         """function to update tooltip"""
+        self.tooltipBound['mem'] = self.memValues['total']
+        self.tooltipBound['swap'] = self.swapValues['total']
         self.tooltip_view.resize(100.0*(len(self.tooltipReq)-self.tooltipReq.count('up')), 100.0)
-        self.tooltipAgent.createGraphic(self.tooltipReq, self.tooltipColors, self.tooltipValues, self.tooltip_scene)
+        self.tooltipAgent.createGraphic(self.tooltipReq, self.tooltipColors, 
+            self.tooltipBound, self.tooltipValues, self.tooltip_scene)
         self.tooltip.setImage(QPixmap.grabWidget(self.tooltip_view))
         Plasma.ToolTipManager.self().setContent(self.applet, self.tooltip)
     
@@ -126,25 +129,29 @@ class pyTextWidget(plasmascript.Applet):
     
     def setupVar(self):
         """function to setup variables"""
-        self.netdev = ''
         self.cpuCore = {-1:"  0.0"}
         self.cpuClockCore = {-1:"   0"}
         numCores = int(commands.getoutput("grep -c '^processor' /proc/cpuinfo"))
         for i in range(numCores):
             self.cpuCore[i] = str("  0.0")
             self.cpuClockCore[i] = str("   0")
-        self.netSpeed = {"up":"   0", "down":"   0"}
-        self.tempNames = []
-        self.temp = {}
-        self.mountNames = []
-        self.mount = {}
         self.hddNames = []
         self.hdd = {}
+        self.mountNames = []
+        self.mount = {}
+        self.memValues = {'used':0.0, 'free':0.0, 'total':1.0}
+        self.netdev = ''
+        self.netSpeed = {"up":"   0", "down":"   0"}
+        self.swapValues = {'used':0.0, 'free':0.0, 'total':1.0}
+        self.tempNames = []
+        self.temp = {}
+        self.tooltipBound = {'cpu':100.0, 'cpuclock':4000.0, 'mem':16000.0, 
+            'swap':16000, 'down':10000.0, 'up':10000.0}
         self.tooltipColors = {}
         self.tooltipNum = 100
         self.tooltipReq = []
         self.tooltipValues = {'cpu':[0.0, 0.01], 'cpuclock':[0.0, 0.01], 'mem':[0.0, 0.01], 
-            'swap':[0.0, 0.01], 'up':[0.0, 0.01], 'down':[0.0, 0.01]}
+            'swap':[0.0, 0.01], 'down':[0.0, 0.01], 'up':[0.0, 0.01]}
         
         # create dictionaries
         self.dict_orders = {'6':'bat', '1':'cpu', '7':'cpuclock', 'f':'custom', '9':'gpu', 
@@ -182,8 +189,6 @@ class pyTextWidget(plasmascript.Applet):
             self.cpuText()
         if (self.cpuclockBool > 0):
             self.cpuclockText()
-        if (self.customBool > 0):
-            self.getCustom()
         if (self.hddBool > 0):
             self.mountText()
         if ((self.memBool > 0) and (self.memInMb == False)):
@@ -251,9 +256,8 @@ class pyTextWidget(plasmascript.Applet):
     
     def memText(self):
         """function to set mem text"""
-        full = self.mem_uf + self.mem_free
         try:
-            mem = 100 * self.mem_used / full
+            mem = 100 * self.memValues['used'] / self.memValues['total']
             mem = "%5s" % (str(round(mem, 1)))
         except:
             mem = "  N\\A"
@@ -288,9 +292,8 @@ class pyTextWidget(plasmascript.Applet):
     
     def swapText(self):
         """function to set swap text"""
-        full = self.swap_used + self.swap_free
         try:
-            mem = 100 * self.swap_used / full
+            mem = 100 * self.swapValues['used'] / self.swapValues['total']
             mem = "%5s" % (str(round(mem, 1)))
         except:
             mem = "  N\\A"
@@ -312,15 +315,6 @@ class pyTextWidget(plasmascript.Applet):
         self.label_temp.setText(text)
     
     
-    def getCustom(self):
-        """function to get output from custom command"""
-        commandOut = commands.getoutput(self.custom_command)
-        line = self.customFormat
-        line = line.split('$custom')[0] + commandOut + line.split('$custom')[1]
-        text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1]
-        self.label_custom.setText(text)
-    
-    
     @pyqtSignature("dataUpdated(const QString &, const Plasma::DataEngine::Data &)")
     def dataUpdated(self, sourceName, data):
         """function to update label"""

sources/ptm/contents/code/reinit.py

@@ -83,7 +83,6 @@ class Reinit():
         self.parent.battery_device = str(settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity'))
         self.parent.ac_device = str(settings.get('ac_device', '/sys/class/power_supply/AC/online'))
         self.parent.player_name = settings.get('player_name', 0).toInt()[0]
-        self.parent.custom_command = str(settings.get('custom_command', 'wget -qO- http://ifconfig.me/ip'))
         
         self.parent.tooltipNum = settings.get('tooltip_num', 100).toInt()[0]
         self.parent.tooltipColors['cpu'] = str(settings.get('cpu_color', '#ff0000'))
@@ -129,9 +128,6 @@ class Reinit():
                         self.parent.memInMb = True
                     elif (self.parent.memFormat.split('$mem')[0] != self.parent.memFormat):
                         self.parent.memInMb = False
-                        self.parent.mem_used = 0.0
-                        self.parent.mem_free = 1.0
-                        self.parent.mem_uf = 0.0
                     line = self.parent.memFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_mem.setText(text)
@@ -146,8 +142,6 @@ class Reinit():
                         self.parent.swapInMb = True
                     elif (self.parent.swapFormat.split('$swap')[0] != self.parent.swapFormat):
                         self.parent.swapInMb = False
-                        self.parent.swap_free = 1.0
-                        self.parent.swap_used = 0.0
                     line = self.parent.swapFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_swap.setText(text)

sources/ptm/contents/code/tooltip.py

@@ -35,23 +35,22 @@ class Tooltip():
         self.parent.tooltipValues[type].append(value)
     
     
-    def createGraphic(self, types, colors, values, widget):
+    def createGraphic(self, types, colors, bounds, values, widget):
         """function to create graph"""
         widget.clear()
         maxOne = [100.0, 100.0]
         pen = QPen()
+        bounds['down'] = 1.0
+        for value in values['down']:
+            if (bounds['down'] < value):
+                bounds['down'] = value
+        for value in values['up']:
+            if (bounds['down'] < value):
+                bounds['down'] = value
+        bounds['up'] = bounds['down']
         down = False
         for type in types:
-            bound = [values[type][0], values[type][0]]
+            norm = [maxOne[0] / len(values[type]), maxOne[1] / (1.5 * bounds[type])]
-            for value in values[type]:
-                if (value < bound[0]):
-                    bound[0] = value
-                elif (value > bound[1]):
-                    bound[1] = value
-            if ((bound[0] == 0.0) and (bound[0] == 0.0)):
-                norm = [maxOne[0] / len(values[type]), maxOne[1] / 1.5]
-            else:
-                norm = [maxOne[0] / len(values[type]), maxOne[1] / (1.5*(bound[1] - bound[0]))]
             pen.setColor(QColor(colors[type]))
             if (down):
                 shift = (types.index(type) - 1) * maxOne[0]
@@ -59,9 +58,9 @@ class Tooltip():
                 shift = types.index(type) * maxOne[0]
             for i in range(len(values[type])-1):
                 x1 = i * norm[0] + shift
-                y1 = -(values[type][i] - bound[0]) * norm[1]
+                y1 = -values[type][i] * norm[1]
                 x2 = (i + 1) * norm[0] + shift
-                y2 = -(values[type][i+1] - bound[0]) * norm[1]
+                y2 = -values[type][i+1] * norm[1]
                 widget.addLine(x1, y1, x2, y2, pen)
             if (type == 'down'):
                 down = True

sources/ptm/contents/ui/configwindow.ui

@@ -1372,31 +1372,6 @@ del - remove item</string>
          </item>
         </layout>
        </item>
-       <item>
-        <layout class="QHBoxLayout" name="layout_customCommand">
-         <item>
-          <widget class="QLabel" name="label_customCommand">
-           <property name="minimumSize">
-            <size>
-             <width>120</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Custom command</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="lineEdit_customCommand">
-           <property name="toolTip">
-            <string>Command to run, example:
-wget -qO- http://ifconfig.me/ip - get external IP</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
        <item>
         <spacer name="spacer_advanced">
          <property name="orientation">
@@ -1412,7 +1387,7 @@ wget -qO- http://ifconfig.me/ip - get external IP</string>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab">
+     <widget class="QWidget" name="tooltip">
       <attribute name="title">
        <string>Tooltip</string>
       </attribute>
@@ -2055,6 +2030,213 @@ wget -qO- http://ifconfig.me/ip - get external IP</string>
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="dataengine">
+      <attribute name="title">
+       <string>DataEngine</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <item>
+        <layout class="QHBoxLayout" name="layout_gpudev">
+         <item>
+          <widget class="QLabel" name="label_gpudev">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>GPU device</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_gpudev">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
+           <item>
+            <property name="text">
+             <string>auto</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>nvidia</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>ati</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_hdddev">
+         <item>
+          <widget class="QLabel" name="label_hdddev">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>HDD</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_hdddev">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_mpdaddress">
+         <item>
+          <widget class="QLabel" name="label_mpdaddress">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>MPD address</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="lineEdit_mpdaddress">
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_mpdport">
+         <item>
+          <widget class="QLabel" name="label_mpdport">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>MPD port</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="spacer_mpdport">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>19</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="spinBox_mpdport">
+           <property name="minimumSize">
+            <size>
+             <width>180</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+           <property name="minimum">
+            <number>0</number>
+           </property>
+           <property name="maximum">
+            <number>50000</number>
+           </property>
+           <property name="singleStep">
+            <number>100</number>
+           </property>
+           <property name="value">
+            <number>6600</number>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_customCommand">
+         <item>
+          <widget class="QLabel" name="label_customCommand">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Custom command</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="lineEdit_customCommand">
+           <property name="toolTip">
+            <string>Custom command to run</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="spacer_dataengine">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>391</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>
@@ -2130,7 +2312,6 @@ wget -qO- http://ifconfig.me/ip - get external IP</string>
   <tabstop>lineEdit_batdev</tabstop>
   <tabstop>lineEdit_acdev</tabstop>
   <tabstop>comboBox_playerSelect</tabstop>
-  <tabstop>lineEdit_customCommand</tabstop>
   <tabstop>spinBox_tooltipNum</tabstop>
   <tabstop>kcolorcombo_cpu</tabstop>
   <tabstop>kcolorcombo_cpuclock</tabstop>
@@ -2144,6 +2325,11 @@ wget -qO- http://ifconfig.me/ip - get external IP</string>
   <tabstop>kcolorcombo</tabstop>
   <tabstop>comboBox_style</tabstop>
   <tabstop>spinBox_weight</tabstop>
+  <tabstop>comboBox_gpudev</tabstop>
+  <tabstop>comboBox_hdddev</tabstop>
+  <tabstop>lineEdit_mpdaddress</tabstop>
+  <tabstop>spinBox_mpdport</tabstop>
+  <tabstop>lineEdit_customCommand</tabstop>
  </tabstops>
  <resources/>
  <connections/>

sources/ptm/po/en.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n"
-"POT-Creation-Date: 2014-04-02 20:48+0400\n"
+"POT-Creation-Date: 2014-04-03 02:22+0400\n"
-"PO-Revision-Date: 2014-04-02 20:49+0400\n"
+"PO-Revision-Date: 2014-04-03 02:23+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -192,7 +192,9 @@ msgstr ""
 
 #. i18n: file: ui/configwindow.ui:613
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#: rc.cpp:83
+#. i18n: file: ui/configwindow.ui:2097
+#. i18n: ectx: property (text), widget (QLabel, label_hdddev)
+#: rc.cpp:83 rc.cpp:289
 msgid "HDD"
 msgstr "HDD"
 
@@ -464,31 +466,15 @@ msgstr "mpd"
 msgid "qmmp"
 msgstr "qmmp"
 
-#. i18n: file: ui/configwindow.ui:1386
+#. i18n: file: ui/configwindow.ui:1392
-#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
+#. i18n: ectx: attribute (title), widget (QWidget, tooltip)
 #: rc.cpp:226
-msgid "Custom command"
-msgstr "Custom command"
-
-#. i18n: file: ui/configwindow.ui:1394
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
-#: rc.cpp:229
-msgid ""
-"Command to run, example:\n"
-"wget -qO- http://ifconfig.me/ip - get external IP"
-msgstr ""
-"Command to run, example:\n"
-"wget -qO- http://ifconfig.me/ip - get external IP"
-
-#. i18n: file: ui/configwindow.ui:1417
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:233
 msgid "Tooltip"
 msgstr "Tooltip"
 
-#. i18n: file: ui/configwindow.ui:1423
+#. i18n: file: ui/configwindow.ui:1398
 #. i18n: ectx: property (text), widget (QLabel, label_tooltip)
-#: rc.cpp:236
+#: rc.cpp:229
 msgid ""
 "CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
 "To enable them just make needed checkbox fully checked."
@@ -496,100 +482,161 @@ msgstr ""
 "CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
 "To enable them just make needed checkbox fully checked."
 
-#. i18n: file: ui/configwindow.ui:1444
+#. i18n: file: ui/configwindow.ui:1419
 #. i18n: ectx: property (text), widget (QLabel, label_tooltipNum)
-#: rc.cpp:239
+#: rc.cpp:232
 msgid "Number of values for tooltips"
 msgstr "Number of values for tooltips"
 
-#. i18n: file: ui/configwindow.ui:1499
+#. i18n: file: ui/configwindow.ui:1474
 #. i18n: ectx: property (text), widget (QLabel, label_cpuColor)
-#: rc.cpp:242
+#: rc.cpp:235
 msgid "CPU color"
 msgstr "CPU color"
 
-#. i18n: file: ui/configwindow.ui:1539
+#. i18n: file: ui/configwindow.ui:1514
 #. i18n: ectx: property (text), widget (QLabel, label_cpuclockColor)
-#: rc.cpp:245
+#: rc.cpp:238
 msgid "CPU clock color"
 msgstr "CPU clock color"
 
-#. i18n: file: ui/configwindow.ui:1579
+#. i18n: file: ui/configwindow.ui:1554
 #. i18n: ectx: property (text), widget (QLabel, label_memColor)
-#: rc.cpp:248
+#: rc.cpp:241
 msgid "Memory color"
 msgstr "Memory color"
 
-#. i18n: file: ui/configwindow.ui:1619
+#. i18n: file: ui/configwindow.ui:1594
 #. i18n: ectx: property (text), widget (QLabel, label_swapColor)
-#: rc.cpp:251
+#: rc.cpp:244
 msgid "Swap color"
 msgstr "Swap color"
 
-#. i18n: file: ui/configwindow.ui:1659
+#. i18n: file: ui/configwindow.ui:1634
 #. i18n: ectx: property (text), widget (QLabel, label_downColor)
-#: rc.cpp:254
+#: rc.cpp:247
 msgid "Download speed color"
 msgstr "Download speed color"
 
-#. i18n: file: ui/configwindow.ui:1699
+#. i18n: file: ui/configwindow.ui:1674
 #. i18n: ectx: property (text), widget (QLabel, label_upColor)
-#: rc.cpp:257
+#: rc.cpp:250
 msgid "Upload speed color"
 msgstr "Upload speed color"
 
-#. i18n: file: ui/configwindow.ui:1745
+#. i18n: file: ui/configwindow.ui:1720
 #. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:260
+#: rc.cpp:253
 msgid "Appearance"
 msgstr "Appearance"
 
-#. i18n: file: ui/configwindow.ui:1759
+#. i18n: file: ui/configwindow.ui:1734
 #. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:263
+#: rc.cpp:256
 msgid "Time interval"
 msgstr "Time interval"
 
-#. i18n: file: ui/configwindow.ui:1814
+#. i18n: file: ui/configwindow.ui:1789
 #. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:266
+#: rc.cpp:259
 msgid "Font"
 msgstr "Font"
 
-#. i18n: file: ui/configwindow.ui:1854
+#. i18n: file: ui/configwindow.ui:1829
 #. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:269
+#: rc.cpp:262
 msgid "Font size"
 msgstr "Font size"
 
-#. i18n: file: ui/configwindow.ui:1909
+#. i18n: file: ui/configwindow.ui:1884
 #. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:272
+#: rc.cpp:265
 msgid "Font color"
 msgstr "Font color"
 
-#. i18n: file: ui/configwindow.ui:1949
+#. i18n: file: ui/configwindow.ui:1924
 #. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:275
+#: rc.cpp:268
 msgid "Font style"
 msgstr "Font style"
 
-#. i18n: file: ui/configwindow.ui:1999
+#. i18n: file: ui/configwindow.ui:1974
 #. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:278
+#: rc.cpp:271
 msgid "Font weight"
 msgstr "Font weight"
 
-#: rc.cpp:279
+#. i18n: file: ui/configwindow.ui:2035
+#. i18n: ectx: attribute (title), widget (QWidget, dataengine)
+#: rc.cpp:274
+msgid "DataEngine"
+msgstr "DataEngine"
+
+#. i18n: file: ui/configwindow.ui:2049
+#. i18n: ectx: property (text), widget (QLabel, label_gpudev)
+#: rc.cpp:277
+msgid "GPU device"
+msgstr "GPU device"
+
+#. i18n: file: ui/configwindow.ui:2069
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
+#: rc.cpp:280
+msgid "auto"
+msgstr "auto"
+
+#. i18n: file: ui/configwindow.ui:2074
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
+#: rc.cpp:283
+msgid "nvidia"
+msgstr "nvidia"
+
+#. i18n: file: ui/configwindow.ui:2079
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
+#: rc.cpp:286
+msgid "ati"
+msgstr "ati"
+
+#. i18n: file: ui/configwindow.ui:2130
+#. i18n: ectx: property (text), widget (QLabel, label_mpdaddress)
+#: rc.cpp:292
+msgid "MPD address"
+msgstr "MPD address"
+
+#. i18n: file: ui/configwindow.ui:2154
+#. i18n: ectx: property (text), widget (QLabel, label_mpdport)
+#: rc.cpp:295
+msgid "MPD port"
+msgstr "MPD port"
+
+#. i18n: file: ui/configwindow.ui:2209
+#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
+#: rc.cpp:298
+msgid "Custom command"
+msgstr "Custom command"
+
+#. i18n: file: ui/configwindow.ui:2216
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
+#: rc.cpp:301
+msgid "Custom command to run"
+msgstr "Custom command to run"
+
+#: rc.cpp:302
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Evgeniy Alekseev"
 
-#: rc.cpp:280
+#: rc.cpp:303
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid ""
+#~ "Command to run, example:\n"
+#~ "wget -qO- http://ifconfig.me/ip - get external IP"
+#~ msgstr ""
+#~ "Command to run, example:\n"
+#~ "wget -qO- http://ifconfig.me/ip - get external IP"
+
 #~ msgid "@@/;@@ - mount point usage, %"
 #~ msgstr "@@/;@@ - mount point usage, %"
 

sources/ptm/po/pytextmonitor.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n"
-"POT-Creation-Date: 2014-04-02 20:48+0400\n"
+"POT-Creation-Date: 2014-04-03 02:22+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -170,7 +170,9 @@ msgstr ""
 
 #. i18n: file: ui/configwindow.ui:613
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#: rc.cpp:83
+#. i18n: file: ui/configwindow.ui:2097
+#. i18n: ectx: property (text), widget (QLabel, label_hdddev)
+#: rc.cpp:83 rc.cpp:289
 msgid "HDD"
 msgstr ""
 
@@ -410,124 +412,164 @@ msgstr ""
 msgid "qmmp"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1386
+#. i18n: file: ui/configwindow.ui:1392
-#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
+#. i18n: ectx: attribute (title), widget (QWidget, tooltip)
 #: rc.cpp:226
-msgid "Custom command"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:1394
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
-#: rc.cpp:229
-msgid ""
-"Command to run, example:\n"
-"wget -qO- http://ifconfig.me/ip - get external IP"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:1417
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:233
 msgid "Tooltip"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1423
+#. i18n: file: ui/configwindow.ui:1398
 #. i18n: ectx: property (text), widget (QLabel, label_tooltip)
-#: rc.cpp:236
+#: rc.cpp:229
 msgid ""
 "CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
 "To enable them just make needed checkbox fully checked."
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1444
+#. i18n: file: ui/configwindow.ui:1419
 #. i18n: ectx: property (text), widget (QLabel, label_tooltipNum)
-#: rc.cpp:239
+#: rc.cpp:232
 msgid "Number of values for tooltips"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1499
+#. i18n: file: ui/configwindow.ui:1474
 #. i18n: ectx: property (text), widget (QLabel, label_cpuColor)
-#: rc.cpp:242
+#: rc.cpp:235
 msgid "CPU color"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1539
+#. i18n: file: ui/configwindow.ui:1514
 #. i18n: ectx: property (text), widget (QLabel, label_cpuclockColor)
-#: rc.cpp:245
+#: rc.cpp:238
 msgid "CPU clock color"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1579
+#. i18n: file: ui/configwindow.ui:1554
 #. i18n: ectx: property (text), widget (QLabel, label_memColor)
-#: rc.cpp:248
+#: rc.cpp:241
 msgid "Memory color"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1619
+#. i18n: file: ui/configwindow.ui:1594
 #. i18n: ectx: property (text), widget (QLabel, label_swapColor)
-#: rc.cpp:251
+#: rc.cpp:244
 msgid "Swap color"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1659
+#. i18n: file: ui/configwindow.ui:1634
 #. i18n: ectx: property (text), widget (QLabel, label_downColor)
-#: rc.cpp:254
+#: rc.cpp:247
 msgid "Download speed color"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1699
+#. i18n: file: ui/configwindow.ui:1674
 #. i18n: ectx: property (text), widget (QLabel, label_upColor)
-#: rc.cpp:257
+#: rc.cpp:250
 msgid "Upload speed color"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1745
+#. i18n: file: ui/configwindow.ui:1720
 #. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:260
+#: rc.cpp:253
 msgid "Appearance"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1759
+#. i18n: file: ui/configwindow.ui:1734
 #. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:263
+#: rc.cpp:256
 msgid "Time interval"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1814
+#. i18n: file: ui/configwindow.ui:1789
 #. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:266
+#: rc.cpp:259
 msgid "Font"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1854
+#. i18n: file: ui/configwindow.ui:1829
 #. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:269
+#: rc.cpp:262
 msgid "Font size"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1909
+#. i18n: file: ui/configwindow.ui:1884
 #. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:272
+#: rc.cpp:265
 msgid "Font color"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1949
+#. i18n: file: ui/configwindow.ui:1924
 #. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:275
+#: rc.cpp:268
 msgid "Font style"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1999
+#. i18n: file: ui/configwindow.ui:1974
 #. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:278
+#: rc.cpp:271
 msgid "Font weight"
 msgstr ""
 
-#: rc.cpp:279
+#. i18n: file: ui/configwindow.ui:2035
+#. i18n: ectx: attribute (title), widget (QWidget, dataengine)
+#: rc.cpp:274
+msgid "DataEngine"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:2049
+#. i18n: ectx: property (text), widget (QLabel, label_gpudev)
+#: rc.cpp:277
+msgid "GPU device"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:2069
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
+#: rc.cpp:280
+msgid "auto"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:2074
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
+#: rc.cpp:283
+msgid "nvidia"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:2079
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
+#: rc.cpp:286
+msgid "ati"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:2130
+#. i18n: ectx: property (text), widget (QLabel, label_mpdaddress)
+#: rc.cpp:292
+msgid "MPD address"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:2154
+#. i18n: ectx: property (text), widget (QLabel, label_mpdport)
+#: rc.cpp:295
+msgid "MPD port"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:2209
+#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
+#: rc.cpp:298
+msgid "Custom command"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:2216
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
+#: rc.cpp:301
+msgid "Custom command to run"
+msgstr ""
+
+#: rc.cpp:302
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 
-#: rc.cpp:280
+#: rc.cpp:303
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ""

sources/ptm/po/ru.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n"
-"POT-Creation-Date: 2014-04-02 20:48+0400\n"
+"POT-Creation-Date: 2014-04-03 02:22+0400\n"
-"PO-Revision-Date: 2014-04-02 20:52+0400\n"
+"PO-Revision-Date: 2014-04-03 02:24+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -192,7 +192,9 @@ msgstr ""
 
 #. i18n: file: ui/configwindow.ui:613
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#: rc.cpp:83
+#. i18n: file: ui/configwindow.ui:2097
+#. i18n: ectx: property (text), widget (QLabel, label_hdddev)
+#: rc.cpp:83 rc.cpp:289
 msgid "HDD"
 msgstr "HDD"
 
@@ -465,31 +467,15 @@ msgstr "mpd"
 msgid "qmmp"
 msgstr "qmmp"
 
-#. i18n: file: ui/configwindow.ui:1386
+#. i18n: file: ui/configwindow.ui:1392
-#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
+#. i18n: ectx: attribute (title), widget (QWidget, tooltip)
 #: rc.cpp:226
-msgid "Custom command"
-msgstr "Своя команда"
-
-#. i18n: file: ui/configwindow.ui:1394
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
-#: rc.cpp:229
-msgid ""
-"Command to run, example:\n"
-"wget -qO- http://ifconfig.me/ip - get external IP"
-msgstr ""
-"Команда для запуска, например:\n"
-"wget -qO- http://ifconfig.me/ip - получить внешний IP"
-
-#. i18n: file: ui/configwindow.ui:1417
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:233
 msgid "Tooltip"
 msgstr "Тултип"
 
-#. i18n: file: ui/configwindow.ui:1423
+#. i18n: file: ui/configwindow.ui:1398
 #. i18n: ectx: property (text), widget (QLabel, label_tooltip)
-#: rc.cpp:236
+#: rc.cpp:229
 msgid ""
 "CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
 "To enable them just make needed checkbox fully checked."
@@ -497,100 +483,161 @@ msgstr ""
 "Поля CPU, частота CPU, память, swap, сеть поддерживают графический тултип. "
 "Чтобы включить его, просто сделайте требуемые чекбоксы полностью чекнутыми."
 
-#. i18n: file: ui/configwindow.ui:1444
+#. i18n: file: ui/configwindow.ui:1419
 #. i18n: ectx: property (text), widget (QLabel, label_tooltipNum)
-#: rc.cpp:239
+#: rc.cpp:232
 msgid "Number of values for tooltips"
 msgstr "Число хранящихся значений"
 
-#. i18n: file: ui/configwindow.ui:1499
+#. i18n: file: ui/configwindow.ui:1474
 #. i18n: ectx: property (text), widget (QLabel, label_cpuColor)
-#: rc.cpp:242
+#: rc.cpp:235
 msgid "CPU color"
 msgstr "Цвет CPU"
 
-#. i18n: file: ui/configwindow.ui:1539
+#. i18n: file: ui/configwindow.ui:1514
 #. i18n: ectx: property (text), widget (QLabel, label_cpuclockColor)
-#: rc.cpp:245
+#: rc.cpp:238
 msgid "CPU clock color"
 msgstr "Цвет частоты CPU"
 
-#. i18n: file: ui/configwindow.ui:1579
+#. i18n: file: ui/configwindow.ui:1554
 #. i18n: ectx: property (text), widget (QLabel, label_memColor)
-#: rc.cpp:248
+#: rc.cpp:241
 msgid "Memory color"
 msgstr "Цвет памяти"
 
-#. i18n: file: ui/configwindow.ui:1619
+#. i18n: file: ui/configwindow.ui:1594
 #. i18n: ectx: property (text), widget (QLabel, label_swapColor)
-#: rc.cpp:251
+#: rc.cpp:244
 msgid "Swap color"
 msgstr "Цвет swap"
 
-#. i18n: file: ui/configwindow.ui:1659
+#. i18n: file: ui/configwindow.ui:1634
 #. i18n: ectx: property (text), widget (QLabel, label_downColor)
-#: rc.cpp:254
+#: rc.cpp:247
 msgid "Download speed color"
 msgstr "Цвет скорости загрузки"
 
-#. i18n: file: ui/configwindow.ui:1699
+#. i18n: file: ui/configwindow.ui:1674
 #. i18n: ectx: property (text), widget (QLabel, label_upColor)
-#: rc.cpp:257
+#: rc.cpp:250
 msgid "Upload speed color"
 msgstr "Цвет скорости отдачи"
 
-#. i18n: file: ui/configwindow.ui:1745
+#. i18n: file: ui/configwindow.ui:1720
 #. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:260
+#: rc.cpp:253
 msgid "Appearance"
 msgstr "Внешний вид"
 
-#. i18n: file: ui/configwindow.ui:1759
+#. i18n: file: ui/configwindow.ui:1734
 #. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:263
+#: rc.cpp:256
 msgid "Time interval"
 msgstr "Интервал обновления"
 
-#. i18n: file: ui/configwindow.ui:1814
+#. i18n: file: ui/configwindow.ui:1789
 #. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:266
+#: rc.cpp:259
 msgid "Font"
 msgstr "Шрифт"
 
-#. i18n: file: ui/configwindow.ui:1854
+#. i18n: file: ui/configwindow.ui:1829
 #. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:269
+#: rc.cpp:262
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#. i18n: file: ui/configwindow.ui:1909
+#. i18n: file: ui/configwindow.ui:1884
 #. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:272
+#: rc.cpp:265
 msgid "Font color"
 msgstr "Цвет шрифта"
 
-#. i18n: file: ui/configwindow.ui:1949
+#. i18n: file: ui/configwindow.ui:1924
 #. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:275
+#: rc.cpp:268
 msgid "Font style"
 msgstr "Стиль шрифта"
 
-#. i18n: file: ui/configwindow.ui:1999
+#. i18n: file: ui/configwindow.ui:1974
 #. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:278
+#: rc.cpp:271
 msgid "Font weight"
 msgstr "Ширина шрифта"
 
-#: rc.cpp:279
+#. i18n: file: ui/configwindow.ui:2035
+#. i18n: ectx: attribute (title), widget (QWidget, dataengine)
+#: rc.cpp:274
+msgid "DataEngine"
+msgstr "DataEngine"
+
+#. i18n: file: ui/configwindow.ui:2049
+#. i18n: ectx: property (text), widget (QLabel, label_gpudev)
+#: rc.cpp:277
+msgid "GPU device"
+msgstr "Устройство GPU"
+
+#. i18n: file: ui/configwindow.ui:2069
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
+#: rc.cpp:280
+msgid "auto"
+msgstr "auto"
+
+#. i18n: file: ui/configwindow.ui:2074
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
+#: rc.cpp:283
+msgid "nvidia"
+msgstr "nvidia"
+
+#. i18n: file: ui/configwindow.ui:2079
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
+#: rc.cpp:286
+msgid "ati"
+msgstr "ati"
+
+#. i18n: file: ui/configwindow.ui:2130
+#. i18n: ectx: property (text), widget (QLabel, label_mpdaddress)
+#: rc.cpp:292
+msgid "MPD address"
+msgstr "Адрес сервера MPD"
+
+#. i18n: file: ui/configwindow.ui:2154
+#. i18n: ectx: property (text), widget (QLabel, label_mpdport)
+#: rc.cpp:295
+msgid "MPD port"
+msgstr "Порт сервера MPD"
+
+#. i18n: file: ui/configwindow.ui:2209
+#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
+#: rc.cpp:298
+msgid "Custom command"
+msgstr "Своя команда"
+
+#. i18n: file: ui/configwindow.ui:2216
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
+#: rc.cpp:301
+msgid "Custom command to run"
+msgstr "Своя команда для запуска"
+
+#: rc.cpp:302
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Evgeniy Alekseev"
 
-#: rc.cpp:280
+#: rc.cpp:303
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid ""
+#~ "Command to run, example:\n"
+#~ "wget -qO- http://ifconfig.me/ip - get external IP"
+#~ msgstr ""
+#~ "Команда для запуска, например:\n"
+#~ "wget -qO- http://ifconfig.me/ip - получить внешний IP"
+
 #~ msgid "@@/;@@ - mount point usage, %"
 #~ msgstr "@@/;@@ - использование точки монтирования, %"