[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/containmentactions/switchwindow
From:       Chani Armitage <chanika () gmail ! com>
Date:       2009-08-24 2:38:16
Message-ID: 1251081496.746423.20398.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1014862 by chani:

don't show empty desktops

 M  +21 -13    switch.cpp  


--- trunk/KDE/kdebase/workspace/plasma/containmentactions/switchwindow/switch.cpp #1014861:1014862
@@ -129,24 +129,32 @@
         int numDesktops = KWindowSystem::numberOfDesktops();
         if (m_mode == AllFlat) {
             for (int i = 1; i <= numDesktops; ++i) {
-                QString name = KWindowSystem::desktopName(i);
-                name = QString("%1: %2").arg(i).arg(name);
-                desktopMenu->addTitle(name);
-                desktopMenu->addActions(desktops.values(i));
+                if (desktops.contains(i)) {
+                    QString name = KWindowSystem::desktopName(i);
+                    name = QString("%1: %2").arg(i).arg(name);
+                    desktopMenu->addTitle(name);
+                    desktopMenu->addActions(desktops.values(i));
+                }
             }
-            desktopMenu->addTitle(i18n("All Desktops"));
-            desktopMenu->addActions(desktops.values(-1));
+            if (desktops.contains(-1)) {
+                desktopMenu->addTitle(i18n("All Desktops"));
+                desktopMenu->addActions(desktops.values(-1));
+            }
         } else { //submenus
             for (int i = 1; i <= numDesktops; ++i) {
-                QString name = KWindowSystem::desktopName(i);
-                name = QString("%1: %2").arg(i).arg(name);
-                KMenu *subMenu = new KMenu(name, desktopMenu);
-                subMenu->addActions(desktops.values(i));
+                if (desktops.contains(i)) {
+                        QString name = KWindowSystem::desktopName(i);
+                        name = QString("%1: %2").arg(i).arg(name);
+                        KMenu *subMenu = new KMenu(name, desktopMenu);
+                        subMenu->addActions(desktops.values(i));
+                        desktopMenu->addMenu(subMenu);
+                }
+            }
+            if (desktops.contains(-1)) {
+                KMenu *subMenu = new KMenu(i18n("All Desktops"), desktopMenu);
+                subMenu->addActions(desktops.values(-1));
                 desktopMenu->addMenu(subMenu);
             }
-            KMenu *subMenu = new KMenu(i18n("All Desktops"), desktopMenu);
-            subMenu->addActions(desktops.values(-1));
-            desktopMenu->addMenu(subMenu);
         }
     }
 
[prev in list] [next in list] [prev in thread] [next in thread]