From kde-commits  Mon Aug 31 16:09:22 2009
From: Alessandro Diaferia <alediaferia () gmail ! com>
Date: Mon, 31 Aug 2009 16:09:22 +0000
To: kde-commits
Subject: KDE/kdebase/workspace/plasma/applets/quicklaunch
Message-Id: <1251734962.004747.28011.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=125173497016802

SVN commit 1017823 by adiaferia:

allow showing icon names

 M  +25 -1     quicklaunchApplet.cpp  
 M  +3 -0      quicklaunchApplet.h  
 M  +16 -2     quicklaunchConfig.ui  


--- trunk/KDE/kdebase/workspace/plasma/applets/quicklaunch/quicklaunchApplet.cpp #1017822:1017823
@@ -63,7 +63,8 @@
     m_addAction(0),
     m_removeAction(0),
     m_sortappAscending(0),
-    m_sortappDescending(0)
+    m_sortappDescending(0),
+    m_showIconNames(false)
 {
     setHasConfigurationInterface(true);
     setAcceptDrops(true);
@@ -105,6 +106,9 @@
     m_visibleIcons = qMax(-1, cg.readEntry("visibleIcons", m_visibleIcons));
     m_dialogIconSize = qMax(s_defaultIconSize, (int)cg.readEntry("dialogIconSize", contentsRect().height() / 2));
 
+    m_showIconNames = (bool)cg.readEntry("showIconNames", false);
+    setShowIconNames(m_showIconNames);
+
     // Initialize outer layout
     m_layout = new QGraphicsLinearLayout(this);
     m_layout->setContentsMargins(0, 0, 0, 0);
@@ -155,6 +159,13 @@
     m_isBusy = false;
 }
 
+void QuicklaunchApplet::setShowIconNames(bool set)
+{
+    foreach (QuicklaunchIcon *icon, m_icons) {
+        icon->setText(set ? icon->appName() : QString());
+    }
+}
+
 QSizeF QuicklaunchApplet::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
 {
     if (which == Qt::PreferredSize) {
@@ -325,6 +336,8 @@
     uiConfig.iconSizeSlider->setValue(m_preferredIconSize);
     uiConfig.dialogIconSizeSpin->setValue(m_dialogIconSize);
     uiConfig.dialogIconSizeSlider->setValue(m_dialogIconSize);
+    
+    uiConfig.iconNamesCheckBox->setChecked(m_showIconNames);
 
     uiConfig.icons->setValue(m_visibleIcons);
     parent->addPage(widget, i18n("General"), icon());
@@ -357,6 +370,14 @@
         cg.writeEntry("dialogIconSize", m_dialogIconSize);
         changed = true;
     }
+    
+    bool iconNames = uiConfig.iconNamesCheckBox->isChecked();
+    if (m_showIconNames != iconNames) {
+        m_showIconNames = iconNames;
+	cg.writeEntry("showIconNames", m_showIconNames);
+        setShowIconNames(m_showIconNames);
+	changed = true;
+    }
 
     if (changed) {
         emit configNeedsSaving();
@@ -631,6 +652,9 @@
     }
 
     QuicklaunchIcon *container = new QuicklaunchIcon(appUrl, text, icon, genericName, this);
+    if (m_showIconNames) {
+        container->setText(container->appName());
+    }
     container->installEventFilter(this);
 
     m_icons.insert(index, container);
--- trunk/KDE/kdebase/workspace/plasma/applets/quicklaunch/quicklaunchApplet.h #1017822:1017823
@@ -167,6 +167,8 @@
         void saveConfig() {}
 
         bool dropHandler(const int pos, const QMimeData *mimedata);
+	
+        void setShowIconNames(bool set);
 
         QGraphicsLinearLayout *m_layout;
         QuicklaunchLayout *m_innerLayout;
@@ -186,6 +188,7 @@
         QuicklaunchIcon *m_rightClickedIcon;
         QPointF m_mousePressPos;
         bool m_isBusy;
+	bool m_showIconNames;
 
         QAction* m_addAction;
         QAction* m_removeAction;
--- trunk/KDE/kdebase/workspace/plasma/applets/quicklaunch/quicklaunchConfig.ui #1017822:1017823
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>372</width>
-    <height>117</height>
+    <width>405</width>
+    <height>143</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -117,6 +117,20 @@
      </property>
     </widget>
    </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Show icon names:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="2">
+    <widget class="QCheckBox" name="iconNamesCheckBox">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>