-

+ added notification
* small refactoring

PKGBUILD

@@ -0,0 +1,56 @@
+# Author: Evgeniy "arcanis" Alexeev <esalexeev@gmail.com>
+# Maintainer: Evgeniy "arcanis" Alexeev <esalexeev@gmail.com>
+
+pkgname=kdeplasma-applets-pytextmonitor
+_pkgname=py-text-monitor
+pkgver=1.4.0
+pkgrel=1
+_dtengine=ext-sysmon
+_dtver=1.2
+pkgdesc="Minimalistic Plasmoid script written on Python2. It looks like widgets in awesome-wm"
+arch=('i686' 'x86_64')
+url="https://github.com/arcan1s/pytextmonitor"
+license=('GPL')
+depends=('kdebase-workspace' 'kdebindings-python2' 'lm_sensors' 'net-tools')
+optdepends=("hddtemp: for HDD temperature monitor" 
+            "catalyst: for GPU monitor" 
+            "nvidia-utils: for GPU monitor")
+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=('988704016573b215bb36b62762075fee'
+         '3182acdadb3b498be929b3cadad92206')
+
+build ()
+{
+  # build dataengine
+  if [[ -d ${srcdir}/${_dtengine}/build ]]; then
+    rm -rf "${srcdir}/${_dtengine}/build"
+  fi
+  mkdir "${srcdir}/${_dtengine}/build"; cd "${srcdir}/${_dtengine}/build"
+  cmake -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
+        ../
+  make
+}
+
+package()
+{
+  # install dataengine
+  cd "${srcdir}/${_dtengine}/build"
+  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" \
+                   "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/metadata.desktop"
+  mkdir -p "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/"{code,ui}
+  install -m644 "${srcdir}/contents/code/"* \
+                -t "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/code"
+  install -m644 "${srcdir}/contents/ui/"* \
+                -t "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/ui"
+}

README

@@ -1,4 +1,4 @@
-pytextmonitor
+py-text-monitor
 =============
 
 PyTextMonitor is a minimalistic Plasmoid script written on Python2. It looks like widgets in awesome-wm.
@@ -33,4 +33,4 @@ Dependencies:
   
   ext-sysmon (for GPU, GPU temp and HDD temp labels)
   lm_sensors (for definition temperature device)
-  net-tools (for definition network device)
+  net-tools (for definition network device)

TODO

@@ -0,0 +1,6 @@
+1. Tooltip (graphical information):
+  a) cpu, %
+  b) cpuclock, mhz
+  c) memory, %
+  d) swap, %
+  e) network, %

create_archive.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# build dataengine
+ARCHIVE="ext-sysmon"
+VERSION=`grep Version ext-sysmon/plasma-engine-extsysmon.desktop | awk -F "=" '{print $2}'`
+# create archive
+if [ -e ${ARCHIVE}-${VERSION}.zip ]; then
+  rm -f ${ARCHIVE}-${VERSION}.zip
+fi
+zip -9 -y -r -q ${ARCHIVE}-${VERSION}.zip ${ARCHIVE}
+# update md5sum
+MD5SUMS=`md5sum ${ARCHIVE}-${VERSION}.zip | awk '{print $1}'`
+sed -i "/         '[0-9A-Fa-f]*/s/[^'][^)]*/         '${MD5SUMS}'/" PKGBUILD
+sed -i "s/_dtver=[0-9.]*/_dtver=${VERSION}/" PKGBUILD
+
+# build widget
+cd sources
+FILES="contents metadata.desktop plasma_applet_pytextmonitor"
+ARCHIVE="py-text-monitor"
+VERSION=`grep Version metadata.desktop | awk -F "=" '{print $2}'`
+# create archive
+if [ -e ${ARCHIVE}-${VERSION}.plasmoid ]; then
+  rm -f ${ARCHIVE}-${VERSION}.plasmoid
+fi
+zip -9 -y -r -q ../${ARCHIVE}-${VERSION}.plasmoid ${FILES}
+cd ..
+# update md5sum
+MD5SUMS=`md5sum ${ARCHIVE}-${VERSION}.plasmoid | awk '{print $1}'`
+sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD
+sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD

ext-sysmon/CMakeLists.txt

@@ -0,0 +1,24 @@
+# set project name
+project (plasma_engine_extsysmon)
+
+# find required libaries
+find_package (KDE4 REQUIRED)
+include (KDE4Defaults)
+
+add_definitions (${QT_DEFINITIONS} 
+                 ${KDE4_DEFINITIONS})
+include_directories (${CMAKE_SOURCE_DIR} 
+                     ${CMAKE_BINARY_DIR} 
+                     ${KDE4_INCLUDES})
+
+set (PLUGIN_NAME ${PROJECT_NAME})
+file (GLOB PROJECT_DESKTOP *.desktop)
+file (GLOB PROJECT_SRCS *.cpp)
+
+# make
+kde4_add_plugin (${PLUGIN_NAME} ${PROJECT_SRCS})
+target_link_libraries (${PLUGIN_NAME} ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS})
+
+# install
+install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGIN_INSTALL_DIR})
+install(FILES ${PROJECT_DESKTOP} DESTINATION ${SERVICES_INSTALL_DIR})

ext-sysmon/contents/code/main.py

@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from PyQt4.QtCore import *
-from PyKDE4.kdecore import *
-from PyKDE4 import plasmascript
-import commands
-
-
-
-class ExtendedSysMon(plasmascript.DataEngine):
-    def __init__(self, parent, args=None):
-        """dataengine definition"""
-        plasmascript.DataEngine.__init__(self, parent)
- 
- 
-    def init(self):
-        """initialization"""
-        self.setMinimumPollingInterval(333)
-        
-        # setup gpu device
-        self.gpudev = ''
-        commandOut = commands.getoutput("lspci")
-        if (commandOut.lower().find('nvidia') > -1):
-            self.gpudev = 'nvidia'
-        elif (commandOut.lower().find('radeon') > -1):
-            self.gpudev = 'ati'
-        
-        # setup hdd devices
-        self.hdddev = []
-        commandOut = commands.getoutput("ls -1 /dev/sd[a-z] && ls -1 /dev/hd[a-z]")
-        for device in commandOut.split('\n'):
-            if (device[:3] != "ls:"):
-                self.hdddev.append(device)
-    
-    
-    def sources(self):
-        """create sources"""
-        sources = ["gpu", "gputemp", "hddtemp"]
-        return sources
-    
-    
-    def sourceRequestEvent(self, name):
-        return self.updateSourceEvent(name)
-    
-    
-    def updateSourceEvent(self, source):
-        """update sources and setup values"""
-        if (source == "gpu"):
-            key = "GPU"
-            if (self.gpudev == 'nvidia'):
-                commandOut = commands.getoutput("nvidia-smi -q -d UTILIZATION | grep Gpu | tail -n1")
-                try:
-                    value = "%5s" % (str(round(float(commandOut.split()[2][:-1]), 1)))
-                except:
-                    value = "  N\A"
-            elif (self.gpudev == 'ati'):
-                commandOut = commands.getoutput("aticonfig --od-getclocks | grep load | tail -n1")
-                try:
-                    value = "%5s" % (str(round(float(commandOut.split()[3][:-1]), 1)))
-                except:
-                    value = "  N\A"
-            else:
-                value = "  N\A"
-            self.setData(source, "GPU", QString(value))
-        elif (source == "gputemp"):
-            if (self.gpudev == 'nvidia'):
-                commandOut = commands.getoutput("nvidia-smi -q -d TEMPERATURE | grep Gpu | tail -n1")
-                try:
-                    value = "%4s" % (str(round(float(commandOut.split()[2]), 1)))
-                except:
-                    value = " N\A"
-            elif (self.gpudev == 'ati'):
-                commandOut = commands.getoutput("aticonfig --od-gettemperature | grep Temperature | tail -n1")
-                try:
-                    value = "%4s" % (str(round(float(commandOut.split()[4]), 1)))
-                except:
-                    value = " N\A"
-            else:
-                value = " N\A"
-            self.setData(source, "GPUTemp", QString(value))
-        elif (source == "hddtemp"):
-            for device in self.hdddev:
-                commandOut = commands.getoutput("hddtemp " + device)
-                try:
-                    value = "%4s" % (str(round(float(commandOut.split(':')[2][:-3]), 1)))
-                except:
-                    value = " N\A"
-                self.setData(source, device, QString(value))
- 
-        return True
-
-
-
-def CreateDataEngine(parent):
-    return ExtendedSysMon(parent)

ext-sysmon/extsysmon.cpp

@@ -0,0 +1,175 @@
+#include "extsysmon.h"
+
+#include <Plasma/DataContainer>
+
+#include <stdio.h>
+
+ExtendedSysMon::ExtendedSysMon(QObject* parent, const QVariantList& args)
+  : Plasma::DataEngine(parent, args)
+{
+  Q_UNUSED(args)
+
+  setMinimumPollingInterval(333);
+
+  FILE *f_out;
+  f_out = popen("lspci 2>&1", "r");
+  char device[256];
+  QString dev;
+  while (fgets(device, 256, f_out) != NULL)
+  {
+    dev = QString(device);
+    if (dev.toLower().contains("nvidia"))
+      gpudev = QString("nvidia");
+    else if (dev.toLower().contains("radeon"))
+      gpudev = QString("ati");
+  }
+  pclose(f_out);
+
+  f_out = popen("ls -1 /dev/sd[a-z] && ls -1 /dev/hd[a-z] 2>&1", "r");
+  while (fgets(device, 256, f_out) != NULL)
+  {
+    dev = QString(device);
+    if (dev[0] == '/')
+      hdddev.append(dev);
+  }
+  pclose(f_out);
+}
+
+QStringList ExtendedSysMon::sources() const
+{
+  QStringList source;
+  source.append(QString("gpu"));
+  source.append(QString("gputemp"));
+  source.append(QString("hddtemp"));
+  return source;
+}
+
+bool ExtendedSysMon::sourceRequestEvent(const QString &name)
+{
+  return updateSourceEvent(name);
+}
+
+bool ExtendedSysMon::updateSourceEvent(const QString &source)
+{
+  FILE *f_out;
+  QString key, out, tmp_out, value;
+  bool ok = false;
+  char output[256], val[5];
+  if (source == QString("gpu"))
+  {
+    key = QString("GPU");
+    if (gpudev == QString("nvidia"))
+    {
+      f_out = popen("nvidia-smi -q -d UTILIZATION | grep Gpu | tail -n1 2>&1", "r");
+      fgets (output, 256, f_out);
+      if ((output[0] == '\0') ||
+          (QString(output).split(QString(" "), QString::SkipEmptyParts).count() < 2))
+        value = QString("  N\\A");
+      else
+      {
+        out = QString(output).split(QString(" "), QString::SkipEmptyParts)[2];
+        sprintf (val, "%5.1f", out.left(out.count()-2).toFloat(&ok));
+        value = QString(val);
+      }
+      pclose(f_out);
+    }
+    else if (gpudev == QString("ati"))
+    {
+      f_out = popen("aticonfig --od-getclocks | grep load | tail -n1 2>&1", "r");
+      fgets (output, 256, f_out);
+      if ((output[0] == '\0') ||
+          (QString(output).split(QString(" "), QString::SkipEmptyParts).count() < 3))
+        value = QString("  N\\A");
+      else
+      {
+        out = QString(output).split(QString(" "), QString::SkipEmptyParts)[3];
+        sprintf (val, "%5.1f", out.left(out.count()-2).toFloat(&ok));
+        value = QString(val);
+      }
+      pclose(f_out);
+    }
+    else
+    {
+      value = QString("  N\\A");
+    }
+    if (ok == false)
+      value = QString("  N\\A");
+    value = value.split(QString(","), QString::SkipEmptyParts).join(QString("."));
+    setData(source, key, value);
+  }
+  else if (source == QString("gputemp"))
+  {
+    key = QString("GPUTemp");
+    if (gpudev == QString("nvidia"))
+    {
+      f_out = popen("nvidia-smi -q -d TEMPERATURE | grep Gpu | tail -n1 2>&1", "r");
+      fgets (output, 256, f_out);
+      if ((output[0] == '\0') ||
+          (QString(output).split(QString(" "), QString::SkipEmptyParts).count() < 2))
+        value = QString(" N\\A");
+      else
+      {
+        out = QString(output).split(QString(" "), QString::SkipEmptyParts)[2];
+        sprintf (val, "%4.1f", out.toFloat(&ok));
+        value = QString(val);
+      }
+      pclose(f_out);
+    }
+    else if (gpudev == QString("ati"))
+    {
+      f_out = popen("aticonfig --od-gettemperature | grep Temperature | tail -n1 2>&1", "r");
+      fgets (output, 256, f_out);
+      if ((output[0] == '\0') ||
+          (QString(output).split(QString(" "), QString::SkipEmptyParts).count() < 4))
+        value = QString(" N\\A");
+      else
+      {
+        out = QString(output).split(QString(" "), QString::SkipEmptyParts)[4];
+        sprintf (val, "%4.1f", out.toFloat(&ok));
+        value = QString(val);
+      }
+      pclose(f_out);
+    }
+    else
+    {
+      value = QString(" N\\A");
+    }
+    if (ok == false)
+      value = QString(" N\\A");
+    value = value.split(QString(","), QString::SkipEmptyParts).join(QString("."));
+    setData(source, key, value);
+  }
+  else if (source == QString("hddtemp"))
+  {
+    char command[256], *dev;
+    QByteArray qb;
+    for (int i=0; i<hdddev.count(); i++)
+    {
+      qb = hdddev[i].toUtf8();
+      dev = qb.data();
+      sprintf(command, "hddtemp %s", dev);
+      f_out = popen(command, "r");
+      fgets(output, 256, f_out);
+      if ((output[0] == '\0') ||
+          (QString(output).split(QString(":"), QString::SkipEmptyParts).count() < 3))
+        value = QString(" N\\A");
+      else
+      {
+        out = QString(output).split(QString(":"), QString::SkipEmptyParts)[2];
+        sprintf (val, "%4.1f", out.left(out.count()-4).toFloat(&ok));
+        value = QString(val);
+      }
+      pclose(f_out);
+      if (ok == false)
+        value = QString(" N\\A");
+      value = value.split(QString(","), QString::SkipEmptyParts).join(QString("."));
+      setData(source, hdddev[i], value);
+    }
+  }
+
+  return true;
+}
+
+K_EXPORT_PLASMA_DATAENGINE(extsysmon, ExtendedSysMon)
+
+#include "extsysmon.moc" 

ext-sysmon/extsysmon.h

@@ -0,0 +1,21 @@
+#ifndef EXTSYSMON_H
+#define EXTSYSMON_H
+
+#include <Plasma/DataEngine>
+
+class ExtendedSysMon : public Plasma::DataEngine
+{
+  Q_OBJECT
+
+public:
+  ExtendedSysMon(QObject *parent, const QVariantList &args);
+
+protected:
+  bool sourceRequestEvent(const QString &name);
+  bool updateSourceEvent(const QString &source);
+  QStringList hdddev;
+  QString gpudev;
+  QStringList sources() const;
+};
+
+#endif // EXTSYSMON_H 

ext-sysmon/plasma-engine-extsysmon.desktop

@@ -6,14 +6,14 @@ ServiceTypes=Plasma/DataEngine
 Type=Service
 Icon=utilities-system-monitor
 
-X-Plasma-API=python
-X-Plasma-MainScript=code/main.py
+X-KDE-ServiceTypes=Plasma/DataEngine
+X-KDE-Library=plasma_engine_extsysmon
+X-Plasma-EngineName=ext-sysmon
 
-X-KDE-PluginInfo-Author=Evgeniy Alexeev aka arcanis
+X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=ext-sysmon
-X-KDE-PluginInfo-Version=1.0
-X-KDE-PluginInfo-Website=http://kde-look.org/
+X-KDE-PluginInfo-Version=1.2
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL

kdeplasma-applets-pytextmonitor.install

@@ -0,0 +1,25 @@
+func_update()
+{
+  cat << EOF
+Update plasmoids...
+EOF
+  kbuildsycoca4 > /dev/null 2>&1
+}
+
+post_install()
+{
+  func_update
+  cat << EOF
+Make sure that \`hddtemp\` can be run as non-root
+EOF
+}
+
+post_upgrade()
+{
+  func_update
+}
+
+post_remove()
+{
+  func_update
+}

sources/contents/code/configdef.py

@@ -37,15 +37,15 @@ class ConfigDefinition:
         settings.set('font_weight', self.parent.font_weight)
         
         # disconnecting from source and clear layout
-        if (self.parent.uptimeBool == 1):
+        if (self.parent.uptimeBool > 0):
             self.parent.systemmonitor.disconnectSource("system/uptime",  self.parent)
             self.parent.label_uptime.setText('')
             self.parent.layout.removeItem(self.parent.label_uptime)
-        if (self.parent.cpuBool == 1):
+        if (self.parent.cpuBool > 0):
             self.parent.systemmonitor.disconnectSource("cpu/system/TotalLoad", self.parent)
             if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat):
-                self.parent.label_cpu0.setText('')
-                self.parent.layout.removeItem(self.parent.label_cpu0)
+                self.parent.label_cpu.setText('')
+                self.parent.layout.removeItem(self.parent.label_cpu)
                 self.parent.label_cpu1.setText('')
                 self.parent.layout.removeItem(self.parent.label_cpu1)
                 for core in range(self.parent.numCores):
@@ -55,11 +55,11 @@ class ConfigDefinition:
             else:
                 self.parent.label_cpu.setText('')
                 self.parent.layout.removeItem(self.parent.label_cpu)
-        if (self.parent.cpuclockBool == 1):
+        if (self.parent.cpuclockBool > 0):
             self.parent.systemmonitor.disconnectSource("cpu/system/AverageClock", self.parent)
             if (self.parent.cpuclockFormat.split('$ccpu')[0] != self.parent.cpuclockFormat):
-                self.parent.label_cpuclock0.setText('')
-                self.parent.layout.removeItem(self.parent.label_cpuclock0)
+                self.parent.label_cpuclock.setText('')
+                self.parent.layout.removeItem(self.parent.label_cpuclock)
                 self.parent.label_cpuclock1.setText('')
                 self.parent.layout.removeItem(self.parent.label_cpuclock1)
                 for core in range(self.parent.numCores):
@@ -69,32 +69,32 @@ class ConfigDefinition:
             else:
                 self.parent.label_cpuclock.setText('')
                 self.parent.layout.removeItem(self.parent.label_cpuclock)
-        if (self.parent.tempBool == 1):
+        if (self.parent.tempBool > 0):
             self.parent.systemmonitor.disconnectSource(self.parent.tempdev, self.parent)
             self.parent.label_temp.setText('')
             self.parent.layout.removeItem(self.parent.label_temp)
-        if (self.parent.gpuBool == 1):
+        if (self.parent.gpuBool > 0):
             self.parent.extsysmon.disconnectSource("gpu", self.parent)
             self.parent.label_gpu.setText('')
             self.parent.layout.removeItem(self.parent.label_gpu)
-        if (self.parent.gputempBool == 1):
+        if (self.parent.gputempBool > 0):
             self.parent.extsysmon.disconnectSource("gputemp", self.parent)
             self.parent.label_gputemp.setText('')
             self.parent.layout.removeItem(self.parent.label_gputemp)
-        if (self.parent.memBool == 1):
+        if (self.parent.memBool > 0):
             self.parent.systemmonitor.disconnectSource("mem/physical/application", self.parent)
             if (self.parent.memInMb == False):
                 self.parent.systemmonitor.disconnectSource("mem/physical/free", self.parent)
                 self.parent.systemmonitor.disconnectSource("mem/physical/used", self.parent)
             self.parent.label_mem.setText('')
             self.parent.layout.removeItem(self.parent.label_mem)
-        if (self.parent.swapBool == 1):
+        if (self.parent.swapBool > 0):
             self.parent.systemmonitor.disconnectSource("mem/swap/used", self.parent)
             if (self.parent.swapInMb == False):
                 self.parent.systemmonitor.disconnectSource("mem/swap/free", self.parent)
             self.parent.label_swap.setText('')
             self.parent.layout.removeItem(self.parent.label_swap)
-        if (self.parent.hddBool == 1):
+        if (self.parent.hddBool > 0):
             for mount in self.parent.mountPoints:
                 self.parent.systemmonitor.disconnectSource("partitions" + mount + "/filllevel", self.parent)
                 exec ('self.parent.label_hdd_' + ''.join(mount.split('/')) + '.setText("")')
@@ -103,30 +103,28 @@ class ConfigDefinition:
             self.parent.label_hdd1.setText('')
             self.parent.layout.removeItem(self.parent.label_hdd0)
             self.parent.layout.removeItem(self.parent.label_hdd1)
-        if (self.parent.hddtempBool == 1):
+        if (self.parent.hddtempBool > 0):
             self.parent.extsysmon.disconnectSource("hddtemp", self.parent)
             self.parent.label_hddtemp.setText('')
             self.parent.layout.removeItem(self.parent.label_hddtemp)
-        if (self.parent.netBool == 1):
+        if (self.parent.netBool > 0):
             self.parent.systemmonitor.disconnectSource("network/interfaces/"+self.parent.netdev+"/transmitter/data", self.parent)
             self.parent.systemmonitor.disconnectSource("network/interfaces/"+self.parent.netdev+"/receiver/data", self.parent)
             self.parent.label_netDown.setText('')
             self.parent.label_netUp.setText('')
             self.parent.layout.removeItem(self.parent.label_netUp)
             self.parent.layout.removeItem(self.parent.label_netDown)
-        if (self.parent.batBool == 1):
+        if (self.parent.batBool > 0):
             self.parent.label_bat.setText('')
             self.parent.layout.removeItem(self.parent.label_bat)
         
         self.parent.label_order = "------------"
         
         for label in self.parent.dict_orders.keys():
-            if (self.configpage.checkboxes[self.parent.dict_orders[label]].checkState() == 2):
-                exec ('self.parent.' + self.parent.dict_orders[label] + 'Bool = 1')
+            exec ('self.parent.' + self.parent.dict_orders[label] + 'Bool = ' + str(self.configpage.checkboxes[self.parent.dict_orders[label]].checkState()))
+            if (self.configpage.checkboxes[self.parent.dict_orders[label]].checkState() > 0):
                 pos = self.configpage.sliders[self.parent.dict_orders[label]].value() - 1
                 self.parent.label_order = self.parent.label_order[:pos] + label + self.parent.label_order[pos+1:]
-            else:
-                exec ('self.parent.' + self.parent.dict_orders[label] + 'Bool = 0')
             if (self.parent.dict_orders[label] == 'net'):
                 exec ('self.parent.' + self.parent.dict_orders[label] + 'NonFormat = str(self.configpage.lineedits[self.parent.dict_orders[label]].text())')
                 exec ('settings.set("' + self.parent.dict_orders[label] + 'NonFormat", self.parent.' + self.parent.dict_orders[label] + 'NonFormat)')
@@ -147,7 +145,7 @@ class ConfigDefinition:
         settings.set('label_order', self.parent.label_order)
         
         # reinitializate
-        self.parent.reinit.reinit()
+        self.parent.reinit.reinit(confAccept=True)
     
     
     def createConfigurationInterface(self, parent):
@@ -167,11 +165,9 @@ class ConfigDefinition:
         self.configpage.ui.spinBox_weight.setValue(settings.get('font_weight', 400).toInt()[0])
         for label in self.parent.dict_orders.keys():
             exec ('bool = self.parent.' + self.parent.dict_orders[label] + 'Bool')
-            if (bool == 1):
-                self.configpage.checkboxes[self.parent.dict_orders[label]].setCheckState(2)
+            self.configpage.checkboxes[self.parent.dict_orders[label]].setCheckState(bool)
+            if (bool > 0):
                 self.configpage.sliders[self.parent.dict_orders[label]].setValue(self.parent.label_order.find(label)+1)
-            else:
-                self.configpage.checkboxes[self.parent.dict_orders[label]].setCheckState(0)
             if (self.parent.dict_orders[label] == 'net'):
                 self.configpage.lineedits[self.parent.dict_orders[label]].setText(str(settings.get(self.parent.dict_orders[label] + 'NonFormat', self.parent.dict_defFormat[self.parent.dict_orders[label]])))
             else:

sources/contents/code/configwindow.py

@@ -43,7 +43,7 @@ class ConfigWindow(QWidget):
         """function to enable label"""
         count = self.sliders['bat'].maximum()
         for label in self.checkboxes.keys():
-            if ((self.checkboxes[label].checkState() == 2) and (self.sliders[label].isEnabled() == False)):
+            if ((self.checkboxes[label].checkState() > 0) and (self.sliders[label].isEnabled() == False)):
                 self.lineedits[label].setEnabled(True)
                 self.sliders[label].setEnabled(True)
                 if (label == 'bat'):

sources/contents/code/dataengine.py

@@ -16,46 +16,46 @@ class DataEngine:
     def connectToEngine(self):
         """function to initializate engine"""
         self.parent.systemmonitor = self.parent.dataEngine("systemmonitor")
-        if ((self.parent.gputempBool == 1) or (self.parent.gpuBool == 1) or (self.parent.hddtempBool == 1)):
+        if ((self.parent.gputempBool > 0) or (self.parent.gpuBool > 0) or (self.parent.hddtempBool > 0)):
             self.parent.extsysmon = self.parent.dataEngine("ext-sysmon")
         
-        if (self.parent.uptimeBool == 1):
+        if (self.parent.uptimeBool > 0):
             self.parent.systemmonitor.connectSource("system/uptime", self.parent, self.parent.interval)
-        if (self.parent.cpuBool == 1):
+        if (self.parent.cpuBool > 0):
             self.parent.systemmonitor.connectSource("cpu/system/TotalLoad", self.parent, self.parent.interval)
             if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat):
                 for core in range(self.parent.numCores):
                     self.parent.systemmonitor.connectSource("cpu/cpu"+str(core)+"/TotalLoad", self.parent, self.parent.interval)
-        if (self.parent.cpuclockBool == 1):
+        if (self.parent.cpuclockBool > 0):
             self.parent.systemmonitor.connectSource("cpu/system/AverageClock", self.parent, self.parent.interval)
             if (self.parent.cpuclockFormat.split('$ccpucl')[0] != self.parent.cpuclockFormat):
                 for core in range(self.parent.numCores):
                     self.parent.systemmonitor.connectSource("cpu/cpu"+str(core)+"/clock", self.parent, self.parent.interval)
-        if (self.parent.tempBool == 1):
+        if (self.parent.tempBool > 0):
             self.parent.systemmonitor.connectSource(self.parent.tempdev, self.parent, self.parent.interval)
-        if (self.parent.gpuBool == 1):
+        if (self.parent.gpuBool > 0):
             self.parent.extsysmon.connectSource("gpu", self.parent, self.parent.interval)
-        if (self.parent.gputempBool == 1):
+        if (self.parent.gputempBool > 0):
             self.parent.extsysmon.connectSource("gputemp", self.parent, self.parent.interval)
-        if (self.parent.memBool == 1):
+        if (self.parent.memBool > 0):
             if (self.parent.memInMb):
                 self.parent.systemmonitor.connectSource("mem/physical/application", self.parent, self.parent.interval)
             else:
                 self.parent.systemmonitor.connectSource("mem/physical/free", self.parent, int(self.parent.interval*0.5))
                 self.parent.systemmonitor.connectSource("mem/physical/used", self.parent, int(self.parent.interval*0.5))
                 self.parent.systemmonitor.connectSource("mem/physical/application", self.parent, int(self.parent.interval*0.5))
-        if (self.parent.swapBool == 1):
+        if (self.parent.swapBool > 0):
             if (self.parent.swapInMb):
                 self.parent.systemmonitor.connectSource("mem/swap/used", self.parent, self.parent.interval)
             else:
                 self.parent.systemmonitor.connectSource("mem/swap/free", self.parent, int(self.parent.interval*0.5))
                 self.parent.systemmonitor.connectSource("mem/swap/used", self.parent, int(self.parent.interval*0.5))
-        if (self.parent.hddBool == 1):
+        if (self.parent.hddBool > 0):
             for mount in self.parent.mountPoints:
                 self.parent.systemmonitor.connectSource("partitions" + mount + "/filllevel", self.parent, self.parent.interval)
-        if (self.parent.hddtempBool == 1):
+        if (self.parent.hddtempBool > 0):
             self.parent.extsysmon.connectSource("hddtemp", self.parent, self.parent.interval)
-        if (self.parent.netBool == 1):
+        if (self.parent.netBool > 0):
             self.parent.updateNetdev = 0
             self.parent.systemmonitor.connectSource("network/interfaces/"+self.parent.netdev+"/transmitter/data", self.parent, self.parent.interval)
             self.parent.systemmonitor.connectSource("network/interfaces/"+self.parent.netdev+"/receiver/data", self.parent, self.parent.interval)
@@ -81,7 +81,7 @@ class DataEngine:
                     else:
                         line = self.parent.cpuFormat.split('$ccpu')[0]
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_cpu0.setText(text)
+                    self.parent.label_cpu.setText(text)
                     if (self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[0] != self.parent.cpuFormat.split('$ccpu')[1]):
                         line = self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[0] + cpuText + self.parent.cpuFormat.split('$ccpu')[1].split('$cpu')[1]
                     else:
@@ -109,7 +109,7 @@ class DataEngine:
                     else:
                         line = self.parent.cpuclockFormat.split('$ccpucl')[0]
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_cpuclock0.setText(text)
+                    self.parent.label_cpuclock.setText(text)
                     if (self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] != self.parent.cpuclockFormat.split('$ccpucl')[1]):
                         line = self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[0] + cpuclockText + self.parent.cpuclockFormat.split('$ccpucl')[1].split('$cpucl')[1]
                     else:
@@ -153,7 +153,7 @@ class DataEngine:
                     if (self.parent.netNonFormat.split('@@')[0] == self.parent.netNonFormat):
                         self.parent.systemmonitor.disconnectSource("network/interfaces/"+self.parent.netdev+"/transmitter/data", self.parent)
                         self.parent.systemmonitor.disconnectSource("network/interfaces/"+self.parent.netdev+"/receiver/data", self.parent)
-                        self.parent.setupNetdev()
+                        self.parent.netdev = self.parent.setupNetdev()
                         self.parent.systemmonitor.connectSource("network/interfaces/"+self.parent.netdev+"/transmitter/data", self.parent, self.parent.interval)
                         self.parent.systemmonitor.connectSource("network/interfaces/"+self.parent.netdev+"/receiver/data", self.parent, self.parent.interval)
                     if (self.parent.netNonFormat.split('$netdev')[0] != self.parent.netNonFormat):

sources/contents/code/main.py

@@ -7,7 +7,7 @@ from PyKDE4.kdeui import *
 from PyKDE4.kio import *
 from PyKDE4 import plasmascript
 from PyKDE4.plasma import Plasma
-import commands, os, time
+import commands, os, shutil, time
 
 import configdef
 import configwindow
@@ -21,8 +21,8 @@ class pyTextWidget(plasmascript.Applet):
     def __init__(self, parent, args=None):
         """widget definition"""
         plasmascript.Applet.__init__(self, parent)
-
-
+    
+    
     def init(self):
         """function to initializate widget"""
         self._name = str(self.package().metadata().pluginName())
@@ -36,9 +36,14 @@ class pyTextWidget(plasmascript.Applet):
         QObject.connect(self.timer, SIGNAL("timeout()"), self.updateLabel)
         
         self.setupVar()
-        self.reinit.reinit()
+        self.reinit.reinit(confAccept=False)
         
         self.setHasConfigurationInterface(True)
+        # Create notifyrc file if required
+        kdehome = unicode(KGlobal.dirs().localkdedir())
+        if ((not os.path.exists(kdehome + "/share/apps/plasma_applet_pytextmonitor/plasma_applet_pytextmonitor.notifyrc")) or
+            (not os.path.exists("/usr" + "/share/apps/plasma_applet_pytextmonitor/plasma_applet_pytextmonitor.notifyrc"))):
+            self.createNotifyrc(kdehome)
     
     
     def createConfigurationInterface(self, parent):
@@ -48,6 +53,14 @@ class pyTextWidget(plasmascript.Applet):
         self.configdef.createConfigurationInterface(parent)
     
     
+    def createNotifyrc(self, kdehome):
+        """function to create *.notifyrc"""
+        if (not os.path.isdir(kdehome + "/share/apps/plasma_applet_pytextmonitor")):
+            os.mkdir(kdehome + "/share/apps/plasma_applet_pytextmonitor")
+        shutil.copy(kdehome + "/share/apps/plasma/plasmoids/py-text-monitor/contents/code/plasma_applet_pytextmonitor.notifyrc",
+                    kdehome + "/share/apps/plasma_applet_pytextmonitor/")
+    
+    
     def initTooltip(self):
         """function to create tooltip"""
         self.tooltip = Plasma.ToolTipContent()
@@ -57,29 +70,30 @@ class pyTextWidget(plasmascript.Applet):
         # show tooltip
         #Plasma.ToolTipManager.self().setContent(self.applet, self.tooltip)
     
-
+    
     def mouseDoubleClickEvent(self, event):
         """function to doubleclick event"""
-        os.system("ksysguard")
+        os.system("ksysguard &")
+    
     
-
     def setupNetdev(self):
         """function to setup network device"""
-        self.netdev = "lo"
+        netdev = "lo"
         try:
             interfaces = []
-            for line in commands.getoutput("ifconfig -a").split("\n"):
-                if ((line != '') and (line[0] != ' ') and (line[0:3] != 'lo:')):
-                    interfaces.append(line.split(":")[0])
+            for line in commands.getoutput("ifconfig -a -s").split("\n"):
+                if ((line.split()[0] != 'Iface') and (line.split()[0] != 'lo')):
+                    interfaces.append(line.split()[0])
             
             for device in interfaces:
                 if (commands.getoutput("ifconfig " + device + " | grep 'inet '") != ''):
-                    self.netdev = device
+                    netdev = device
                     break
         except:
             pass
-
-
+        return netdev
+    
+    
     def setupVar(self):
         """function to setup variables"""
         self.netdev = ''
@@ -100,8 +114,8 @@ class pyTextWidget(plasmascript.Applet):
     def showConfigurationInterface(self):
         """function to show configuration window"""
         plasmascript.Applet.showConfigurationInterface(self)
-
-
+    
+    
     def startPolling(self):
         try:
             self.timer.start()
@@ -113,17 +127,17 @@ class pyTextWidget(plasmascript.Applet):
             self.label_error.setText('<font color="red">ERROR</font>')
             self.layout.addItem(self.label_error)
             return
-   
+    
     def updateLabel(self):
         """function to update label"""
-        if ((self.memBool == 1) and (self.memInMb == False)):
+        if ((self.memBool > 0) and (self.memInMb == False)):
             self.memText()
-        if ((self.swapBool == 1) and (self.swapInMb == False)):
+        if ((self.swapBool > 0) and (self.swapInMb == False)):
             self.swapText()
-        if (self.batBool == 1):
+        if (self.batBool > 0):
             self.batText()
-
-
+    
+    
     def batText(self):
         """function to set battery text"""
         line = self.batFormat
@@ -149,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
@@ -162,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
@@ -185,4 +199,4 @@ class pyTextWidget(plasmascript.Applet):
 
 
 def CreateApplet(parent):
-	return pyTextWidget(parent)
+    return pyTextWidget(parent)

sources/contents/code/plasma_applet_pytextmonitor.notifyrc

@@ -0,0 +1,44 @@
+[Global]
+IconName=system
+Name=PyTextMonitor
+Comment=PyTextMonitor information
+
+[Event/system]
+Name=System information
+Comment=System information
+Action=Popup
+
+[Event/processor]
+Name=Processor information
+Comment=Processor information
+Action=Popup
+
+[Event/graphical]
+Name=GPU information
+Comment=GPU information
+Action=Popup
+
+[Event/memory]
+Name=Memory information
+Comment=Memory information
+Action=Popup
+
+[Event/disk]
+Name=Disk information
+Comment=Disk information
+Action=Popup
+
+[Event/network]
+Name=Network information
+Comment=Network information
+Action=Popup
+
+[Event/battery]
+Name=Battery information
+Comment=Battery information
+Action=Popup
+
+[Event/graphinfo]
+Name=Graphical Information
+Comment=Graphical Information
+Action=Popup

sources/contents/code/ptmnotify.py

@@ -0,0 +1,214 @@
+# -*- coding: utf-8 -*-
+
+from PyKDE4.kdecore import KComponentData
+from PyKDE4.kdeui import KNotification
+import commands
+
+
+
+class PTMNotify:
+    def __init__(self, parent):
+        """class definition"""
+        self.parent = parent
+    
+    
+    def init(self):
+        """function to init notification"""
+        content = self.initText(self.parent)
+        self.createNotify(content)
+    
+    
+    def createNotify(self, content):
+        """function to create notification for label"""
+        notification = KNotification(content[0])
+        notification.setComponentData(KComponentData("plasma_applet_pytextmonitor"))
+        notification.setTitle("PyTextMonitor info ::: " + content[0]);
+        notification.setText(content[1]);
+        notification.sendEvent();
+    
+    
+    def createText(self, type):
+        """function to create text"""
+        text = ""
+        if (type == "system"):
+            try:
+                text = text + "Kernel: %s\n" %(commands.getoutput("uname -rsm"))
+                text = text + "Hostname: %s\n" %(commands.getoutput("uname -n"))
+                text = text + "Whoami: %s\n" %(commands.getoutput("whoami"))
+                text = text + "Uptime: %s\n" %(commands.getoutput("uptime"))
+            except:
+                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]))))
+                output = commands.getoutput("sensors -u")
+                text = text + "Temps:"
+                for line in output.split("\n"):
+                    if (line.find("_input") > -1):
+                        text = text + " %s\xb0C" %(str(round(float(line.split()[-1]), 0)))
+            except:
+                text = "Something wrong"
+        elif (type == "graphical"):
+            try:
+                output = commands.getoutput("lspci -m | grep 'VGA\|3D'")
+                if (output.lower().find('nvidia') > -1):
+                    gpudev = "nvidia"
+                elif (output.lower().find('radeon') > -1):
+                    gpudev = "ati"
+                for line in output.split("\n"):
+                    text = text + "%s %s\n" %(line.split('"')[0], line.split('"')[5])
+                if (gpudev == 'nvidia'):
+                    output = commands.getoutput("nvidia-smi -q -d UTILIZATION | grep Gpu | tail -n1")
+                    try:
+                        value = "%5s" % (str(round(float(output.split()[2][:-1]), 1)))
+                    except:
+                        value = "  N\A"
+                elif (gpudev == 'ati'):
+                    output = commands.getoutput("aticonfig --od-getclocks | grep load | tail -n1")
+                    try:
+                        value = "%5s" % (str(round(float(output.split()[3][:-1]), 1)))
+                    except:
+                        value = "  N\A"
+                else:
+                    value = "  N\A"
+                text = text + "Load: %s%%\n" %(value)
+                if (gpudev == 'nvidia'):
+                    output = commands.getoutput("nvidia-smi -q -d TEMPERATURE | grep Gpu | tail -n1")
+                    try:
+                        value = "%5s" % (str(round(float(output.split()[2][:-1]), 1)))
+                    except:
+                        value = "  N\A"
+                elif (gpudev == 'ati'):
+                    output = commands.getoutput("aticonfig --od-gettemperature | grep Temperature | tail -n1")
+                    try:
+                        value = "%5s" % (str(round(float(output.split()[3][:-1]), 1)))
+                    except:
+                        value = "  N\A"
+                else:
+                    value = "  N\A"
+                text = text + "Temp: %s\xb0C\n" %(value)
+            except:
+                text = "Something wrong"
+        elif (type == "memory"):
+            try:
+                output = commands.getoutput("free -m -o").split("\n")
+                memusage = int(output[1].split()[1]) - (int(output[1].split()[3]) + int(output[1].split()[5]) + int(output[1].split()[6]))
+                text = text + "Memory: %s of %s (%s%%)\n" %(str(memusage), output[1].split()[1], str(int(100*memusage/int(output[1].split()[1]))))
+                text = text + "Swap: %s of %s (%s%%)\n" %(output[2].split()[2], output[2].split()[1], str(int(100*int(output[2].split()[2])/int(output[2].split()[1]))))
+                output = commands.getoutput("swapon --show").split("\n")
+                text = text + "Swap Device: %s (%s)" %(output[1].split()[0], output[1].split()[1])
+            except:
+                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:
+                text = "Something wrong"
+        elif (type == "network"):
+            try:
+                output = commands.getoutput("ifconfig -a -s").split("\n")[1:]
+                text = text + "Devices:"
+                for line in output:
+                    text = text + " %s" %(line.split()[0])
+                output = commands.getoutput("ifconfig -a -s " + self.parent.parent.netdev + " && sleep 0.2 && ifconfig -a -s " + self.parent.parent.netdev).split("\n")
+                download = int((int(output[3].split()[2]) - int(output[1].split()[2])) / (0.2 * 1024))
+                upload = int((int(output[3].split()[6]) - int(output[1].split()[6])) / (0.2 * 1024))
+                text = text + "\n%s: %s/%s KB/s\n" %(self.parent.parent.netdev, download, upload)
+                output = commands.getoutput("ifconfig " + self.parent.parent.netdev + " | grep 'inet '").split()[1]
+                text = text + "IP: %s\n" %(output[:-1])
+                output = commands.getoutput("wget http://checkip.dyndns.org/ -q -O - | awk '{print $6}' | sed 's/<.*>//g'")
+                text = text + "External IP: %s" %(output[:-1])
+            except:
+                text = "Something wrong"
+        elif (type == "battery"):
+            try:
+                text = text + "%s" %(commands.getoutput("acpi -abi"))
+            except:
+                text = "Something wrong"
+        
+        content = [type, text]
+        return content
+    
+    
+    def initText(self, sender):
+        """function to send text"""
+        try:
+            if (sender == self.parent.parent.label_uptime):
+                content = self.createText("system")
+                return content
+        except:
+            pass
+        try:
+            if (sender == self.parent.parent.label_cpu):
+                content = self.createText("processor")
+                return content
+        except:
+            pass
+        try:
+            if (sender == self.parent.parent.label_cpuclock):
+                content = self.createText("processor")
+                return content
+        except:
+            pass
+        try:
+            if (sender == self.parent.parent.label_temp):
+                content = self.createText("processor")
+                return content
+        except:
+            pass
+        try:
+            if (sender == self.parent.parent.label_gpu):
+                content = self.createText("graphical")
+                return content
+        except:
+            pass
+        try:
+            if (sender == self.parent.parent.label_gputemp):
+                content = self.createText("graphical")
+                return content
+        except:
+            pass
+        try:
+            if (sender == self.parent.parent.label_mem):
+                content = self.createText("memory")
+                return content
+        except:
+            pass
+        try:
+            if (sender == self.parent.parent.label_swap):
+                content = self.createText("memory")
+                return content
+        except:
+            pass
+        try:
+            if (sender == self.parent.parent.label_hdd0):
+                content = self.createText("disk")
+                return content
+        except:
+            pass
+        try:
+            if (sender == self.parent.parent.label_hddtemp):
+                content = self.createText("disk")
+                return content
+        except:
+            pass
+        try:
+            if (sender == self.parent.parent.label_netDown):
+                content = self.createText("network")
+                return content
+        except:
+            pass
+        try:
+            if (sender == self.parent.parent.label_bat):
+                content = self.createText("battery")
+                return content
+        except:
+            pass

sources/contents/code/reinit.py

@@ -1,8 +1,26 @@
 # -*- coding: utf-8 -*-
 
 from PyQt4.QtCore import *
+from PyQt4.QtGui import *
 from PyKDE4.plasma import Plasma
 import config
+import ptmnotify
+
+
+
+class NewPlasmaLabel(Plasma.Label):
+    """new Label with defined clicked() event"""
+    def __init__(self, applet, parent):
+        """class definition"""
+        Plasma.Label.__init__(self, applet)
+        self.parent = parent
+        self.notify = ptmnotify.PTMNotify(self)
+    
+    
+    def mousePressEvent(self, event):
+        """mouse click event"""
+        if (event.button() == Qt.LeftButton):
+            self.notify.init()
 
 
 
@@ -10,8 +28,9 @@ class Reinit():
     def __init__(self, parent):
         """class definition"""
         self.parent = parent
-
-    def reinit(self):
+    
+    
+    def reinit(self, confAccept=False):
         """function to reinitializate widget"""
         settings = config.Config(self.parent)
         self.parent.interval = settings.get('interval', 2000).toInt()[0]
@@ -26,37 +45,25 @@ class Reinit():
         self.parent.label_order = str(settings.get('label_order', '1345'))
         for label in self.parent.dict_orders.values():
             if ((label == 'cpu') or (label == 'mem') or (label == 'swap') or (label == 'net')):
-                exec ('self.parent.' + label + 'Bool = int(settings.get("' + label + 'Bool",  1))')
+                exec ('self.parent.' + label + 'Bool = int(settings.get("' + label + 'Bool",  2))')
             else:
                 exec ('self.parent.' + label + 'Bool = int(settings.get("' + label + 'Bool",  0))')
-        # small function for update if errors exist
-        summ = 0
-        for label in self.parent.dict_orders.values():
-            exec ('summ += self.parent.' + label + 'Bool')
-        if (len(self.parent.label_order) != summ):
-            for label in self.parent.dict_orders.values():
-                if ((label == 'cpu') or (label == 'mem') or (label == 'swap') or (label == 'net')):
-                    exec ('self.parent.' + label + 'Bool = 1')
-                else:
-                    exec ('self.parent.' + label + 'Bool = 0')
-                exec ('settings.set("' + label + 'Bool", self.parent.' + label + 'Bool)')
-            self.parent.label_order = '1345'
-            settings.set('label_order', self.parent.label_order)
         
+        # labels
         for order in self.parent.label_order:
             if (order == "1"):
-                if (self.parent.cpuBool == 1):
+                if (self.parent.cpuBool > 0):
                     self.parent.cpuFormat = str(settings.get('cpuFormat', '[cpu: $cpu%]'))
                     if (self.parent.cpuFormat.split('$ccpu')[0] != self.parent.cpuFormat):
-                        self.parent.label_cpu0 = Plasma.Label(self.parent.applet)
+                        self.parent.label_cpu = NewPlasmaLabel(self.parent.applet, self.parent)
                         self.parent.label_cpu1 = Plasma.Label(self.parent.applet)
                         if (self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[0] != self.parent.cpuFormat.split('$ccpu')[0]):
                             line = self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[0] + '-----' + self.parent.cpuFormat.split('$ccpu')[0].split('$cpu')[1]
                         else:
                             line = self.parent.cpuFormat.split('$ccpu')[0]
                         text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        self.parent.label_cpu0.setText(text)
-                        self.parent.layout.addItem(self.parent.label_cpu0)
+                        self.parent.label_cpu.setText(text)
+                        self.parent.layout.addItem(self.parent.label_cpu)
                         text = self.parent.formatLine.split('$LINE')[0] + "-----" + self.parent.formatLine.split('$LINE')[1]
                         for core in range(self.parent.numCores):
                             exec ('self.parent.label_coreCpu' + str(core) + ' = Plasma.Label(self.parent.applet)')
@@ -70,7 +77,7 @@ class Reinit():
                         self.parent.label_cpu1.setText(text)
                         self.parent.layout.addItem(self.parent.label_cpu1)
                     else:
-                        self.parent.label_cpu = Plasma.Label(self.parent.applet)
+                        self.parent.label_cpu = NewPlasmaLabel(self.parent.applet, self.parent)
                         if (self.parent.cpuFormat.split('$cpu')[0] != self.parent.cpuFormat):
                             line = self.parent.cpuFormat.split('$cpu')[0] + '-----' + self.parent.cpuFormat.split('$cpu')[1]
                         else:
@@ -79,10 +86,10 @@ class Reinit():
                         self.parent.label_cpu.setText(text)
                         self.parent.layout.addItem(self.parent.label_cpu)
             elif (order == "2"):
-                if (self.parent.tempBool == 1):
+                if (self.parent.tempBool > 0):
                     self.parent.tempdev = str(settings.get('temp_device', '<select device>'))
                     self.parent.tempFormat = str(settings.get('tempFormat', '[temp: $temp&deg;C]'))
-                    self.parent.label_temp = Plasma.Label(self.parent.applet)
+                    self.parent.label_temp = NewPlasmaLabel(self.parent.applet, self.parent)
                     if (self.parent.tempFormat.split('$temp')[0] != self.parent.tempFormat):
                         line = self.parent.tempFormat.split('$temp')[0] + '----' + self.parent.tempFormat.split('$temp')[1]
                     else:
@@ -91,11 +98,11 @@ class Reinit():
                     self.parent.label_temp.setText(text)
                     self.parent.layout.addItem(self.parent.label_temp)
             elif (order == "3"):
-                if (self.parent.memBool == 1):
+                if (self.parent.memBool > 0):
                     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
@@ -105,15 +112,15 @@ class Reinit():
                     else:
                         line = self.parent.memFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_mem = Plasma.Label(self.parent.applet)
+                    self.parent.label_mem = NewPlasmaLabel(self.parent.applet, self.parent)
                     self.parent.label_mem.setText(text)
                     self.parent.layout.addItem(self.parent.label_mem)
             elif (order == "4"):
-                if (self.parent.swapBool == 1):
+                if (self.parent.swapBool > 0):
                     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
@@ -122,22 +129,22 @@ class Reinit():
                     else:
                         line = self.parent.swapFormat
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                    self.parent.label_swap = Plasma.Label(self.parent.applet)
+                    self.parent.label_swap = NewPlasmaLabel(self.parent.applet, self.parent)
                     self.parent.label_swap.setText(text)
                     self.parent.layout.addItem(self.parent.label_swap)
             elif (order == "5"):
-                if (self.parent.netBool == 1):
+                if (self.parent.netBool > 0):
                     self.parent.netNonFormat = str(settings.get('netNonFormat', '[net: $netKB/s]'))
                     if (self.parent.netNonFormat.split('@@')[0] != self.parent.netNonFormat):
                         self.parent.netdev = self.parent.netNonFormat.split('@@')[1]
                         self.parent.netNonFormat = self.parent.netNonFormat.split('@@')[0] + self.parent.netNonFormat.split('@@')[2]
                     else:
-                        self.parent.setupNetdev()
+                        self.parent.netdev = self.parent.setupNetdev()
                     if (self.parent.netNonFormat.split('$netdev')[0] != self.parent.netNonFormat):
                         self.parent.netFormat = self.parent.netNonFormat.split('$netdev')[0] + self.parent.netdev + self.parent.netNonFormat.split('$netdev')[1]
                     else:
                         self.parent.netFormat = self.parent.netNonFormat
-                    self.parent.label_netDown = Plasma.Label(self.parent.applet)
+                    self.parent.label_netDown = NewPlasmaLabel(self.parent.applet, self.parent)
                     if (self.parent.netFormat.split('$net')[0] != self.parent.netFormat):
                         line = self.parent.netFormat.split('$net')[0] + '----'
                     else:
@@ -154,11 +161,11 @@ class Reinit():
                     self.parent.label_netUp.setText(text)
                     self.parent.layout.addItem(self.parent.label_netUp)
             elif (order == "6"):
-                if (self.parent.batBool == 1):
+                if (self.parent.batBool > 0):
                     self.parent.batFormat = str(settings.get('batFormat', '[bat: $bat%$ac]'))
                     self.parent.battery_device= str(settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity'))
                     self.parent.ac_device = str(settings.get('ac_device', '/sys/class/power_supply/AC/online'))
-                    self.parent.label_bat = Plasma.Label(self.parent.applet)
+                    self.parent.label_bat = NewPlasmaLabel(self.parent.applet, self.parent)
                     line = self.parent.batFormat
                     if (line.split('$ac')[0] != line):
                         line = line.split('$ac')[0] + '(-)' + line.split('$ac')[1]
@@ -168,18 +175,18 @@ class Reinit():
                     self.parent.label_bat.setText(text)
                     self.parent.layout.addItem(self.parent.label_bat)
             elif (order == "7"):
-                if (self.parent.cpuclockBool == 1):
+                if (self.parent.cpuclockBool > 0):
                     self.parent.cpuclockFormat = str(settings.get('cpuclockFormat', '[mhz: $cpucl]'))
                     if (self.parent.cpuclockFormat.split('$ccpucl')[0] != self.parent.cpuclockFormat):
-                        self.parent.label_cpuclock0 = Plasma.Label(self.parent.applet)
+                        self.parent.label_cpuclock = NewPlasmaLabel(self.parent.applet, self.parent)
                         self.parent.label_cpuclock1 = Plasma.Label(self.parent.applet)
                         if (self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] != self.parent.cpuclockFormat.split('$ccpucl')[0]):
                             line = self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[0] + '----' + self.parent.cpuclockFormat.split('$ccpucl')[0].split('$cpucl')[1]
                         else:
                             line = self.parent.cpuclockFormat.split('$ccpucl')[0]
                         text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        self.parent.label_cpuclock0.setText(text)
-                        self.parent.layout.addItem(self.parent.label_cpuclock0)
+                        self.parent.label_cpuclock.setText(text)
+                        self.parent.layout.addItem(self.parent.label_cpuclock)
                         text = self.parent.formatLine.split('$LINE')[0] + "----" + self.parent.formatLine.split('$LINE')[1]
                         for core in range(self.parent.numCores):
                             exec ('self.parent.label_coreCpuclock' + str(core) + ' = Plasma.Label(self.parent.applet)')
@@ -193,7 +200,7 @@ class Reinit():
                         self.parent.label_cpuclock1.setText(text)
                         self.parent.layout.addItem(self.parent.label_cpuclock1)
                     else:
-                        self.parent.label_cpuclock = Plasma.Label(self.parent.applet)
+                        self.parent.label_cpuclock = NewPlasmaLabel(self.parent.applet, self.parent)
                         if (self.parent.cpuclockFormat.split('$cpucl')[0] != self.parent.cpuclockFormat):
                             line = self.parent.cpuclockFormat.split('$cpucl')[0] + '----' + self.parent.cpuclockFormat.split('$cpucl')[1]
                         else:
@@ -202,9 +209,9 @@ class Reinit():
                         self.parent.label_cpuclock.setText(text)
                         self.parent.layout.addItem(self.parent.label_cpuclock)
             elif (order == "8"):
-                if (self.parent.uptimeBool == 1):
+                if (self.parent.uptimeBool > 0):
                     self.parent.uptimeFormat = str(settings.get('uptimeFormat', '[uptime: $uptime]'))
-                    self.parent.label_uptime = Plasma.Label(self.parent.applet)
+                    self.parent.label_uptime = NewPlasmaLabel(self.parent.applet, self.parent)
                     if (self.parent.uptimeFormat.split('$uptime')[0] != self.parent.uptimeFormat):
                         line = self.parent.uptimeFormat.split('$uptime')[0] + '---d--h--m' + self.parent.uptimeFormat.split('$uptime')[1]
                     else:
@@ -213,9 +220,9 @@ class Reinit():
                     self.parent.label_uptime.setText(text)
                     self.parent.layout.addItem(self.parent.label_uptime)
             elif (order == "9"):
-                if (self.parent.gpuBool == 1):
+                if (self.parent.gpuBool > 0):
                     self.parent.gpuFormat = str(settings.get('gpuFormat', '[gpu: $gpu%]'))
-                    self.parent.label_gpu = Plasma.Label(self.parent.applet)
+                    self.parent.label_gpu = NewPlasmaLabel(self.parent.applet, self.parent)
                     if (self.parent.gpuFormat.split('$gpu')[0] != self.parent.gpuFormat):
                         line = self.parent.gpuFormat.split('$gpu')[0] + '-----' + self.parent.gpuFormat.split('$gpu')[1]
                     else:
@@ -224,9 +231,9 @@ class Reinit():
                     self.parent.label_gpu.setText(text)
                     self.parent.layout.addItem(self.parent.label_gpu)
             elif (order == "a"):
-                if (self.parent.gputempBool == 1):
+                if (self.parent.gputempBool > 0):
                     self.parent.gputempFormat = str(settings.get('gputempFormat', '[gpu temp: $gputemp&deg;C]'))
-                    self.parent.label_gputemp = Plasma.Label(self.parent.applet)
+                    self.parent.label_gputemp = NewPlasmaLabel(self.parent.applet, self.parent)
                     if (self.parent.gputempFormat.split('$gputemp')[0] != self.parent.gputempFormat):
                         line = self.parent.gputempFormat.split('$gputemp')[0] + '----' + self.parent.gputempFormat.split('$gputemp')[1]
                     else:
@@ -235,13 +242,13 @@ class Reinit():
                     self.parent.label_gputemp.setText(text)
                     self.parent.layout.addItem(self.parent.label_gputemp)
             elif (order == "b"):
-                if (self.parent.hddBool == 1):
+                if (self.parent.hddBool > 0):
                     self.parent.hddFormat = str(settings.get('hddFormat', '[hdd: @@/@@%]'))
                     if (self.parent.hddFormat.split('@@')[0] != self.parent.hddFormat):
                         self.parent.mountPoints = self.parent.hddFormat.split('@@')[1].split(';')
                         line = self.parent.hddFormat.split('@@')[0]
                         text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
-                        self.parent.label_hdd0 = Plasma.Label(self.parent.applet)
+                        self.parent.label_hdd0 = NewPlasmaLabel(self.parent.applet, self.parent)
                         self.parent.label_hdd0.setText(text)
                         self.parent.layout.addItem(self.parent.label_hdd0)
                         text = self.parent.formatLine.split('$LINE')[0] + "-----" + self.parent.formatLine.split('$LINE')[1]
@@ -260,9 +267,9 @@ class Reinit():
                         self.parent.label_hdd0.setText(text)
                         self.parent.layout.addItem(self.parent.label_hdd0)
             elif (order == "c"):
-                if (self.parent.hddtempBool == 1):
+                if (self.parent.hddtempBool > 0):
                     self.parent.hddtempFormat = str(settings.get('hddtempFormat', '[hdd temp: @@/dev/sda@@&deg;C]'))
-                    self.parent.label_hddtemp = Plasma.Label(self.parent.applet)
+                    self.parent.label_hddtemp = NewPlasmaLabel(self.parent.applet, self.parent)
                     if (self.parent.hddtempFormat.split('@@')[0] != self.parent.hddtempFormat):
                         line = self.parent.hddtempFormat.split('@@')[0] + '----' + self.parent.hddtempFormat.split('@@')[2]
                     else:
@@ -270,20 +277,16 @@ class Reinit():
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_hddtemp.setText(text)
                     self.parent.layout.addItem(self.parent.label_hddtemp)
-        self.parent.applet.setLayout(self.parent.layout)        
-        self.parent.theme = Plasma.Svg(self.parent)
-        self.parent.theme.setImagePath("widgets/background")
-        self.parent.setBackgroundHints(Plasma.Applet.DefaultBackground)
-        self.parent.resize(10,10)
+        if not confAccept:
+            self.parent.applet.setLayout(self.parent.layout)
+            self.parent.theme = Plasma.Svg(self.parent)
+            self.parent.theme.setImagePath("widgets/background")
+            self.parent.setBackgroundHints(Plasma.Applet.DefaultBackground)
+        self.parent.resize(10, 10)
         
         # create dataengines
-        label_start = True
-        while label_start:
-            try:
-                self.parent.dataengine.connectToEngine()
-                label_start = False
-            except:
-                pass
+        self.parent.thread().wait(60000)
+        self.parent.dataengine.connectToEngine()
         
         self.parent.timer.setInterval(self.parent.interval)
         self.parent.startPolling()

sources/metadata.desktop

@@ -9,10 +9,10 @@ X-Plasma-API=python
 X-Plasma-MainScript=code/main.py
 X-Plasma-RequiredExtensions=LaunchApp,LocalIO,FileDialog
 
-X-KDE-PluginInfo-Author=Evgeniy Alexeev aka arcanis
+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=1.3.4
+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=