diff --git a/pytextmonitor.plasmoid b/pytextmonitor.plasmoid index 5283d0f..c42938c 100644 Binary files a/pytextmonitor.plasmoid and b/pytextmonitor.plasmoid differ diff --git a/source/contents/code/main.py b/source/contents/code/main.py index 59a7c14..1bbeca2 100755 --- a/source/contents/code/main.py +++ b/source/contents/code/main.py @@ -38,8 +38,13 @@ class pyTextWidget(plasmascript.Applet): self.settings.set('font_size', self.font_size) self.font_color = str(self.configpage.ui.kcolorcombo.color().name()) self.settings.set('font_color', self.font_color) - self.font_style = str(self.configpage.ui.lineEdit_style.text()) + if (self.configpage.ui.comboBox_style.currentIndex() == 0): + self.font_style = 'normal' + else: + self.font_style = 'italic' self.settings.set('font_style', self.font_style) + self.font_weight = int(self.configpage.ui.spinBox_weight.value()) + self.settings.set('font_weight', self.font_weight) # disconnecting from source and clear layout if (self.cpuBool == 1): @@ -162,11 +167,16 @@ class pyTextWidget(plasmascript.Applet): self.configpage = ConfigWindow(self, self.settings) font = QFont(str(self.settings.get('font_family', 'Terminus')), int(self.settings.get('font_size', 12)), 50) - self.configpage.ui.spinBox_interval.setValue(int(self.settings.get('interval', '2000'))) + self.configpage.ui.spinBox_interval.setValue(int(self.settings.get('interval', 2000))) self.configpage.ui.fontComboBox.setCurrentFont(font) self.configpage.ui.spinBox_fontSize.setValue(int(self.settings.get('font_size', 12))) self.configpage.ui.kcolorcombo.setColor(QColor(str(self.settings.get('font_color', '#000000')))) - self.configpage.ui.lineEdit_style.setText(str(self.settings.get('font_style', 'normal'))) + font = str(self.settings.get('font_style', 'normal')) + if (font == 'normal'): + self.configpage.ui.comboBox_style.setCurrentIndex(0) + else: + self.configpage.ui.comboBox_style.setCurrentIndex(1) + self.configpage.ui.spinBox_weight.setValue(int(self.settings.get('font_weight', 400))) if (self.cpuBool == 1): self.configpage.ui.checkBox_cpu.setCheckState(2) @@ -236,10 +246,10 @@ class pyTextWidget(plasmascript.Applet): self.configpage.ui.lineEdit_net.setEnabled(True) self.configpage.ui.comboBox_numNet.setEnabled(True) else: - self.configpage.ui.checkBox_swap.setCheckState(0) + self.configpage.ui.checkBox_net.setCheckState(0) self.configpage.ui.slider_net.setDisabled(True) self.configpage.ui.comboBox_numNet.setDisabled(True) - self.configpage.ui.lineEdit_swap.setDisabled(True) + self.configpage.ui.lineEdit_net.setDisabled(True) self.configpage.ui.comboBox_numNet.setCurrentIndex(int(self.settings.get('num_dev', 0))) self.configpage.ui.lineEdit_net.setText(str(self.settings.get('netNonFormat', '[net: $netKB/s]'))) @@ -269,10 +279,10 @@ class pyTextWidget(plasmascript.Applet): self.font_size = int(self.settings.get('font_size', 12)) self.font_color = str(self.settings.get('font_color', '#000000')) self.font_style = str(self.settings.get('font_style', 'normal')) - self.formatLine = "" - self.formatLine = self.formatLine + "

$LINE"
-        self.formatLine = self.formatLine + "

" + self.font_weight = int(self.settings.get('font_weight', 400)) + self.formatLine = "
$LINE
" self.label_order = str(self.settings.get('label_order', '1723456')) self.cpuBool = int(self.settings.get('cpuBool', 1)) self.cpuclockBool = int(self.settings.get('cpuclockBool', 1)) diff --git a/source/contents/ui/configwindow.ui b/source/contents/ui/configwindow.ui index 6592cb9..d492c4c 100644 --- a/source/contents/ui/configwindow.ui +++ b/source/contents/ui/configwindow.ui @@ -7,7 +7,7 @@ 0 0 519 - 383 + 455 @@ -19,7 +19,7 @@ 519 - 383 + 455 @@ -43,13 +43,13 @@ 511 - 378 + 450 16777215 - 378 + 450 @@ -670,12 +670,12 @@ - One device + One device - Two devices + Two devices @@ -1274,7 +1274,101 @@ - + + + + 0 + 0 + + + + + 150 + 25 + + + + + 150 + 25 + + + + + normal + + + + + italic + + + + + + + + + + + + 0 + 0 + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + + + + + 0 + 0 + + + + + 100 + 25 + + + + + 100 + 25 + + + + Font weight + + + + + + + Qt::Horizontal + + + + 40 + 19 + + + + + + 0 @@ -1296,6 +1390,18 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + 1 + + + 1000 + + + 50 + + + 400 + @@ -1314,6 +1420,7 @@ widget_net widget_bat widget_cpuclock + widget_weight @@ -1367,7 +1474,8 @@ fontComboBox spinBox_fontSize kcolorcombo - lineEdit_style + comboBox_style + spinBox_weight diff --git a/source/metadata.desktop b/source/metadata.desktop index 2e716cb..e3ee828 100644 --- a/source/metadata.desktop +++ b/source/metadata.desktop @@ -9,7 +9,7 @@ X-Plasma-MainScript=code/main.py 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.1.2 +X-KDE-PluginInfo-Version=1.1.3 X-KDE-PluginInfo-Website=http://kde-look.org/ X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends=