Prerelease 1.7.2

This commit is contained in:
arcan1s 2014-04-03 02:32:56 +04:00
parent d7cc354432
commit 0db909d914
14 changed files with 610 additions and 211 deletions

View File

@ -1,3 +1,8 @@
Ver.1.7.2:
+ added dataengine configuration from ptm
+ added custom command to dataengine
- removed custom command from ptm
Ver.1.7.1:
- removed error label
* fix bug with zero values in tooltip

View File

@ -105,16 +105,34 @@ File with AC information. File (`/sys/class/power_supply/AC/online` by default)
Select one of supported music playes for player label.
Tooltip settings
----------------
Since version 1.7.0 CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make the needed checkboxes a fully checked. The number of stored values can be set in the tab. Colors of graphs are configurable too.
DataEngine settings
-------------------
**GPU device**
Select one of supported GPU devices. `auto` will enable auto selection. Default is `auto`.
**HDD**
Select one of HDDs for HDD temperature monitor. `all` will enable monitor for all devices. Default is `all`.
**MPD address**
Address of MPD server. Default is `localhost`.
**MPD port**
Port of MPD server. Default is `6600`.
**Custom command**
*NOTE* This can cause the computer freeze.
A command, which will be run for custom label.
Tooltip settings
----------------
Since version 1.7.0 CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make the needed checkboxes a fully checked. The number of stored values can be set in the tab. Colors of graphs are configurable too.
DataEngine configuration
------------------------
You may edit DataEngine configuration. It is `/usr/share/config/extsysmon.conf` or `$HOME/share/config/extsysmon.conf` depending on the type of installation. Uncomment needed line and edit it.

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -88,6 +88,8 @@ class DataEngine:
self.parent.systemmonitor.connectSource("network/interfaces/"+self.parent.netdev+"/receiver/data", self.parent, self.parent.interval)
if (self.parent.playerBool > 0):
self.parent.extsysmon.connectSource("player", self.parent, self.parent.interval)
if (self.parent.customBool > 0):
self.parent.extsysmon.connectSource("custom", self.parent, self.parent.interval)
def dataUpdated(self, sourceName, data):
"""function to update data"""
@ -103,12 +105,18 @@ class DataEngine:
line = line.split('$uptime')[0] + uptimeText + line.split('$uptime')[1]
elif (line.split('$custom')[0] != line):
uptimeText = self.parent.custom_uptime
if (uptimeText.split('$ds')[0] != uptimeText):
uptimeText = "%s%3i%s" % (uptimeText.split('$ds')[0], days, uptimeText.split('$ds')[1])
if (uptimeText.split('$hs')[0] != uptimeText):
uptimeText = "%s%2i%s" % (uptimeText.split('$hs')[0], hours, uptimeText.split('$hs')[1])
if (uptimeText.split('$ms')[0] != uptimeText):
uptimeText = "%s%2i%s" % (uptimeText.split('$ms')[0], minutes, uptimeText.split('$ms')[1])
if (uptimeText.split('$dd')[0] != uptimeText):
uptimeText = "%s%03i%s" % (uptimeText.split('$dd')[0], days, uptimeText.split('$dd')[1])
if (uptimeText.split('$d')[0] != uptimeText):
uptimeText = "%s%3i%s" % (uptimeText.split('$d')[0], days, uptimeText.split('$d')[1])
if (uptimeText.split('$hh')[0] != uptimeText):
uptimeText = "%s%02i%s" % (uptimeText.split('$hh')[0], hours, uptimeText.split('$hh')[1])
if (uptimeText.split('$h')[0] != uptimeText):
uptimeText = "%s%2i%s" % (uptimeText.split('$h')[0], hours, uptimeText.split('$h')[1])
if (uptimeText.split('$mm')[0] != uptimeText):
uptimeText = "%s%02i%s" % (uptimeText.split('$mm')[0], minutes, uptimeText.split('$mm')[1])
if (uptimeText.split('$m')[0] != uptimeText):
uptimeText = "%s%2i%s" % (uptimeText.split('$m')[0], minutes, uptimeText.split('$m')[1])
line = line.split('$custom')[0] + uptimeText + line.split('$custom')[1]
text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
self.parent.label_uptime.setText(text)
@ -280,6 +288,14 @@ class DataEngine:
line = self.parent.timeFormat
text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
self.parent.label_time.setText(text)
elif (sourceName == "custom"):
value = str(data[QString(u'custom')].toUtf8()).decode("utf-8")
if (self.parent.customFormat.split('$custom')[0] != self.parent.customFormat):
line = self.parent.customFormat.split('$custom')[0] + value + self.parent.customFormat.split('$custom')[1]
else:
line = self.parent.customFormat
text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
self.parent.label_custom.setText(text)
self.parent.update()
except:

View File

@ -182,8 +182,6 @@ class pyTextWidget(plasmascript.Applet):
self.cpuText()
if (self.cpuclockBool > 0):
self.cpuclockText()
if (self.customBool > 0):
self.getCustom()
if (self.hddBool > 0):
self.mountText()
if ((self.memBool > 0) and (self.memInMb == False)):
@ -312,15 +310,6 @@ class pyTextWidget(plasmascript.Applet):
self.label_temp.setText(text)
def getCustom(self):
"""function to get output from custom command"""
commandOut = commands.getoutput(self.custom_command)
line = self.customFormat
line = line.split('$custom')[0] + commandOut + line.split('$custom')[1]
text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1]
self.label_custom.setText(text)
@pyqtSignature("dataUpdated(const QString &, const Plasma::DataEngine::Data &)")
def dataUpdated(self, sourceName, data):
"""function to update label"""

View File

@ -83,7 +83,6 @@ class Reinit():
self.parent.battery_device = str(settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity'))
self.parent.ac_device = str(settings.get('ac_device', '/sys/class/power_supply/AC/online'))
self.parent.player_name = settings.get('player_name', 0).toInt()[0]
self.parent.custom_command = str(settings.get('custom_command', 'wget -qO- http://ifconfig.me/ip'))
self.parent.tooltipNum = settings.get('tooltip_num', 100).toInt()[0]
self.parent.tooltipColors['cpu'] = str(settings.get('cpu_color', '#ff0000'))

View File

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

View File

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

View File

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

View File

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