From 7380379fcfd8c5bbb9b32f6eb872c9232f238a5b Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Fri, 11 Apr 2014 16:46:02 +0200
Subject: [PATCH] we don't have different widgets for vd anymore

---
 kcmkwin/kwindesktop/main.cpp | 12 ------------
 kcmkwin/kwindesktop/main.ui  | 11 ++---------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/kcmkwin/kwindesktop/main.cpp b/kcmkwin/kwindesktop/main.cpp
index 2326c071ec..ec64996842 100644
--- a/kcmkwin/kwindesktop/main.cpp
+++ b/kcmkwin/kwindesktop/main.cpp
@@ -155,7 +155,6 @@ void KWinDesktopConfig::init()
     connect(m_ui->rowsSpinBox, SIGNAL(valueChanged(int)), SLOT(changed()));
     connect(m_ui->numberSpinBox, SIGNAL(valueChanged(int)), SLOT(changed()));
     connect(m_ui->numberSpinBox, SIGNAL(valueChanged(int)), SLOT(slotChangeShortcuts(int)));
-    connect(m_ui->activityCheckBox, SIGNAL(stateChanged(int)), SLOT(changed()));
     connect(m_ui->desktopNames, SIGNAL(changed()), SLOT(changed()));
     connect(m_ui->popupInfoCheckBox, SIGNAL(toggled(bool)), SLOT(changed()));
     connect(m_ui->popupHideSpinBox, SIGNAL(valueChanged(int)), SLOT(changed()));
@@ -281,14 +280,6 @@ void KWinDesktopConfig::load()
     slotEffectSelectionChanged(m_ui->effectComboBox->currentIndex());
     // TODO: plasma stuff
 
-    QDBusInterface interface("org.kde.plasma-desktop", "/App");
-    if (interface.isValid()) {
-        bool perVirtualDesktopViews = interface.call("perVirtualDesktopViews").arguments().first().toBool();
-        m_ui->activityCheckBox->setEnabled(true);
-        m_ui->activityCheckBox->setChecked(perVirtualDesktopViews);
-    } else
-        m_ui->activityCheckBox->setEnabled(false);
-
     emit changed(false);
 }
 
@@ -381,9 +372,6 @@ void KWinDesktopConfig::save()
     QDBusMessage message = QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
     QDBusConnection::sessionBus().send(message);
 
-    QDBusInterface interface("org.kde.plasma-desktop", "/App");
-    interface.call("setPerVirtualDesktopViews", (m_ui->activityCheckBox->isChecked()));
-
     emit changed(false);
 }
 
diff --git a/kcmkwin/kwindesktop/main.ui b/kcmkwin/kwindesktop/main.ui
index 73ccac96db..b84fda0284 100644
--- a/kcmkwin/kwindesktop/main.ui
+++ b/kcmkwin/kwindesktop/main.ui
@@ -51,7 +51,7 @@
              <string>Here you can set how many virtual desktops you want on your KDE desktop.</string>
             </property>
             <property name="text">
-             <string>Number of desktops:</string>
+             <string>&amp;Number of desktops:</string>
             </property>
             <property name="buddy">
              <cstring>numberSpinBox</cstring>
@@ -80,7 +80,7 @@
              <bool>true</bool>
             </property>
             <property name="text">
-             <string>Number of rows:</string>
+             <string>N&amp;umber of rows:</string>
             </property>
             <property name="buddy">
              <cstring>rowsSpinBox</cstring>
@@ -94,13 +94,6 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0" colspan="2">
-           <widget class="QCheckBox" name="activityCheckBox">
-            <property name="text">
-             <string>Different widgets for each desktop</string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>