diff --git a/PKGBUILD b/PKGBUILD index 3e12f83..5268d44 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -20,7 +20,7 @@ optdepends=("amarok: for music player monitor" makedepends=('automoc4' 'cmake') source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) install=${pkgname}.install -md5sums=('eb49cc4c68b161500ba103bd00090b65') +md5sums=('0a9eb42a939b26e215fe289cf914c219') backup=('usr/share/config/extsysmon.conf') prepare() { diff --git a/README.md b/README.md index 7caa72f..fd6d071 100644 --- a/README.md +++ b/README.md @@ -149,11 +149,11 @@ Commands, which will be run for custom label. **GPU device** -Select one of supported GPU devices. `auto` will enable auto selection. Default is `auto`. +Select one of supported GPU devices. `auto` will enable auto selection, `disable` will disable definition of GPU states. Default is `auto`. **HDD** -Select one of HDDs for HDD temperature monitor. `all` will enable monitor for all devices. Default is `all`. +Select one of HDDs for HDD temperature monitor. `all` will enable monitor for all devices, `disable` will disable definition of HDD temperature. Default is `all`. **hddtemp cmd** diff --git a/md_readme/en.md b/md_readme/en.md index 7caa72f..fd6d071 100644 --- a/md_readme/en.md +++ b/md_readme/en.md @@ -149,11 +149,11 @@ Commands, which will be run for custom label. **GPU device** -Select one of supported GPU devices. `auto` will enable auto selection. Default is `auto`. +Select one of supported GPU devices. `auto` will enable auto selection, `disable` will disable definition of GPU states. Default is `auto`. **HDD** -Select one of HDDs for HDD temperature monitor. `all` will enable monitor for all devices. Default is `all`. +Select one of HDDs for HDD temperature monitor. `all` will enable monitor for all devices, `disable` will disable definition of HDD temperature. Default is `all`. **hddtemp cmd** diff --git a/md_readme/ru.md b/md_readme/ru.md index 2034474..01cd24f 100644 --- a/md_readme/ru.md +++ b/md_readme/ru.md @@ -149,11 +149,11 @@ PyTextMonitor - минималистичный плазмоид, написан **Устройство GPU** -Выберете одно из поддерживаемых устройств GPU. `auto` включит автоматическое определение. По умолчанию `auto`. +Выберете одно из поддерживаемых устройств GPU. `auto` включит автоматическое определение, `disable` отключит все мониторы GPU. По умолчанию `auto`. **HDD** -Выберете один из HDD для монитора его температуры. `all` включит монитор для всех доступных устройств. По умолчанию `all`. +Выберете один из HDD для монитора его температуры. `all` включит монитор для всех доступных устройств, `disable` отключит определение температуры HDD. По умолчанию `all`. **Команда hddtemp** diff --git a/readme_diff.patch b/readme_diff.patch index 7fc9be7..5577648 100644 --- a/readme_diff.patch +++ b/readme_diff.patch @@ -1,5 +1,5 @@ --- README.md.orig 2014-05-21 19:56:55.000000000 +0400 -+++ README.md 2014-05-27 09:07:25.548819808 +0400 ++++ README.md 2014-05-27 16:05:16.796247699 +0400 @@ -10,6 +10,7 @@ Configuration ------------- @@ -33,17 +33,24 @@ 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. -@@ -154,6 +155,10 @@ +@@ -148,11 +149,15 @@ - Select one of HDDs for HDD temperature monitor. `all` will enable monitor for all devices. Default is `all`. + **GPU device** +-Select one of supported GPU devices. `auto` will enable auto selection. Default is `auto`. ++Select one of supported GPU devices. `auto` will enable auto selection, `disable` will disable definition of GPU states. Default is `auto`. + + **HDD** + +-Select one of HDDs for HDD temperature monitor. `all` will enable monitor for all devices. Default is `all`. ++Select one of HDDs for HDD temperature monitor. `all` will enable monitor for all devices, `disable` will disable definition of HDD temperature. Default is `all`. ++ +**hddtemp cmd** + +Type a command which will be run for hddtemp DataEngine. Default is `sudo hddtemp`. -+ + **MPD address** - Address of MPD server. Default is `localhost`. @@ -172,6 +177,9 @@ * *FreeBSD*: `PKGCMD=pkg_version -I -l '<'`, `PKGNULL=0` * *Mandriva*: `PKGCMD=urpmq --auto-select`, `PKGNULL=0` diff --git a/sources/ext-sysmon/extsysmon.cpp b/sources/ext-sysmon/extsysmon.cpp index a384d82..095033f 100644 --- a/sources/ext-sysmon/extsysmon.cpp +++ b/sources/ext-sysmon/extsysmon.cpp @@ -45,6 +45,8 @@ QString ExtendedSysMon::getAllHdd() QString dev; command.start("find /dev -name [hms]d[a-z]"); command.waitForFinished(-1); +#include + qDebug() << command.readAllStandardError(); qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput()); for (int i=0; i - 0 + 4 @@ -1194,8 +1194,8 @@ $ps - list of running processes comma separated 0 - -183 - 526 + 0 + 328 723 @@ -2523,6 +2523,11 @@ del - remove item auto + + + disable + + nvidia diff --git a/sources/readme/en.html b/sources/readme/en.html index df38a83..ecc1fc5 100644 --- a/sources/readme/en.html +++ b/sources/readme/en.html @@ -154,11 +154,11 @@

GPU device

-

Select one of supported GPU devices. auto will enable auto selection. Default is auto.

+

Select one of supported GPU devices. auto will enable auto selection, disable will disable definition of GPU states. Default is auto.

HDD

-

Select one of HDDs for HDD temperature monitor. all will enable monitor for all devices. Default is all.

+

Select one of HDDs for HDD temperature monitor. all will enable monitor for all devices, disable will disable definition of HDD temperature. Default is all.

hddtemp cmd

diff --git a/sources/readme/ru.html b/sources/readme/ru.html index c20a931..279388e 100644 --- a/sources/readme/ru.html +++ b/sources/readme/ru.html @@ -151,11 +151,11 @@

Устройство GPU

-

Выберете одно из поддерживаемых устройств GPU. auto включит автоматическое определение. По умолчанию auto.

+

Выберете одно из поддерживаемых устройств GPU. auto включит автоматическое определение, disable отключит все мониторы GPU. По умолчанию auto.

HDD

-

Выберете один из HDD для монитора его температуры. all включит монитор для всех доступных устройств. По умолчанию all.

+

Выберете один из HDD для монитора его температуры. all включит монитор для всех доступных устройств, disable отключит определение температуры HDD. По умолчанию all.

Команда hddtemp