diff --git a/CHANGELOG b/CHANGELOG index 70c1010..f18149a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ Ver.2.0.1: + add support of custom interfaces +* fix label edge's shading +* fix cpu*, cpucl*, gpu*, ps* tags Ver.2.0.0: + add new widget - awesome widget diff --git a/CHANGELOG-RU b/CHANGELOG-RU index e391cbd..99a0b9d 100644 --- a/CHANGELOG-RU +++ b/CHANGELOG-RU @@ -1,5 +1,7 @@ Вер.2.0.1: + добавлена поддержка кастомных интерфейсов +* фикс затенения краев поля +* фикс тегов cpu*, cpucl*, gpu*, ps* Вер.2.0.0: + добавлен виджет awesome widget diff --git a/PKGBUILD b/PKGBUILD index 771e517..68a47b6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=kdeplasma-applets-awesome-widgets _pkgname=awesome-widgets -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ optdepends=("amarok: for music player monitor" makedepends=('automoc4' 'cmake') source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) install=${pkgname}.install -md5sums=('a09199150ec3c1e2303ebe5878ba1913') +md5sums=('3ffa5c0456ee124900373f106c2649cd') backup=('usr/share/config/extsysmon.conf') prepare() { diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 92fd6ef..d40d864 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_policy (SET CMP0015 NEW) project (awesome-widgets) set (PROJECT_VERSION_MAJOR 2) set (PROJECT_VERSION_MINOR 0) -set (PROJECT_VERSION_PATCH 0) +set (PROJECT_VERSION_PATCH 1) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) set (PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) diff --git a/sources/awesome-widget/awesome-widget.cpp b/sources/awesome-widget/awesome-widget.cpp index db3751a..517ee99 100644 --- a/sources/awesome-widget/awesome-widget.cpp +++ b/sources/awesome-widget/awesome-widget.cpp @@ -255,20 +255,20 @@ QStringList AwesomeWidget::getKeys() allKeys.append(QString("uptime")); allKeys.append(QString("cuptime")); // cpuclock - allKeys.append(QString("cpucl")); for (int i=counts[QString("cpu")]-1; i>=0; i--) allKeys.append(QString("cpucl") + QString::number(i)); + allKeys.append(QString("cpucl")); // cpu - allKeys.append(QString("cpu")); for (int i=counts[QString("cpu")]-1; i>=0; i--) allKeys.append(QString("cpu") + QString::number(i)); + allKeys.append(QString("cpu")); // temperature for (int i=counts[QString("temp")]-1; i>=0; i--) allKeys.append(QString("temp") + QString::number(i)); - // gpu - allKeys.append(QString("gpu")); // gputemp allKeys.append(QString("gputemp")); + // gpu + allKeys.append(QString("gpu")); // memory allKeys.append(QString("memmb")); allKeys.append(QString("memgb")); @@ -321,9 +321,9 @@ QStringList AwesomeWidget::getKeys() allKeys.append(QString("progress")); allKeys.append(QString("title")); // ps - allKeys.append(QString("ps")); allKeys.append(QString("pscount")); allKeys.append(QString("pstotal")); + allKeys.append(QString("ps")); // package manager for (int i=counts[QString("pkg")]-1; i>=0; i--) allKeys.append(QString("pkgcount") + QString::number(i));