add background settings to the tooltip

sources/ptm/contents/code/configdef.py

@@ -88,6 +88,10 @@ class ConfigDefinition:
         settings.set('ac_offline', str(self.configpage['advanced'].ui.lineEdit_acOffline.text()))
 
         settings.set('tooltip_num', self.configpage['tooltip'].ui.spinBox_tooltipNum.value())
+        if (self.configpage['tooltip'].checkBox_background.checkState() == 0):
+            settings.set("tooltip_background", "null")
+        else:
+            settings.set("tooltip_background", str(self.configpage['tooltip'].kcolorcombos["background"].color().name()))
         for label in ['cpu', 'cpuclock', 'mem', 'swap', 'down', 'up']:
             settings.set(self.defaults['confColor'][label], str(self.configpage['tooltip'].kcolorcombos[label].color().name()))
 
@@ -216,6 +220,11 @@ class ConfigDefinition:
         self.configpage['advanced'].ui.lineEdit_acOffline.setText(str(settings.get('ac_offline', '( )')))
 
         self.configpage['tooltip'].ui.spinBox_tooltipNum.setValue(settings.get('tooltip_num', 100).toInt()[0])
+        if (str(settings.get('tooltip_background', 'null')) == "null"):
+            self.configpage['tooltip'].checkBox_background.setCheckState(0)
+        else:
+            self.configpage['tooltip'].checkBox_background.setCheckState(2)
+            self.configpage['tooltip'].ui.kcolorcombo_cpu.setColor(QColor(str(settings.get('tooltip_background', 'null'))))
         self.configpage['tooltip'].ui.kcolorcombo_cpu.setColor(QColor(str(settings.get('cpu_color', '#ff0000'))))
         self.configpage['tooltip'].ui.kcolorcombo_cpuclock.setColor(QColor(str(settings.get('cpuclock_color', '#00ff00'))))
         self.configpage['tooltip'].ui.kcolorcombo_mem.setColor(QColor(str(settings.get('mem_color', '#0000ff'))))
@@ -253,8 +262,8 @@ class ConfigDefinition:
         self.configpage['dataengine'].ui.lineEdit_mpdaddress.setText(deSettings['MPDADDRESS'])
         self.configpage['dataengine'].ui.spinBox_mpdport.setValue(int(deSettings['MPDPORT']))
         self.configpage['dataengine'].ui.spinBox_mpdport.setValue(int(deSettings['MPDPORT']))
-        index = self.configpage['dataengine'].ui.comboBox_mpris.findText(deSettings['MPRIS'])
-        self.configpage['dataengine'].ui.comboBox_mpris.setCurrentIndex(index)
+        self.configpage['dataengine'].ui.comboBox_mpris.addItem(deSettings['MPRIS'])
+        self.configpage['dataengine'].ui.comboBox_mpris.setCurrentIndex(self.configpage['dataengine'].ui.comboBox_mpris.count()-1)
         self.configpage['dataengine'].ui.listWidget_pkgCommand.clear()
         for i in range(len(deSettings['PKGCMD'].split(','))):
             try:

sources/ptm/contents/code/main.py

@@ -201,6 +201,8 @@ class pyTextWidget(plasmascript.Applet):
         # graphical tooltip
         self.tooltipScene = QGraphicsScene()
         self.tooltipView = QGraphicsView(self.tooltipScene)
+        self.tooltipView.setStyleSheet("background: transparent")
+        self.tooltipView.setContentsMargins(0, 0, 0, 0)
         self.tooltipView.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         self.tooltipView.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         # show tooltip

sources/ptm/contents/code/reinit.py

@@ -72,6 +72,7 @@ class Reinit():
 
         ptmVars['tooltip'] = {}
         ptmVars['tooltip']['colors'] = {}
+        ptmVars['tooltip']['colors']['background'] = str(settings.get('tooltip_background', 'null'))
         ptmVars['tooltip']['colors']['cpu'] = str(settings.get('cpu_color', '#ff0000'))
         ptmVars['tooltip']['colors']['cpuclock'] = str(settings.get('cpuclock_color', '#00ff00'))
         ptmVars['tooltip']['colors']['mem'] = str(settings.get('mem_color', '#0000ff'))

sources/ptm/contents/code/tooltip.py

@@ -47,6 +47,10 @@ class Tooltip():
         values = ptmTooltip['values']
         maxOne = [100.0, 100.0]
         bounds['down'] = 1.0
+        if (colors['background'] != "null"):
+            widget.setBackgroundBrush(QColor(colors['background']))
+        else:
+            widget.setBackgroundBrush(QBrush(Qt.NoBrush))
         for value in values['down']:
             if (bounds['down'] < value):
                 bounds['down'] = value

sources/ptm/contents/code/tooltipconfig.py

@@ -38,7 +38,16 @@ class TooltipWindow(QWidget):
         QWidget.__init__(self)
         self.ui = uic.loadUi(parent.package().filePath('ui', 'tooltipconfig.ui'), self)
         self.parent = parent
-        self.kcolorcombos = {'cpu':self.ui.kcolorcombo_cpu,
+        self.kcolorcombos = {'background':self.ui.kcolorcombo_background, 'cpu':self.ui.kcolorcombo_cpu,
             'cpuclock':self.ui.kcolorcombo_cpuclock, 'down':self.ui.kcolorcombo_down,
             'mem':self.ui.kcolorcombo_mem, 'swap':self.ui.kcolorcombo_swap,
             'up':self.ui.kcolorcombo_up}
+        QObject.connect(self.ui.checkBox_background, SIGNAL("stateChanged(int)"), self.setBackground)
+
+
+    def setBackground(self, background=0):
+        """function to enable/disable background elements"""
+        if (background == 0):
+            self.kcolorcombos['background'].setDisabled(True)
+        else:
+            self.kcolorcombos['background'].setEnabled(True)

sources/ptm/contents/ui/tooltipconfig.ui

@@ -115,6 +115,49 @@
          </item>
         </layout>
        </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_background">
+         <item>
+          <widget class="QCheckBox" name="checkBox_background">
+           <property name="minimumSize">
+            <size>
+             <width>200</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Background</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="spacer_background">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="KColorCombo" name="kcolorcombo_background">
+           <property name="minimumSize">
+            <size>
+             <width>180</width>
+             <height>0</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item>
         <layout class="QHBoxLayout" name="layout_cpuclockColor">
          <item>
@@ -382,7 +425,10 @@
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>scrollArea_tooltip</tabstop>
   <tabstop>spinBox_tooltipNum</tabstop>
+  <tabstop>checkBox_background</tabstop>
+  <tabstop>kcolorcombo_background</tabstop>
   <tabstop>kcolorcombo_cpuclock</tabstop>
   <tabstop>kcolorcombo_swap</tabstop>
   <tabstop>kcolorcombo_cpu</tabstop>

sources/ptm/contents/ui/widget.ui

@@ -1233,6 +1233,7 @@ $total - total number of desktops</string>
   </layout>
  </widget>
  <tabstops>
+  <tabstop>scrollArea_settings</tabstop>
   <tabstop>checkBox_time</tabstop>
   <tabstop>lineEdit_time</tabstop>
   <tabstop>slider_time</tabstop>
@@ -1287,6 +1288,9 @@ $total - total number of desktops</string>
   <tabstop>checkBox_custom</tabstop>
   <tabstop>lineEdit_custom</tabstop>
   <tabstop>slider_custom</tabstop>
+  <tabstop>checkBox_desktop</tabstop>
+  <tabstop>lineEdit_desktop</tabstop>
+  <tabstop>slider_desktop</tabstop>
  </tabstops>
  <resources/>
  <connections/>