From fbfc573a8ab421c33b46a6a638747e0517e93c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
Date: Mon, 14 Sep 2015 10:19:16 +0200
Subject: [PATCH] desktop grid: add option to hide buttons

one does indeed not change the desktop count
that often...

BUG: 352588
FIXED-IN: 5.5
REVIEW: 125228
---
 effects/desktopgrid/desktopgrid.cpp       |  3 ++-
 effects/desktopgrid/desktopgrid.kcfg      |  3 +++
 effects/desktopgrid/desktopgrid_config.ui | 11 +++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index 00aa846e16..3dd210fb6a 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -1126,7 +1126,8 @@ void DesktopGridEffect::setup()
     bool enableRemove = effects->numberOfDesktops() > 1;
 
     QHash< DesktopButtonsView*, EffectWindow* >::iterator it = m_desktopButtonsViews.begin();
-    for (int i = 0; i < effects->numScreens(); ++i) {
+    const int n = DesktopGridConfig::showAddRemove() ? effects->numScreens() : 0;
+    for (int i = 0; i < n; ++i) {
         DesktopButtonsView *view;
         if (it == m_desktopButtonsViews.end()) {
             view = new DesktopButtonsView();
diff --git a/effects/desktopgrid/desktopgrid.kcfg b/effects/desktopgrid/desktopgrid.kcfg
index 452be24c7c..37934a9e07 100644
--- a/effects/desktopgrid/desktopgrid.kcfg
+++ b/effects/desktopgrid/desktopgrid.kcfg
@@ -24,5 +24,8 @@
             <entry name="PresentWindows" type="Bool">
                 <default>true</default>
             </entry>
+            <entry name="ShowAddRemove" type="Bool">
+                <default>true</default>
+            </entry>
         </group>
 </kcfg>
diff --git a/effects/desktopgrid/desktopgrid_config.ui b/effects/desktopgrid/desktopgrid_config.ui
index 8347d50691..50a73b195b 100644
--- a/effects/desktopgrid/desktopgrid_config.ui
+++ b/effects/desktopgrid/desktopgrid_config.ui
@@ -52,7 +52,7 @@
       <item row="1" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
-         <string>&amp;Border width:</string>
+         <string>Border wid&amp;th:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -142,7 +142,7 @@
       <item row="4" column="0">
        <widget class="QLabel" name="layoutRowsLabel">
         <property name="text">
-         <string>Number of &amp;rows:</string>
+         <string>N&amp;umber of rows:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -191,6 +191,13 @@
         </property>
        </widget>
       </item>
+      <item row="6" column="0" colspan="2">
+       <widget class="QCheckBox" name="kcfg_ShowAddRemove">
+        <property name="text">
+         <string>Show buttons to alter count of virtual desktops</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>