From bfb7d72faf6f0bd18e66df11daba6a3574ab0ebe Mon Sep 17 00:00:00 2001
From: arcan1s <esalexeev@gmail.com>
Date: Wed, 9 Jul 2014 09:59:04 +0400
Subject: [PATCH] change lineedit to combobox

---
 sources/desktop-panel/desktop-panel.cpp |  7 ++-
 sources/desktop-panel/widget.ui         | 75 ++++++++++++++++++++++++-
 2 files changed, 78 insertions(+), 4 deletions(-)

diff --git a/sources/desktop-panel/desktop-panel.cpp b/sources/desktop-panel/desktop-panel.cpp
index fcae593..fa6af0f 100644
--- a/sources/desktop-panel/desktop-panel.cpp
+++ b/sources/desktop-panel/desktop-panel.cpp
@@ -286,7 +286,8 @@ void DesktopPanel::createConfigurationInterface(KConfigDialog *parent)
     else
         uiWidConfig.checkBox_rightStretch->setCheckState(Qt::Checked);
     uiWidConfig.spinBox_interval->setValue(configuration[QString("interval")].toInt());
-    uiWidConfig.lineEdit_mark->setText(configuration[QString("mark")]);
+    uiWidConfig.comboBox_mark->setItemText(uiWidConfig.comboBox_mark->count()-1, configuration[QString("mark")]);
+    uiWidConfig.comboBox_mark->setCurrentIndex(uiWidConfig.comboBox_mark->count()-1);
     uiWidConfig.lineEdit_pattern->setText(configuration[QString("pattern")]);
     uiWidConfig.lineEdit_desktopcmd->setText(configuration[QString("desktopcmd")]);
 
@@ -340,7 +341,7 @@ void DesktopPanel::configAccepted()
     cg.writeEntry("leftStretch", QString::number(uiWidConfig.checkBox_leftStretch->checkState()));
     cg.writeEntry("rightStretch", QString::number(uiWidConfig.checkBox_rightStretch->checkState()));
     cg.writeEntry("interval", QString::number(uiWidConfig.spinBox_interval->value()));
-    cg.writeEntry("mark", uiWidConfig.lineEdit_mark->text());
+    cg.writeEntry("mark", uiWidConfig.comboBox_mark->currentText());
     cg.writeEntry("pattern", uiWidConfig.lineEdit_pattern->text());
     cg.writeEntry("desktopcmd", uiWidConfig.lineEdit_desktopcmd->text());
 
@@ -368,7 +369,7 @@ void DesktopPanel::configChanged()
     configuration[QString("interval")] = cg.readEntry("interval", "1000");
     configuration[QString("layout")] = cg.readEntry("layout", "0");
     configuration[QString("leftStretch")] = cg.readEntry("leftStretch", "2");
-    configuration[QString("mark")] = cg.readEntry("mark", "*");
+    configuration[QString("mark")] = cg.readEntry("mark", "¤");
     configuration[QString("pattern")] = cg.readEntry("pattern", "[$mark$number/$total: $name]");
     configuration[QString("rightStretch")] = cg.readEntry("rightStretch", "2");
 
diff --git a/sources/desktop-panel/widget.ui b/sources/desktop-panel/widget.ui
index c70b410..bdb43bc 100644
--- a/sources/desktop-panel/widget.ui
+++ b/sources/desktop-panel/widget.ui
@@ -134,10 +134,83 @@
           </widget>
          </item>
          <item>
-          <widget class="QLineEdit" name="lineEdit_mark">
+          <widget class="QComboBox" name="comboBox_mark">
            <property name="toolTip">
             <string>A mark which will be shown if this desktop is active</string>
            </property>
+           <property name="editable">
+            <bool>true</bool>
+           </property>
+           <item>
+            <property name="text">
+             <string notr="true">#</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string notr="true">$</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string notr="true">%</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string notr="true">&amp;</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string notr="true">*</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string notr="true">@</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string notr="true">¤</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string notr="true">¶</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string notr="true">·</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string notr="true">º</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string notr="true">×</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string notr="true">†</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string notr="true">•</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string notr="true">(current)</string>
+            </property>
+           </item>
           </widget>
          </item>
         </layout>