diff --git a/py-text-monitor-1.3.3.plasmoid b/py-text-monitor-1.3.3.plasmoid deleted file mode 100644 index 479f7c2..0000000 Binary files a/py-text-monitor-1.3.3.plasmoid and /dev/null differ diff --git a/py-text-monitor-1.3.3b.plasmoid b/py-text-monitor-1.3.3b.plasmoid new file mode 100644 index 0000000..7b77119 Binary files /dev/null and b/py-text-monitor-1.3.3b.plasmoid differ diff --git a/screenshots/config.png b/screenshots/config_1.png similarity index 100% rename from screenshots/config.png rename to screenshots/config_1.png diff --git a/screenshots/config_2.png b/screenshots/config_2.png new file mode 100644 index 0000000..538547d Binary files /dev/null and b/screenshots/config_2.png differ diff --git a/source/contents/code/configdef.py b/source/contents/code/configdef.py index 3185a89..0af14f2 100644 --- a/source/contents/code/configdef.py +++ b/source/contents/code/configdef.py @@ -3,6 +3,7 @@ from PyQt4.QtGui import * from PyKDE4.kdecore import * from PyKDE4.kdeui import * +import commands import config @@ -141,6 +142,9 @@ class ConfigDefinition: self.parent.ac_device = str(self.configpage.ui.lineEdit_acdev.text()) settings.set('battery_device', self.parent.battery_device) settings.set('ac_device', self.parent.ac_device) + elif (self.parent.dict_orders[label] == 'temp'): + self.parent.tempdev = str(self.configpage.ui.comboBox_temp.currentText()) + settings.set('temp_device', self.parent.tempdev) self.parent.label_order = ''.join(self.parent.label_order.split('-')) settings.set('label_order', self.parent.label_order) @@ -179,6 +183,17 @@ class ConfigDefinition: if (self.parent.dict_orders[label] == 'bat'): self.configpage.ui.lineEdit_batdev.setText(str(settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity'))) self.configpage.ui.lineEdit_acdev.setText(str(settings.get('ac_device', '/sys/class/power_supply/AC/online'))) + elif (self.parent.dict_orders[label] == 'temp'): + self.configpage.ui.comboBox_temp.addItem(str(settings.get('temp_device', '')) self.parent.tempFormat = str(settings.get('tempFormat', '[temp: $temp°C]')) self.parent.label_temp = Plasma.Label(self.parent.applet) if (self.parent.tempFormat.split('$temp')[0] != self.parent.tempFormat): diff --git a/source/contents/ui/configwindow.ui b/source/contents/ui/configwindow.ui index a1ae113..a0745d1 100644 --- a/source/contents/ui/configwindow.ui +++ b/source/contents/ui/configwindow.ui @@ -463,10 +463,41 @@ $ccpucl - CPU clock for each core, MHz - + + + + 0 + 0 + + - 0 + 100 + 25 + + + + + 16777215 + 25 + + + + true + + + + + + + + 0 + 0 + + + + + 150 25 diff --git a/source/metadata.desktop b/source/metadata.desktop index bfe3777..96777af 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.3 +X-KDE-PluginInfo-Version=1.3.3b X-KDE-PluginInfo-Website=http://kde-look.org/ X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends=