diff --git a/CHANGELOG b/CHANGELOG index 6a13492..49281cf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ Ver.1.7.4: + added support more than 10 tags in cpu, cpuclock, hdd, hddtemp, temp labels +* changes in custom uptime format Ver.1.7.3: + added tags $memgb, $swapgb diff --git a/CHANGELOG-RU b/CHANGELOG-RU index 684327c..961ad09 100644 --- a/CHANGELOG-RU +++ b/CHANGELOG-RU @@ -1,5 +1,6 @@ Вер.1.7.4: + добавлена поддержка более чем 10 тэгов в полях cpu, cpuclock, hdd, hddtemp, temp +* изменения в кастомном формате аптайма Вер.1.7.3: + добавлены тэги $memgb, $swapgb diff --git a/PKGBUILD b/PKGBUILD index e12af93..398c330 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=kdeplasma-applets-pytextmonitor _pkgname=pytextmonitor -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="Minimalistic Plasmoid script written on Python2. It looks like widgets in Awesome WM" arch=('i686' 'x86_64') @@ -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=('de9de52ffae7d94bd123cea801a411da') +md5sums=('2da85505e39497baf50cbade068c0780') backup=('usr/share/config/extsysmon.conf') prepare() { diff --git a/sources/ptm/contents/code/dataengine.py b/sources/ptm/contents/code/dataengine.py index be3d8d0..f0f4fdf 100644 --- a/sources/ptm/contents/code/dataengine.py +++ b/sources/ptm/contents/code/dataengine.py @@ -230,15 +230,15 @@ class DataEngine: if (updatedData['value'].split('$dd')[0] != updatedData['value']): updatedData['value'] = "%s%03i%s" % (updatedData['value'].split('$dd')[0], days, updatedData['value'].split('$dd')[1]) if (updatedData['value'].split('$d')[0] != updatedData['value']): - updatedData['value'] = "%s%3i%s" % (updatedData['value'].split('$d')[0], days, updatedData['value'].split('$d')[1]) + updatedData['value'] = "%s%i%s" % (updatedData['value'].split('$d')[0], days, updatedData['value'].split('$d')[1]) if (updatedData['value'].split('$hh')[0] != updatedData['value']): updatedData['value'] = "%s%02i%s" % (updatedData['value'].split('$hh')[0], hours, updatedData['value'].split('$hh')[1]) if (updatedData['value'].split('$h')[0] != updatedData['value']): - updatedData['value'] = "%s%2i%s" % (updatedData['value'].split('$h')[0], hours, updatedData['value'].split('$h')[1]) + updatedData['value'] = "%s%i%s" % (updatedData['value'].split('$h')[0], hours, updatedData['value'].split('$h')[1]) if (updatedData['value'].split('$mm')[0] != updatedData['value']): updatedData['value'] = "%s%02i%s" % (updatedData['value'].split('$mm')[0], minutes, updatedData['value'].split('$mm')[1]) if (updatedData['value'].split('$m')[0] != updatedData['value']): - updatedData['value'] = "%s%2i%s" % (updatedData['value'].split('$m')[0], minutes, updatedData['value'].split('$m')[1]) + updatedData['value'] = "%s%i%s" % (updatedData['value'].split('$m')[0], minutes, updatedData['value'].split('$m')[1]) except: pass return updatedData