Merge pull request #11 from arcan1s/experimental

Experimental

CHANGELOG

@@ -1,3 +1,12 @@
+Ver.1.7.0:
++ added support of several tags in temperature label
++ added tags $cpuN, $cpuclN, $hddN, $tempN, $hddtempN, $up, $down
++ added label with custom command
+- removed tags @@...@@, $temp, $ccpu, $ccpucl, $net
+* changes in settings
+* ptm now does not require net-tools
+* refactoring
+
 Ver.1.6.1:
 + added support of several devices in hddtemp label
 - fixed #6

README.md

@@ -14,55 +14,81 @@ For edited output you must open Settings window and setup output format in lines
 * label `$isotime` - time in iso format
 * label `$shorttime` - time in short locale format
 * label `$longtime` - time in long locale format
-* label `$custom` - will enable custom time format
+* label `$custom` - custom time format
-* label `$dddd` - weekday in long format (required `$custom` flag)
-* label `$ddd` - weekday in short format (required `$custom` flag)
-* label `$dd` - day (required `$custom` flag)
-* label `$d` - day without zero (required `$custom` flag)
-* label `$MMMM` - month in long format (required `$custom` flag)
-* label `$MMM` - month in short format (required `$custom` flag)
-* label `$MM` - month (required `$custom` flag)
-* label `$M` - month without zero (required `$custom` flag)
-* label `$yyyy` - year (required `$custom` flag)
-* label `$yy` - year in short format (required `$custom` flag)
-* label `$hh` - hours (required `$custom` flag)
-* label `$h` - hours without zero (required `$custom` flag)
-* label `$mm` - minutes (required `$custom` flag)
-* label `$m` - minutes without zero (required `$custom` flag)
-* label `$ss` - seconds (required `$custom` flag)
-* label `$s` - seconds without zero (required `$custom` flag)
 * label `$uptime` - uptime, <i>---d--h--m</i>
-* label `$custom` - will enable custom uptime format
+* label `$custom` - custom uptime format
-* label `$ds` - uptime days (required `$custom` flag)
-* label `$hs` - uptime hours (required `$custom` flag)
-* label `$ms` - uptime minutes (required `$custom` flag)
 * label `$cpu` - total load cpu, <i>%</i>
-* label `$ccpu` - load CPU for each core, <i>%</i>
+* label `$cpuN` - load CPU for core N, <i>%</i>. N should be in range 0 to 8
 * label `$cpucl` - average cpu clock, <i>MHz</i>
-* label `$ccpucl` - cpu clock for each core, <i>MHz</i>
+* label `$cpuclN` - cpu clock for core N, <i>MHz</i>. N should be in range 0 to 8
-* label `$temp` - average temperature in system
+* label `$tempN` - temperature for device N. For example, `$temp0`
 * label `$gpu` - GPU usage, <i>%</i>. `aticonfig` or `nvidia-smi` must be installed
 * label `$gputemp` - GPU temperature. `aticonfig` or `nvidia-smi` must be installed
 * label `$mem` - usage memory, <i>%</i>
 * label `$memmb` - usage memory, <i>MB</i>
 * label `$swap` - swap, <i>%</i>
 * label `$swapmb` - swap, <i>MB</i>
-* label `@@/@@` (in hdd label) - mount point (`/` in example) usage, <i>%</i>. Separator for mount points list is `;`, for example `@@/;/home;/mnt/global@@`
+* label `$hddN` - usage for mount point N, <i>%</i>. For example, `$hdd0`
-* label `@@/dev/sda@@` (in hddtemp label) - HDD (`/dev/sda` in example) temperature. Separator for device list is `;`, for example `@@/dev/sda;/dev/sdb@@`. `hddtemp` must be installed
+* label `$hddtempN` - temperature for HDD N. For example, `$hddtemp0`
-* label `$net` - download and upload speed, <i>KB/s</i>. You may specify network device: something like `@@eth0@@`
+* label `$down` - download speed, <i>KB/s</i>
+* label `$up` - upload speed, <i>KB/s</i>
 * label `$netdev` - current network device
-* label `$bat` - battery charge, <i>%</i>. Battery device may be set below. File (`/sys/class/power_supply/BAT0/capacity` by default) must contain only battery charge in percent
+* label `$bat` - battery charge, <i>%</i>
-* label `$ac` - status AC device. Return <i>(*)</i> if AC device is online or <i>( )</i> if offline. AC device may be set below. FIle (`/sys/class/power_supply/AC/online` by default) must contain `1` if AC is online
+* label `$ac` - status AC device. Return <i>(*)</i> if AC device is online or <i>( )</i> if offline
-* label `$artist` - current song artist. One of supported music players must be installed
 * label `$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
 * label `$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
 * label `$title` - current song title. One of supported music players must be installed
+* label `$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>.
 
+Advanced settings
+-----------------
+**Custom time**
+* label `$dddd` - weekday in long format
+* label `$ddd` - weekday in short format
+* label `$dd` - day
+* label `$d` - day without zero
+* label `$MMMM` - month in long format
+* label `$MMM` - month in short format
+* label `$MM` - month
+* label `$M` - month without zero
+* label `$yyyy` - year
+* label `$yy` - year in short format
+* label `$hh` - hours
+* label `$h` - hours without zero
+* label `$mm` - minutes
+* label `$m` - minutes without zero
+* label `$ss` - seconds
+* label `$s` - seconds without zero
+**Custom uptime**
+* label `$ds` - uptime days
+* label `$hs` - uptime hours
+* label `$ms` - uptime minutes
+**Temperature devices**
+List of devices, which will be observed in temp label (combo box items come from `sensors`). List widget is editable, delete key will remove current item.
+**Mount points**
+List of mount points, which will be observed in hdd label (combo box items come from `mount`). List widget is editable, delete key will remove current item.
+**HDD**
+List of hard disk devices, which will be observed in hddtem label (combo box items come from `find`). List widget is editable, delete key will remove current item.
+**Network directory**
+Path to directory, which contains network devices information. Default is `/sys/class/net`. Required for auto select network device.
+**Network device**
+Use specified device as active. Combo box items come from **network directory**. Will disable auto select network device.
+**Battery device**
+File with battery information. File (`/sys/class/power_supply/BAT0/capacity` by default) should contain only battery charge in percent.
+**AC device**
+File with AC information. File (`/sys/class/power_supply/AC/online` by default) must contain `1` if AC is online.
+**Music player**
+Select one of supported music playes for player label.
+**Custom command**
+**NOTE** This can cause the computer freeze.
+A command, which will be run for custom label.
+
 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.
@@ -84,7 +110,6 @@ Dependencies
 * kdebase-workspace
 * kdebindings-python2
 * lm_sensors (for definition temperature device)
-* net-tools (for definition network device)
 * sysstat (for notification)
 
 Optional dependencies

sources/CMakeLists.txt

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

sources/ptm/contents/code/config.py

@@ -1,20 +1,22 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2012 Alex Oleshkevich <alex.oleshkevich@gmail.com>
+############################################################################
-# 
+# Copyright 2012 Alex Oleshkevich <alex.oleshkevich@gmail.com>             #
-# This program is free software; you can redistribute it and/or modify
+#                                                                          #
-# it under the terms of the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify     #
-# the Free Software Foundation; either version 2 of the License, or
+# it under the terms of the GNU General Public License as published by     #
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or        #
-# 
+# (at your option) any later version.                                      #
-# This program is distributed in the hope that it will be useful,
+#                                                                          #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# This program is distributed in the hope that it will be useful,          #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
-# GNU General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
-# 
+# GNU General Public License for more details.                             #
-# You should have received a copy of the GNU General Public License along
+#                                                                          #
-# with this program; if not, write to the Free Software Foundation, Inc.,
+# You should have received a copy of the GNU General Public License along  #
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program; if not, write to the Free Software Foundation, Inc.,  #
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.              #
+############################################################################
 
 from util import *
 

sources/ptm/contents/code/configdef.py

@@ -17,6 +17,7 @@
 #   along with pytextmonitor. If not, see http://www.gnu.org/licenses/     #
 ############################################################################
 
+from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from PyKDE4.kdecore import *
 from PyKDE4.kdeui import *
@@ -53,6 +54,33 @@ class ConfigDefinition:
         self.parent.font_weight = self.configpage.ui.spinBox_weight.value()
         settings.set('font_weight', self.parent.font_weight)
         
+        self.parent.custom_time = str(self.configpage.ui.lineEdit_timeFormat.text())
+        settings.set('custom_time', self.parent.custom_time)
+        self.parent.custom_uptime = str(self.configpage.ui.lineEdit_uptimeFormat.text())
+        settings.set('custom_uptime', self.parent.custom_uptime)
+        # temp and mount below
+        self.parent.hddNames = []
+        self.parent.hdd = {}
+        for i in range(self.configpage.ui.listWidget_hddDevice.count()):
+            item = self.configpage.ui.listWidget_hddDevice.item(i).text()
+            self.parent.hddNames.append(str(item))
+            self.parent.hdd[str(item)] =" 0.0"
+        settings.set('hdd', '@@'.join(self.parent.hddNames))
+        self.parent.netdir = str(self.configpage.ui.lineEdit_netdir.text())
+        settings.set('netdir', self.parent.netdir)
+        self.parent.netdevBool = str(self.configpage.ui.checkBox_netdev.checkState())
+        settings.set('netdevBool', self.parent.netdevBool)
+        self.parent.custom_netdev = str(self.configpage.ui.comboBox_netdev.currentText())
+        settings.set('custom_netdev', self.parent.custom_netdev)
+        self.parent.battery_device = str(self.configpage.ui.lineEdit_batdev.text())
+        settings.set('battery_device', self.parent.battery_device)
+        self.parent.ac_device = str(self.configpage.ui.lineEdit_acdev.text())
+        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)
+        
         # disconnecting from source and clear layout
         if (self.parent.uptimeBool > 0):
             self.parent.systemmonitor.disconnectSource("system/uptime",  self.parent)
@@ -60,36 +88,28 @@ class ConfigDefinition:
             self.parent.layout.removeItem(self.parent.label_uptime)
         if (self.parent.cpuBool > 0):
             self.parent.systemmonitor.disconnectSource("cpu/system/TotalLoad", self.parent)
-            if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat):
+            for core in self.parent.cpuCore.keys():
-                self.parent.label_cpu.setText('')
+                self.parent.systemmonitor.disconnectSource("cpu/cpu"+str(core)+"/TotalLoad", self.parent)
-                self.parent.layout.removeItem(self.parent.label_cpu)
+            self.parent.label_cpu.setText('')
-                self.parent.label_cpu1.setText('')
+            self.parent.layout.removeItem(self.parent.label_cpu)
-                self.parent.layout.removeItem(self.parent.label_cpu1)
-                for core in range(self.parent.numCores):
-                    self.parent.systemmonitor.disconnectSource("cpu/cpu"+str(core)+"/TotalLoad", self.parent)
-                    exec ("self.parent.label_coreCpu" + str(core) + ".setText('')")
-                    exec ("self.parent.layout.removeItem(self.parent.label_coreCpu" + str(core) + ")")
-            else:
-                self.parent.label_cpu.setText('')
-                self.parent.layout.removeItem(self.parent.label_cpu)
         if (self.parent.cpuclockBool > 0):
             self.parent.systemmonitor.disconnectSource("cpu/system/AverageClock", self.parent)
-            if (self.parent.cpuclockFormat.split('$ccpu')[0] != self.parent.cpuclockFormat):
+            for core in self.parent.cpuClockCore.keys():
-                self.parent.label_cpuclock.setText('')
+                self.parent.systemmonitor.disconnectSource("cpu/cpu"+str(core)+"/clock", self.parent)
-                self.parent.layout.removeItem(self.parent.label_cpuclock)
+            self.parent.label_cpuclock.setText('')
-                self.parent.label_cpuclock1.setText('')
+            self.parent.layout.removeItem(self.parent.label_cpuclock)
-                self.parent.layout.removeItem(self.parent.label_cpuclock1)
-                for core in range(self.parent.numCores):
-                    self.parent.systemmonitor.disconnectSource("cpu/cpu"+str(core)+"/clock", self.parent)
-                    exec ("self.parent.label_coreCpuclock" + str(core) + ".setText('')")
-                    exec ("self.parent.layout.removeItem(self.parent.label_coreCpuclock" + str(core) + ")")
-            else:
-                self.parent.label_cpuclock.setText('')
-                self.parent.layout.removeItem(self.parent.label_cpuclock)
         if (self.parent.tempBool > 0):
-            self.parent.systemmonitor.disconnectSource(self.parent.tempdev, self.parent)
+            for item in self.parent.temp:
+                self.parent.systemmonitor.disconnectSource(item, self.parent)
             self.parent.label_temp.setText('')
             self.parent.layout.removeItem(self.parent.label_temp)
+        self.parent.tempNames = []
+        self.parent.temp = {}
+        for i in range(self.configpage.ui.listWidget_tempDevice.count()):
+            item = self.configpage.ui.listWidget_tempDevice.item(i).text()
+            self.parent.tempNames.append(str(item))
+            self.parent.temp[str(item)] =" 0.0"
+        settings.set('temp_device', '@@'.join(self.parent.tempNames))
         if (self.parent.gpuBool > 0):
             self.parent.extsysmon.disconnectSource("gpu", self.parent)
             self.parent.label_gpu.setText('')
@@ -112,14 +132,17 @@ class ConfigDefinition:
             self.parent.label_swap.setText('')
             self.parent.layout.removeItem(self.parent.label_swap)
         if (self.parent.hddBool > 0):
-            for mount in self.parent.mountPoints:
+            for item in self.parent.mount:
-                self.parent.systemmonitor.disconnectSource("partitions" + mount + "/filllevel", self.parent)
+                self.parent.systemmonitor.disconnectSource("partitions" + item + "/filllevel", self.parent)
-                exec ('self.parent.label_hdd_' + ''.join(mount.split('/')) + '.setText("")')
+            self.parent.label_hdd.setText('')
-                exec ("self.parent.layout.removeItem(self.parent.label_hdd_" + ''.join(mount.split('/')) + ")")
+            self.parent.layout.removeItem(self.parent.label_hdd)
-            self.parent.label_hdd0.setText('')
+        self.parent.mountNames = []
-            self.parent.label_hdd1.setText('')
+        self.parent.mount = {}
-            self.parent.layout.removeItem(self.parent.label_hdd0)
+        for i in range(self.configpage.ui.listWidget_mount.count()):
-            self.parent.layout.removeItem(self.parent.label_hdd1)
+            item = self.configpage.ui.listWidget_mount.item(i).text()
+            self.parent.mountNames.append(str(item))
+            self.parent.mount[str(item)] ="  0.0"
+        settings.set('mount', '@@'.join(self.parent.mountNames))
         if (self.parent.hddtempBool > 0):
             self.parent.extsysmon.disconnectSource("hddtemp", self.parent)
             self.parent.label_hddtemp.setText('')
@@ -127,10 +150,8 @@ class ConfigDefinition:
         if (self.parent.netBool > 0):
             self.parent.systemmonitor.disconnectSource("network/interfaces/"+self.parent.netdev+"/transmitter/data", self.parent)
             self.parent.systemmonitor.disconnectSource("network/interfaces/"+self.parent.netdev+"/receiver/data", self.parent)
-            self.parent.label_netDown.setText('')
+            self.parent.label_net.setText('')
-            self.parent.label_netUp.setText('')
+            self.parent.layout.removeItem(self.parent.label_net)
-            self.parent.layout.removeItem(self.parent.label_netUp)
-            self.parent.layout.removeItem(self.parent.label_netDown)
         if (self.parent.batBool > 0):
             self.parent.label_bat.setText('')
             self.parent.layout.removeItem(self.parent.label_bat)
@@ -142,8 +163,11 @@ class ConfigDefinition:
             self.parent.timemon.disconnectSource("Local", self.parent)
             self.parent.label_time.setText('')
             self.parent.layout.removeItem(self.parent.label_time)
+        if (self.parent.customBool > 0):
+            self.parent.label_custom.setText('')
+            self.parent.layout.removeItem(self.parent.label_custom)
         
-        self.parent.label_order = "--------------"
+        self.parent.label_order = "---------------"
         
         for label in self.parent.dict_orders.keys():
             exec ('self.parent.' + self.parent.dict_orders[label] + 'Bool = ' + str(self.configpage.checkboxes[self.parent.dict_orders[label]].checkState()))
@@ -156,19 +180,7 @@ class ConfigDefinition:
             else:
                 exec ('self.parent.' + self.parent.dict_orders[label] + 'Format = str(self.configpage.lineedits[self.parent.dict_orders[label]].text())')
                 exec ('settings.set("' + self.parent.dict_orders[label] + 'Format", self.parent.' + self.parent.dict_orders[label] + 'Format)')
-            exec ('settings.set("' + self.parent.dict_orders[label] + 'Bool", self.parent.' + self.parent.dict_orders[label] + 'Bool)')
+            exec ('settings.set("' + self.parent.dict_orders[label] + 'Bool", self.parent.' + self.parent.dict_orders[label] + 'Bool)')        
-            if (self.parent.dict_orders[label] == 'bat'):
-                self.parent.battery_device = str(self.configpage.ui.lineEdit_batdev.text())
-                self.parent.ac_device = str(self.configpage.ui.lineEdit_acdev.text())
-                settings.set('battery_device', self.parent.battery_device)
-                settings.set('ac_device', self.parent.ac_device)
-            elif (self.parent.dict_orders[label] == 'temp'):
-                self.parent.tempdev = str(self.configpage.ui.comboBox_temp.currentText())
-                settings.set('temp_device', self.parent.tempdev)
-            elif (self.parent.dict_orders[label] == 'player'):
-                self.parent.player_name = self.configpage.ui.comboBox_player.currentIndex()
-                settings.set('player_name', self.parent.player_name)
-        
         self.parent.label_order = ''.join(self.parent.label_order.split('-'))
         settings.set('label_order', self.parent.label_order)
         
@@ -191,6 +203,52 @@ class ConfigDefinition:
         else:
             self.configpage.ui.comboBox_style.setCurrentIndex(1)
         self.configpage.ui.spinBox_weight.setValue(settings.get('font_weight', 400).toInt()[0])
+        
+        self.configpage.ui.lineEdit_timeFormat.setText(str(settings.get('custom_time', '$hh:$mm')))
+        self.configpage.ui.lineEdit_uptimeFormat.setText(str(settings.get('custom_uptime', '$ds,$hs,$ms')))
+        commandOut = commands.getoutput("sensors")
+        for item in commandOut.split("\n\n"):
+            for device in item.split("\n"):
+                if (device.find('\xc2\xb0C') > -1):
+                    try:
+                        tempdev = 'lmsensors/' + item.split("\n")[0] + '/' + '_'.join(device.split(":")[0].split())
+                        self.configpage.ui.comboBox_tempDevice.addItem(tempdev)
+                    except:
+                        pass
+        self.configpage.ui.listWidget_tempDevice.clear()
+        for item in str(settings.get('temp_device', '')).split('@@'):
+            if (len(item) > 0):
+                self.configpage.ui.listWidget_tempDevice.addItem(item)
+        commandOut = commands.getoutput("mount")
+        for item in commandOut.split("\n"):
+            try:
+                mount = item.split(' on ')[1].split(' type ')[0]
+                self.configpage.ui.comboBox_mount.addItem(mount)
+            except:
+                pass
+        self.configpage.ui.listWidget_mount.clear()
+        for item in str(settings.get('mount', '/')).split('@@'):
+            self.configpage.ui.listWidget_mount.addItem(item)
+        commandOut = commands.getoutput("find /dev -name '[hs]d[a-z]'")
+        for item in commandOut.split("\n"):
+            try:
+                self.configpage.ui.comboBox_hddDevice.addItem(item)
+            except:
+                pass
+        self.configpage.ui.listWidget_hddDevice.clear()
+        for item in str(settings.get('hdd', '/dev/sda')).split('@@'):
+            self.configpage.ui.listWidget_hddDevice.addItem(item)
+        self.configpage.ui.lineEdit_netdir.setText(str(settings.get('netdir', '/sys/class/net')))
+        self.configpage.ui.checkBox_netdev.setCheckState(settings.get('netdevBool', 0).toInt()[0])
+        for item in QDir.entryList(QDir(str(settings.get('netdir', '/sys/class/net'))), QDir.Dirs | QDir.NoDotAndDotDot):
+            self.configpage.ui.comboBox_netdev.addItem(item)
+        index = self.configpage.ui.comboBox_netdev.findText(str(settings.get('custom_netdev', 'lo')))
+        self.configpage.ui.comboBox_netdev.setCurrentIndex(index)
+        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')))
+        
         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)
@@ -200,22 +258,6 @@ class ConfigDefinition:
                 self.configpage.lineedits[self.parent.dict_orders[label]].setText(str(settings.get(self.parent.dict_orders[label] + 'NonFormat', self.parent.dict_defFormat[self.parent.dict_orders[label]])))
             else:
                 self.configpage.lineedits[self.parent.dict_orders[label]].setText(str(settings.get(self.parent.dict_orders[label] + 'Format', self.parent.dict_defFormat[self.parent.dict_orders[label]])))
-            if (self.parent.dict_orders[label] == 'bat'):
-                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')))
-            elif (self.parent.dict_orders[label] == 'temp'):
-                self.configpage.ui.comboBox_temp.addItem(str(settings.get('temp_device', '<select device>')))
-                commandOut = commands.getoutput("sensors")
-                for adapter in commandOut.split("\n\n"):
-                    for device in adapter.split("\n"):
-                        if (device.find('\xc2\xb0C') > -1):
-                            try:
-                                tempdev = 'lmsensors/' + adapter.split('\n')[0] + '/' + '_'.join(device.split(":")[0].split())
-                                self.configpage.ui.comboBox_temp.addItem(tempdev)
-                            except:
-                                pass
-            elif (self.parent.dict_orders[label] == 'player'):
-                self.configpage.ui.comboBox_player.setCurrentIndex(int(settings.get('player_name', 0)))
         
         # add config page
         page = parent.addPage(self.configpage, i18n(self.parent.name()))

sources/ptm/contents/code/configwindow.py

@@ -37,42 +37,108 @@ class ConfigWindow(QWidget):
         'hddtemp':self.ui.checkBox_hddTemp, 'mem':self.ui.checkBox_mem, 
         'net':self.ui.checkBox_net, 'swap':self.ui.checkBox_swap, 
         'temp':self.ui.checkBox_temp, 'uptime':self.ui.checkBox_uptime, 
-        'player':self.ui.checkBox_player, 'time':self.ui.checkBox_time}
+        'player':self.ui.checkBox_player, 'time':self.ui.checkBox_time,
-        self.sliders = {'bat':self.ui.slider_bat, 'cpu':self.ui.slider_cpu, 
+        'custom':self.ui.checkBox_custom}
-        'cpuclock':self.ui.slider_cpuclock, 'gpu':self.ui.slider_gpu, 
-        'gputemp':self.ui.slider_gpuTemp, 'hdd':self.ui.slider_hdd, 
-        'hddtemp':self.ui.slider_hddTemp, 'mem':self.ui.slider_mem, 
-        'net':self.ui.slider_net, 'swap':self.ui.slider_swap, 
-        'temp':self.ui.slider_temp, 'uptime':self.ui.slider_uptime, 
-        'player':self.ui.slider_player, 'time':self.ui.slider_time}
         self.lineedits = {'bat':self.ui.lineEdit_bat, 'cpu':self.ui.lineEdit_cpu, 
         'cpuclock':self.ui.lineEdit_cpuclock, 'gpu':self.ui.lineEdit_gpu, 
         'gputemp':self.ui.lineEdit_gpuTemp, 'hdd':self.ui.lineEdit_hdd, 
         'hddtemp':self.ui.lineEdit_hddTemp, 'mem':self.ui.lineEdit_mem, 
         'net':self.ui.lineEdit_net, 'swap':self.ui.lineEdit_swap, 
         'temp':self.ui.lineEdit_temp, 'uptime':self.ui.lineEdit_uptime, 
-        'player':self.ui.lineEdit_player, 'time':self.ui.lineEdit_time}
+        'player':self.ui.lineEdit_player, 'time':self.ui.lineEdit_time,
+        'custom':self.ui.lineEdit_custom}
+        self.sliders = {'bat':self.ui.slider_bat, 'cpu':self.ui.slider_cpu, 
+        'cpuclock':self.ui.slider_cpuclock, 'gpu':self.ui.slider_gpu, 
+        'gputemp':self.ui.slider_gpuTemp, 'hdd':self.ui.slider_hdd, 
+        'hddtemp':self.ui.slider_hddTemp, 'mem':self.ui.slider_mem, 
+        'net':self.ui.slider_net, 'swap':self.ui.slider_swap, 
+        'temp':self.ui.slider_temp, 'uptime':self.ui.slider_uptime, 
+        'player':self.ui.slider_player, 'time':self.ui.slider_time, 
+        'custom':self.ui.slider_custom}
         
-        for item in self.checkboxes.values():
+        QObject.connect(self.ui.checkBox_netdev, SIGNAL("stateChanged(int)"), self.setNetdevEnabled)
-            QObject.connect(item, SIGNAL("stateChanged(int)"), self.setStatus)
+        QObject.connect(self.ui.pushButton_hddDevice, SIGNAL("clicked()"), self.addHddDevice)
+        QObject.connect(self.ui.pushButton_mount, SIGNAL("clicked()"), self.addMount)
+        QObject.connect(self.ui.pushButton_tempDevice, SIGNAL("clicked()"), self.addTempDevice)
+        QObject.connect(self.ui.listWidget_hddDevice, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_hddDevice.openPersistentEditor)
+        QObject.connect(self.ui.listWidget_mount, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_mount.openPersistentEditor)
+        QObject.connect(self.ui.listWidget_tempDevice, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_tempDevice.openPersistentEditor)
         for item in self.sliders.values():
             QObject.connect(item, SIGNAL("valueChanged(int)"), self.setSlider)
+        for item in self.checkboxes.values():
+            QObject.connect(item, SIGNAL("stateChanged(int)"), self.setStatus)
+    
+    
+    def keyPressEvent(self, event):
+        """delete events"""
+        if (event.key() == Qt.Key_Delete):
+            if (self.ui.listWidget_hddDevice.hasFocus() and
+                (self.ui.listWidget_hddDevice.currentRow() > -1)):
+                self.ui.listWidget_hddDevice.takeItem(self.ui.listWidget_hddDevice.currentRow())
+            elif (self.ui.listWidget_mount.hasFocus() and
+                (self.ui.listWidget_mount.currentRow() > -1)):
+                self.ui.listWidget_mount.takeItem(self.ui.listWidget_mount.currentRow())
+            elif (self.ui.listWidget_tempDevice.hasFocus() and
+                (self.ui.listWidget_tempDevice.currentRow() > -1)):
+                self.ui.listWidget_tempDevice.takeItem(self.ui.listWidget_tempDevice.currentRow())
+
+
+    def addHddDevice(self):
+        """function to add mount points"""
+        self.ui.listWidget_hddDevice.clearSelection()
+        if (self.ui.listWidget_hddDevice.count() > 9):
+            self.ui.listWidget_hddDevice.takeItem(0)
+        self.ui.listWidget_hddDevice.addItem(self.ui.comboBox_hddDevice.currentText())
+
+
+    def addMount(self):
+        """function to add mount points"""
+        self.ui.listWidget_mount.clearSelection()
+        if (self.ui.listWidget_mount.count() > 9):
+            self.ui.listWidget_mount.takeItem(0)
+        self.ui.listWidget_mount.addItem(self.ui.comboBox_mount.currentText())
+
+
+    def addTempDevice(self):
+        """function to add temperature device"""
+        self.ui.listWidget_tempDevice.clearSelection()
+        if (self.ui.listWidget_tempDevice.count() > 9):
+            self.ui.listWidget_tempDevice.takeItem(0)
+        self.ui.listWidget_tempDevice.addItem(self.ui.comboBox_tempDevice.currentText())
+    
+    
+    def setNetdevEnabled(self):
+        """function to set enabled netdev"""
+        if (self.ui.checkBox_netdev.checkState() == 0):
+            self.ui.comboBox_netdev.setDisabled(True)
+        else:
+            self.ui.comboBox_netdev.setEnabled(True)
+
+
+    def setSlider(self):
+        """function to set sliders"""
+        if (self.sender().isEnabled() == True):
+            second_slider = self.sender()
+            order = []
+            for slider in self.sliders.values():
+                if (slider.isEnabled() == True):
+                    order.append(slider.value())
+                    if ((slider.value() == self.sender().value()) and (slider != self.sender())):
+                        second_slider = slider
+            if (second_slider == self.sender()):
+                return
+            for value in range(len(order)):
+                if (order.count(value+1) == 0):
+                    new_value = value + 1
+            second_slider.setValue(new_value)
 
     
     def setStatus(self):
         """function to enable label"""
-        count = self.sliders['bat'].maximum()
         for label in self.checkboxes.keys():
             if ((self.checkboxes[label].checkState() > 0) and (self.sliders[label].isEnabled() == False)):
                 self.lineedits[label].setEnabled(True)
                 self.sliders[label].setEnabled(True)
-                if (label == 'bat'):
-                    self.ui.lineEdit_acdev.setEnabled(True)
-                    self.ui.lineEdit_batdev.setEnabled(True)
-                elif (label == 'temp'):
-                    self.ui.comboBox_temp.setEnabled(True)
-                elif (label == 'player'):
-                    self.ui.comboBox_player.setEnabled(True)
                 slider_label = 0
                 for slider in self.sliders.values():
                     if (slider.isEnabled() == True):
@@ -86,13 +152,6 @@ class ConfigWindow(QWidget):
             elif ((self.checkboxes[label].checkState() == 0) and (self.sliders[label].isEnabled() == True)):
                 self.lineedits[label].setDisabled(True)
                 self.sliders[label].setDisabled(True)
-                if (label == 'bat'):
-                    self.ui.lineEdit_acdev.setDisabled(True)
-                    self.ui.lineEdit_batdev.setDisabled(True)
-                elif (label == 'temp'):
-                    self.ui.comboBox_temp.setDisabled(True)
-                elif (label == 'player'):
-                    self.ui.comboBox_player.setDisabled(True)
                 for slider in self.sliders.values():
                     if ((slider.value() == slider.maximum()) and (slider != self.sliders[label])):
                         slider.setValue(self.sliders[label].value())
@@ -106,23 +165,3 @@ class ConfigWindow(QWidget):
                     else:
                         slider.setMaximum(1)
                 self.sliders[label].setValue(1)
-    
-    def setSlider(self):
-        """function to set sliders"""
-        if (self.sender().isEnabled() == True):
-            second_slider = self.sender()
-            order = []
-            for slider in self.sliders.values():
-                if (slider.isEnabled() == True):
-                    order.append(slider.value())
-                    if ((slider.value() == self.sender().value()) and (slider != self.sender())):
-                        second_slider = slider
-            
-            if (second_slider == self.sender()):
-                return
-            
-            for value in range(len(order)):
-                if (order.count(value+1) == 0):
-                    new_value = value + 1
-            
-            second_slider.setValue(new_value)

sources/ptm/contents/code/dataengine.py

@@ -29,6 +29,7 @@ timeLetters = ['dddd', 'ddd', 'dd', 'd', \
     'hh', 'h', 'mm', 'm', 'ss', 's']
 
 
+
 class DataEngine:
     def __init__(self, parent):
         """class definition"""
@@ -48,16 +49,17 @@ class DataEngine:
             self.parent.systemmonitor.connectSource("system/uptime", self.parent, self.parent.interval)
         if (self.parent.cpuBool > 0):
             self.parent.systemmonitor.connectSource("cpu/system/TotalLoad", self.parent, self.parent.interval)
-            if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat):
+            for core in self.parent.cpuCore.keys():
-                for core in range(self.parent.numCores):
+                if (core > -1):
                     self.parent.systemmonitor.connectSource("cpu/cpu"+str(core)+"/TotalLoad", self.parent, self.parent.interval)
         if (self.parent.cpuclockBool > 0):
             self.parent.systemmonitor.connectSource("cpu/system/AverageClock", self.parent, self.parent.interval)
-            if (self.parent.cpuclockFormat.split('$ccpucl')[0] != self.parent.cpuclockFormat):
+            for core in self.parent.cpuClockCore.keys():
-                for core in range(self.parent.numCores):
+                if (core > -1):
                     self.parent.systemmonitor.connectSource("cpu/cpu"+str(core)+"/clock", self.parent, self.parent.interval)
         if (self.parent.tempBool > 0):
-            self.parent.systemmonitor.connectSource(self.parent.tempdev, self.parent, self.parent.interval)
+            for item in self.parent.tempNames:
+                self.parent.systemmonitor.connectSource(item, self.parent, self.parent.interval)
         if (self.parent.gpuBool > 0):
             self.parent.extsysmon.connectSource("gpu", self.parent, self.parent.interval)
         if (self.parent.gputempBool > 0):
@@ -76,8 +78,8 @@ class DataEngine:
                 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 mount in self.parent.mountPoints:
+            for item in self.parent.mountNames:
-                self.parent.systemmonitor.connectSource("partitions" + mount + "/filllevel", self.parent, self.parent.interval)
+                self.parent.systemmonitor.connectSource("partitions" + item + "/filllevel", self.parent, self.parent.interval)
         if (self.parent.hddtempBool > 0):
             self.parent.extsysmon.connectSource("hddtemp", self.parent, self.parent.interval)
         if (self.parent.netBool > 0):
@@ -100,89 +102,34 @@ class DataEngine:
                     uptimeText = "%3id%2ih%2im" % (days, hours, minutes)
                     line = line.split('$uptime')[0] + uptimeText + line.split('$uptime')[1]
                 elif (line.split('$custom')[0] != line):
-                    line = ''.join(line.split('$custom'))
+                    uptimeText = self.parent.custom_uptime
-                    if (line.split('$ds')[0] != line):
+                    if (uptimeText.split('$ds')[0] != uptimeText):
-                        line = "%s%3i%s" % (line.split('$ds')[0], days, line.split('$ds')[1])
+                        uptimeText = "%s%3i%s" % (uptimeText.split('$ds')[0], days, uptimeText.split('$ds')[1])
-                    if (line.split('$hs')[0] != line):
+                    if (uptimeText.split('$hs')[0] != uptimeText):
-                        line = "%s%2i%s" % (line.split('$hs')[0], hours, line.split('$hs')[1])
+                        uptimeText = "%s%2i%s" % (uptimeText.split('$hs')[0], hours, uptimeText.split('$hs')[1])
-                    if (line.split('$ms')[0] != line):
+                    if (uptimeText.split('$ms')[0] != uptimeText):
-                        line = "%s%2i%s" % (line.split('$ms')[0], minutes, line.split('$ms')[1])
+                        uptimeText = "%s%2i%s" % (uptimeText.split('$ms')[0], minutes, uptimeText.split('$ms')[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)
             elif (sourceName == "cpu/system/TotalLoad"):
                 value = str(round(float(data[QString(u'value')]), 1))
-                cpuText = "%5s" % (value)
+                self.parent.cpuCore[-1] = "%5s" % (value)
-                if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat):
-                    if (self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[0] != self.parent.cpuFormat.split('$ccpu')[0]):
-                        line = self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[0] + cpuText + self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[1]
-                    else:
-                        line = self.parent.cpuFormat.split('$ccpu')[0]
-                    text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_cpu.setText(text)
-                    if (self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[0] != self.parent.cpuFormat.split('$ccpu')[1]):
-                        line = self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[0] + cpuText + self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[1]
-                    else:
-                        line = self.parent.cpuFormat.split('$ccpu')[1]
-                    text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_cpu1.setText(text)
-                else:
-                    if (self.parent.cpuFormat.split('$cpu')[0] != self.parent.cpuFormat):
-                        line = self.parent.cpuFormat.split('$cpu')[0] + cpuText + self.parent.cpuFormat.split('$cpu')[1]
-                    else:
-                        line = self.parent.cpuFormat
-                    text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_cpu.setText(text)
             elif ((str(sourceName)[:7] == "cpu/cpu") and (str(sourceName).split('/')[2] == "TotalLoad")):
                 value = str(round(float(data[QString(u'value')]), 1))
-                cpuText = "%5s" % (value)
+                self.parent.cpuCore[int(str(sourceName)[7])] = "%5s" % (value)
-                text = self.parent.formatLine.split('$LINE')[0] + cpuText + self.parent.formatLine.split('$LINE')[1]
-                exec ('self.parent.label_coreCpu' + str(sourceName)[7] + '.setText(text)')
             elif (sourceName == "cpu/system/AverageClock"):
                 value = str(data[QString(u'value')]).split('.')[0]
-                cpuclockText = "%4s" % (value)
+                self.parent.cpuClockCore[-1] = "%4s" % (value)
-                if (self.parent.cpuclockFormat.split('$ccpucl')[0] != self.parent.cpuclockFormat):
-                    if (self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] != self.parent.cpuclockFormat.split('$ccpucl')[0]):
-                        line = self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] + cpuclockText + self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[1]
-                    else:
-                        line = self.parent.cpuclockFormat.split('$ccpucl')[0]
-                    text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_cpuclock.setText(text)
-                    if (self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] != self.parent.cpuclockFormat.split('$ccpucl')[1]):
-                        line = self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] + cpuclockText + self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[1]
-                    else:
-                        line = self.parent.cpuclockFormat.split('$ccpucl')[1]
-                    text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_cpuclock1.setText(text)
-                else:
-                    if (self.parent.cpuclockFormat.split('$cpucl')[0] != self.parent.cpuclockFormat):
-                        line = self.parent.cpuclockFormat.split('$cpucl')[0] + cpuclockText + self.parent.cpuclockFormat.split('$cpucl')[1]
-                    else:
-                        line = self.parent.cpuclockFormat
-                    text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_cpuclock.setText(text)
             elif ((str(sourceName)[:7] == "cpu/cpu") and (str(sourceName).split('/')[2] == "clock")):
                 value = str(data[QString(u'value')]).split('.')[0]
-                cpuclockText = "%4s" % (value)
+                self.parent.cpuClockCore[int(str(sourceName)[7])] = "%4s" % (value)
-                text = self.parent.formatLine.split('$LINE')[0] + cpuclockText + self.parent.formatLine.split('$LINE')[1]
-                exec ('self.parent.label_coreCpuclock' + str(sourceName)[7] + '.setText(text)')
             elif (sourceName == "network/interfaces/"+self.parent.netdev+"/transmitter/data"):
                 value = str(data[QString(u'value')]).split('.')[0]
-                up_speed = "%4s" % (value)
+                self.parent.netSpeed["up"] = "%4s" % (value)
-                if (self.parent.netFormat.split('$net')[0] != self.parent.netFormat):
-                    line = '/' + up_speed + self.parent.netFormat.split('$net')[1]
-                else:
-                    line = ''
-                text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                self.parent.label_netUp.setText(text)
             elif (sourceName == "network/interfaces/"+self.parent.netdev+"/receiver/data"):
                 value = str(data[QString(u'value')]).split('.')[0]
-                down_speed = "%4s" % (value)
+                self.parent.netSpeed["down"] = "%4s" % (value)
-                if (self.parent.netFormat.split('$net')[0] != self.parent.netFormat):
-                    line = self.parent.netFormat.split('$net')[0] + down_speed
-                else:
-                    line = self.parent.netFormat
-                text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                self.parent.label_netDown.setText(text)
                 # update network device
                 self.parent.updateNetdev = self.parent.updateNetdev + 1
                 if (self.parent.updateNetdev == 100):
@@ -197,20 +144,12 @@ class DataEngine:
                         self.parent.netFormat = self.parent.netNonFormat.split('$netdev')[0] + self.parent.netdev + self.parent.netNonFormat.split('$netdev')[1]
                     else:
                         self.parent.netFormat = self.parent.netNonFormat
-            elif (sourceName == self.parent.tempdev):
+            elif (str(sourceName).split('/')[0] == "lmsensors"):
                 value = str(round(float(data[QString(u'value')]), 1))
-                tempText = "%4s" % (value)
+                self.parent.temp[str(sourceName)] = "%4s" % (value)
-                if (self.parent.tempFormat.split('$temp')[0] != self.parent.tempFormat):
-                    line = self.parent.tempFormat.split('$temp')[0] + tempText + self.parent.tempFormat.split('$temp')[1]
-                else:
-                    line = self.parent.tempFormat
-                text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                self.parent.label_temp.setText(text)
             elif (str(sourceName).split('/')[0] == "partitions"):
                 value = str(round(float(data[QString(u'value')]), 1))
-                hddText = "%5s" % (value)
+                self.parent.mount['/'+'/'.join(str(sourceName).split('/')[1:-1])] = "%5s" % (value)
-                text = self.parent.formatLine.split('$LINE')[0] + hddText + self.parent.formatLine.split('$LINE')[1]
-                exec ('self.parent.label_hdd_' + ''.join(str(sourceName).split('/')[1:-1]) + '.setText(text)')
             elif (sourceName == "mem/physical/free"):
                 self.parent.mem_free = float(data[QString(u'value')])
             elif (sourceName == "mem/physical/used"):
@@ -260,15 +199,13 @@ class DataEngine:
                 text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                 self.parent.label_gputemp.setText(text)
             elif (sourceName == "hddtemp"):
-                hddtempText = []
+                for item in self.parent.hddNames:
-                for device in self.parent.hddtempFormat.split('@@')[1].split(';'):
+                    value = str(data[QString(item)])
-                    if (len(device) > 0):
+                    self.parent.hdd[item] = "%4s" % (value)
-                        value = str(data[QString(device)])
+                line = self.parent.hddtempFormat
-                        hddtempText.append("%4s" % (value))
+                for i in range(len(self.parent.hddNames)):
-                if (self.parent.hddtempFormat.split('@@')[0] != self.parent.hddtempFormat):
+                    if (line.split('$hddtemp'+str(i))[0] != line):
-                    line = self.parent.hddtempFormat.split('@@')[0] + ' '.join(hddtempText) + self.parent.hddtempFormat.split('@@')[2]
+                        line = line.split('$hddtemp'+str(i))[0] + self.parent.hdd[self.parent.hddNames[i]] + line.split('$hddtemp'+str(i))[1]
-                else:
-                    line = self.parent.hddtempFormat
                 text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                 self.parent.label_hddtemp.setText(text)
             elif (sourceName == "player"):
@@ -318,24 +255,15 @@ class DataEngine:
                 elif (self.parent.timeFormat.split('$longtime')[0] != self.parent.timeFormat):
                     value = str(data[QString(u'DateTime')].toString(Qt.SystemLocaleLongDate).toUtf8())
                     line = self.parent.timeFormat.split('$longtime')[0] + value.decode("utf-8") + self.parent.timeFormat.split('$longtime')[1]
-                elif (self.parent.timeFormat.split('$snsntime')[0] != self.parent.timeFormat):
-                    rawDate = str(data[QString(u'DateTime')].toString(Qt.TextDate).toUtf8())
-                    value = rawDate.split()[0] + " " + rawDate.split()[2] + " " + \
-                        rawDate.split()[1] + " " + ':'.join(rawDate.split()[3].split(':')[0:2])
-                    line = self.parent.timeFormat.split('$snsntime')[0] + value.decode("utf-8") + self.parent.timeFormat.split('$snsntime')[1]
-                elif (self.parent.timeFormat.split('$nsnstime')[0] != self.parent.timeFormat):
-                    rawDate = str(data[QString(u'DateTime')].toString(Qt.TextDate).toUtf8())
-                    value = ':'.join(rawDate.split()[3].split(':')[0:2]) + " " + rawDate.split()[0] + " " + \
-                        rawDate.split()[2] + " " + rawDate.split()[1]
-                    line = self.parent.timeFormat.split('$nsnstime')[0] + value.decode("utf-8") + self.parent.timeFormat.split('$nsnstime')[1]
                 elif (self.parent.timeFormat.split('$custom')[0] != self.parent.timeFormat):
                     rawDate = data[QString(u'DateTime')]
-                    line = ''.join(self.parent.timeFormat.split('$custom'))
+                    value = self.parent.custom_time
                     for letters in timeLetters:
-                        if (line.split('$'+letters)[0] != line):
+                        if (value.split('$'+letters)[0] != value):
-                            line = line.split('$'+letters)[0] + \
+                            value = value.split('$'+letters)[0] + \
                                 str(data[QString(u'DateTime')].toString(letters).toUtf8()).decode("utf-8") + \
-                                line.split('$'+letters)[1]
+                                value.split('$'+letters)[1]
+                    line = self.parent.timeFormat.split('$custom')[0] + value + self.parent.timeFormat.split('$custom')[1]
                 else:
                     line = self.parent.timeFormat
                 text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]

sources/ptm/contents/code/main.py

@@ -96,41 +96,48 @@ class pyTextWidget(plasmascript.Applet):
     def setupNetdev(self):
         """function to setup network device"""
         netdev = "lo"
-        try:
+        interfaces = QDir.entryList(QDir(self.netdir), QDir.Dirs | QDir.NoDotAndDotDot)
-            interfaces = []
+        for device in interfaces:
-            for line in commands.getoutput("ifconfig -a -s").split("\n"):
+            if (str(device) != "lo"):
-                if ((line.split()[0] != 'Iface') and (line.split()[0] != 'lo')):
+                try:
-                    interfaces.append(line.split()[0])
+                    with open(self.netdir+"/"+str(device)+"/operstate", "r") as stateFile:
-            
+                        if (stateFile.readline() == "up\n"):
-            for device in interfaces:
+                            netdev = str(device)
-                if (commands.getoutput("ifconfig " + device + " | grep 'inet '") != ''):
+                except:
-                    netdev = device
+                    pass
-                    break
-        except:
-            pass
         return netdev
     
     
     def setupVar(self):
         """function to setup variables"""
         self.netdev = ''
-        # setup number of cores
+        self.cpuCore = {-1:"  0.0"}
-        commandOut = commands.getoutput("grep -c '^processor' /proc/cpuinfo")
+        self.cpuClockCore = {-1:"   0"}
-        self.numCores = int(commandOut)
+        numCores = int(commands.getoutput("grep -c '^processor' /proc/cpuinfo"))
-        self.tempdev = "tempdevice"
+        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 = {}
         
         # create dictionaries
-        self.dict_orders = {'6':'bat', '1':'cpu', '7':'cpuclock', '9':'gpu', 'a':'gputemp', 
+        self.dict_orders = {'6':'bat', '1':'cpu', '7':'cpuclock', 'f':'custom', '9':'gpu', 
-        'b':'hdd', 'c':'hddtemp', '3':'mem', '5':'net', '4':'swap', '2':'temp', '8':'uptime', 
+        'a':'gputemp', 'b':'hdd', 'c':'hddtemp', '3':'mem', '5':'net', '4':'swap', '2':'temp', 
-        'd':'player', 'e':'time'}
+        '8':'uptime', 'd':'player', 'e':'time'}
         self.dict_defFormat = {'bat':'[bat: $bat%$ac]', 'cpu':'[cpu: $cpu%]', 
-        'cpuclock':'[mhz: $cpucl]', 'gpu':'[gpu: $gpu%]', 
+        'cpuclock':'[mhz: $cpucl]', 'custom':'[$custom]', 'gpu':'[gpu: $gpu%]', 
-        'gputemp':'[gpu temp: $gputemp°C]', 'hdd':'[hdd: @@/@@%]', 
+        'gputemp':'[gpu temp: $gputemp°C]', 'hdd':'[hdd: $hdd0%]', 
-        'hddtemp':'[hdd temp: @@/dev/sda@@°C]', 'mem':'[mem: $mem%]', 
+        'hddtemp':'[hdd temp: $hddtemp0°C]', 'mem':'[mem: $mem%]', 
-        'net':'[$netdev: $netKB/s]', 'swap':'[swap: $swap%]', 
+        'net':'[$netdev: $down/$upKB/s]', 'swap':'[swap: $swap%]', 
-        'temp':'[temp: $temp°C]', 'uptime':'[uptime: $uptime]', 
+        'temp':'[temp: $temp0°C]', 'uptime':'[uptime: $uptime]', 
         'player':'[$artist - $title]', 'time':'[$time]'}
-    
+
+
     def showConfigurationInterface(self):
         """function to show configuration window"""
         plasmascript.Applet.showConfigurationInterface(self)
@@ -147,15 +154,28 @@ class pyTextWidget(plasmascript.Applet):
             self.label_error.setText('<font color="red">ERROR</font>')
             self.layout.addItem(self.label_error)
             return
-    
+
+
     def updateLabel(self):
         """function to update label"""
-        if ((self.memBool > 0) and (self.memInMb == False)):
-            self.memText()
-        if ((self.swapBool > 0) and (self.swapInMb == False)):
-            self.swapText()
         if (self.batBool > 0):
             self.batText()
+        if (self.cpuBool > 0):
+            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)):
+            self.memText()
+        if (self.netBool > 0):
+            self.netText()
+        if ((self.swapBool > 0) and (self.swapInMb == False)):
+            self.swapText()
+        if (self.tempBool > 0):
+            self.tempText()
     
     
     def batText(self):
@@ -169,7 +189,6 @@ class pyTextWidget(plasmascript.Applet):
                 bat = 'off'
             bat = "%3s" % (bat)
             line = line.split('$bat')[0] + bat + line.split('$bat')[1]
-        
         if (line.split('$ac')[0] != line):
             try:
                 with open (self.ac_device, 'r') as bat_file:
@@ -185,6 +204,32 @@ class pyTextWidget(plasmascript.Applet):
         self.label_bat.setText(text)
     
     
+    def cpuText(self):
+        """function to set cpu text"""
+        line = self.cpuFormat
+        for core in self.cpuCore.keys():
+            if (core > -1):
+                if (line.split('$cpu'+str(core))[0] != line):
+                    line = line.split('$cpu'+str(core))[0] + self.cpuCore[core] + line.split('$cpu'+str(core))[1]
+        if (line.split('$cpu')[0] != line):
+            line = line.split('$cpu')[0] + self.cpuCore[-1] + line.split('$cpu')[1]
+        text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1]
+        self.label_cpu.setText(text)
+    
+    
+    def cpuclockText(self):
+        """function to set cpu clock text"""
+        line = self.cpuclockFormat
+        for core in self.cpuClockCore.keys():
+            if (core > -1):
+                if (line.split('$cpucl'+str(core))[0] != line):
+                    line = line.split('$cpucl'+str(core))[0] + self.cpuClockCore[core] + line.split('$cpucl'+str(core))[1]
+        if (line.split('$cpucl')[0] != line):
+            line = line.split('$cpucl')[0] + self.cpuClockCore[-1] + line.split('$cpucl')[1]
+        text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1]
+        self.label_cpuclock.setText(text)
+    
+    
     def memText(self):
         """function to set mem text"""
         full = self.mem_uf + self.mem_free
@@ -201,6 +246,27 @@ class pyTextWidget(plasmascript.Applet):
         self.label_mem.setText(text)
     
     
+    def mountText(self):
+        """function to set mount text"""
+        line = self.hddFormat
+        for i in range(len(self.mountNames)):
+            if (line.split('$hdd'+str(i))[0] != line):
+                line = line.split('$hdd'+str(i))[0] + self.mount[self.mountNames[i]] + line.split('$hdd'+str(i))[1]
+        text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1]
+        self.label_hdd.setText(text)
+    
+    
+    def netText(self):
+        """function to set network text"""
+        line = self.netFormat
+        if (line.split('$up')[0] != line):
+            line = line.split('$up')[0] + self.netSpeed['up'] + line.split('$up')[1]
+        if (line.split('$down')[0] != line):
+            line = line.split('$down')[0] + self.netSpeed['down'] + line.split('$down')[1]
+        text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1]
+        self.label_net.setText(text)
+    
+    
     def swapText(self):
         """function to set swap text"""
         full = self.swap_used + self.swap_free
@@ -217,6 +283,25 @@ class pyTextWidget(plasmascript.Applet):
         self.label_swap.setText(text)
     
     
+    def tempText(self):
+        """function to set temperature text"""
+        line = self.tempFormat
+        for i in range(len(self.tempNames)):
+            if (line.split('$temp'+str(i))[0] != line):
+                line = line.split('$temp'+str(i))[0] + self.temp[self.tempNames[i]] + line.split('$temp'+str(i))[1]
+        text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1]
+        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/ptmnotify.py

@@ -236,7 +236,7 @@ class PTMNotify:
         except:
             pass
         try:
-            if (sender == self.parent.parent.label_hdd0):
+            if (sender == self.parent.parent.label_hdd):
                 content = self.createText("disk")
                 return content
         except:
@@ -248,7 +248,7 @@ class PTMNotify:
         except:
             pass
         try:
-            if (sender == self.parent.parent.label_netDown):
+            if (sender == self.parent.parent.label_net):
                 content = self.createText("network")
                 return content
         except:
@@ -265,3 +265,9 @@ class PTMNotify:
                 return content
         except:
             pass
+        try:
+            if (sender == self.parent.parent.label_custom):
+                content = self.createText("system")
+                return content
+        except:
+            pass

sources/ptm/contents/code/reinit.py

@@ -59,180 +59,123 @@ class Reinit():
         self.parent.formatLine = "<pre><p align=\"center\"><span style=\" font-family:'" + self.parent.font_family + "'; font-style:" + self.parent.font_style
         self.parent.formatLine = self.parent.formatLine + "; font-size:" + str(self.parent.font_size) + "pt; font-weight:" + str(self.parent.font_weight)
         self.parent.formatLine = self.parent.formatLine + "; color:" + self.parent.font_color + ";\">$LINE</span></p></pre>"
+        
+        self.parent.custom_time = str(settings.get('custom_time', '$hh:$mm'))
+        self.parent.custom_uptime = str(settings.get('custom_uptime', '$ds,$hs,$ms'))
+        self.parent.tempNames = []
+        self.parent.temp = {}
+        for item in str(settings.get('temp_device', '')).split('@@'):
+            self.parent.tempNames.append(item)
+            self.parent.temp[item] =" 0.0"
+        self.parent.mountNames = []
+        self.parent.mount = {}
+        for item in str(settings.get('mount', '/')).split('@@'):
+            self.parent.mountNames.append(item)
+            self.parent.mount[item] ="  0.0"
+        self.parent.hddNames = []
+        self.parent.hdd = {}
+        for item in str(settings.get('hdd', '/dev/sda')).split('@@'):
+            self.parent.hddNames.append(item)
+            self.parent.hdd[item] =" 0.0"
+        self.parent.netdir = str(settings.get('netdir', '/sys/class/net'))
+        self.parent.netdevBool = settings.get('netdevBool', 0).toInt()[0]
+        self.parent.custom_netdev = str(settings.get('custom_netdev', 'lo'))
+        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.label_order = str(settings.get('label_order', '1345'))
         for label in self.parent.dict_orders.values():
             if ((label == 'cpu') or (label == 'mem') or (label == 'swap') or (label == 'net')):
-                exec ('self.parent.' + label + 'Bool = int(settings.get("' + label + 'Bool",  2))')
+                exec ('self.parent.' + label + 'Bool = settings.get("' + label + 'Bool",  2).toInt()[0]')
             else:
-                exec ('self.parent.' + label + 'Bool = int(settings.get("' + label + 'Bool",  0))')
+                exec ('self.parent.' + label + 'Bool = settings.get("' + label + 'Bool",  0).toInt()[0]')
         
         # labels
         for order in self.parent.label_order:
             if (order == "1"):
                 if (self.parent.cpuBool > 0):
                     self.parent.cpuFormat = str(settings.get('cpuFormat', '[cpu: $cpu%]'))
-                    if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat):
+                    self.parent.label_cpu = NewPlasmaLabel(self.parent.applet, self.parent)
-                        self.parent.label_cpu = NewPlasmaLabel(self.parent.applet, self.parent)
+                    line = self.parent.cpuFormat
-                        self.parent.label_cpu1 = Plasma.Label(self.parent.applet)
+                    text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        if (self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[0] != self.parent.cpuFormat.split('$ccpu')[0]):
+                    self.parent.label_cpu.setText(text)
-                            line = self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[0] + '-----' + self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[1]
+                    self.parent.layout.addItem(self.parent.label_cpu)
-                        else:
-                            line = self.parent.cpuFormat.split('$ccpu')[0]
-                        text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        self.parent.label_cpu.setText(text)
-                        self.parent.layout.addItem(self.parent.label_cpu)
-                        text = self.parent.formatLine.split('$LINE')[0] + "-----" + self.parent.formatLine.split('$LINE')[1]
-                        for core in range(self.parent.numCores):
-                            exec ('self.parent.label_coreCpu' + str(core) + ' = Plasma.Label(self.parent.applet)')
-                            exec ('self.parent.label_coreCpu' + str(core) + '.setText(text)')
-                            exec ('self.parent.layout.addItem(self.parent.label_coreCpu' + str(core) + ')')
-                        if (self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[0] != self.parent.cpuFormat.split('$ccpu')[1]):
-                            line = self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[0] + '-----' + self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[1]
-                        else:
-                            line = self.parent.cpuFormat.split('$ccpu')[1]
-                        text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        self.parent.label_cpu1.setText(text)
-                        self.parent.layout.addItem(self.parent.label_cpu1)
-                    else:
-                        self.parent.label_cpu = NewPlasmaLabel(self.parent.applet, self.parent)
-                        if (self.parent.cpuFormat.split('$cpu')[0] != self.parent.cpuFormat):
-                            line = self.parent.cpuFormat.split('$cpu')[0] + '-----' + self.parent.cpuFormat.split('$cpu')[1]
-                        else:
-                            line = self.parent.cpuFormat
-                        text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        self.parent.label_cpu.setText(text)
-                        self.parent.layout.addItem(self.parent.label_cpu)
             elif (order == "2"):
                 if (self.parent.tempBool > 0):
-                    self.parent.tempdev = str(settings.get('temp_device', '<select device>'))
+                    self.parent.tempFormat = str(settings.get('tempFormat', '[temp: $temp0&deg;C]'))
-                    self.parent.tempFormat = str(settings.get('tempFormat', '[temp: $temp&deg;C]'))
                     self.parent.label_temp = NewPlasmaLabel(self.parent.applet, self.parent)
-                    if (self.parent.tempFormat.split('$temp')[0] != self.parent.tempFormat):
+                    line = self.parent.tempFormat
-                        line = self.parent.tempFormat.split('$temp')[0] + '----' + self.parent.tempFormat.split('$temp')[1]
-                    else:
-                        line = self.parent.tempFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_temp.setText(text)
                     self.parent.layout.addItem(self.parent.label_temp)
             elif (order == "3"):
                 if (self.parent.memBool > 0):
                     self.parent.memFormat = str(settings.get('memFormat', '[mem: $mem%]'))
+                    self.parent.label_mem = NewPlasmaLabel(self.parent.applet, self.parent)
                     if (self.parent.memFormat.split('$memmb')[0] != self.parent.memFormat):
                         self.parent.memInMb = True
-                        line = self.parent.memFormat.split('$memmb')[0] + '-----' + self.parent.memFormat.split('$memmb')[1]
                     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.split('$mem')[0] + '-----' + self.parent.memFormat.split('$mem')[1]
+                    line = self.parent.memFormat
-                    else:
-                        line = self.parent.memFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_mem = NewPlasmaLabel(self.parent.applet, self.parent)
                     self.parent.label_mem.setText(text)
                     self.parent.layout.addItem(self.parent.label_mem)
             elif (order == "4"):
                 if (self.parent.swapBool > 0):
                     self.parent.swapFormat = str(settings.get('swapFormat', '[swap: $swap%]'))
+                    self.parent.label_swap = NewPlasmaLabel(self.parent.applet, self.parent)
                     if (self.parent.swapFormat.split('$swapmb')[0] != self.parent.swapFormat):
                         self.parent.swapInMb = True
-                        line = self.parent.swapFormat.split('$swapmb')[0] + '-----' + self.parent.swapFormat.split('$swapmb')[1]
                     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.split('$swap')[0] + '-----' + self.parent.swapFormat.split('$swap')[1]
+                    line = self.parent.swapFormat
-                    else:
-                        line = self.parent.swapFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_swap = NewPlasmaLabel(self.parent.applet, self.parent)
                     self.parent.label_swap.setText(text)
                     self.parent.layout.addItem(self.parent.label_swap)
             elif (order == "5"):
                 if (self.parent.netBool > 0):
-                    self.parent.netNonFormat = str(settings.get('netNonFormat', '[net: $netKB/s]'))
+                    self.parent.netNonFormat = str(settings.get('netNonFormat', '[net: $down/$upKB/s]'))
-                    if (self.parent.netNonFormat.split('@@')[0] != self.parent.netNonFormat):
+                    self.parent.label_net = NewPlasmaLabel(self.parent.applet, self.parent)
-                        self.parent.netdev = self.parent.netNonFormat.split('@@')[1]
+                    if (self.parent.netdevBool > 0):
-                        self.parent.netNonFormat = self.parent.netNonFormat.split('@@')[0] + self.parent.netNonFormat.split('@@')[2]
+                        self.parent.netdev = self.parent.custom_netdev
                     else:
                         self.parent.netdev = self.parent.setupNetdev()
                     if (self.parent.netNonFormat.split('$netdev')[0] != self.parent.netNonFormat):
                         self.parent.netFormat = self.parent.netNonFormat.split('$netdev')[0] + self.parent.netdev + self.parent.netNonFormat.split('$netdev')[1]
                     else:
                         self.parent.netFormat = self.parent.netNonFormat
-                    self.parent.label_netDown = NewPlasmaLabel(self.parent.applet, self.parent)
+                    line = self.parent.netFormat
-                    if (self.parent.netFormat.split('$net')[0] != self.parent.netFormat):
-                        line = self.parent.netFormat.split('$net')[0] + '----'
-                    else:
-                        line = self.parent.netFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_netDown.setText(text)
+                    self.parent.label_net.setText(text)
-                    self.parent.layout.addItem(self.parent.label_netDown)
+                    self.parent.layout.addItem(self.parent.label_net)
-                    self.parent.label_netUp = Plasma.Label(self.parent.applet)
-                    if (self.parent.netFormat.split('$net')[0] != self.parent.netFormat):
-                        line = '/----' + self.parent.netFormat.split('$net')[1]
-                    else:
-                        line = ''
-                    text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_netUp.setText(text)
-                    self.parent.layout.addItem(self.parent.label_netUp)
             elif (order == "6"):
                 if (self.parent.batBool > 0):
                     self.parent.batFormat = str(settings.get('batFormat', '[bat: $bat%$ac]'))
-                    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.label_bat = NewPlasmaLabel(self.parent.applet, self.parent)
                     line = self.parent.batFormat
-                    if (line.split('$ac')[0] != line):
-                        line = line.split('$ac')[0] + '(-)' + line.split('$ac')[1]
-                    if (line.split('$bat')[0] != line):
-                        line = line.split('$bat')[0] + '---' + line.split('$bat')[1]
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_bat.setText(text)
                     self.parent.layout.addItem(self.parent.label_bat)
             elif (order == "7"):
                 if (self.parent.cpuclockBool > 0):
                     self.parent.cpuclockFormat = str(settings.get('cpuclockFormat', '[mhz: $cpucl]'))
-                    if (self.parent.cpuclockFormat.split('$ccpucl')[0] != self.parent.cpuclockFormat):
+                    self.parent.label_cpuclock = NewPlasmaLabel(self.parent.applet, self.parent)
-                        self.parent.label_cpuclock = NewPlasmaLabel(self.parent.applet, self.parent)
+                    line = self.parent.cpuclockFormat
-                        self.parent.label_cpuclock1 = Plasma.Label(self.parent.applet)
+                    text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        if (self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] != self.parent.cpuclockFormat.split('$ccpucl')[0]):
+                    self.parent.label_cpuclock.setText(text)
-                            line = self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] + '----' + self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[1]
+                    self.parent.layout.addItem(self.parent.label_cpuclock)
-                        else:
-                            line = self.parent.cpuclockFormat.split('$ccpucl')[0]
-                        text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        self.parent.label_cpuclock.setText(text)
-                        self.parent.layout.addItem(self.parent.label_cpuclock)
-                        text = self.parent.formatLine.split('$LINE')[0] + "----" + self.parent.formatLine.split('$LINE')[1]
-                        for core in range(self.parent.numCores):
-                            exec ('self.parent.label_coreCpuclock' + str(core) + ' = Plasma.Label(self.parent.applet)')
-                            exec ('self.parent.label_coreCpuclock' + str(core) + '.setText(text)')
-                            exec ('self.parent.layout.addItem(self.parent.label_coreCpuclock' + str(core) + ')')
-                        if (self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] != self.parent.cpuclockFormat.split('$ccpucl')[1]):
-                            line = self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] + '----' + self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[1]
-                        else:
-                            line = self.parent.cpuclockFormat.split('$ccpucl')[1]
-                        text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        self.parent.label_cpuclock1.setText(text)
-                        self.parent.layout.addItem(self.parent.label_cpuclock1)
-                    else:
-                        self.parent.label_cpuclock = NewPlasmaLabel(self.parent.applet, self.parent)
-                        if (self.parent.cpuclockFormat.split('$cpucl')[0] != self.parent.cpuclockFormat):
-                            line = self.parent.cpuclockFormat.split('$cpucl')[0] + '----' + self.parent.cpuclockFormat.split('$cpucl')[1]
-                        else:
-                            line = self.parent.cpuclockFormat
-                        text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        self.parent.label_cpuclock.setText(text)
-                        self.parent.layout.addItem(self.parent.label_cpuclock)
             elif (order == "8"):
                 if (self.parent.uptimeBool > 0):
                     self.parent.uptimeFormat = str(settings.get('uptimeFormat', '[uptime: $uptime]'))
                     self.parent.label_uptime = NewPlasmaLabel(self.parent.applet, self.parent)
-                    if (self.parent.uptimeFormat.split('$uptime')[0] != self.parent.uptimeFormat):
+                    line = self.parent.uptimeFormat
-                        line = self.parent.uptimeFormat.split('$uptime')[0] + '---d--h--m' + self.parent.uptimeFormat.split('$uptime')[1]
-                    else:
-                        line = self.parent.uptimeFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_uptime.setText(text)
                     self.parent.layout.addItem(self.parent.label_uptime)
@@ -240,10 +183,7 @@ class Reinit():
                 if (self.parent.gpuBool > 0):
                     self.parent.gpuFormat = str(settings.get('gpuFormat', '[gpu: $gpu%]'))
                     self.parent.label_gpu = NewPlasmaLabel(self.parent.applet, self.parent)
-                    if (self.parent.gpuFormat.split('$gpu')[0] != self.parent.gpuFormat):
+                    line = self.parent.gpuFormat
-                        line = self.parent.gpuFormat.split('$gpu')[0] + '-----' + self.parent.gpuFormat.split('$gpu')[1]
-                    else:
-                        line = self.parent.gpuFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_gpu.setText(text)
                     self.parent.layout.addItem(self.parent.label_gpu)
@@ -251,65 +191,31 @@ class Reinit():
                 if (self.parent.gputempBool > 0):
                     self.parent.gputempFormat = str(settings.get('gputempFormat', '[gpu temp: $gputemp&deg;C]'))
                     self.parent.label_gputemp = NewPlasmaLabel(self.parent.applet, self.parent)
-                    if (self.parent.gputempFormat.split('$gputemp')[0] != self.parent.gputempFormat):
+                    line = self.parent.gputempFormat
-                        line = self.parent.gputempFormat.split('$gputemp')[0] + '----' + self.parent.gputempFormat.split('$gputemp')[1]
-                    else:
-                        line = self.parent.gputempFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_gputemp.setText(text)
                     self.parent.layout.addItem(self.parent.label_gputemp)
             elif (order == "b"):
                 if (self.parent.hddBool > 0):
-                    self.parent.hddFormat = str(settings.get('hddFormat', '[hdd: @@/@@%]'))
+                    self.parent.hddFormat = str(settings.get('hddFormat', '[hdd: $hdd0%]'))
-                    if (self.parent.hddFormat.split('@@')[0] != self.parent.hddFormat):
+                    self.parent.label_hdd = NewPlasmaLabel(self.parent.applet, self.parent)
-                        self.parent.mountPoints = self.parent.hddFormat.split('@@')[1].split(';')
+                    line = self.parent.hddFormat
-                        line = self.parent.hddFormat.split('@@')[0]
+                    text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
+                    self.parent.label_hdd.setText(text)
-                        self.parent.label_hdd0 = NewPlasmaLabel(self.parent.applet, self.parent)
+                    self.parent.layout.addItem(self.parent.label_hdd)
-                        self.parent.label_hdd0.setText(text)
-                        self.parent.layout.addItem(self.parent.label_hdd0)
-                        text = self.parent.formatLine.split('$LINE')[0] + "-----" + self.parent.formatLine.split('$LINE')[1]
-                        for mount in self.parent.mountPoints:
-                            exec ('self.parent.label_hdd_' + ''.join(mount.split('/')) + ' = Plasma.Label(self.parent.applet)')
-                            exec ('self.parent.label_hdd_' + ''.join(mount.split('/')) + '.setText(text)')
-                            exec ('self.parent.layout.addItem(self.parent.label_hdd_' + ''.join(mount.split('/')) + ')')
-                        line = self.parent.hddFormat.split('@@')[2]
-                        text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        self.parent.label_hdd1 = Plasma.Label(self.parent.applet)
-                        self.parent.label_hdd1.setText(text)
-                        self.parent.layout.addItem(self.parent.label_hdd1)
-                    else:
-                        line = self.parent.hddFormat
-                        text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        self.parent.label_hdd0.setText(text)
-                        self.parent.layout.addItem(self.parent.label_hdd0)
             elif (order == "c"):
                 if (self.parent.hddtempBool > 0):
-                    self.parent.hddtempFormat = str(settings.get('hddtempFormat', '[hdd temp: @@/dev/sda@@&deg;C]'))
+                    self.parent.hddtempFormat = str(settings.get('hddtempFormat', '[hdd temp: $hddtemp0&deg;C]'))
                     self.parent.label_hddtemp = NewPlasmaLabel(self.parent.applet, self.parent)
-                    if (self.parent.hddtempFormat.split('@@')[0] != self.parent.hddtempFormat):
+                    line = self.parent.hddtempFormat
-                        line = self.parent.hddtempFormat.split('@@')[0] + '----' + self.parent.hddtempFormat.split('@@')[2]
-                    else:
-                        line = self.parent.hddtempFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_hddtemp.setText(text)
                     self.parent.layout.addItem(self.parent.label_hddtemp)
             elif (order == "d"):
                 if (self.parent.playerBool > 0):
                     self.parent.playerFormat = str(settings.get('playerFormat', '[$artist - $title]'))
-                    self.parent.player_name = settings.get('player_name', 0).toInt()[0]
                     self.parent.label_player = NewPlasmaLabel(self.parent.applet, self.parent)
                     line = self.parent.playerFormat
-                    if (line.split('$album')[0] != line):
-                        line = line.split('$album')[0] + 'N\\A' + line.split('$album')[1]
-                    if (line.split('$artist')[0] != line):
-                        line = line.split('$artist')[0] + 'N\\A' + line.split('$artist')[1]
-                    if (line.split('$progress')[0] != line):
-                        line = line.split('$progress')[0] + '00:00' + line.split('$progress')[1]
-                    if (line.split('$title')[0] != line):
-                        line = line.split('$title')[0] + 'N\\A' + line.split('$title')[1]
-                    if (line.split('$time')[0] != line):
-                        line = line.split('$time')[0] + '00:00' + line.split('$time')[1]
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_player.setText(text)
                     self.parent.layout.addItem(self.parent.label_player)
@@ -317,13 +223,18 @@ class Reinit():
                 if (self.parent.timeBool > 0):
                     self.parent.timeFormat = str(settings.get('timeFormat', '[$time]'))
                     self.parent.label_time = NewPlasmaLabel(self.parent.applet, self.parent)
-                    if (self.parent.timeFormat.split('$time')[0] != self.parent.timeFormat):
+                    line = self.parent.timeFormat
-                        line = self.parent.timeFormat.split('$time')[0] + '----------------------' + self.parent.timeFormat.split('$time')[1]
-                    else:
-                        line = self.parent.timeFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_time.setText(text)
                     self.parent.layout.addItem(self.parent.label_time)
+            elif (order == "f"):
+                if (self.parent.customBool > 0):
+                    self.parent.customFormat = str(settings.get('customFormat', '[$custom]'))
+                    self.parent.label_custom = NewPlasmaLabel(self.parent.applet, self.parent)
+                    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.layout.addItem(self.parent.label_custom)
         if not confAccept:
             self.parent.layout.setContentsMargins(1, 1, 1, 1)
             self.parent.applet.setLayout(self.parent.layout)

sources/ptm/contents/code/util.py

@@ -1,20 +1,22 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2012 Alex Oleshkevich <alex.oleshkevich@gmail.com>
+############################################################################
-# 
+# Copyright 2012 Alex Oleshkevich <alex.oleshkevich@gmail.com>             #
-# This program is free software; you can redistribute it and/or modify
+#                                                                          #
-# it under the terms of the GNU General Public License as published by
+# This program is free software; you can redistribute it and/or modify     #
-# the Free Software Foundation; either version 2 of the License, or
+# it under the terms of the GNU General Public License as published by     #
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or        #
-# 
+# (at your option) any later version.                                      #
-# This program is distributed in the hope that it will be useful,
+#                                                                          #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# This program is distributed in the hope that it will be useful,          #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
-# GNU General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
-# 
+# GNU General Public License for more details.                             #
-# You should have received a copy of the GNU General Public License along
+#                                                                          #
-# with this program; if not, write to the Free Software Foundation, Inc.,
+# You should have received a copy of the GNU General Public License along  #
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program; if not, write to the Free Software Foundation, Inc.,  #
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.              #
+############################################################################
 
 from shutil import copyfile
 from PyKDE4.kdecore import *

sources/ptm/contents/ui/configwindow.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>575</width>
-    <height>588</height>
+    <height>538</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -77,12 +77,7 @@
 $isotime - time in ISO format
 $shorttime - time in short format
 $longtime - time in log format
-$custom: $dddd - long weekday; $ddd - short weekday; $dd - day; $d day w\o zero; 
+$custom - custom time format</string>
-	$MMMM - long month; $MMM - short month; $MM - month; $M - month w\o zero; 
-	$yyyy - year; $yy short year; 
-	$hh - hours (24 only); $h - hours w\o zero (24 only); 
-	$mm - minutes; $m - minutes w\o zero;
-	$ss - seconds; $s - seconds w\o zero</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -101,7 +96,7 @@ $custom: $dddd - long weekday; $ddd - short weekday; $dd - day; $d day w\o zero;
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -138,7 +133,7 @@ $custom: $dddd - long weekday; $ddd - short weekday; $dd - day; $d day w\o zero;
           <widget class="QLineEdit" name="lineEdit_uptime">
            <property name="toolTip">
             <string>$uptime - system uptime
-$custom: $ds - uptime days; $hs - uptime hours; $ms - uptime minutes</string>
+$custom - custom format</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -157,7 +152,7 @@ $custom: $ds - uptime days; $hs - uptime hours; $ms - uptime minutes</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -197,7 +192,9 @@ $custom: $ds - uptime days; $hs - uptime hours; $ms - uptime minutes</string>
           <widget class="QLineEdit" name="lineEdit_cpu">
            <property name="toolTip">
             <string>$cpu - total load CPU, %
-$ccpu - load CPU for each core, %</string>
+$cpu0 - load CPU for core 0, %
+...
+$cpu7 - load CPU for core 7, %</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -216,7 +213,7 @@ $ccpu - load CPU for each core, %</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -256,7 +253,9 @@ $ccpu - load CPU for each core, %</string>
           <widget class="QLineEdit" name="lineEdit_cpuclock">
            <property name="toolTip">
             <string>$cpucl - average CPU clock, MHz
-$ccpucl - CPU clock for each core, MHz</string>
+$cpucl0 - CPU clock for core 0, MHz
+...
+$cpucl7 - CPU clock for core 7, MHz</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -275,7 +274,7 @@ $ccpucl - CPU clock for each core, MHz</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -311,23 +310,10 @@ $ccpucl - CPU clock for each core, MHz</string>
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_temp">
-           <property name="maximumSize">
-            <size>
-             <width>150</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
          <item>
           <widget class="QLineEdit" name="lineEdit_temp">
            <property name="toolTip">
-            <string>$temp - physical temperature on CPU</string>
+            <string>$tempN - physical temperature on device N (from 0). Example: $temp0</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -346,7 +332,7 @@ $ccpucl - CPU clock for each core, MHz</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -404,7 +390,7 @@ $ccpucl - CPU clock for each core, MHz</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -462,7 +448,7 @@ $ccpucl - CPU clock for each core, MHz</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -521,7 +507,7 @@ $memmb - RAM usage, MB</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -580,7 +566,7 @@ $swapmb - swap usage, MB</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -619,7 +605,7 @@ $swapmb - swap usage, MB</string>
          <item>
           <widget class="QLineEdit" name="lineEdit_hdd">
            <property name="toolTip">
-            <string>@@/;@@ - mount point usage, %</string>
+            <string>$hddN - usage for mount point N (from 0), %. Example: $hdd0</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -638,7 +624,7 @@ $swapmb - swap usage, MB</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -677,7 +663,7 @@ $swapmb - swap usage, MB</string>
          <item>
           <widget class="QLineEdit" name="lineEdit_hddTemp">
            <property name="toolTip">
-            <string>@@/dev/sda@@ - physical temperature on /dev/sda</string>
+            <string>$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -696,7 +682,7 @@ $swapmb - swap usage, MB</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -735,9 +721,9 @@ $swapmb - swap usage, MB</string>
          <item>
           <widget class="QLineEdit" name="lineEdit_net">
            <property name="toolTip">
-            <string>$net - network speed, down/up, KB/s
+            <string>$down - download speed, KB/s
-$netdev - current network device
+$up - upload speed, KB/s
-@@eth0@@ - disable auto select device and set specified device</string>
+$netdev - current network device</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -756,7 +742,7 @@ $netdev - current network device
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -815,7 +801,7 @@ $ac - AC status</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -833,92 +819,6 @@ $ac - AC status</string>
          </item>
         </layout>
        </item>
-       <item>
-        <layout class="QHBoxLayout" name="layout_batdev">
-         <item>
-          <spacer name="spacer_batdev">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Preferred</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>120</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_batdev">
-           <property name="minimumSize">
-            <size>
-             <width>120</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Battery device</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="lineEdit_batdev">
-           <property name="toolTip">
-            <string>&quot;/sys/class/power_supply/BAT0/capacity&quot; by default</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="layout_acdev">
-         <item>
-          <spacer name="spacer_acdev">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Preferred</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>120</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_acdev">
-           <property name="minimumSize">
-            <size>
-             <width>120</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>AC device</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="lineEdit_acdev">
-           <property name="toolTip">
-            <string>&quot;/sys/class/power_supply/AC/online&quot; by default</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
        <item>
         <layout class="QHBoxLayout" name="layout_player">
          <item>
@@ -937,31 +837,6 @@ $ac - AC status</string>
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QComboBox" name="comboBox_player">
-           <property name="minimumSize">
-            <size>
-             <width>100</width>
-             <height>0</height>
-            </size>
-           </property>
-           <item>
-            <property name="text">
-             <string>amarok</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>mpd</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>qmmp</string>
-            </property>
-           </item>
-          </widget>
-         </item>
          <item>
           <widget class="QLineEdit" name="lineEdit_player">
            <property name="toolTip">
@@ -988,7 +863,7 @@ $title - song title</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>14</number>
+            <number>15</number>
            </property>
            <property name="pageStep">
             <number>1</number>
@@ -1006,6 +881,64 @@ $title - song title</string>
          </item>
         </layout>
        </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_custom">
+         <item>
+          <widget class="QCheckBox" name="checkBox_custom">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Custom</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="lineEdit_custom">
+           <property name="toolTip">
+            <string>$custom - get output from custom command</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSlider" name="slider_custom">
+           <property name="maximumSize">
+            <size>
+             <width>120</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="minimum">
+            <number>1</number>
+           </property>
+           <property name="maximum">
+            <number>15</number>
+           </property>
+           <property name="pageStep">
+            <number>1</number>
+           </property>
+           <property name="value">
+            <number>15</number>
+           </property>
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="tickPosition">
+            <enum>QSlider::TicksAbove</enum>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item>
         <spacer name="spacer_elements">
          <property name="orientation">
@@ -1021,6 +954,446 @@ $title - song title</string>
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="advanced">
+      <attribute name="title">
+       <string>Advanced</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <layout class="QHBoxLayout" name="layout_timeFormat">
+         <item>
+          <widget class="QLabel" name="label_timeFormat">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Custom time format</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="lineEdit_timeFormat">
+           <property name="toolTip">
+            <string>$dddd - long weekday
+$ddd - short weekday
+$dd - day
+$d - day w\o zero
+$MMMM - long month
+$MMM - short month
+$MM - month
+$M - month w\o zero
+$yyyy - year
+$yy - short year
+$hh - hours (24 only)
+$h - hours w\o zero (24 only)
+$mm - minutes
+$m - minutes w\o zero
+$ss - seconds
+$s - seconds w\o zero</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_uptimeFormat">
+         <item>
+          <widget class="QLabel" name="label_uptimeFormat">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Custom uptime format</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="lineEdit_uptimeFormat">
+           <property name="toolTip">
+            <string>$ds - uptime days
+$hs - uptime hours
+$ms - uptime minutes</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="layout_tempDevice">
+         <item>
+          <layout class="QHBoxLayout" name="layout_tempDeviceSelect">
+           <item>
+            <widget class="QLabel" name="label_tempDevice">
+             <property name="minimumSize">
+              <size>
+               <width>120</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Temperature devices</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBox_tempDevice">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="editable">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButton_tempDevice">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Add</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <widget class="QListWidget" name="listWidget_tempDevice">
+           <property name="toolTip">
+            <string>Editable
+del - remove item</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="layout_mount">
+         <item>
+          <layout class="QHBoxLayout" name="layout_mountSelect">
+           <item>
+            <widget class="QLabel" name="label_mount">
+             <property name="minimumSize">
+              <size>
+               <width>120</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Mount points</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBox_mount">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="editable">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButton_mount">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Add</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <widget class="QListWidget" name="listWidget_mount">
+           <property name="toolTip">
+            <string>Editable
+del - remove item</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="layout_hddDevice">
+         <item>
+          <layout class="QHBoxLayout" name="layout_hddDeviceSelect">
+           <item>
+            <widget class="QLabel" name="label_hddDevice">
+             <property name="minimumSize">
+              <size>
+               <width>120</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>HDD devices</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBox_hddDevice">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="editable">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButton_hddDevice">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Add</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <widget class="QListWidget" name="listWidget_hddDevice">
+           <property name="toolTip">
+            <string>Editable
+del - remove item</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_netdir">
+         <item>
+          <widget class="QLabel" name="label_netdir">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Network directory</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="lineEdit_netdir">
+           <property name="toolTip">
+            <string>&quot;/sys/class/net&quot; by default</string>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_netdev">
+         <item>
+          <widget class="QCheckBox" name="checkBox_netdev">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>Disable auto select device and set specified device</string>
+           </property>
+           <property name="text">
+            <string>Set network device</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_netdev">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="editable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_batdev">
+         <item>
+          <widget class="QLabel" name="label_batdev">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Battery device</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="lineEdit_batdev">
+           <property name="toolTip">
+            <string>&quot;/sys/class/power_supply/BAT0/capacity&quot; by default</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_acdev">
+         <item>
+          <widget class="QLabel" name="label_acdev">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>AC device</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="lineEdit_acdev">
+           <property name="toolTip">
+            <string>&quot;/sys/class/power_supply/AC/online&quot; by default</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_playerSelect">
+         <item>
+          <widget class="QLabel" name="label_playerSelect">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Music player</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBox_playerSelect">
+           <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>amarok</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>mpd</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>qmmp</string>
+            </property>
+           </item>
+          </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>Command to run, example:
+wget -qO- http://ifconfig.me/ip - get external IP</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="spacer_advenced">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="appearance">
       <attribute name="title">
        <string>Appearance</string>
@@ -1362,7 +1735,6 @@ $title - song title</string>
   <tabstop>lineEdit_cpuclock</tabstop>
   <tabstop>slider_cpuclock</tabstop>
   <tabstop>checkBox_temp</tabstop>
-  <tabstop>comboBox_temp</tabstop>
   <tabstop>lineEdit_temp</tabstop>
   <tabstop>slider_temp</tabstop>
   <tabstop>checkBox_gpu</tabstop>
@@ -1389,12 +1761,30 @@ $title - song title</string>
   <tabstop>checkBox_bat</tabstop>
   <tabstop>lineEdit_bat</tabstop>
   <tabstop>slider_bat</tabstop>
-  <tabstop>lineEdit_batdev</tabstop>
-  <tabstop>lineEdit_acdev</tabstop>
   <tabstop>checkBox_player</tabstop>
-  <tabstop>comboBox_player</tabstop>
   <tabstop>lineEdit_player</tabstop>
   <tabstop>slider_player</tabstop>
+  <tabstop>checkBox_custom</tabstop>
+  <tabstop>lineEdit_custom</tabstop>
+  <tabstop>slider_custom</tabstop>
+  <tabstop>lineEdit_timeFormat</tabstop>
+  <tabstop>lineEdit_uptimeFormat</tabstop>
+  <tabstop>comboBox_tempDevice</tabstop>
+  <tabstop>pushButton_tempDevice</tabstop>
+  <tabstop>listWidget_tempDevice</tabstop>
+  <tabstop>comboBox_mount</tabstop>
+  <tabstop>pushButton_mount</tabstop>
+  <tabstop>listWidget_mount</tabstop>
+  <tabstop>comboBox_hddDevice</tabstop>
+  <tabstop>pushButton_hddDevice</tabstop>
+  <tabstop>listWidget_hddDevice</tabstop>
+  <tabstop>lineEdit_netdir</tabstop>
+  <tabstop>checkBox_netdev</tabstop>
+  <tabstop>comboBox_netdev</tabstop>
+  <tabstop>lineEdit_batdev</tabstop>
+  <tabstop>lineEdit_acdev</tabstop>
+  <tabstop>comboBox_playerSelect</tabstop>
+  <tabstop>lineEdit_customCommand</tabstop>
   <tabstop>spinBox_interval</tabstop>
   <tabstop>fontComboBox</tabstop>
   <tabstop>spinBox_fontSize</tabstop>

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-03-31 00:58+0400\n"
+"POT-Creation-Date: 2014-04-01 23:36+0400\n"
-"PO-Revision-Date: 2014-03-31 01:01+0400\n"
+"PO-Revision-Date: 2014-04-01 23:39+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -46,7 +46,7 @@ msgstr ""
 msgid "Time"
 msgstr "Time"
 
-#. i18n: file: ui/configwindow.ui:85
+#. i18n: file: ui/configwindow.ui:80
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_time)
 #: rc.cpp:15
 msgid ""
@@ -54,123 +54,117 @@ msgid ""
 "$isotime - time in ISO format\n"
 "$shorttime - time in short format\n"
 "$longtime - time in log format\n"
-"$custom: $dddd - long weekday; $ddd - short weekday; $dd - day; $d day w\\o "
+"$custom - custom time format"
-"zero; \n"
-"\t$MMMM - long month; $MMM - short month; $MM - month; $M - month w\\o "
-"zero; \n"
-"\t$yyyy - year; $yy short year; \n"
-"\t$hh - hours (24 only); $h - hours w\\o zero (24 only); \n"
-"\t$mm - minutes; $m - minutes w\\o zero;\n"
-"\t$ss - seconds; $s - seconds w\\o zero"
 msgstr ""
 "$time - time in default format\n"
 "$isotime - time in ISO format\n"
 "$shorttime - time in short format\n"
 "$longtime - time in log format\n"
-"$custom: $dddd - long weekday; $ddd - short weekday; $dd - day; $d day w\\o "
+"$custom - custom time format"
-"zero; \n"
-"\t$MMMM - long month; $MMM - short month; $MM - month; $M - month w\\o "
-"zero; \n"
-"\t$yyyy - year; $yy short year; \n"
-"\t$hh - hours (24 only); $h - hours w\\o zero (24 only); \n"
-"\t$mm - minutes; $m - minutes w\\o zero;\n"
-"\t$ss - seconds; $s - seconds w\\o zero"
 
-#. i18n: file: ui/configwindow.ui:130
+#. i18n: file: ui/configwindow.ui:125
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_uptime)
-#: rc.cpp:27
+#: rc.cpp:22
 msgid "Uptime"
 msgstr "Uptime"
 
-#. i18n: file: ui/configwindow.ui:141
+#. i18n: file: ui/configwindow.ui:136
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptime)
-#: rc.cpp:30
+#: rc.cpp:25
 msgid ""
 "$uptime - system uptime\n"
-"$custom: $ds - uptime days; $hs - uptime hours; $ms - uptime minutes"
+"$custom - custom format"
 msgstr ""
 "$uptime - system uptime\n"
-"$custom: $ds - uptime days; $hs - uptime hours; $ms - uptime minutes"
+"$custom - custom format"
 
-#. i18n: file: ui/configwindow.ui:189
+#. i18n: file: ui/configwindow.ui:184
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpu)
-#: rc.cpp:34
+#: rc.cpp:29
 msgid "CPU"
 msgstr "CPU"
 
-#. i18n: file: ui/configwindow.ui:200
+#. i18n: file: ui/configwindow.ui:197
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpu)
-#: rc.cpp:38
+#: rc.cpp:33
 #, no-c-format
 msgid ""
 "$cpu - total load CPU, %\n"
-"$ccpu - load CPU for each core, %"
+"$cpu0 - load CPU for core 0, %\n"
+"...\n"
+"$cpu7 - load CPU for core 7, %"
 msgstr ""
 "$cpu - total load CPU, %\n"
-"$ccpu - load CPU for each core, %"
+"$cpu0 - load CPU for core 0, %\n"
+"...\n"
+"$cpu7 - load CPU for core 7, %"
 
-#. i18n: file: ui/configwindow.ui:248
+#. i18n: file: ui/configwindow.ui:245
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpuclock)
-#: rc.cpp:42
+#: rc.cpp:39
 msgid "CPU Clock"
 msgstr "CPU Clock"
 
-#. i18n: file: ui/configwindow.ui:259
+#. i18n: file: ui/configwindow.ui:258
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpuclock)
-#: rc.cpp:45
+#: rc.cpp:42
 msgid ""
 "$cpucl - average CPU clock, MHz\n"
-"$ccpucl - CPU clock for each core, MHz"
+"$cpucl0 - CPU clock for core 0, MHz\n"
+"...\n"
+"$cpucl7 - CPU clock for core 7, MHz"
 msgstr ""
 "$cpucl - average CPU clock, MHz\n"
-"$ccpucl - CPU clock for each core, MHz"
+"$cpucl0 - CPU clock for core 0, MHz\n"
+"...\n"
+"$cpucl7 - CPU clock for core 7, MHz"
 
-#. i18n: file: ui/configwindow.ui:307
+#. i18n: file: ui/configwindow.ui:306
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_temp)
-#: rc.cpp:49
+#: rc.cpp:48
 msgid "Temperature"
 msgstr "Temperature"
 
-#. i18n: file: ui/configwindow.ui:330
+#. i18n: file: ui/configwindow.ui:316
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_temp)
-#: rc.cpp:52
+#: rc.cpp:51
-msgid "$temp - physical temperature on CPU"
+msgid "$tempN - physical temperature on device N (from 0). Example: $temp0"
-msgstr "$temp - physical temperature on CPU"
+msgstr "$tempN - physical temperature on device N (from 0). Example: $temp0"
 
-#. i18n: file: ui/configwindow.ui:378
+#. i18n: file: ui/configwindow.ui:364
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpu)
-#: rc.cpp:55
+#: rc.cpp:54
 msgid "GPU"
 msgstr "GPU"
 
-#. i18n: file: ui/configwindow.ui:388
+#. i18n: file: ui/configwindow.ui:374
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpu)
-#: rc.cpp:59
+#: rc.cpp:58
 #, no-c-format
 msgid "$gpu - gpu usage, %"
 msgstr "$gpu - gpu usage, %"
 
-#. i18n: file: ui/configwindow.ui:436
+#. i18n: file: ui/configwindow.ui:422
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpuTemp)
-#: rc.cpp:62
+#: rc.cpp:61
 msgid "GPU Temp"
 msgstr "GPU Temp"
 
-#. i18n: file: ui/configwindow.ui:446
+#. i18n: file: ui/configwindow.ui:432
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpuTemp)
-#: rc.cpp:65
+#: rc.cpp:64
 msgid "$gputemp - physical temperature on GPU"
 msgstr "$gputemp - physical temperature on GPU"
 
-#. i18n: file: ui/configwindow.ui:494
+#. i18n: file: ui/configwindow.ui:480
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_mem)
-#: rc.cpp:68
+#: rc.cpp:67
 msgid "Memory"
 msgstr "Memory"
 
-#. i18n: file: ui/configwindow.ui:505
+#. i18n: file: ui/configwindow.ui:491
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_mem)
-#: rc.cpp:72
+#: rc.cpp:71
 #, no-c-format
 msgid ""
 "$mem - RAM usage, %\n"
@@ -179,15 +173,15 @@ msgstr ""
 "$mem - RAM usage, %\n"
 "$memmb - RAM usage, MB"
 
-#. i18n: file: ui/configwindow.ui:553
+#. i18n: file: ui/configwindow.ui:539
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_swap)
-#: rc.cpp:76
+#: rc.cpp:75
 msgid "Swap"
 msgstr "Swap"
 
-#. i18n: file: ui/configwindow.ui:564
+#. i18n: file: ui/configwindow.ui:550
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_swap)
-#: rc.cpp:80
+#: rc.cpp:79
 #, no-c-format
 msgid ""
 "$swap - swap usage, %\n"
@@ -196,58 +190,60 @@ msgstr ""
 "$swap - swap usage, %\n"
 "$swapmb - swap usage, MB"
 
-#. i18n: file: ui/configwindow.ui:612
+#. i18n: file: ui/configwindow.ui:598
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#: rc.cpp:84
+#: rc.cpp:83
 msgid "HDD"
 msgstr "HDD"
 
-#. i18n: file: ui/configwindow.ui:622
+#. i18n: file: ui/configwindow.ui:608
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hdd)
-#: rc.cpp:88
+#: rc.cpp:87
 #, no-c-format
-msgid "@@/;@@ - mount point usage, %"
+msgid "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
-msgstr "@@/;@@ - mount point usage, %"
+msgstr "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
 
-#. i18n: file: ui/configwindow.ui:670
+#. i18n: file: ui/configwindow.ui:656
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_hddTemp)
-#: rc.cpp:91
+#: rc.cpp:90
 msgid "HDD Temp"
 msgstr "HDD Temp"
 
-#. i18n: file: ui/configwindow.ui:680
+#. i18n: file: ui/configwindow.ui:666
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hddTemp)
-#: rc.cpp:94
+#: rc.cpp:93
-msgid "@@/dev/sda@@ - physical temperature on /dev/sda"
+msgid ""
-msgstr "@@/dev/sda@@ - physical temperature on /dev/sda"
+"$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0"
+msgstr ""
+"$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0"
 
-#. i18n: file: ui/configwindow.ui:728
+#. i18n: file: ui/configwindow.ui:714
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_net)
-#: rc.cpp:97
+#: rc.cpp:96
 msgid "Network"
 msgstr "Network"
 
-#. i18n: file: ui/configwindow.ui:740
+#. i18n: file: ui/configwindow.ui:726
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_net)
-#: rc.cpp:100
+#: rc.cpp:99
 msgid ""
-"$net - network speed, down/up, KB/s\n"
+"$down - download speed, KB/s\n"
-"$netdev - current network device\n"
+"$up - upload speed, KB/s\n"
-"@@eth0@@ - disable auto select device and set specified device"
+"$netdev - current network device"
 msgstr ""
-"$net - network speed, down/up, KB/s\n"
+"$down - download speed, KB/s\n"
-"$netdev - current network device\n"
+"$up - upload speed, KB/s\n"
-"@@eth0@@ - disable auto select device and set specified device"
+"$netdev - current network device"
 
-#. i18n: file: ui/configwindow.ui:788
+#. i18n: file: ui/configwindow.ui:774
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_bat)
-#: rc.cpp:105
+#: rc.cpp:104
 msgid "Battery"
 msgstr "Battery"
 
-#. i18n: file: ui/configwindow.ui:799
+#. i18n: file: ui/configwindow.ui:785
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_bat)
-#: rc.cpp:109
+#: rc.cpp:108
 #, no-c-format
 msgid ""
 "$bat - battery charge, %\n"
@@ -256,57 +252,17 @@ msgstr ""
 "$bat - battery charge, %\n"
 "$ac - AC status"
 
-#. i18n: file: ui/configwindow.ui:863
+#. i18n: file: ui/configwindow.ui:833
-#. i18n: ectx: property (text), widget (QLabel, label_batdev)
-#: rc.cpp:113
-msgid "Battery device"
-msgstr "Battery device"
-
-#. i18n: file: ui/configwindow.ui:870
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
-#: rc.cpp:116
-msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
-msgstr "\"/sys/class/power_supply/BAT0/capacity\" by default"
-
-#. i18n: file: ui/configwindow.ui:906
-#. i18n: ectx: property (text), widget (QLabel, label_acdev)
-#: rc.cpp:119
-msgid "AC device"
-msgstr "AC device"
-
-#. i18n: file: ui/configwindow.ui:913
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
-#: rc.cpp:122
-msgid "\"/sys/class/power_supply/AC/online\" by default"
-msgstr "\"/sys/class/power_supply/AC/online\" by default"
-
-#. i18n: file: ui/configwindow.ui:933
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_player)
-#: rc.cpp:125
+#. i18n: file: ui/configwindow.ui:1329
+#. i18n: ectx: property (text), widget (QLabel, label_playerSelect)
+#: rc.cpp:112 rc.cpp:214
 msgid "Music player"
 msgstr "Music player"
 
-#. i18n: file: ui/configwindow.ui:950
+#. i18n: file: ui/configwindow.ui:847
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player)
-#: rc.cpp:128
-msgid "amarok"
-msgstr "amarok"
-
-#. i18n: file: ui/configwindow.ui:955
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player)
-#: rc.cpp:131
-msgid "mpd"
-msgstr "mpd"
-
-#. i18n: file: ui/configwindow.ui:960
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player)
-#: rc.cpp:134
-msgid "qmmp"
-msgstr "qmmp"
-
-#. i18n: file: ui/configwindow.ui:972
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_player)
-#: rc.cpp:137
+#: rc.cpp:115
 msgid ""
 "$album - song album\n"
 "$artist - song artist\n"
@@ -320,55 +276,273 @@ msgstr ""
 "$time - song duration\n"
 "$title - song title"
 
-#. i18n: file: ui/configwindow.ui:1026
+#. i18n: file: ui/configwindow.ui:895
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_custom)
+#: rc.cpp:122
+msgid "Custom"
+msgstr "Custom"
+
+#. i18n: file: ui/configwindow.ui:905
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_custom)
+#: rc.cpp:125
+msgid "$custom - get output from custom command"
+msgstr "$custom - get output from custom command"
+
+#. i18n: file: ui/configwindow.ui:959
+#. i18n: ectx: attribute (title), widget (QWidget, advanced)
+#: rc.cpp:128
+msgid "Advanced"
+msgstr "Advanced"
+
+#. i18n: file: ui/configwindow.ui:973
+#. i18n: ectx: property (text), widget (QLabel, label_timeFormat)
+#: rc.cpp:131
+msgid "Custom time format"
+msgstr "Custom time format"
+
+#. i18n: file: ui/configwindow.ui:995
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_timeFormat)
+#: rc.cpp:134
+msgid ""
+"$dddd - long weekday\n"
+"$ddd - short weekday\n"
+"$dd - day\n"
+"$d - day w\\o zero\n"
+"$MMMM - long month\n"
+"$MMM - short month\n"
+"$MM - month\n"
+"$M - month w\\o zero\n"
+"$yyyy - year\n"
+"$yy - short year\n"
+"$hh - hours (24 only)\n"
+"$h - hours w\\o zero (24 only)\n"
+"$mm - minutes\n"
+"$m - minutes w\\o zero\n"
+"$ss - seconds\n"
+"$s - seconds w\\o zero"
+msgstr ""
+"$dddd - long weekday\n"
+"$ddd - short weekday\n"
+"$dd - day\n"
+"$d - day w\\o zero\n"
+"$MMMM - long month\n"
+"$MMM - short month\n"
+"$MM - month\n"
+"$M - month w\\o zero\n"
+"$yyyy - year\n"
+"$yy - short year\n"
+"$hh - hours (24 only)\n"
+"$h - hours w\\o zero (24 only)\n"
+"$mm - minutes\n"
+"$m - minutes w\\o zero\n"
+"$ss - seconds\n"
+"$s - seconds w\\o zero"
+
+#. i18n: file: ui/configwindow.ui:1015
+#. i18n: ectx: property (text), widget (QLabel, label_uptimeFormat)
+#: rc.cpp:152
+msgid "Custom uptime format"
+msgstr "Custom uptime format"
+
+#. i18n: file: ui/configwindow.ui:1024
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptimeFormat)
+#: rc.cpp:155
+msgid ""
+"$ds - uptime days\n"
+"$hs - uptime hours\n"
+"$ms - uptime minutes"
+msgstr ""
+"$ds - uptime days\n"
+"$hs - uptime hours\n"
+"$ms - uptime minutes"
+
+#. i18n: file: ui/configwindow.ui:1046
+#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+#: rc.cpp:160
+msgid "Temperature devices"
+msgstr "Temperature devices"
+
+#. i18n: file: ui/configwindow.ui:1072
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
+#. i18n: file: ui/configwindow.ui:1130
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
+#. i18n: file: ui/configwindow.ui:1188
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_hddDevice)
+#: rc.cpp:163 rc.cpp:173 rc.cpp:183
+msgid "Add"
+msgstr "Add"
+
+#. i18n: file: ui/configwindow.ui:1082
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
+#. i18n: file: ui/configwindow.ui:1140
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
+#. i18n: file: ui/configwindow.ui:1198
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_hddDevice)
+#: rc.cpp:166 rc.cpp:176 rc.cpp:186
+msgid ""
+"Editable\n"
+"del - remove item"
+msgstr ""
+"Editable\n"
+"del - remove item"
+
+#. i18n: file: ui/configwindow.ui:1104
+#. i18n: ectx: property (text), widget (QLabel, label_mount)
+#: rc.cpp:170
+msgid "Mount points"
+msgstr "Mount points"
+
+#. i18n: file: ui/configwindow.ui:1162
+#. i18n: ectx: property (text), widget (QLabel, label_hddDevice)
+#: rc.cpp:180
+msgid "HDD devices"
+msgstr "HDD devices"
+
+#. i18n: file: ui/configwindow.ui:1218
+#. i18n: ectx: property (text), widget (QLabel, label_netdir)
+#: rc.cpp:190
+msgid "Network directory"
+msgstr "Network directory"
+
+#. i18n: file: ui/configwindow.ui:1225
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_netdir)
+#: rc.cpp:193
+msgid "\"/sys/class/net\" by default"
+msgstr "\"/sys/class/net\" by default"
+
+#. i18n: file: ui/configwindow.ui:1245
+#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBox_netdev)
+#: rc.cpp:196
+msgid "Disable auto select device and set specified device"
+msgstr "Disable auto select device and set specified device"
+
+#. i18n: file: ui/configwindow.ui:1248
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_netdev)
+#: rc.cpp:199
+msgid "Set network device"
+msgstr "Set network device"
+
+#. i18n: file: ui/configwindow.ui:1281
+#. i18n: ectx: property (text), widget (QLabel, label_batdev)
+#: rc.cpp:202
+msgid "Battery device"
+msgstr "Battery device"
+
+#. i18n: file: ui/configwindow.ui:1288
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
+#: rc.cpp:205
+msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
+msgstr "\"/sys/class/power_supply/BAT0/capacity\" by default"
+
+#. i18n: file: ui/configwindow.ui:1305
+#. i18n: ectx: property (text), widget (QLabel, label_acdev)
+#: rc.cpp:208
+msgid "AC device"
+msgstr "AC device"
+
+#. i18n: file: ui/configwindow.ui:1312
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
+#: rc.cpp:211
+msgid "\"/sys/class/power_supply/AC/online\" by default"
+msgstr "\"/sys/class/power_supply/AC/online\" by default"
+
+#. i18n: file: ui/configwindow.ui:1349
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
+#: rc.cpp:217
+msgid "amarok"
+msgstr "amarok"
+
+#. i18n: file: ui/configwindow.ui:1354
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
+#: rc.cpp:220
+msgid "mpd"
+msgstr "mpd"
+
+#. i18n: file: ui/configwindow.ui:1359
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
+#: rc.cpp:223
+msgid "qmmp"
+msgstr "qmmp"
+
+#. i18n: file: ui/configwindow.ui:1377
+#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
+#: rc.cpp:226
+msgid "Custom command"
+msgstr "Custom command"
+
+#. i18n: file: ui/configwindow.ui:1385
+#. 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:1408
 #. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:144
+#: rc.cpp:233
 msgid "Appearance"
 msgstr "Appearance"
 
-#. i18n: file: ui/configwindow.ui:1040
+#. i18n: file: ui/configwindow.ui:1422
 #. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:147
+#: rc.cpp:236
 msgid "Time interval"
 msgstr "Time interval"
 
-#. i18n: file: ui/configwindow.ui:1095
+#. i18n: file: ui/configwindow.ui:1477
 #. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:150
+#: rc.cpp:239
 msgid "Font"
 msgstr "Font"
 
-#. i18n: file: ui/configwindow.ui:1135
+#. i18n: file: ui/configwindow.ui:1517
 #. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:153
+#: rc.cpp:242
 msgid "Font size"
 msgstr "Font size"
 
-#. i18n: file: ui/configwindow.ui:1190
+#. i18n: file: ui/configwindow.ui:1572
 #. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:156
+#: rc.cpp:245
 msgid "Font color"
 msgstr "Font color"
 
-#. i18n: file: ui/configwindow.ui:1230
+#. i18n: file: ui/configwindow.ui:1612
 #. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:159
+#: rc.cpp:248
 msgid "Font style"
 msgstr "Font style"
 
-#. i18n: file: ui/configwindow.ui:1280
+#. i18n: file: ui/configwindow.ui:1662
 #. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:162
+#: rc.cpp:251
 msgid "Font weight"
 msgstr "Font weight"
 
-#: rc.cpp:163
+#: rc.cpp:252
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Evgeniy Alekseev"
 
-#: rc.cpp:164
+#: rc.cpp:253
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "@@/;@@ - mount point usage, %"
+#~ msgstr "@@/;@@ - mount point usage, %"
+
+#~ msgid "@@/dev/sda@@ - physical temperature on /dev/sda"
+#~ msgstr "@@/dev/sda@@ - physical temperature on /dev/sda"
+
+#~ msgid ""
+#~ "$net - network speed, down/up, KB/s\n"
+#~ "$netdev - current network device\n"
+#~ "@@eth0@@ - disable auto select device and set specified device"
+#~ msgstr ""
+#~ "$net - network speed, down/up, KB/s\n"
+#~ "$netdev - current network device\n"
+#~ "@@eth0@@ - disable auto select device and set specified device"

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-03-31 00:58+0400\n"
+"POT-Creation-Date: 2014-04-01 23:36+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"
@@ -43,7 +43,7 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:85
+#. i18n: file: ui/configwindow.ui:80
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_time)
 #: rc.cpp:15
 msgid ""
@@ -51,232 +51,190 @@ msgid ""
 "$isotime - time in ISO format\n"
 "$shorttime - time in short format\n"
 "$longtime - time in log format\n"
-"$custom: $dddd - long weekday; $ddd - short weekday; $dd - day; $d day w\\o "
+"$custom - custom time format"
-"zero; \n"
-"\t$MMMM - long month; $MMM - short month; $MM - month; $M - month w\\o "
-"zero; \n"
-"\t$yyyy - year; $yy short year; \n"
-"\t$hh - hours (24 only); $h - hours w\\o zero (24 only); \n"
-"\t$mm - minutes; $m - minutes w\\o zero;\n"
-"\t$ss - seconds; $s - seconds w\\o zero"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:130
+#. i18n: file: ui/configwindow.ui:125
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_uptime)
-#: rc.cpp:27
+#: rc.cpp:22
 msgid "Uptime"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:141
+#. i18n: file: ui/configwindow.ui:136
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptime)
-#: rc.cpp:30
+#: rc.cpp:25
 msgid ""
 "$uptime - system uptime\n"
-"$custom: $ds - uptime days; $hs - uptime hours; $ms - uptime minutes"
+"$custom - custom format"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:189
+#. i18n: file: ui/configwindow.ui:184
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpu)
-#: rc.cpp:34
+#: rc.cpp:29
 msgid "CPU"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:200
+#. i18n: file: ui/configwindow.ui:197
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpu)
-#: rc.cpp:38
+#: rc.cpp:33
 #, no-c-format
 msgid ""
 "$cpu - total load CPU, %\n"
-"$ccpu - load CPU for each core, %"
+"$cpu0 - load CPU for core 0, %\n"
+"...\n"
+"$cpu7 - load CPU for core 7, %"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:248
+#. i18n: file: ui/configwindow.ui:245
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpuclock)
-#: rc.cpp:42
+#: rc.cpp:39
 msgid "CPU Clock"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:259
+#. i18n: file: ui/configwindow.ui:258
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpuclock)
-#: rc.cpp:45
+#: rc.cpp:42
 msgid ""
 "$cpucl - average CPU clock, MHz\n"
-"$ccpucl - CPU clock for each core, MHz"
+"$cpucl0 - CPU clock for core 0, MHz\n"
+"...\n"
+"$cpucl7 - CPU clock for core 7, MHz"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:307
+#. i18n: file: ui/configwindow.ui:306
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_temp)
-#: rc.cpp:49
+#: rc.cpp:48
 msgid "Temperature"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:330
+#. i18n: file: ui/configwindow.ui:316
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_temp)
-#: rc.cpp:52
+#: rc.cpp:51
-msgid "$temp - physical temperature on CPU"
+msgid "$tempN - physical temperature on device N (from 0). Example: $temp0"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:378
+#. i18n: file: ui/configwindow.ui:364
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpu)
-#: rc.cpp:55
+#: rc.cpp:54
 msgid "GPU"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:388
+#. i18n: file: ui/configwindow.ui:374
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpu)
-#: rc.cpp:59
+#: rc.cpp:58
 #, no-c-format
 msgid "$gpu - gpu usage, %"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:436
+#. i18n: file: ui/configwindow.ui:422
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpuTemp)
-#: rc.cpp:62
+#: rc.cpp:61
 msgid "GPU Temp"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:446
+#. i18n: file: ui/configwindow.ui:432
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpuTemp)
-#: rc.cpp:65
+#: rc.cpp:64
 msgid "$gputemp - physical temperature on GPU"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:494
+#. i18n: file: ui/configwindow.ui:480
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_mem)
-#: rc.cpp:68
+#: rc.cpp:67
 msgid "Memory"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:505
+#. i18n: file: ui/configwindow.ui:491
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_mem)
-#: rc.cpp:72
+#: rc.cpp:71
 #, no-c-format
 msgid ""
 "$mem - RAM usage, %\n"
 "$memmb - RAM usage, MB"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:553
+#. i18n: file: ui/configwindow.ui:539
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_swap)
-#: rc.cpp:76
+#: rc.cpp:75
 msgid "Swap"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:564
+#. i18n: file: ui/configwindow.ui:550
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_swap)
-#: rc.cpp:80
+#: rc.cpp:79
 #, no-c-format
 msgid ""
 "$swap - swap usage, %\n"
 "$swapmb - swap usage, MB"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:612
+#. i18n: file: ui/configwindow.ui:598
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#: rc.cpp:84
+#: rc.cpp:83
 msgid "HDD"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:622
+#. i18n: file: ui/configwindow.ui:608
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hdd)
-#: rc.cpp:88
+#: rc.cpp:87
 #, no-c-format
-msgid "@@/;@@ - mount point usage, %"
+msgid "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:670
+#. i18n: file: ui/configwindow.ui:656
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_hddTemp)
-#: rc.cpp:91
+#: rc.cpp:90
 msgid "HDD Temp"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:680
+#. i18n: file: ui/configwindow.ui:666
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hddTemp)
-#: rc.cpp:94
+#: rc.cpp:93
-msgid "@@/dev/sda@@ - physical temperature on /dev/sda"
+msgid ""
+"$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:728
+#. i18n: file: ui/configwindow.ui:714
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_net)
-#: rc.cpp:97
+#: rc.cpp:96
 msgid "Network"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:740
+#. i18n: file: ui/configwindow.ui:726
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_net)
-#: rc.cpp:100
+#: rc.cpp:99
 msgid ""
-"$net - network speed, down/up, KB/s\n"
+"$down - download speed, KB/s\n"
-"$netdev - current network device\n"
+"$up - upload speed, KB/s\n"
-"@@eth0@@ - disable auto select device and set specified device"
+"$netdev - current network device"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:788
+#. i18n: file: ui/configwindow.ui:774
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_bat)
-#: rc.cpp:105
+#: rc.cpp:104
 msgid "Battery"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:799
+#. i18n: file: ui/configwindow.ui:785
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_bat)
-#: rc.cpp:109
+#: rc.cpp:108
 #, no-c-format
 msgid ""
 "$bat - battery charge, %\n"
 "$ac - AC status"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:863
+#. i18n: file: ui/configwindow.ui:833
-#. i18n: ectx: property (text), widget (QLabel, label_batdev)
-#: rc.cpp:113
-msgid "Battery device"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:870
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
-#: rc.cpp:116
-msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:906
-#. i18n: ectx: property (text), widget (QLabel, label_acdev)
-#: rc.cpp:119
-msgid "AC device"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:913
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
-#: rc.cpp:122
-msgid "\"/sys/class/power_supply/AC/online\" by default"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:933
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_player)
-#: rc.cpp:125
+#. i18n: file: ui/configwindow.ui:1329
+#. i18n: ectx: property (text), widget (QLabel, label_playerSelect)
+#: rc.cpp:112 rc.cpp:214
 msgid "Music player"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:950
+#. i18n: file: ui/configwindow.ui:847
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player)
-#: rc.cpp:128
-msgid "amarok"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:955
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player)
-#: rc.cpp:131
-msgid "mpd"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:960
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player)
-#: rc.cpp:134
-msgid "qmmp"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:972
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_player)
-#: rc.cpp:137
+#: rc.cpp:115
 msgid ""
 "$album - song album\n"
 "$artist - song artist\n"
@@ -285,54 +243,235 @@ msgid ""
 "$title - song title"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1026
+#. i18n: file: ui/configwindow.ui:895
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_custom)
+#: rc.cpp:122
+msgid "Custom"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:905
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_custom)
+#: rc.cpp:125
+msgid "$custom - get output from custom command"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:959
+#. i18n: ectx: attribute (title), widget (QWidget, advanced)
+#: rc.cpp:128
+msgid "Advanced"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:973
+#. i18n: ectx: property (text), widget (QLabel, label_timeFormat)
+#: rc.cpp:131
+msgid "Custom time format"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:995
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_timeFormat)
+#: rc.cpp:134
+msgid ""
+"$dddd - long weekday\n"
+"$ddd - short weekday\n"
+"$dd - day\n"
+"$d - day w\\o zero\n"
+"$MMMM - long month\n"
+"$MMM - short month\n"
+"$MM - month\n"
+"$M - month w\\o zero\n"
+"$yyyy - year\n"
+"$yy - short year\n"
+"$hh - hours (24 only)\n"
+"$h - hours w\\o zero (24 only)\n"
+"$mm - minutes\n"
+"$m - minutes w\\o zero\n"
+"$ss - seconds\n"
+"$s - seconds w\\o zero"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1015
+#. i18n: ectx: property (text), widget (QLabel, label_uptimeFormat)
+#: rc.cpp:152
+msgid "Custom uptime format"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1024
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptimeFormat)
+#: rc.cpp:155
+msgid ""
+"$ds - uptime days\n"
+"$hs - uptime hours\n"
+"$ms - uptime minutes"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1046
+#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+#: rc.cpp:160
+msgid "Temperature devices"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1072
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
+#. i18n: file: ui/configwindow.ui:1130
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
+#. i18n: file: ui/configwindow.ui:1188
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_hddDevice)
+#: rc.cpp:163 rc.cpp:173 rc.cpp:183
+msgid "Add"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1082
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
+#. i18n: file: ui/configwindow.ui:1140
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
+#. i18n: file: ui/configwindow.ui:1198
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_hddDevice)
+#: rc.cpp:166 rc.cpp:176 rc.cpp:186
+msgid ""
+"Editable\n"
+"del - remove item"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1104
+#. i18n: ectx: property (text), widget (QLabel, label_mount)
+#: rc.cpp:170
+msgid "Mount points"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1162
+#. i18n: ectx: property (text), widget (QLabel, label_hddDevice)
+#: rc.cpp:180
+msgid "HDD devices"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1218
+#. i18n: ectx: property (text), widget (QLabel, label_netdir)
+#: rc.cpp:190
+msgid "Network directory"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1225
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_netdir)
+#: rc.cpp:193
+msgid "\"/sys/class/net\" by default"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1245
+#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBox_netdev)
+#: rc.cpp:196
+msgid "Disable auto select device and set specified device"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1248
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_netdev)
+#: rc.cpp:199
+msgid "Set network device"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1281
+#. i18n: ectx: property (text), widget (QLabel, label_batdev)
+#: rc.cpp:202
+msgid "Battery device"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1288
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
+#: rc.cpp:205
+msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1305
+#. i18n: ectx: property (text), widget (QLabel, label_acdev)
+#: rc.cpp:208
+msgid "AC device"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1312
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
+#: rc.cpp:211
+msgid "\"/sys/class/power_supply/AC/online\" by default"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1349
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
+#: rc.cpp:217
+msgid "amarok"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1354
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
+#: rc.cpp:220
+msgid "mpd"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1359
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
+#: rc.cpp:223
+msgid "qmmp"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1377
+#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
+#: rc.cpp:226
+msgid "Custom command"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1385
+#. 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:1408
 #. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:144
+#: rc.cpp:233
 msgid "Appearance"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1040
+#. i18n: file: ui/configwindow.ui:1422
 #. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:147
+#: rc.cpp:236
 msgid "Time interval"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1095
+#. i18n: file: ui/configwindow.ui:1477
 #. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:150
+#: rc.cpp:239
 msgid "Font"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1135
+#. i18n: file: ui/configwindow.ui:1517
 #. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:153
+#: rc.cpp:242
 msgid "Font size"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1190
+#. i18n: file: ui/configwindow.ui:1572
 #. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:156
+#: rc.cpp:245
 msgid "Font color"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1230
+#. i18n: file: ui/configwindow.ui:1612
 #. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:159
+#: rc.cpp:248
 msgid "Font style"
 msgstr ""
 
-#. i18n: file: ui/configwindow.ui:1280
+#. i18n: file: ui/configwindow.ui:1662
 #. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:162
+#: rc.cpp:251
 msgid "Font weight"
 msgstr ""
 
-#: rc.cpp:163
+#: rc.cpp:252
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 
-#: rc.cpp:164
+#: rc.cpp:253
 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-03-31 00:58+0400\n"
+"POT-Creation-Date: 2014-04-01 23:36+0400\n"
-"PO-Revision-Date: 2014-03-31 01:22+0400\n"
+"PO-Revision-Date: 2014-04-01 23:48+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -37,9 +37,8 @@ msgid ""
 "Detailed information may be found on <a href=\"http://arcanis.name/projects/"
 "pytextmonitor/\">project homepage</a>"
 msgstr ""
-"Подробная информация может быть найдена на <a "
+"Подробная информация может быть найдена на <a href=\"http://arcanis.name/ru/"
-"href=\"http://arcanis.name/ru/projects/"
+"projects/pytextmonitor/\">домашней странице проекта</a>"
-"pytextmonitor/\">домашней странице проекта</a>"
 
 #. i18n: file: ui/configwindow.ui:66
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_time)
@@ -47,7 +46,7 @@ msgstr ""
 msgid "Time"
 msgstr "Время"
 
-#. i18n: file: ui/configwindow.ui:85
+#. i18n: file: ui/configwindow.ui:80
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_time)
 #: rc.cpp:15
 msgid ""
@@ -55,123 +54,117 @@ msgid ""
 "$isotime - time in ISO format\n"
 "$shorttime - time in short format\n"
 "$longtime - time in log format\n"
-"$custom: $dddd - long weekday; $ddd - short weekday; $dd - day; $d day w\\o "
+"$custom - custom time format"
-"zero; \n"
-"\t$MMMM - long month; $MMM - short month; $MM - month; $M - month w\\o "
-"zero; \n"
-"\t$yyyy - year; $yy short year; \n"
-"\t$hh - hours (24 only); $h - hours w\\o zero (24 only); \n"
-"\t$mm - minutes; $m - minutes w\\o zero;\n"
-"\t$ss - seconds; $s - seconds w\\o zero"
 msgstr ""
 "$time - время в стандартном формате\n"
-"$isotime - время ISO формате\n"
+"$isotime - время в ISO формате\n"
 "$shorttime - время в коротком формате\n"
 "$longtime - время в длинном формате\n"
-"$custom: $dddd - день недели (длинный); $ddd - день недели (короткий); $dd - "
+"$custom - свой формат времени"
-"день; $d - день без 0; \n"
-"\t$MMMM - месяц (длинный); $MMM - месяц (короткий); $MM - месяц; $M - месяц "
-"без 0; \n"
-"\t$yyyy - год; $yy - год (короткий); \n"
-"\t$hh - часы (24); $h - часы без 0 (24); \n"
-"\t$mm - минуты; $m - минуты без 0;\n"
-"\t$ss - секунды; $s - секунды без 0"
 
-#. i18n: file: ui/configwindow.ui:130
+#. i18n: file: ui/configwindow.ui:125
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_uptime)
-#: rc.cpp:27
+#: rc.cpp:22
 msgid "Uptime"
 msgstr "Время работы"
 
-#. i18n: file: ui/configwindow.ui:141
+#. i18n: file: ui/configwindow.ui:136
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptime)
-#: rc.cpp:30
+#: rc.cpp:25
 msgid ""
 "$uptime - system uptime\n"
-"$custom: $ds - uptime days; $hs - uptime hours; $ms - uptime minutes"
+"$custom - custom format"
 msgstr ""
 "$uptime - время работы\n"
-"$custom: $ds - дни работы; $hs - часы; $ms - минуты"
+"$custom - свой формат"
 
-#. i18n: file: ui/configwindow.ui:189
+#. i18n: file: ui/configwindow.ui:184
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpu)
-#: rc.cpp:34
+#: rc.cpp:29
 msgid "CPU"
 msgstr "CPU"
 
-#. i18n: file: ui/configwindow.ui:200
+#. i18n: file: ui/configwindow.ui:197
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpu)
-#: rc.cpp:38
+#: rc.cpp:33
 #, no-c-format
 msgid ""
 "$cpu - total load CPU, %\n"
-"$ccpu - load CPU for each core, %"
+"$cpu0 - load CPU for core 0, %\n"
+"...\n"
+"$cpu7 - load CPU for core 7, %"
 msgstr ""
 "$cpu - общая загрузка CPU, %\n"
-"$ccpu - загрузка CPU для каждого ядра, %"
+"$cpu0 - загрузка CPU для ядра 0, %\n"
+"...\n"
+"$cpu7 - загрузка CPU для ядра 7, %"
 
-#. i18n: file: ui/configwindow.ui:248
+#. i18n: file: ui/configwindow.ui:245
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_cpuclock)
-#: rc.cpp:42
+#: rc.cpp:39
 msgid "CPU Clock"
 msgstr "Частота CPU"
 
-#. i18n: file: ui/configwindow.ui:259
+#. i18n: file: ui/configwindow.ui:258
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_cpuclock)
-#: rc.cpp:45
+#: rc.cpp:42
 msgid ""
 "$cpucl - average CPU clock, MHz\n"
-"$ccpucl - CPU clock for each core, MHz"
+"$cpucl0 - CPU clock for core 0, MHz\n"
+"...\n"
+"$cpucl7 - CPU clock for core 7, MHz"
 msgstr ""
 "$cpucl - средняя частота CPU, MHz\n"
-"$ccpucl - частота CPU для каждого ядра, MHz"
+"$cpucl0 - частота CPU для ядра 0, MHz\n"
+"...\n"
+"$cpucl7 - частота CPU для ядра 7, MHz"
 
-#. i18n: file: ui/configwindow.ui:307
+#. i18n: file: ui/configwindow.ui:306
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_temp)
-#: rc.cpp:49
+#: rc.cpp:48
 msgid "Temperature"
 msgstr "Температура"
 
-#. i18n: file: ui/configwindow.ui:330
+#. i18n: file: ui/configwindow.ui:316
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_temp)
-#: rc.cpp:52
+#: rc.cpp:51
-msgid "$temp - physical temperature on CPU"
+msgid "$tempN - physical temperature on device N (from 0). Example: $temp0"
-msgstr "$temp - физическая температура на CPU"
+msgstr "$tempN - физическая температура на устройстве N (от 0). Пример: $temp0"
 
-#. i18n: file: ui/configwindow.ui:378
+#. i18n: file: ui/configwindow.ui:364
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpu)
-#: rc.cpp:55
+#: rc.cpp:54
 msgid "GPU"
 msgstr "GPU"
 
-#. i18n: file: ui/configwindow.ui:388
+#. i18n: file: ui/configwindow.ui:374
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpu)
-#: rc.cpp:59
+#: rc.cpp:58
 #, no-c-format
 msgid "$gpu - gpu usage, %"
 msgstr "$gpu - использование GPU, %"
 
-#. i18n: file: ui/configwindow.ui:436
+#. i18n: file: ui/configwindow.ui:422
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_gpuTemp)
-#: rc.cpp:62
+#: rc.cpp:61
 msgid "GPU Temp"
 msgstr "Температура GPU"
 
-#. i18n: file: ui/configwindow.ui:446
+#. i18n: file: ui/configwindow.ui:432
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_gpuTemp)
-#: rc.cpp:65
+#: rc.cpp:64
 msgid "$gputemp - physical temperature on GPU"
 msgstr "$gputemp - физическая температура на GPU"
 
-#. i18n: file: ui/configwindow.ui:494
+#. i18n: file: ui/configwindow.ui:480
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_mem)
-#: rc.cpp:68
+#: rc.cpp:67
 msgid "Memory"
 msgstr "Память"
 
-#. i18n: file: ui/configwindow.ui:505
+#. i18n: file: ui/configwindow.ui:491
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_mem)
-#: rc.cpp:72
+#: rc.cpp:71
 #, no-c-format
 msgid ""
 "$mem - RAM usage, %\n"
@@ -180,15 +173,15 @@ msgstr ""
 "$mem - использование RAM, %\n"
 "$memmb - использование RAM, MB"
 
-#. i18n: file: ui/configwindow.ui:553
+#. i18n: file: ui/configwindow.ui:539
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_swap)
-#: rc.cpp:76
+#: rc.cpp:75
 msgid "Swap"
 msgstr "Swap"
 
-#. i18n: file: ui/configwindow.ui:564
+#. i18n: file: ui/configwindow.ui:550
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_swap)
-#: rc.cpp:80
+#: rc.cpp:79
 #, no-c-format
 msgid ""
 "$swap - swap usage, %\n"
@@ -197,58 +190,61 @@ msgstr ""
 "$swap - использование swap, %\n"
 "$swapmb - использование swap, MB"
 
-#. i18n: file: ui/configwindow.ui:612
+#. i18n: file: ui/configwindow.ui:598
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#: rc.cpp:84
+#: rc.cpp:83
 msgid "HDD"
 msgstr "HDD"
 
-#. i18n: file: ui/configwindow.ui:622
+#. i18n: file: ui/configwindow.ui:608
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hdd)
-#: rc.cpp:88
+#: rc.cpp:87
 #, no-c-format
-msgid "@@/;@@ - mount point usage, %"
+msgid "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
-msgstr "@@/;@@ - использование точки монтирования, %"
+msgstr "$hddN - использование точки монтирования N (от 0), %. Пример: $hdd0"
 
-#. i18n: file: ui/configwindow.ui:670
+#. i18n: file: ui/configwindow.ui:656
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_hddTemp)
-#: rc.cpp:91
+#: rc.cpp:90
 msgid "HDD Temp"
 msgstr "Температура HDD"
 
-#. i18n: file: ui/configwindow.ui:680
+#. i18n: file: ui/configwindow.ui:666
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_hddTemp)
-#: rc.cpp:94
+#: rc.cpp:93
-msgid "@@/dev/sda@@ - physical temperature on /dev/sda"
+msgid ""
-msgstr "@@/dev/sda@@ - физическая температура /dev/sda"
+"$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0"
+msgstr ""
+"$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0 "
+"$hddtempN - температура на устройстве N (от 0). Пример: $hddtemp0"
 
-#. i18n: file: ui/configwindow.ui:728
+#. i18n: file: ui/configwindow.ui:714
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_net)
-#: rc.cpp:97
+#: rc.cpp:96
 msgid "Network"
 msgstr "Сеть"
 
-#. i18n: file: ui/configwindow.ui:740
+#. i18n: file: ui/configwindow.ui:726
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_net)
-#: rc.cpp:100
+#: rc.cpp:99
 msgid ""
-"$net - network speed, down/up, KB/s\n"
+"$down - download speed, KB/s\n"
-"$netdev - current network device\n"
+"$up - upload speed, KB/s\n"
-"@@eth0@@ - disable auto select device and set specified device"
+"$netdev - current network device"
 msgstr ""
-"$net - скорость передачи данных, down/up, KB/s\n"
+"$down - скорость скачки, KB/s\n"
-"$netdev - используемое устройство\n"
+"$up - скорость загрузки, KB/s\n"
-"@@eth0@@ - отключить автовыбор устройства и установить указанное"
+"$netdev - текущее устройство"
 
-#. i18n: file: ui/configwindow.ui:788
+#. i18n: file: ui/configwindow.ui:774
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_bat)
-#: rc.cpp:105
+#: rc.cpp:104
 msgid "Battery"
 msgstr "Батарея"
 
-#. i18n: file: ui/configwindow.ui:799
+#. i18n: file: ui/configwindow.ui:785
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_bat)
-#: rc.cpp:109
+#: rc.cpp:108
 #, no-c-format
 msgid ""
 "$bat - battery charge, %\n"
@@ -257,57 +253,17 @@ msgstr ""
 "$bat - заряд батареи, %\n"
 "$ac - статус адаптора питания"
 
-#. i18n: file: ui/configwindow.ui:863
+#. i18n: file: ui/configwindow.ui:833
-#. i18n: ectx: property (text), widget (QLabel, label_batdev)
-#: rc.cpp:113
-msgid "Battery device"
-msgstr "Устройство батареи"
-
-#. i18n: file: ui/configwindow.ui:870
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
-#: rc.cpp:116
-msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
-msgstr "\"/sys/class/power_supply/BAT0/capacity\" по умолчанию"
-
-#. i18n: file: ui/configwindow.ui:906
-#. i18n: ectx: property (text), widget (QLabel, label_acdev)
-#: rc.cpp:119
-msgid "AC device"
-msgstr "Устройство AC"
-
-#. i18n: file: ui/configwindow.ui:913
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
-#: rc.cpp:122
-msgid "\"/sys/class/power_supply/AC/online\" by default"
-msgstr "\"/sys/class/power_supply/AC/online\" по умолчанию"
-
-#. i18n: file: ui/configwindow.ui:933
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_player)
-#: rc.cpp:125
+#. i18n: file: ui/configwindow.ui:1329
+#. i18n: ectx: property (text), widget (QLabel, label_playerSelect)
+#: rc.cpp:112 rc.cpp:214
 msgid "Music player"
 msgstr "Музыкальный плеер"
 
-#. i18n: file: ui/configwindow.ui:950
+#. i18n: file: ui/configwindow.ui:847
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player)
-#: rc.cpp:128
-msgid "amarok"
-msgstr "amarok"
-
-#. i18n: file: ui/configwindow.ui:955
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player)
-#: rc.cpp:131
-msgid "mpd"
-msgstr "mpd"
-
-#. i18n: file: ui/configwindow.ui:960
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_player)
-#: rc.cpp:134
-msgid "qmmp"
-msgstr "qmmp"
-
-#. i18n: file: ui/configwindow.ui:972
 #. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_player)
-#: rc.cpp:137
+#: rc.cpp:115
 msgid ""
 "$album - song album\n"
 "$artist - song artist\n"
@@ -321,56 +277,273 @@ msgstr ""
 "$time - продолжительность\n"
 "$title - название"
 
-#. i18n: file: ui/configwindow.ui:1026
+#. i18n: file: ui/configwindow.ui:895
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_custom)
+#: rc.cpp:122
+msgid "Custom"
+msgstr "Своя команда"
+
+#. i18n: file: ui/configwindow.ui:905
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_custom)
+#: rc.cpp:125
+msgid "$custom - get output from custom command"
+msgstr "$custom - получить информацию из своей команды"
+
+#. i18n: file: ui/configwindow.ui:959
+#. i18n: ectx: attribute (title), widget (QWidget, advanced)
+#: rc.cpp:128
+msgid "Advanced"
+msgstr "Расширенные"
+
+#. i18n: file: ui/configwindow.ui:973
+#. i18n: ectx: property (text), widget (QLabel, label_timeFormat)
+#: rc.cpp:131
+msgid "Custom time format"
+msgstr "Свой формат времени"
+
+#. i18n: file: ui/configwindow.ui:995
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_timeFormat)
+#: rc.cpp:134
+msgid ""
+"$dddd - long weekday\n"
+"$ddd - short weekday\n"
+"$dd - day\n"
+"$d - day w\\o zero\n"
+"$MMMM - long month\n"
+"$MMM - short month\n"
+"$MM - month\n"
+"$M - month w\\o zero\n"
+"$yyyy - year\n"
+"$yy - short year\n"
+"$hh - hours (24 only)\n"
+"$h - hours w\\o zero (24 only)\n"
+"$mm - minutes\n"
+"$m - minutes w\\o zero\n"
+"$ss - seconds\n"
+"$s - seconds w\\o zero"
+msgstr ""
+"$dddd - день недели (длинный)\n"
+"$ddd - день недели (короткий)\n"
+"$dd - день\n"
+"$d - день без 0\n"
+"$MMMM - месяц (длинный)\n"
+"$MMM - месяц (короткий)\n"
+"$MM - месяц\n"
+"$M - месяц без 0\n"
+"$yyyy - год\n"
+"$yy - год (короткий)\n"
+"$hh - часы (24)\n"
+"$h - часы без 0 (24)\n"
+"$mm - минуты\n"
+"$m - минуты без 0\n"
+"$ss - секунды\n"
+"$s - секунды без 0"
+
+#. i18n: file: ui/configwindow.ui:1015
+#. i18n: ectx: property (text), widget (QLabel, label_uptimeFormat)
+#: rc.cpp:152
+msgid "Custom uptime format"
+msgstr "Свой формат аптайма"
+
+#. i18n: file: ui/configwindow.ui:1024
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_uptimeFormat)
+#: rc.cpp:155
+msgid ""
+"$ds - uptime days\n"
+"$hs - uptime hours\n"
+"$ms - uptime minutes"
+msgstr ""
+"$ds - дни работы\n"
+"$hs - часы\n"
+"$ms - минуты"
+
+#. i18n: file: ui/configwindow.ui:1046
+#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+#: rc.cpp:160
+msgid "Temperature devices"
+msgstr "Температурные устройства"
+
+#. i18n: file: ui/configwindow.ui:1072
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
+#. i18n: file: ui/configwindow.ui:1130
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
+#. i18n: file: ui/configwindow.ui:1188
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_hddDevice)
+#: rc.cpp:163 rc.cpp:173 rc.cpp:183
+msgid "Add"
+msgstr "Добавить"
+
+#. i18n: file: ui/configwindow.ui:1082
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
+#. i18n: file: ui/configwindow.ui:1140
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
+#. i18n: file: ui/configwindow.ui:1198
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_hddDevice)
+#: rc.cpp:166 rc.cpp:176 rc.cpp:186
+msgid ""
+"Editable\n"
+"del - remove item"
+msgstr ""
+"Редактируемо\n"
+"del - удалить строку"
+
+#. i18n: file: ui/configwindow.ui:1104
+#. i18n: ectx: property (text), widget (QLabel, label_mount)
+#: rc.cpp:170
+msgid "Mount points"
+msgstr "Точки монтирования"
+
+#. i18n: file: ui/configwindow.ui:1162
+#. i18n: ectx: property (text), widget (QLabel, label_hddDevice)
+#: rc.cpp:180
+msgid "HDD devices"
+msgstr "HDD"
+
+#. i18n: file: ui/configwindow.ui:1218
+#. i18n: ectx: property (text), widget (QLabel, label_netdir)
+#: rc.cpp:190
+msgid "Network directory"
+msgstr "Путь к интерфейсам"
+
+#. i18n: file: ui/configwindow.ui:1225
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_netdir)
+#: rc.cpp:193
+msgid "\"/sys/class/net\" by default"
+msgstr "\"/sys/class/net\" по умолчанию"
+
+#. i18n: file: ui/configwindow.ui:1245
+#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBox_netdev)
+#: rc.cpp:196
+msgid "Disable auto select device and set specified device"
+msgstr "Отключить авто выбор устройства и использовать указанное"
+
+#. i18n: file: ui/configwindow.ui:1248
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_netdev)
+#: rc.cpp:199
+msgid "Set network device"
+msgstr "Выберете сетевое устройство"
+
+#. i18n: file: ui/configwindow.ui:1281
+#. i18n: ectx: property (text), widget (QLabel, label_batdev)
+#: rc.cpp:202
+msgid "Battery device"
+msgstr "Устройство батареи"
+
+#. i18n: file: ui/configwindow.ui:1288
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
+#: rc.cpp:205
+msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
+msgstr "\"/sys/class/power_supply/BAT0/capacity\" по умолчанию"
+
+#. i18n: file: ui/configwindow.ui:1305
+#. i18n: ectx: property (text), widget (QLabel, label_acdev)
+#: rc.cpp:208
+msgid "AC device"
+msgstr "Устройство AC"
+
+#. i18n: file: ui/configwindow.ui:1312
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
+#: rc.cpp:211
+msgid "\"/sys/class/power_supply/AC/online\" by default"
+msgstr "\"/sys/class/power_supply/AC/online\" по умолчанию"
+
+#. i18n: file: ui/configwindow.ui:1349
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
+#: rc.cpp:217
+msgid "amarok"
+msgstr "amarok"
+
+#. i18n: file: ui/configwindow.ui:1354
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
+#: rc.cpp:220
+msgid "mpd"
+msgstr "mpd"
+
+#. i18n: file: ui/configwindow.ui:1359
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
+#: rc.cpp:223
+msgid "qmmp"
+msgstr "qmmp"
+
+#. i18n: file: ui/configwindow.ui:1377
+#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
+#: rc.cpp:226
+msgid "Custom command"
+msgstr "Своя команда"
+
+#. i18n: file: ui/configwindow.ui:1385
+#. 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:1408
 #. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:144
+#: rc.cpp:233
 msgid "Appearance"
 msgstr "Внешний вид"
 
-#. i18n: file: ui/configwindow.ui:1040
+#. i18n: file: ui/configwindow.ui:1422
 #. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:147
+#: rc.cpp:236
 msgid "Time interval"
 msgstr "Интервал обновления"
 
-#. i18n: file: ui/configwindow.ui:1095
+#. i18n: file: ui/configwindow.ui:1477
 #. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:150
+#: rc.cpp:239
 msgid "Font"
 msgstr "Шрифт"
 
-#. i18n: file: ui/configwindow.ui:1135
+#. i18n: file: ui/configwindow.ui:1517
 #. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:153
+#: rc.cpp:242
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#. i18n: file: ui/configwindow.ui:1190
+#. i18n: file: ui/configwindow.ui:1572
 #. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:156
+#: rc.cpp:245
 msgid "Font color"
 msgstr "Цвет шрифта"
 
-#. i18n: file: ui/configwindow.ui:1230
+#. i18n: file: ui/configwindow.ui:1612
 #. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:159
+#: rc.cpp:248
 msgid "Font style"
 msgstr "Стиль шрифта"
 
-#. i18n: file: ui/configwindow.ui:1280
+#. i18n: file: ui/configwindow.ui:1662
 #. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:162
+#: rc.cpp:251
 msgid "Font weight"
 msgstr "Ширина шрифта"
 
-#: rc.cpp:163
+#: rc.cpp:252
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Evgeniy Alekseev"
 
-#: rc.cpp:164
+#: rc.cpp:253
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
+#~ msgid "@@/;@@ - mount point usage, %"
+#~ msgstr "@@/;@@ - использование точки монтирования, %"
 
+#~ msgid "@@/dev/sda@@ - physical temperature on /dev/sda"
+#~ msgstr "@@/dev/sda@@ - физическая температура /dev/sda"
+
+#~ msgid ""
+#~ "$net - network speed, down/up, KB/s\n"
+#~ "$netdev - current network device\n"
+#~ "@@eth0@@ - disable auto select device and set specified device"
+#~ msgstr ""
+#~ "$net - скорость передачи данных, down/up, KB/s\n"
+#~ "$netdev - используемое устройство\n"
+#~ "@@eth0@@ - отключить автовыбор устройства и установить указанное"