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 96b77ff..479f7c2 100644 Binary files a/pytextmonitor-1.3.2b.plasmoid and b/py-text-monitor-1.3.3.plasmoid differ 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=