From 7069758b731739460d60f67188c11b9101524b30 Mon Sep 17 00:00:00 2001
From: arcan1s <darkarcanis@mail.ru>
Date: Mon, 10 Nov 2014 01:53:27 +0300
Subject: [PATCH] add colorsettings to DP tooltip remove deprecated settings
 from AW

---
 sources/awesome-widget/configuration.cpp |  6 +--
 sources/awesome-widget/deconfig.ui       | 46 ++++++-----------------
 sources/desktop-panel/desktop-panel.cpp  |  4 ++
 sources/desktop-panel/widget.ui          | 47 ++++++++++++++++++++++--
 4 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp
index a660750..c8a1ebd 100644
--- a/sources/awesome-widget/configuration.cpp
+++ b/sources/awesome-widget/configuration.cpp
@@ -40,7 +40,6 @@ QMap<QString, QString> AwesomeWidget::readDataEngineConfiguration()
 
     QMap<QString, QString> rawConfig;
     rawConfig[QString("ACPIPATH")] = QString("/sys/class/power_supply/");
-    rawConfig[QString("DESKTOPCMD")] = QString("qdbus org.kde.kwin /KWin currentDesktop");
     rawConfig[QString("GPUDEV")] = QString("auto");
     rawConfig[QString("HDDDEV")] = QString("all");
     rawConfig[QString("HDDTEMPCMD")] = QString("sudo hddtemp");
@@ -105,8 +104,7 @@ QMap<QString, QString> AwesomeWidget::updateDataEngineConfiguration(const QMap<Q
         key = rawConfig.keys()[i];
         value = rawConfig[key];
         key.remove(QChar(' '));
-        if ((key != QString("DESKTOPCMD")) &&
-            (key != QString("HDDTEMPCMD")) &&
+        if ((key != QString("HDDTEMPCMD")) &&
             (key != QString("PKGCMD")))
             value.remove(QChar(' '));
         config[key] = value;
@@ -399,7 +397,6 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
         uiDEConfig.tableWidget_customCommand->setCellWidget(i, 4, redirect);
     }
     externalScripts.clear();
-    uiDEConfig.lineEdit_desktopCmd->setText(deSettings[QString("DESKTOPCMD")]);
     uiDEConfig.comboBox_gpudev->setCurrentIndex(
                 uiDEConfig.comboBox_gpudev->findText(deSettings[QString("GPUDEV")], Qt::MatchFixedString));
     cmd = QString("find /dev -name [hms]d[a-z]");
@@ -597,7 +594,6 @@ void AwesomeWidget::configAccepted()
         script->writeConfiguration();
         delete script;
     }
-    deSettings[QString("DESKTOPCMD")] = uiDEConfig.lineEdit_desktopCmd->text();
     deSettings[QString("GPUDEV")] = uiDEConfig.comboBox_gpudev->currentText();
     deSettings[QString("HDDDEV")] = uiDEConfig.comboBox_hdddev->currentText();
     deSettings[QString("HDDTEMPCMD")] = uiDEConfig.lineEdit_hddtempCmd->text();
diff --git a/sources/awesome-widget/deconfig.ui b/sources/awesome-widget/deconfig.ui
index 7d89bf7..817fc65 100644
--- a/sources/awesome-widget/deconfig.ui
+++ b/sources/awesome-widget/deconfig.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>700</width>
-    <height>586</height>
+    <height>584</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -43,11 +43,11 @@
         <x>0</x>
         <y>0</y>
         <width>684</width>
-        <height>570</height>
+        <height>568</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout">
-       <item row="5" column="0">
+       <item row="4" column="0">
         <layout class="QHBoxLayout" name="layout_hddtempCmd">
          <item>
           <widget class="QLabel" name="label_hddtempCmd">
@@ -71,7 +71,7 @@
          </item>
         </layout>
        </item>
-       <item row="3" column="0">
+       <item row="2" column="0">
         <layout class="QHBoxLayout" name="layout_gpudev">
          <item>
           <widget class="QLabel" name="label_gpudev">
@@ -124,7 +124,7 @@
          </item>
         </layout>
        </item>
-       <item row="4" column="0">
+       <item row="3" column="0">
         <layout class="QHBoxLayout" name="layout_hdddev">
          <item>
           <widget class="QLabel" name="label_hdddev">
@@ -157,7 +157,7 @@
          </item>
         </layout>
        </item>
-       <item row="9" column="0">
+       <item row="8" column="0">
         <layout class="QHBoxLayout" name="layout_playerSelect">
          <item>
           <widget class="QLabel" name="label_playerSelect">
@@ -200,7 +200,7 @@
          </item>
         </layout>
        </item>
-       <item row="7" column="0">
+       <item row="6" column="0">
         <layout class="QHBoxLayout" name="layout_mpdport">
          <item>
           <widget class="QLabel" name="label_mpdport">
@@ -255,31 +255,7 @@
          </item>
         </layout>
        </item>
-       <item row="2" column="0">
-        <layout class="QHBoxLayout" name="layout_desktopCmd">
-         <item>
-          <widget class="QLabel" name="label_desktopCmd">
-           <property name="minimumSize">
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Desktop check cmd</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="lineEdit_desktopCmd">
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="6" column="0">
+       <item row="5" column="0">
         <layout class="QHBoxLayout" name="layout_mpdaddress">
          <item>
           <widget class="QLabel" name="label_mpdaddress">
@@ -303,7 +279,7 @@
          </item>
         </layout>
        </item>
-       <item row="11" column="0">
+       <item row="10" column="0">
         <spacer name="spacer_dataengine">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -381,7 +357,7 @@
          </column>
         </widget>
        </item>
-       <item row="8" column="0">
+       <item row="7" column="0">
         <layout class="QVBoxLayout" name="layout_mpris">
          <item>
           <widget class="QLabel" name="label_mprisInfo">
@@ -471,7 +447,7 @@
          </item>
         </layout>
        </item>
-       <item row="10" column="0">
+       <item row="9" column="0">
         <layout class="QVBoxLayout" name="layout_pkgCommand">
          <item>
           <widget class="QTableWidget" name="tableWidget_pkgCommand">
diff --git a/sources/desktop-panel/desktop-panel.cpp b/sources/desktop-panel/desktop-panel.cpp
index c8ae08a..1d5ebbc 100644
--- a/sources/desktop-panel/desktop-panel.cpp
+++ b/sources/desktop-panel/desktop-panel.cpp
@@ -318,6 +318,7 @@ void DesktopPanel::paintTooltip(const int active)
 
     QPen pen = QPen();
     pen.setWidthF(2.0 * info.desktop.width() / 400.0);
+    pen.setColor(QColor(configuration[QString("tooltipColor")]));
     for (int i=0; i<info.windows.count(); i++) {
         toolTipScene->addLine(info.windows[i].left() + margin, info.windows[i].bottom() + margin,
                               info.windows[i].left() + margin, info.windows[i].top() + margin, pen);
@@ -394,6 +395,7 @@ void DesktopPanel::createConfigurationInterface(KConfigDialog *parent)
     else
         uiWidConfig.checkBox_tooltip->setCheckState(Qt::Checked);
     uiWidConfig.spinBox_tooltip->setValue(configuration[QString("tooltipWidth")].toInt());
+    uiWidConfig.kcolorcombo_tooltipColor->setColor(QColor(configuration[QString("tooltipColor")]));
     if (configuration[QString("background")].toInt() == 0)
         uiWidConfig.checkBox_background->setCheckState(Qt::Unchecked);
     else
@@ -477,6 +479,7 @@ void DesktopPanel::configAccepted()
     cg.writeEntry("pattern", uiWidConfig.textEdit_elements->toPlainText());
     cg.writeEntry("tooltip", QString::number(uiWidConfig.checkBox_tooltip->checkState()));
     cg.writeEntry("tooltipWidth", QString::number(uiWidConfig.spinBox_tooltip->value()));
+    cg.writeEntry("tooltipColor", uiWidConfig.kcolorcombo_tooltipColor->color().name());
     cg.writeEntry("background", QString::number(uiWidConfig.checkBox_background->checkState()));
     cg.writeEntry("layout", QString::number(uiWidConfig.checkBox_layout->checkState()));
     cg.writeEntry("mark", uiWidConfig.comboBox_mark->currentText());
@@ -513,6 +516,7 @@ void DesktopPanel::configChanged()
     configuration[QString("pattern")] = cg.readEntry("pattern", "[$fullmark$number/$total: $name]");
     configuration[QString("tooltip")] = cg.readEntry("tooltip", "2");
     configuration[QString("tooltipWidth")] = cg.readEntry("tooltipWidth", "200");
+    configuration[QString("tooltipColor")] = cg.readEntry("tooltipColor", "#ffffff");
     configuration[QString("background")] = cg.readEntry("background", "2");
     configuration[QString("layout")] = cg.readEntry("layout", "0");
     configuration[QString("mark")] = cg.readEntry("mark", "¤");
diff --git a/sources/desktop-panel/widget.ui b/sources/desktop-panel/widget.ui
index c4f0de2..c57e024 100644
--- a/sources/desktop-panel/widget.ui
+++ b/sources/desktop-panel/widget.ui
@@ -20,14 +20,14 @@
    <string notr="true">Widget</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="6" column="0">
+   <item row="7" column="0">
     <widget class="QCheckBox" name="checkBox_layout">
      <property name="text">
       <string>Vertical layout</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="0">
+   <item row="9" column="0">
     <layout class="QHBoxLayout" name="layout_mark">
      <item>
       <widget class="QLabel" name="label_mark">
@@ -372,15 +372,56 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0">
+   <item row="5" column="0">
     <widget class="QCheckBox" name="checkBox_background">
      <property name="text">
       <string>Enable background</string>
      </property>
     </widget>
    </item>
+   <item row="4" column="0">
+    <layout class="QHBoxLayout" name="layout_tooltipColor">
+     <item>
+      <widget class="QLabel" name="label_tooltipColor">
+       <property name="text">
+        <string>Tooltip border color</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="spacer_tooltipColor">
+       <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_tooltipColor">
+       <property name="minimumSize">
+        <size>
+         <width>180</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KColorCombo</class>
+   <extends>QComboBox</extends>
+   <header>kcolorcombo.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>