diff --git a/CHANGELOG b/CHANGELOG index 0b367a8..9fb8626 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ -Ver.1.10.3: +Ver.1.11.0: + added ability to disable background image ++ added desktop DataEngine ++ added PTM desktop panel ++ added desktop label (tags $name, $number, $total) Ver.1.10.2: - fix error with tempUnits in hddtemp label diff --git a/CHANGELOG-RU b/CHANGELOG-RU index a5c143a..5cdec6c 100644 --- a/CHANGELOG-RU +++ b/CHANGELOG-RU @@ -1,5 +1,8 @@ -Вер.1.10.3: +Вер.1.11.0: + добавлена возможность отключения фона ++ добавлен desktop DataEngine ++ добавлен виджет PTM desktop panel ++ добавлено поле текущий рабочий стол (теги $name, $number, $total) Вер.1.10.2: - фикс ошибки с tempUnits в поле hddtemp diff --git a/README.md b/README.md index 2dbcb0e..e06b3fe 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,9 @@ For edited output you must open Settings window and setup output format in lines * tag `$ps` - list of running processes * tag `$pkgcountN` - number of packages, which available to upgrade for command N. For example, `$pkgcount0` * tag `$customN` - returns output for custom command N. For example, `$custom0` +* tag `$name` - name of the current desktop +* tag `$number` - number of the current desktop +* tag `$total` - total number of desktops Label order will changed if you change slider position. HTML tags in label work normally. @@ -177,6 +180,10 @@ DataEngine settings Commands, which will be run for custom label. +**Desktop cmd** + +Type a command which will be run for desktop DataEngine. Default is `qdbus org.kde.kwin /KWin currentDesktop`. + **GPU device** Select one of supported GPU devices. `auto` will enable auto selection, `disable` will disable definition of GPU states. Default is `auto`. @@ -212,10 +219,40 @@ List of commands, which will be run. Number of null lines is a number of unneede Select one of supported music playes for player label. -DataEngine configuration ------------------------- +PTM desktop panel +================= -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. +Since version 1.11.0 PyTextMonitor provides a minimalistic panel for monitoring on desktops written on `C++`. And yes, it looks like the same panel in Awesome. + +Desktop panel configuration +--------------------------- + +**Enable background** + +Uncheck to disable default background and set transparent one. + +**Vertical layout** + +Use vertical layout instead of horizontal one. + +**Add stretch** + +Add stretch (spacer) to the selected side of the widget. + +**Mark** + +Type symbol (or line) which will be shown if this desktop is active now. + +**Pattern tags** + +* tag `$mark` - show mark if this desktop is active +* tag `$name` - name of the current desktop +* tag `$number` - number of the current desktop +* tag `$total` - total number of desktops + +**Command** + +Type command which will be run on left click on the selected desktop. Available variables are same as for pattern. Default is `dbus org.kde.kwin /KWin setCurrentDesktop $number`. Instruction =========== diff --git a/md_readme/en.md b/md_readme/en.md index 2dbcb0e..e06b3fe 100644 --- a/md_readme/en.md +++ b/md_readme/en.md @@ -60,6 +60,9 @@ For edited output you must open Settings window and setup output format in lines * tag `$ps` - list of running processes * tag `$pkgcountN` - number of packages, which available to upgrade for command N. For example, `$pkgcount0` * tag `$customN` - returns output for custom command N. For example, `$custom0` +* tag `$name` - name of the current desktop +* tag `$number` - number of the current desktop +* tag `$total` - total number of desktops Label order will changed if you change slider position. HTML tags in label work normally. @@ -177,6 +180,10 @@ DataEngine settings Commands, which will be run for custom label. +**Desktop cmd** + +Type a command which will be run for desktop DataEngine. Default is `qdbus org.kde.kwin /KWin currentDesktop`. + **GPU device** Select one of supported GPU devices. `auto` will enable auto selection, `disable` will disable definition of GPU states. Default is `auto`. @@ -212,10 +219,40 @@ List of commands, which will be run. Number of null lines is a number of unneede Select one of supported music playes for player label. -DataEngine configuration ------------------------- +PTM desktop panel +================= -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. +Since version 1.11.0 PyTextMonitor provides a minimalistic panel for monitoring on desktops written on `C++`. And yes, it looks like the same panel in Awesome. + +Desktop panel configuration +--------------------------- + +**Enable background** + +Uncheck to disable default background and set transparent one. + +**Vertical layout** + +Use vertical layout instead of horizontal one. + +**Add stretch** + +Add stretch (spacer) to the selected side of the widget. + +**Mark** + +Type symbol (or line) which will be shown if this desktop is active now. + +**Pattern tags** + +* tag `$mark` - show mark if this desktop is active +* tag `$name` - name of the current desktop +* tag `$number` - number of the current desktop +* tag `$total` - total number of desktops + +**Command** + +Type command which will be run on left click on the selected desktop. Available variables are same as for pattern. Default is `dbus org.kde.kwin /KWin setCurrentDesktop $number`. Instruction =========== diff --git a/readme_diff.patch b/readme_diff.patch index b67a2d7..3e7ee68 100644 --- a/readme_diff.patch +++ b/readme_diff.patch @@ -1,6 +1,16 @@ ---- README.md.orig 2014-06-09 16:57:03.181101600 +0400 -+++ README.md 2014-07-08 10:09:15.338228176 +0400 -@@ -75,6 +75,10 @@ +--- README.md.orig 2014-07-08 12:10:47.217925504 +0400 ++++ README.md 2014-07-09 13:30:07.324141630 +0400 +@@ -60,6 +60,9 @@ + * tag `$ps` - list of running processes + * tag `$pkgcountN` - number of packages, which available to upgrade for command N. For example, `$pkgcount0` + * tag `$customN` - returns output for custom command N. For example, `$custom0` ++* tag `$name` - name of the current desktop ++* tag `$number` - number of the current desktop ++* tag `$total` - total number of desktops + + Label order will changed if you change slider position. HTML tags in label work normally. + +@@ -75,6 +78,10 @@ Advanced settings ----------------- @@ -11,3 +21,58 @@ **Vertical layout** Use vertical layout instead of horizontal one. +@@ -173,6 +180,10 @@ + + Commands, which will be run for custom label. + ++**Desktop cmd** ++ ++Type a command which will be run for desktop DataEngine. Default is `qdbus org.kde.kwin /KWin currentDesktop`. ++ + **GPU device** + + Select one of supported GPU devices. `auto` will enable auto selection, `disable` will disable definition of GPU states. Default is `auto`. +@@ -208,10 +219,40 @@ + + Select one of supported music playes for player label. + +-DataEngine configuration +------------------------- ++PTM desktop panel ++================= ++ ++Since version 1.11.0 PyTextMonitor provides a minimalistic panel for monitoring on desktops written on `C++`. And yes, it looks like the same panel in Awesome. ++ ++Desktop panel configuration ++--------------------------- ++ ++**Enable background** ++ ++Uncheck to disable default background and set transparent one. ++ ++**Vertical layout** ++ ++Use vertical layout instead of horizontal one. ++ ++**Add stretch** ++ ++Add stretch (spacer) to the selected side of the widget. ++ ++**Mark** ++ ++Type symbol (or line) which will be shown if this desktop is active now. ++ ++**Pattern tags** ++ ++* tag `$mark` - show mark if this desktop is active ++* tag `$name` - name of the current desktop ++* tag `$number` - number of the current desktop ++* tag `$total` - total number of desktops ++ ++**Command** + +-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. ++Type command which will be run on left click on the selected desktop. Available variables are same as for pattern. Default is `dbus org.kde.kwin /KWin setCurrentDesktop $number`. + + Instruction + =========== diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 8c493de..feee866 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -7,8 +7,8 @@ cmake_policy (SET CMP0015 NEW) project (pytextmonitor) set (PROJECT_VERSION_MAJOR 1) -set (PROJECT_VERSION_MINOR 10) -set (PROJECT_VERSION_PATCH 3) +set (PROJECT_VERSION_MINOR 11) +set (PROJECT_VERSION_PATCH 0) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) message (STATUS "Version: ${PROJECT_VERSION}") diff --git a/sources/readme/en.html b/sources/readme/en.html index e224936..85521b0 100644 --- a/sources/readme/en.html +++ b/sources/readme/en.html @@ -59,6 +59,9 @@
$ps - list of running processes$pkgcountN - number of packages, which available to upgrade for command N. For example, $pkgcount0$customN - returns output for custom command N. For example, $custom0$name - name of the current desktop$number - number of the current desktop$total - total number of desktopsLabel order will changed if you change slider position. HTML tags in label work normally.
@@ -177,6 +180,10 @@Commands, which will be run for custom label.
+Desktop cmd
+ +Type a command which will be run for desktop DataEngine. Default is qdbus org.kde.kwin /KWin currentDesktop.
GPU device
Select one of supported GPU devices. auto will enable auto selection, disable will disable definition of GPU states. Default is auto.
Select one of supported music playes for player label.
-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.
Since version 1.11.0 PyTextMonitor provides a minimalistic panel for monitoring on desktops written on C++. And yes, it looks like the same panel in Awesome.
Enable background
+ +Uncheck to disable default background and set transparent one.
+ +Vertical layout
+ +Use vertical layout instead of horizontal one.
+ +Add stretch
+ +Add stretch (spacer) to the selected side of the widget.
+ +Mark
+ +Type symbol (or line) which will be shown if this desktop is active now.
+ +Pattern tags
+ +$mark - show mark if this desktop is active$name - name of the current desktop$number - number of the current desktop$total - total number of desktopsCommand
+ +Type command which will be run on left click on the selected desktop. Available variables are same as for pattern. Default is dbus org.kde.kwin /KWin setCurrentDesktop $number.