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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/desktop/shell
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-08-31 2:28:20
Message-ID: 20100831022820.13B5CAC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1170191 by aseigo:

hide the panel controller when immutability changes
BUG:249571


 M  +10 -1     panelview.cpp  
 M  +1 -0      panelview.h  


--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/panelview.cpp #1170190:1170191
@@ -398,7 +398,7 @@
 
     Plasma::Containment *oldContainment = this->containment();
     if (oldContainment) {
-        disconnect(oldContainment, 0, this, 0);
+        disconnect(oldContainment);
     }
 
     connect(containment, SIGNAL(newStatus(Plasma::ItemStatus)), this, \
SLOT(setStatus(Plasma::ItemStatus))); @@ -407,6 +407,7 @@
     connect(containment, SIGNAL(appletAdded(Plasma::Applet *, const QPointF &)), \
                this, SLOT(appletAdded(Plasma::Applet *)));
     connect(containment, SIGNAL(showAddWidgetsInterface(QPointF)), this, \
                SLOT(showWidgetExplorer()));
     connect(containment, SIGNAL(screenChanged(int,int,Plasma::Containment*)), this, \
SLOT(pinchContainmentToCurrentScreen())); +    connect(containment, \
SIGNAL(immutabilityChanged(Plasma::ImmutabilityType)), this, \
SLOT(immutabilityChanged(Plasma::ImmutabilityType)));  
     KConfigGroup viewIds(KGlobal::config(), "ViewIds");
 
@@ -1007,6 +1008,14 @@
     return m_alignment;
 }
 
+void PanelView::immutabilityChanged(Plasma::ImmutabilityType immutability)
+{
+    if (immutability != Plasma::Mutable) {
+        delete m_panelController;
+        m_panelController = 0;
+    }
+}
+
 void PanelView::togglePanelController()
 {
     //kDebug();
--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/panelview.h #1170190:1170191
@@ -239,6 +239,7 @@
 #endif
 
 private Q_SLOTS:
+    void immutabilityChanged(Plasma::ImmutabilityType immutability);
     void togglePanelController();
     void showWidgetExplorer();
     void editingComplete();


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