From 6c9a167aa287fdc7dcbc9a97318fa71dd71862a7 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 22 Oct 2013 16:22:39 +0400 Subject: [PATCH] Release 1.4.0 + added notification * small refactoring --- PKGBUILD | 8 +-- TODO | 2 +- create_archive.sh | 2 +- ext-sysmon-1.2.zip | Bin 2974 -> 2974 bytes kdeplasma-applets-pytextmonitor.install | 11 ++-- .../py-text-monitor-1.3.6.plasmoid | Bin py-text-monitor-1.4.0.plasmoid | Bin 0 -> 17248 bytes sources/contents/code/main.py | 47 +++++++++++------- .../code/plasma_applet_pytextmonitor.notifyrc | 5 ++ sources/contents/code/ptmnotify.py | 15 +++--- sources/contents/code/reinit.py | 9 ++-- sources/contents/ui/configwindow.ui | 42 ++++++++++++++++ sources/metadata.desktop | 2 +- 13 files changed, 106 insertions(+), 37 deletions(-) rename py-text-monitor-1.3.6.plasmoid => old_versions/py-text-monitor-1.3.6.plasmoid (100%) create mode 100644 py-text-monitor-1.4.0.plasmoid diff --git a/PKGBUILD b/PKGBUILD index 4f21d3e..efcefb8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=kdeplasma-applets-pytextmonitor _pkgname=py-text-monitor -pkgver=1.3.6 +pkgver=1.4.0 pkgrel=1 _dtengine=ext-sysmon _dtver=1.2 @@ -19,8 +19,8 @@ makedepends=('automoc4' 'cmake') source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}.plasmoid https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_dtengine}-${_dtver}.zip) install=${pkgname}.install -md5sums=('de54ece6545d28888a60d33f09ce69a1' - '775bc3a6057f2dc1696f09b8d315a3e9') +md5sums=('988704016573b215bb36b62762075fee' + '3182acdadb3b498be929b3cadad92206') build () { @@ -42,6 +42,8 @@ package() make DESTDIR="${pkgdir}" install # install plasmoid + install -D -m644 "${srcdir}/contents/code/plasma_applet_pytextmonitor.notifyrc" \ + "${pkgdir}/`kde4-config --prefix`/share/apps/plasma_applet_pytextmonitor/plasma_applet_pytextmonitor.notifyrc" install -D -m644 "${srcdir}/metadata.desktop" \ "${pkgdir}/`kde4-config --prefix`/share/kde4/services/${_pkgname}.desktop" install -D -m644 "${srcdir}/metadata.desktop" \ diff --git a/TODO b/TODO index 19d4a8c..f46f42f 100644 --- a/TODO +++ b/TODO @@ -3,4 +3,4 @@ b) cpuclock, mhz c) memory, % d) swap, % - f) network, % + e) network, % diff --git a/create_archive.sh b/create_archive.sh index f3c1450..b4ad3dd 100755 --- a/create_archive.sh +++ b/create_archive.sh @@ -15,7 +15,7 @@ sed -i "s/_dtver=[0-9.]*/_dtver=${VERSION}/" PKGBUILD # build widget cd sources -FILES="contents metadata.desktop" +FILES="contents metadata.desktop plasma_applet_pytextmonitor" ARCHIVE="py-text-monitor" VERSION=`grep Version metadata.desktop | awk -F "=" '{print $2}'` # create archive diff --git a/ext-sysmon-1.2.zip b/ext-sysmon-1.2.zip index efeb97ba70062cedc5dac4f95091106e8d886601..bd3d3026df7751f2347fc545c00c7ef4754a8012 100644 GIT binary patch delta 216 zcmbOyK2MxCz?+$civa}EM4Tq_Dyk^>c?W%pOA9Kk;AUWCdBM!Uz>)%#1*sEZU}E3^ zs|#{qhpO8+(~prEsCDuyMt!iDe0saKV?%T`XXgWgI$i!Id0>5S4p5 l^_hW2PJYiR16IVx<%hzrKDyr)%#1*sEZU}E3^ zs|#{qhpO8+(~pt4Q$l6(D@J|xk6B>7n-!QQGBOJR1-CHkv5P- /dev/null 2>&1 +} + +post_install() +{ + func_update cat << EOF Make sure that \`hddtemp\` can be run as non-root EOF @@ -11,10 +16,10 @@ EOF post_upgrade() { - post_install + func_update } post_remove() { - post_install + func_update } diff --git a/py-text-monitor-1.3.6.plasmoid b/old_versions/py-text-monitor-1.3.6.plasmoid similarity index 100% rename from py-text-monitor-1.3.6.plasmoid rename to old_versions/py-text-monitor-1.3.6.plasmoid diff --git a/py-text-monitor-1.4.0.plasmoid b/py-text-monitor-1.4.0.plasmoid new file mode 100644 index 0000000000000000000000000000000000000000..d9d5851984ce0448dca16f66fa795d31f5d2bfa2 GIT binary patch literal 17248 zcma)j19YWZ*6oRHv%-p#if!ArZQDu3wpp=lqf$Y|wo|eFQhi_l|LwlF`@M66DeA03ZZ1k_!9U zCJN4OFaRLXLl6J})ac{Oa{mJn9H8U<8@>NXlk$qe%lmT+zmwc~~RT9x5z^V9YYbf}TCj3NfOi+)NMW
    _FDPa3BoXO+2PENyvVyh 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') self.layout.addItem(self.label_error) return - + def updateLabel(self): """function to update label""" if ((self.memBool > 0) and (self.memInMb == False)): @@ -123,8 +136,8 @@ class pyTextWidget(plasmascript.Applet): self.swapText() if (self.batBool > 0): self.batText() - - + + def batText(self): """function to set battery text""" line = self.batFormat @@ -150,8 +163,8 @@ class pyTextWidget(plasmascript.Applet): line = line.split('$ac')[0] + bat + line.split('$ac')[1] text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] self.label_bat.setText(text) - - + + def memText(self): """function to set mem text""" full = self.mem_uf + self.mem_free @@ -163,8 +176,8 @@ class pyTextWidget(plasmascript.Applet): line = self.memFormat text = self.formatLine.split('$LINE')[0] + line + self.formatLine.split('$LINE')[1] self.label_mem.setText(text) - - + + def swapText(self): """function to set swap text""" full = self.swap_used + self.swap_free @@ -186,4 +199,4 @@ class pyTextWidget(plasmascript.Applet): def CreateApplet(parent): - return pyTextWidget(parent) + return pyTextWidget(parent) diff --git a/sources/contents/code/plasma_applet_pytextmonitor.notifyrc b/sources/contents/code/plasma_applet_pytextmonitor.notifyrc index c1d6188..a6530d8 100644 --- a/sources/contents/code/plasma_applet_pytextmonitor.notifyrc +++ b/sources/contents/code/plasma_applet_pytextmonitor.notifyrc @@ -37,3 +37,8 @@ Action=Popup Name=Battery information Comment=Battery information Action=Popup + +[Event/graphinfo] +Name=Graphical Information +Comment=Graphical Information +Action=Popup diff --git a/sources/contents/code/ptmnotify.py b/sources/contents/code/ptmnotify.py index 4cf7d6e..9f02df1 100644 --- a/sources/contents/code/ptmnotify.py +++ b/sources/contents/code/ptmnotify.py @@ -37,12 +37,13 @@ class PTMNotify: text = text + "Whoami: %s\n" %(commands.getoutput("whoami")) text = text + "Uptime: %s\n" %(commands.getoutput("uptime")) except: - pass + text = "Something wrong" elif (type == "processor"): try: output = commands.getoutput("grep 'model name' /proc/cpuinfo | head -1") text = text + "Model: %s\n" %(' '.join(output.split()[3:])) output = commands.getoutput("sar -u | tail -1") + print "1" text = text + "CPU Usage: %s%%\n" %(str(100-float(output.split()[-1]))) output = commands.getoutput("grep MHz /proc/cpuinfo | head -1") text = text + "CPU Freq: %s MHz\n" %(str(int(float(output.split()[-1])))) @@ -52,7 +53,7 @@ class PTMNotify: if (line.find("_input") > -1): text = text + " %s\xb0C" %(str(round(float(line.split()[-1]), 0))) except: - pass + text = "Something wrong" elif (type == "graphical"): try: output = commands.getoutput("lspci -m | grep 'VGA\|3D'") @@ -93,7 +94,7 @@ class PTMNotify: value = " N\A" text = text + "Temp: %s\xb0C\n" %(value) except: - pass + text = "Something wrong" elif (type == "memory"): try: output = commands.getoutput("free -m -o").split("\n") @@ -103,14 +104,14 @@ class PTMNotify: output = commands.getoutput("swapon --show").split("\n") text = text + "Swap Device: %s (%s)" %(output[1].split()[0], output[1].split()[1]) except: - pass + text = "Something wrong" elif (type == "disk"): try: output = commands.getoutput("df -h --output='source,target,used,size,pcent' --exclude-type=fuseblk --exclude-type=tmpfs --exclude-type=devtmpfs").split("\n")[1:] for line in output: text = text + "%s (to %s): %s of %s (%s)\n" %(line.split()[0], line.split()[1], line.split()[2], line.split()[3], line.split()[4]) except: - pass + text = "Something wrong" elif (type == "network"): try: output = commands.getoutput("ifconfig -a -s").split("\n")[1:] @@ -126,12 +127,12 @@ class PTMNotify: output = commands.getoutput("wget http://checkip.dyndns.org/ -q -O - | awk '{print $6}' | sed 's/<.*>//g'") text = text + "External IP: %s" %(output[:-1]) except: - pass + text = "Something wrong" elif (type == "battery"): try: text = text + "%s" %(commands.getoutput("acpi -abi")) except: - pass + text = "Something wrong" content = [type, text] return content diff --git a/sources/contents/code/reinit.py b/sources/contents/code/reinit.py index 050851e..49bf25c 100644 --- a/sources/contents/code/reinit.py +++ b/sources/contents/code/reinit.py @@ -16,7 +16,7 @@ class NewPlasmaLabel(Plasma.Label): self.parent = parent self.notify = ptmnotify.PTMNotify(self) - + def mousePressEvent(self, event): """mouse click event""" if (event.button() == Qt.LeftButton): @@ -49,6 +49,7 @@ class Reinit(): else: exec ('self.parent.' + label + 'Bool = int(settings.get("' + label + 'Bool", 0))') + # labels for order in self.parent.label_order: if (order == "1"): if (self.parent.cpuBool > 0): @@ -101,7 +102,7 @@ class Reinit(): self.parent.memFormat = str(settings.get('memFormat', '[mem: $mem%]')) if (self.parent.memFormat.split('$memmb')[0] != self.parent.memFormat): self.parent.memInMb = True - text = self.parent.formatLine.split('$LINE')[0] + self.parent.memFormat.split('$memmb')[0] + '-----' + self.parent.memFormat.split('$memmb')[1] + self.parent.formatLine.split('$LINE')[1] + line = self.parent.memFormat.split('$memmb')[0] + '-----' + self.parent.memFormat.split('$memmb')[1] elif (self.parent.memFormat.split('$mem')[0] != self.parent.memFormat): self.parent.memInMb = False self.parent.mem_used = 0.0 @@ -119,7 +120,7 @@ class Reinit(): self.parent.swapFormat = str(settings.get('swapFormat', '[swap: $swap%]')) if (self.parent.swapFormat.split('$swapmb')[0] != self.parent.swapFormat): self.parent.swapInMb = True - text = self.parent.formatLine.split('$LINE')[0] + self.parent.swapFormat.split('$swapmb')[0] + '-----' + self.parent.swapFormat.split('$swapmb')[1] + self.parent.formatLine.split('$LINE')[1] + line = self.parent.swapFormat.split('$swapmb')[0] + '-----' + self.parent.swapFormat.split('$swapmb')[1] elif (self.parent.swapFormat.split('$swap')[0] != self.parent.swapFormat): self.parent.swapInMb = False self.parent.swap_free = 1.0 @@ -281,7 +282,7 @@ class Reinit(): self.parent.theme = Plasma.Svg(self.parent) self.parent.theme.setImagePath("widgets/background") self.parent.setBackgroundHints(Plasma.Applet.DefaultBackground) - self.parent.resize(10,10) + self.parent.resize(10, 10) # create dataengines self.parent.thread().wait(60000) diff --git a/sources/contents/ui/configwindow.ui b/sources/contents/ui/configwindow.ui index f633e52..968161b 100644 --- a/sources/contents/ui/configwindow.ui +++ b/sources/contents/ui/configwindow.ui @@ -65,6 +65,9 @@ $uptime - uptime + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -118,6 +121,9 @@ $cpu - total load CPU, % $ccpu - load CPU for each core, % + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -174,6 +180,9 @@ $ccpu - load CPU for each core, % $cpucl - average CPU clock, MHz $ccpucl - CPU clock for each core, MHz + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -242,6 +251,9 @@ $ccpucl - CPU clock for each core, MHz $temp - physical temperature on CPU + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -297,6 +309,9 @@ $ccpucl - CPU clock for each core, MHz $gpu - gpu usage, % + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -352,6 +367,9 @@ $ccpucl - CPU clock for each core, MHz $gputemp - physical temperature on GPU + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -408,6 +426,9 @@ $ccpucl - CPU clock for each core, MHz $mem - RAM usage, % $memmb - RAM usage, MB + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -464,6 +485,9 @@ $memmb - RAM usage, MB $swap - swap usage, % $swapmb - swap usage, MB + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -519,6 +543,9 @@ $swapmb - swap usage, MB @@/;@@ - mount point usage, % + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -574,6 +601,9 @@ $swapmb - swap usage, MB @@/dev/sda@@ - physical temperature on /dev/sda + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -631,6 +661,9 @@ $swapmb - swap usage, MB $netdev - current network device @@eth0@@ - disable auto select device and set specified device + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -687,6 +720,9 @@ $netdev - current network device $bat - battery charge, % $ac - AC status + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -755,6 +791,9 @@ $ac - AC status "/sys/class/power_supply/BAT0/capacity" by default + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -795,6 +834,9 @@ $ac - AC status "/sys/class/power_supply/AC/online" by default + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + diff --git a/sources/metadata.desktop b/sources/metadata.desktop index beb5f2a..6b64ef9 100644 --- a/sources/metadata.desktop +++ b/sources/metadata.desktop @@ -12,7 +12,7 @@ X-Plasma-RequiredExtensions=LaunchApp,LocalIO,FileDialog X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Name=py-text-monitor -X-KDE-PluginInfo-Version=2.0.0 +X-KDE-PluginInfo-Version=1.4.0 X-KDE-PluginInfo-Website=http://kde-look.org/ X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends=