Release 1.5.1

+ added date andtime support

PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=kdeplasma-applets-pytextmonitor
 _pkgname=py-text-monitor
-pkgver=1.5.0
+pkgver=1.5.1
 pkgrel=1
 _dtengine=ext-sysmon
 _dtver=1.3
@@ -22,7 +22,7 @@ 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=('df8e9f6df8e7b3caee3a502315756d81'
+md5sums=('3ef9536493e48cd460ee3f37faa8cf58'
          'f7fce53d5f616891b30beac1afd99728')
 
 build ()

sources/contents/code/configdef.py

@@ -134,10 +134,15 @@ class ConfigDefinition:
             self.parent.label_bat.setText('')
             self.parent.layout.removeItem(self.parent.label_bat)
         if (self.parent.playerBool > 0):
+            self.parent.extsysmon.disconnectSource("player", self.parent)
             self.parent.label_player.setText('')
             self.parent.layout.removeItem(self.parent.label_player)
+        if (self.parent.timeBool > 0):
+            self.parent.timemon.disconnectSource("Local", self.parent)
+            self.parent.label_time.setText('')
+            self.parent.layout.removeItem(self.parent.label_time)
         
-        self.parent.label_order = "-------------"
+        self.parent.label_order = "--------------"
         
         for label in self.parent.dict_orders.keys():
             exec ('self.parent.' + self.parent.dict_orders[label] + 'Bool = ' + str(self.configpage.checkboxes[self.parent.dict_orders[label]].checkState()))

sources/contents/code/configwindow.py

@@ -36,21 +36,21 @@ class ConfigWindow(QWidget):
         'hddtemp':self.ui.checkBox_hddTemp, 'mem':self.ui.checkBox_mem, 
         'net':self.ui.checkBox_net, 'swap':self.ui.checkBox_swap, 
         'temp':self.ui.checkBox_temp, 'uptime':self.ui.checkBox_uptime, 
-        'player':self.ui.checkBox_player}
+        'player':self.ui.checkBox_player, 'time':self.ui.checkBox_time}
         self.sliders = {'bat':self.ui.slider_bat, 'cpu':self.ui.slider_cpu, 
         'cpuclock':self.ui.slider_cpuclock, 'gpu':self.ui.slider_gpu, 
         'gputemp':self.ui.slider_gpuTemp, 'hdd':self.ui.slider_hdd, 
         'hddtemp':self.ui.slider_hddTemp, 'mem':self.ui.slider_mem, 
         'net':self.ui.slider_net, 'swap':self.ui.slider_swap, 
         'temp':self.ui.slider_temp, 'uptime':self.ui.slider_uptime, 
-        'player':self.ui.slider_player}
+        'player':self.ui.slider_player, 'time':self.ui.slider_time}
         self.lineedits = {'bat':self.ui.lineEdit_bat, 'cpu':self.ui.lineEdit_cpu, 
         'cpuclock':self.ui.lineEdit_cpuclock, 'gpu':self.ui.lineEdit_gpu, 
         'gputemp':self.ui.lineEdit_gpuTemp, 'hdd':self.ui.lineEdit_hdd, 
         'hddtemp':self.ui.lineEdit_hddTemp, 'mem':self.ui.lineEdit_mem, 
         'net':self.ui.lineEdit_net, 'swap':self.ui.lineEdit_swap, 
         'temp':self.ui.lineEdit_temp, 'uptime':self.ui.lineEdit_uptime, 
-        'player':self.ui.lineEdit_player}
+        'player':self.ui.lineEdit_player, 'time':self.ui.lineEdit_time}
         
         for item in self.checkboxes.values():
             QObject.connect(item, SIGNAL("stateChanged(int)"), self.setStatus)

sources/contents/code/dataengine.py

@@ -35,6 +35,10 @@ class DataEngine:
         if ((self.parent.gputempBool > 0) or (self.parent.gpuBool > 0) or (self.parent.hddtempBool > 0) or (self.parent.playerBool > 0)):
             self.parent.extsysmon = self.parent.dataEngine("ext-sysmon")
         
+        if (self.parent.timeBool > 0):
+            self.parent.timemon = self.parent.dataEngine("time")
+            self.parent.timemon.connectSource("Local", self.parent, 1000)
+        
         if (self.parent.uptimeBool > 0):
             self.parent.systemmonitor.connectSource("system/uptime", self.parent, self.parent.interval)
         if (self.parent.cpuBool > 0):
@@ -270,7 +274,14 @@ class DataEngine:
                     line = line.split('$title')[0] + title + line.split('$title')[1]
                 text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                 self.parent.label_player.setText(text)
-                
+            elif (sourceName == "Local"):
+                value = str(data[QString(u'DateTime')].toString().toUtf8())
+                if (self.parent.timeFormat.split('$time')[0] != self.parent.timeFormat):
+                    line = self.parent.timeFormat.split('$time')[0] + value.decode("utf-8") + self.parent.timeFormat.split('$time')[1]
+                else:
+                    line = self.parent.timeFormat
+                text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
+                self.parent.label_time.setText(text)
             
             self.parent.update()
         except:

sources/contents/code/main.py

@@ -120,14 +120,14 @@ class pyTextWidget(plasmascript.Applet):
         # create dictionaries
         self.dict_orders = {'6':'bat', '1':'cpu', '7':'cpuclock', '9':'gpu', 'a':'gputemp', 
         'b':'hdd', 'c':'hddtemp', '3':'mem', '5':'net', '4':'swap', '2':'temp', '8':'uptime', 
-        'd':'player'}
+        'd':'player', 'e':'time'}
         self.dict_defFormat = {'bat':'[bat: $bat%$ac]', 'cpu':'[cpu: $cpu%]', 
         'cpuclock':'[mhz: $cpucl]', 'gpu':'[gpu: $gpu%]', 
         'gputemp':'[gpu temp: $gputemp°C]', 'hdd':'[hdd: @@/@@%]', 
         'hddtemp':'[hdd temp: @@/dev/sda@@°C]', 'mem':'[mem: $mem%]', 
         'net':'[$netdev: $netKB/s]', 'swap':'[swap: $swap%]', 
         'temp':'[temp: $temp°C]', 'uptime':'[uptime: $uptime]', 
-        'player':'[$artist - $title]'}
+        'player':'[$artist - $title]', 'time':'[$time]'}
     
     def showConfigurationInterface(self):
         """function to show configuration window"""

sources/contents/code/ptmnotify.py

@@ -180,6 +180,12 @@ class PTMNotify:
     
     def initText(self, sender):
         """function to send text"""
+        try:
+            if (sender == self.parent.parent.label_time):
+                content = self.createText("system")
+                return content
+        except:
+            pass
         try:
             if (sender == self.parent.parent.label_uptime):
                 content = self.createText("system")

sources/contents/code/reinit.py

@@ -307,6 +307,17 @@ class Reinit():
                     text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
                     self.parent.label_player.setText(text)
                     self.parent.layout.addItem(self.parent.label_player)
+            elif (order == "e"):
+                if (self.parent.timeBool > 0):
+                    self.parent.timeFormat = str(settings.get('timeFormat', '[$time]'))
+                    self.parent.label_time = NewPlasmaLabel(self.parent.applet, self.parent)
+                    if (self.parent.timeFormat.split('$time')[0] != self.parent.timeFormat):
+                        line = self.parent.timeFormat.split('$time')[0] + '----------------------' + self.parent.timeFormat.split('$time')[1]
+                    else:
+                        line = self.parent.timeFormat
+                    text = self.parent.formatLine.split('$LINE')[0] + line + self.parent.formatLine.split('$LINE')[1]
+                    self.parent.label_time.setText(text)
+                    self.parent.layout.addItem(self.parent.label_time)
         if not confAccept:
             self.parent.applet.setLayout(self.parent.layout)
             self.parent.theme = Plasma.Svg(self.parent)

sources/contents/ui/configwindow.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>575</width>
-    <height>530</height>
+    <height>561</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -42,6 +42,61 @@
        <string>Widget settings</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <layout class="QHBoxLayout" name="layout_time">
+         <item>
+          <widget class="QCheckBox" name="checkBox_time">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string notr="true">Time</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="lineEdit_time">
+           <property name="toolTip">
+            <string notr="true">$time - time</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSlider" name="slider_time">
+           <property name="maximumSize">
+            <size>
+             <width>120</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="minimum">
+            <number>1</number>
+           </property>
+           <property name="maximum">
+            <number>14</number>
+           </property>
+           <property name="pageStep">
+            <number>1</number>
+           </property>
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="tickPosition">
+            <enum>QSlider::TicksAbove</enum>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item>
         <layout class="QHBoxLayout" name="layout_uptime">
          <item>
@@ -82,11 +137,14 @@
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
+           <property name="value">
+            <number>2</number>
+           </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -138,13 +196,13 @@ $ccpu - load CPU for each core, %</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
            <property name="value">
-            <number>2</number>
+            <number>3</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -197,13 +255,13 @@ $ccpucl - CPU clock for each core, MHz</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
            <property name="value">
-            <number>3</number>
+            <number>4</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -268,13 +326,13 @@ $ccpucl - CPU clock for each core, MHz</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
            <property name="value">
-            <number>4</number>
+            <number>5</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -326,13 +384,13 @@ $ccpucl - CPU clock for each core, MHz</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
            <property name="value">
-            <number>5</number>
+            <number>6</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -384,13 +442,13 @@ $ccpucl - CPU clock for each core, MHz</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
            <property name="value">
-            <number>6</number>
+            <number>7</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -443,13 +501,13 @@ $memmb - RAM usage, MB</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
            <property name="value">
-            <number>7</number>
+            <number>8</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -502,13 +560,13 @@ $swapmb - swap usage, MB</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
            <property name="value">
-            <number>8</number>
+            <number>9</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -560,13 +618,13 @@ $swapmb - swap usage, MB</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
            <property name="value">
-            <number>9</number>
+            <number>10</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -618,13 +676,13 @@ $swapmb - swap usage, MB</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
            <property name="value">
-            <number>10</number>
+            <number>11</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -678,13 +736,13 @@ $netdev - current network device
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
            <property name="value">
-            <number>11</number>
+            <number>12</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -737,13 +795,13 @@ $ac - AC status</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
            <property name="value">
-            <number>12</number>
+            <number>13</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -907,13 +965,13 @@ $artist - song artist</string>
             <number>1</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
            <property name="value">
-            <number>13</number>
+            <number>14</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -1268,6 +1326,9 @@ $artist - song artist</string>
  </customwidgets>
  <tabstops>
   <tabstop>tabWidget</tabstop>
+  <tabstop>checkBox_time</tabstop>
+  <tabstop>lineEdit_time</tabstop>
+  <tabstop>slider_time</tabstop>
   <tabstop>checkBox_uptime</tabstop>
   <tabstop>lineEdit_uptime</tabstop>
   <tabstop>slider_uptime</tabstop>

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=1.5.0
+X-KDE-PluginInfo-Version=1.5.1
 X-KDE-PluginInfo-Website=http://kde-look.org/
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=