From e66e8c476b973f3cb21d445c34cb5be8de2e1a0d Mon Sep 17 00:00:00 2001 From: arcan1s Date: Wed, 29 May 2013 04:05:43 +0400 Subject: [PATCH] New release 1.3.3: edited reading temperature device rename --- README | 7 +++++-- extsysmon-1.0.zip => ext-sysmon-1.0.zip | Bin .../contents/code/main.py | 0 {extsysmon => ext-sysmon}/metadata.desktop | 0 install_ext-sysmon.sh | 3 +++ install_extsysmon.sh | 3 --- ...plasmoid => py-text-monitor-1.3.3.plasmoid | Bin 15468 -> 15481 bytes source/contents/code/main.py | 4 ++-- source/metadata.desktop | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) rename extsysmon-1.0.zip => ext-sysmon-1.0.zip (100%) rename {extsysmon => ext-sysmon}/contents/code/main.py (100%) rename {extsysmon => ext-sysmon}/metadata.desktop (100%) create mode 100755 install_ext-sysmon.sh delete mode 100755 install_extsysmon.sh rename pytextmonitor-1.3.2b.plasmoid => py-text-monitor-1.3.3.plasmoid (76%) diff --git a/README b/README index fbaca5d..864d496 100644 --- a/README +++ b/README @@ -26,8 +26,11 @@ For edited output you must open Settings window and setup output format in lines Label order will changed if you change slider position. HTML tags in label work normally. Attention: you don't may set to show $cpu in swap label for example. $cpu will work only in cpu label. -Attention: gpu, gputemp and hddtemp labels require extsysmon dataengine! + Dependencies: - extsysmon kdebindings-python2 + + extsysmon (for GPU, GPU temp and HDD temp labels) + lm_sensors (for definition temperature device) + net-tools (for definition network device) \ No newline at end of file diff --git a/extsysmon-1.0.zip b/ext-sysmon-1.0.zip similarity index 100% rename from extsysmon-1.0.zip rename to ext-sysmon-1.0.zip diff --git a/extsysmon/contents/code/main.py b/ext-sysmon/contents/code/main.py similarity index 100% rename from extsysmon/contents/code/main.py rename to ext-sysmon/contents/code/main.py diff --git a/extsysmon/metadata.desktop b/ext-sysmon/metadata.desktop similarity index 100% rename from extsysmon/metadata.desktop rename to ext-sysmon/metadata.desktop diff --git a/install_ext-sysmon.sh b/install_ext-sysmon.sh new file mode 100755 index 0000000..b08f442 --- /dev/null +++ b/install_ext-sysmon.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +plasmapkg -t dataengine -i ext-sysmon-1.0.zip diff --git a/install_extsysmon.sh b/install_extsysmon.sh deleted file mode 100755 index f336a9a..0000000 --- a/install_extsysmon.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -plasmapkg -t dataengine -i extsysmon-1.0.zip diff --git a/pytextmonitor-1.3.2b.plasmoid b/py-text-monitor-1.3.3.plasmoid similarity index 76% rename from pytextmonitor-1.3.2b.plasmoid rename to py-text-monitor-1.3.3.plasmoid index 96b77ffe26ebc8bb78a8e8ca8169ec2b376ed5f8..479f7c229fd6c19f1292e1371895f549782a80c4 100644 GIT binary patch delta 2689 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 delta 2704 zcmZvec{CJk8;55M#=b^|p+?p+cCwpnDZ-$TeVPUhNwQ^`EE$t58EaX`5<`~8j9o~! zY}JbhLy;|_tXcZh_uu<{=Q;Oz?%#Qy`>*Sq`&@g$--44BK}VUSCn|=2uMlexYZj?y z@HxkyNDSuun<)dF6fnpENTNgwOauQm=#z}VKVKoC+T&ojx&`7fws zH|d`-g0gUfUjGqyRYvxvVPEYLN16Aj7^IRE!;ygHxP@UKsx{7jGN*ptLE`qRlaav9 z@hFe}LDMc37l_r_Tvhegt}K1*DRk!=%ViHSc;=4@446J2(vhk^1zQJ`dvV^e?=dP> zZkKeVG}Gj4ZWzpyG_+1a%JX*@GzMP?5+3)wF=qBx3r8RoWv0P~FCrwcC_AJR2G%Ei z*^}it>u+;`GhI=%>u4?v&YM1LC%Up+}0&B_jzMOtfQodfXjOkc7U@D zeBwx*o%=;G(**0t^|xawUj@y?1U;%nZF84GzFRZtv-Il6o4-SQ6R(Jg;#WbrQKXIp;UN?@(8 zg#ATbLD}Ic?r63|k;B*@9ObDCP6(>CFJq=e5hZsvTyrdV z%tz6=*w>S}H3fLrfM!OUVcI2;qoWCX4^Ei*VKc_eeNS+7ecYnrViL6l>#*5eRsJR7 z+kWwNS59Nhr`Yy@!TLXvso{e+P_~$xS|DXjE%AN0-|k8FOMDe@opQ@O02I)WZK$QK zqdsf6T?)eX@|&72Wb`i)YL;tD6%twM!v)+f2nV#_3L`tWSY;$f<~GZ61NoE!4%C#F z4+m>APG=|ADG%bn?PDKWqMtoYlVn<9`>ejmKGV{=_v(%*Me4C)y76?f&B2AEK{R#I z0c8QTSKNyV-g=pXG#lA!=Y;U$51z?Myd|*9v0YowHg|KCa>$Z6f+5Y)c|C}UgDal# zeTVyG^sIHV5%frJN(desV7dw;?7@>Au_lCabzXks|<;+fiZ<11C>_sc`G3XF!==VK{z|e@Z>2HDcO&fMjj|Xji78X0>YR^V(5 zD~y4OIf;HWA2Dw+rFnHNvmUI-X!m8k3L_*Xe(>NsE_&x745`vt+<}Ep=Da>oe#FD~ z)SbyMuLIj>4UJ$mj1zQ;VwFt%n(FA68v^Plma?w=`{$SY|?s89;{r>%Ue*(XK;+|KJX zFYgRJ{fD z6xZ|gYRIofF9&9G(_vbc)Oq+zrQm8&oG8jDyldANwW#Hu!3Rr%_KGj;^)?0h(!*8S z_ZHUjg_=pss*fySCC#mi^7t4nI3*`ghpOAG`G6zEbM`QCWbt892vDpueJg(%|LwqQ z8oQHHa=Ya{Wn}8?AA(0&Geq?fkK$&>;0ydt|Lp`+hZkJN!7d#{z_%) z?V;bA&TY>6VEvznjddk#x2_i8)!+ZZ-8rRJLruu^RIfqhT=nqT9beibq+N3sqahq$ zI#LDX%Hq|@-gaQe9-18(QE3}1BySi9MC7H_PS@SG5l4Cp}V{+Nz@ z7q?3}15(>D0PzlV`=KLtEVptMl*2u?p$7#s(o;8$?^q778Ozhpv9_p&s7hfvR5L$# z{WOe%5HCgqSa#K8*~zUwg2fz=BYEY~f9UkDTM=U{T3Wx}Z{W|W&K0-HK8ugB!(IG+ z@&kT5qLbX(cf?5?kkI?92V9bqtbdzT`3f-33fg2KDx_Cx1_S_182|vDg0|un)<6bF}m7zDaW-CSL z6iu<1KYctP$g>frP@8b2vs*JGN5w;5+lxYRV2jF}*pi&uKh18r~bTM@J5 zi_hlb1CktY(@jmnW%&t-?<-xsj9beihw)`mx^42Q2^__6$pVqkA9{GcnK@*bBe%cP za-f{9tw&gAc)+WRNw&Uj`1Q}?t&bGOZXAh@azQ%N$0sE&*<2{9y^Zo&L07b9a8PM3 za@@{%kf&pBaOrlE1_)%Usf58Cet!bmsLnjJ0rqlHqm~Cfs-NVb+G)`rkqPvzL@w@g}xBtZ_bnJ8hz%flgQDme#;Qzp6`Y+6X WfwVGXV*WG9aeNSr0Dz#zpY$JBGU09j diff --git a/source/contents/code/main.py b/source/contents/code/main.py index c9eb12f..9298b57 100644 --- a/source/contents/code/main.py +++ b/source/contents/code/main.py @@ -85,8 +85,8 @@ class pyTextWidget(plasmascript.Applet): commandOut = commands.getoutput("grep -c '^processor' /proc/cpuinfo") self.numCores = int(commandOut) # setup temperature device - commandOut = commands.getoutput("sensors | grep Physical -B2") - self.tempdev = "lmsensors/"+commandOut.split("\n")[0]+"/"+'_'.join(commandOut.split("\n")[2].split(":")[0].split()) + commandOut = commands.getoutput("sensors | grep adapter -B1 -A1 | grep °C -B2") + self.tempdev = "lmsensors/" + commandOut.split("\n")[0] + "/" + '_'.join(commandOut.split("\n")[2].split(":")[0].split()) # create dictionaries self.dict_orders = {'6':'bat', '1':'cpu', '7':'cpuclock', '9':'gpu', 'a':'gputemp', diff --git a/source/metadata.desktop b/source/metadata.desktop index 070a275..bfe3777 100644 --- a/source/metadata.desktop +++ b/source/metadata.desktop @@ -12,7 +12,7 @@ X-Plasma-RequiredExtensions=FileDialog,LaunchApp,LocalIO X-KDE-PluginInfo-Author=Evgeniy Alexeev aka arcanis X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Name=py-text-monitor -X-KDE-PluginInfo-Version=1.3.2b +X-KDE-PluginInfo-Version=1.3.3 X-KDE-PluginInfo-Website=http://kde-look.org/ X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends=