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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma
From:       Chani Armitage <chanika () gmail ! com>
Date:       2009-10-18 23:42:02
Message-ID: 1255909322.552748.27401.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1037410 by chani:

allow adding an activity while zoomed in

 M  +0 -3      desktop/shell/desktopview.cpp  
 M  +1 -5      desktop/shell/plasmaapp.cpp  
 M  +2 -2      generic/containmentactions/contextmenu/menu.cpp  


--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/desktopview.cpp #1037409:1037410
@@ -90,7 +90,6 @@
 
     if (containment) {
         containment->enableAction("zoom in", false);
-        containment->enableAction("add sibling containment", false);
         connect(PlasmaApp::self()->corona(), \
SIGNAL(containmentAdded(Plasma::Containment *)), this, \
SLOT(containmentAdded(Plasma::Containment *)));  }
 
@@ -314,7 +313,6 @@
         //make sure actions are up-to-date
         //this is icky but necessary to have the toolbox show the right actions for \
the zoom level  containment->enableAction("zoom in", false);
-        containment->enableAction("add sibling containment", false);
     }
 
     if (m_dashboard && m_dashboardFollowsDesktop) {
@@ -328,7 +326,6 @@
         if (zoomLevel == Plasma::DesktopZoom) {
             //make sure actions are up-to-date
             oldContainment->enableAction("zoom in", false);
-            oldContainment->enableAction("add sibling containment", false);
         }
     }
 
--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/plasmaapp.cpp #1037409:1037410
@@ -595,8 +595,6 @@
         KAction *activityAction = c->addAction("add sibling containment");
         activityAction->setText(i18n("Add Activity"));
         activityAction->setIcon(KIcon("list-add"));
-        activityAction->setVisible(false);
-        activityAction->setEnabled(false);
         connect(activityAction, SIGNAL(triggered()), this, SLOT(addContainment()));
         activityAction->setShortcut(KShortcut("alt+d, alt+a"));
         activityAction->setShortcutContext(Qt::ApplicationShortcut);
@@ -884,7 +882,6 @@
         setControllerVisible(false);
         m_zoomLevel = Plasma::DesktopZoom;
         containment->closeToolBox();
-        addSibling = false;
         zoomIn = false;
         //remove = false;
     } else if (m_zoomLevel == Plasma::OverviewZoom) {
@@ -1068,8 +1065,7 @@
 
 void PlasmaApp::updateActions(Plasma::ImmutabilityType immutability)
 {
-    bool enable = immutability == Plasma::Mutable && m_zoomLevel != \
                Plasma::DesktopZoom;
-    kDebug() << enable;
+    bool enable = immutability == Plasma::Mutable;
     m_corona->enableAction("add sibling containment", enable);
 }
 
--- trunk/KDE/kdebase/workspace/plasma/generic/containmentactions/contextmenu/menu.cpp \
#1037409:1037410 @@ -80,8 +80,8 @@
         defaultEnabled << true << true << true << true << true;
     } else {
         //FIXME ugly code!
-        m_allActions << "_context" << "_run_command" << "add widgets" << "_add \
panel" << "remove" << "lock widgets" << "zoom in" << "zoom out" << "_sep1" << \
"_lock_screen" << "_logout" << "_sep2" << "configure" << "configure shortcuts" << \
                "_sep3" << "_wallpaper";
-        defaultEnabled << true << true << true << true << true << true << false << \
false << true << true << true << true << true << false << true << true; +        \
m_allActions << "_context" << "_run_command" << "add widgets" << "_add panel" << "add \
sibling containment" << "remove" << "lock widgets" << "zoom in" << "zoom out" << \
"_sep1" << "_lock_screen" << "_logout" << "_sep2" << "configure" << "configure \
shortcuts" << "_sep3" << "_wallpaper"; +        defaultEnabled << true << true << \
true << true << false << true << true << false << false << true << true << true << \
true << true << false << true << true;  }
 
     for (int i = 0; i < m_allActions.count(); ++i) {


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