added support of disable ooption to dataengine

2025-04-24 23:47:20 +00:00 · 2014-05-27 16:15:49 +04:00 · 2014-05-27 16:15:49 +04:00 · e7b6e4a3bf
commit e7b6e4a3bf
parent 3d8f88d935
10 changed files with 37 additions and 22 deletions
--- a/2
+++ b/2
@ -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() {
--- 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**

--- 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**

--- 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**

--- 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`
--- 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>
+    qDebug() << command.readAllStandardError();
    qoutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput());
    for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++) {
        dev = qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i];
@ -57,7 +59,7 @@ QString ExtendedSysMon::getAllHdd()
 QString ExtendedSysMon::getAutoGpu()
 {
    QProcess command;
-    QString gpu = QString("unknown");
+    QString gpu = QString("disable");
    QString qoutput = QString("");
    command.start("lspci");
    command.waitForFinished(-1);
--- a/sources/ptm/contents/code/configdef.py
+++ b/sources/ptm/contents/code/configdef.py
@ -167,7 +167,7 @@ class ConfigDefinition:
        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]'")
+        commandOut = commands.getoutput("find /dev -name '[hms]d[a-z]'")
        for item in commandOut.split("\n"):
            try:
                self.configpage.ui.comboBox_hddDevice.addItem(item)
@ -217,7 +217,8 @@ class ConfigDefinition:
        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]'")
+        self.configpage.ui.comboBox_hdddev.addItem("disable")
+        commandOut = commands.getoutput("find /dev -name '[hms]d[a-z]'")
        for item in commandOut.split("\n"):
            try:
                self.configpage.ui.comboBox_hdddev.addItem(item)
--- a/sources/ptm/contents/ui/configwindow.ui
+++ b/sources/ptm/contents/ui/configwindow.ui
@ -35,7 +35,7 @@
   <item>
    <widget class="QTabWidget" name="tabWidget">
     <property name="currentIndex">
-      <number>0</number>
+      <number>4</number>
     </property>
     <widget class="QWidget" name="settings">
      <attribute name="title">
@ -1194,8 +1194,8 @@ $ps - list of running processes comma separated</string>
          <property name="geometry">
           <rect>
            <x>0</x>
-            <y>-183</y>
-            <width>526</width>
+            <y>0</y>
+            <width>328</width>
            <height>723</height>
           </rect>
          </property>
@ -2523,6 +2523,11 @@ del - remove item</string>
                 <string notr="true">auto</string>
                </property>
               </item>
+               <item>
+                <property name="text">
+                 <string notr="true">disable</string>
+                </property>
+               </item>
               <item>
                <property name="text">
                 <string notr="true">nvidia</string>
--- a/sources/readme/en.html
+++ b/sources/readme/en.html
@ -154,11 +154,11 @@

 <p><strong>GPU device</strong></p>

-<p>Select one of supported GPU devices. <code>auto</code> will enable auto selection. Default is <code>auto</code>.</p>
+<p>Select one of supported GPU devices. <code>auto</code> will enable auto selection, <code>disable</code> will disable definition of GPU states. Default is <code>auto</code>.</p>

 <p><strong>HDD</strong></p>

-<p>Select one of HDDs for HDD temperature monitor. <code>all</code> will enable monitor for all devices. Default is <code>all</code>.</p>
+<p>Select one of HDDs for HDD temperature monitor. <code>all</code> will enable monitor for all devices, <code>disable</code> will disable definition of HDD temperature. Default is <code>all</code>.</p>

 <p><strong>hddtemp cmd</strong></p>

--- a/sources/readme/ru.html
+++ b/sources/readme/ru.html
@ -151,11 +151,11 @@

 <p><strong>Устройство GPU</strong></p>

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

 <p><strong>HDD</strong></p>

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

 <p><strong>Команда hddtemp</strong></p>