add checkboxes to tooltip window

sources/awesome-widget/advanced.ui

@@ -490,27 +490,6 @@ $m - uptime minutes without zero</string>
    </item>
   </layout>
  </widget>
- <tabstops>
-  <tabstop>scrollArea_advanced</tabstop>
-  <tabstop>checkBox_background</tabstop>
-  <tabstop>checkBox_layout</tabstop>
-  <tabstop>checkBox_popup</tabstop>
-  <tabstop>checkBox_leftStretch</tabstop>
-  <tabstop>checkBox_rightStretch</tabstop>
-  <tabstop>lineEdit_timeFormat</tabstop>
-  <tabstop>lineEdit_uptimeFormat</tabstop>
-  <tabstop>comboBox_tempUnits</tabstop>
-  <tabstop>listWidget_tempDevice</tabstop>
-  <tabstop>listWidget_mount</tabstop>
-  <tabstop>listWidget_hddSpeedDevice</tabstop>
-  <tabstop>listWidget_hddDevice</tabstop>
-  <tabstop>checkBox_netdev</tabstop>
-  <tabstop>comboBox_netdev</tabstop>
-  <tabstop>lineEdit_batdev</tabstop>
-  <tabstop>lineEdit_acOnline</tabstop>
-  <tabstop>lineEdit_acOffline</tabstop>
-  <tabstop>lineEdit_acdev</tabstop>
- </tabstops>
  <resources/>
  <connections/>
 </ui>

sources/awesome-widget/awesome-widget.h

@@ -58,8 +58,6 @@ public slots:
 private slots:
     void reinit();
     // configuration interface
-    void setNetworkDevice();
-    void setTooltipBackground();
 
 protected:
     void createConfigurationInterface(KConfigDialog *parent);

sources/awesome-widget/configuration.cpp

@@ -236,7 +236,6 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
     uiAdvancedConfig.comboBox_netdev->setCurrentIndex(
                 uiAdvancedConfig.comboBox_netdev->findText(configuration[QString("customNetdev")],
                 Qt::MatchFixedString));
-    setNetworkDevice();
     uiAdvancedConfig.lineEdit_batdev->setText(configuration[QString("batteryDevice")]);
     uiAdvancedConfig.lineEdit_acdev->setText(configuration[QString("acDevice")]);
     uiAdvancedConfig.lineEdit_acOnline->setText(configuration[QString("acOnline")]);
@@ -249,12 +248,35 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
     else
         uiAdvancedConfig.checkBox_background->setCheckState(Qt::Checked);
     uiTooltipConfig.kcolorcombo_background->setColor(QColor(configuration[QString("tooltipBackground")]));
-    setTooltipBackground();
+    if (configuration[QString("cpuTooltip")].toInt() == 0)
+        uiTooltipConfig.checkBox_cpu->setCheckState(Qt::Unchecked);
+    else
+        uiTooltipConfig.checkBox_cpu->setCheckState(Qt::Checked);
     uiTooltipConfig.kcolorcombo_cpu->setColor(QColor(configuration[QString("cpuColor")]));
+    if (configuration[QString("cpuclockTooltip")].toInt() == 0)
+        uiTooltipConfig.checkBox_cpuclock->setCheckState(Qt::Unchecked);
+    else
+        uiTooltipConfig.checkBox_cpuclock->setCheckState(Qt::Checked);
     uiTooltipConfig.kcolorcombo_cpuclock->setColor(QColor(configuration[QString("cpuclockColor")]));
+    if (configuration[QString("memTooltip")].toInt() == 0)
+        uiTooltipConfig.checkBox_mem->setCheckState(Qt::Unchecked);
+    else
+        uiTooltipConfig.checkBox_mem->setCheckState(Qt::Checked);
     uiTooltipConfig.kcolorcombo_mem->setColor(QColor(configuration[QString("memColor")]));
+    if (configuration[QString("swapTooltip")].toInt() == 0)
+        uiTooltipConfig.checkBox_swap->setCheckState(Qt::Unchecked);
+    else
+        uiTooltipConfig.checkBox_swap->setCheckState(Qt::Checked);
     uiTooltipConfig.kcolorcombo_swap->setColor(QColor(configuration[QString("swapColor")]));
+    if (configuration[QString("downTooltip")].toInt() == 0)
+        uiTooltipConfig.checkBox_down->setCheckState(Qt::Unchecked);
+    else
+        uiTooltipConfig.checkBox_down->setCheckState(Qt::Checked);
     uiTooltipConfig.kcolorcombo_down->setColor(QColor(configuration[QString("downColor")]));
+    if (configuration[QString("upTooltip")].toInt() == 0)
+        uiTooltipConfig.checkBox_up->setCheckState(Qt::Unchecked);
+    else
+        uiTooltipConfig.checkBox_up->setCheckState(Qt::Checked);
     uiTooltipConfig.kcolorcombo_up->setColor(QColor(configuration[QString("upColor")]));
 
     // appearance
@@ -378,11 +400,17 @@ void AwesomeWidget::configAccepted()
     cg.writeEntry("tooltipNumber", QString::number(uiTooltipConfig.spinBox_tooltipNum->value()));
     cg.writeEntry("useTooltipBackground", QString::number(uiTooltipConfig.checkBox_background->checkState()));
     cg.writeEntry("tooltipBackground", uiTooltipConfig.kcolorcombo_background->color().name());
+    cg.writeEntry("cpuTooltip", QString::number(uiTooltipConfig.checkBox_cpu->checkState()));
     cg.writeEntry("cpuColor", uiTooltipConfig.kcolorcombo_cpu->color().name());
+    cg.writeEntry("cpuclockTooltip", QString::number(uiTooltipConfig.checkBox_cpuclock->checkState()));
     cg.writeEntry("cpuclockColor", uiTooltipConfig.kcolorcombo_cpuclock->color().name());
+    cg.writeEntry("memTooltip", QString::number(uiTooltipConfig.checkBox_mem->checkState()));
     cg.writeEntry("memColor", uiTooltipConfig.kcolorcombo_mem->color().name());
+    cg.writeEntry("swapTooltip", QString::number(uiTooltipConfig.checkBox_swap->checkState()));
     cg.writeEntry("swapColor", uiTooltipConfig.kcolorcombo_swap->color().name());
+    cg.writeEntry("downTooltip", QString::number(uiTooltipConfig.checkBox_down->checkState()));
     cg.writeEntry("downColor", uiTooltipConfig.kcolorcombo_down->color().name());
+    cg.writeEntry("upTooltip", QString::number(uiTooltipConfig.checkBox_up->checkState()));
     cg.writeEntry("upColor", uiTooltipConfig.kcolorcombo_up->color().name());
 
     // appearance
@@ -454,11 +482,17 @@ void AwesomeWidget::configChanged()
     configuration[QString("tooltipNumber")] = cg.readEntry("tooltipNumber", "100");
     configuration[QString("useTooltipBackground")] = cg.readEntry("useTooltipBackground", "2");
     configuration[QString("tooltipBackground")] = cg.readEntry("tooltipBackground", "#ffffff");
+    configuration[QString("cpuTooltip")] = cg.readEntry("cpuTooltip", "2");
     configuration[QString("cpuColor")] = cg.readEntry("cpuColor", "#ff0000");
+    configuration[QString("cpuclockTooltip")] = cg.readEntry("cpuclockTooltip", "2");
     configuration[QString("cpuclockColor")] = cg.readEntry("cpuclockColor", "#00ff00");
+    configuration[QString("memTooltip")] = cg.readEntry("memTooltip", "2");
     configuration[QString("memColor")] = cg.readEntry("memColor", "#0000ff");
+    configuration[QString("swapTooltip")] = cg.readEntry("swapTooltip", "2");
     configuration[QString("swapColor")] = cg.readEntry("swapColor", "#ffff00");
+    configuration[QString("downTooltip")] = cg.readEntry("downTooltip", "2");
     configuration[QString("downColor")] = cg.readEntry("downColor", "#00ffff");
+    configuration[QString("upTooltip")] = cg.readEntry("upTooltip", "2");
     configuration[QString("upColor")] = cg.readEntry("upColor", "#ff00ff");
 
     // appearance
@@ -480,25 +514,3 @@ void AwesomeWidget::configChanged()
 
     reinit();
 }
-
-
-void AwesomeWidget::setNetworkDevice()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    if (uiAdvancedConfig.checkBox_netdev->checkState() == 0)
-        uiAdvancedConfig.comboBox_netdev->setDisabled(true);
-    else if (uiAdvancedConfig.checkBox_netdev->checkState() == 2)
-        uiAdvancedConfig.checkBox_netdev->setEnabled(true);
-}
-
-
-void AwesomeWidget::setTooltipBackground()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    if (uiTooltipConfig.checkBox_background->checkState() == 0)
-        uiTooltipConfig.kcolorcombo_cpu->setDisabled(true);
-    else if (uiTooltipConfig.checkBox_background->checkState() == 2)
-        uiTooltipConfig.kcolorcombo_cpu->setEnabled(true);
-}

sources/awesome-widget/deconfig.ui

@@ -462,19 +462,6 @@ del - remove item</string>
    </item>
   </layout>
  </widget>
- <tabstops>
-  <tabstop>scrollArea_dattaengine</tabstop>
-  <tabstop>tableWidget_customCommand</tabstop>
-  <tabstop>lineEdit_desktopCmd</tabstop>
-  <tabstop>comboBox_gpudev</tabstop>
-  <tabstop>comboBox_hdddev</tabstop>
-  <tabstop>lineEdit_hddtempCmd</tabstop>
-  <tabstop>lineEdit_mpdaddress</tabstop>
-  <tabstop>spinBox_mpdport</tabstop>
-  <tabstop>comboBox_mpris</tabstop>
-  <tabstop>comboBox_playerSelect</tabstop>
-  <tabstop>tableWidget_pkgCommand</tabstop>
- </tabstops>
  <resources/>
  <connections/>
 </ui>

sources/awesome-widget/tooltipconfig.ui

@@ -158,90 +158,10 @@
          </item>
         </layout>
        </item>
-       <item>
-        <layout class="QHBoxLayout" name="layout_cpuclockColor">
-         <item>
-          <widget class="QLabel" name="label_cpuclockColor">
-           <property name="minimumSize">
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>CPU clock color</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="spacer_cpuclockColor">
-           <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_cpuclock">
-           <property name="minimumSize">
-            <size>
-             <width>180</width>
-             <height>0</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="layout_swapColor">
-         <item>
-          <widget class="QLabel" name="label_swapColor">
-           <property name="minimumSize">
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Swap color</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="spacer_swapColor">
-           <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_swap">
-           <property name="minimumSize">
-            <size>
-             <width>180</width>
-             <height>0</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
        <item>
         <layout class="QHBoxLayout" name="layout_cpuColor">
          <item>
-          <widget class="QLabel" name="label_cpuColor">
+          <widget class="QCheckBox" name="checkBox_cpu">
            <property name="minimumSize">
             <size>
              <width>200</width>
@@ -251,6 +171,9 @@
            <property name="text">
             <string>CPU color</string>
            </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
           </widget>
          </item>
          <item>
@@ -279,9 +202,9 @@
         </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="layout_downColor">
+        <layout class="QHBoxLayout" name="layout_cpuclockColor">
          <item>
-          <widget class="QLabel" name="label_downColor">
+          <widget class="QCheckBox" name="checkBox_cpuclock">
            <property name="minimumSize">
             <size>
              <width>200</width>
@@ -289,12 +212,15 @@
             </size>
            </property>
            <property name="text">
-            <string>Download speed color</string>
+            <string>CPU clock color</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <spacer name="spacer_downColor">
+          <spacer name="spacer_cpuclockColor">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -307,7 +233,7 @@
           </spacer>
          </item>
          <item>
-          <widget class="KColorCombo" name="kcolorcombo_down">
+          <widget class="KColorCombo" name="kcolorcombo_cpuclock">
            <property name="minimumSize">
             <size>
              <width>180</width>
@@ -321,7 +247,7 @@
        <item>
         <layout class="QHBoxLayout" name="layout_memColor">
          <item>
-          <widget class="QLabel" name="label_memColor">
+          <widget class="QCheckBox" name="checkBox_mem">
            <property name="minimumSize">
             <size>
              <width>200</width>
@@ -331,6 +257,9 @@
            <property name="text">
             <string>Memory color</string>
            </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
           </widget>
          </item>
          <item>
@@ -358,10 +287,96 @@
          </item>
         </layout>
        </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_swapColor">
+         <item>
+          <widget class="QCheckBox" name="checkBox_swap">
+           <property name="minimumSize">
+            <size>
+             <width>200</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Swap color</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="spacer_swapColor">
+           <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_swap">
+           <property name="minimumSize">
+            <size>
+             <width>180</width>
+             <height>0</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="layout_downColor">
+         <item>
+          <widget class="QCheckBox" name="checkBox_down">
+           <property name="minimumSize">
+            <size>
+             <width>200</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Download speed color</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="spacer_downColor">
+           <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_down">
+           <property name="minimumSize">
+            <size>
+             <width>180</width>
+             <height>0</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item>
         <layout class="QHBoxLayout" name="layout_upColor">
          <item>
-          <widget class="QLabel" name="label_upColor">
+          <widget class="QCheckBox" name="checkBox_up">
            <property name="minimumSize">
             <size>
              <width>200</width>
@@ -371,6 +386,9 @@
            <property name="text">
             <string>Upload speed color</string>
            </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
           </widget>
          </item>
          <item>
@@ -424,18 +442,6 @@
    <header>kcolorcombo.h</header>
   </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>
-  <tabstop>kcolorcombo_down</tabstop>
-  <tabstop>kcolorcombo_mem</tabstop>
-  <tabstop>kcolorcombo_up</tabstop>
- </tabstops>
  <resources/>
  <connections/>
 </ui>