moved containmentconfigview out of libplasmaquick

src/plasmaquick/CMakeLists.txt

@@ -5,8 +5,8 @@ set(plasmaquick_LIB_SRC
     configmodel.cpp
     configview.cpp
     private/configcategory_p.cpp
-    private/containmentconfigview_p.cpp
-    private/currentcontainmentactionsmodel_p.cpp
+    #private/containmentconfigview_p.cpp
+    #private/currentcontainmentactionsmodel_p.cpp
 )
 
 

src/plasmaquick/plasmaquickview.cpp

@@ -17,7 +17,6 @@
  */
 
 #include "plasmaquickview.h"
-#include "private/containmentconfigview_p.h"
 #include "configview.h"
 
 #include <QDebug>
@@ -141,13 +140,8 @@ void PlasmaQuickViewPrivate::showConfigurationInterface(Plasma::Applet *applet)
         return;
     }
 
-    Plasma::Containment *cont = qobject_cast<Plasma::Containment *>(applet);
+    configView = new ConfigView(applet);
 
-    if (cont) {
-        configView = new ContainmentConfigView(cont);
-    } else {
-        configView = new ConfigView(applet);
-    }
     configView.data()->init();
     configView.data()->show();
 }

src/shell/CMakeLists.txt

@@ -57,6 +57,8 @@ set(widgetexplorer_SRC
 
 add_executable(plasma-shell
     main.cpp
+    containmentconfigview.cpp
+    currentcontainmentactionsmodel.cpp
     desktopview.cpp
     panelview.cpp
     panelconfigview.cpp

src/shell/containmentconfigview.cpp

@@ -17,9 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "currentcontainmentactionsmodel_p.h"
-#include "containmentconfigview_p.h"
-#include "configcategory_p.h"
+#include "currentcontainmentactionsmodel.h"
+#include "containmentconfigview.h"
 #include "configmodel.h"
 
 #include <kdeclarative/configpropertymap.h>
@@ -182,4 +181,4 @@ void ContainmentConfigView::syncWallpaperObjects()
     m_currentWallpaperConfig = static_cast<ConfigPropertyMap *>(wallpaperGraphicsObject->property("configuration").value<QObject *>());
 }
 
-#include "private/moc_containmentconfigview_p.cpp"
+#include "private/moc_containmentconfigview.cpp"

src/shell/currentcontainmentactionsmodel.cpp

@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "currentcontainmentactionsmodel_p.h"
+#include "currentcontainmentactionsmodel.h"
 
 #include <QMouseEvent>
 
@@ -259,4 +259,4 @@ void CurrentContainmentActionsModel::save()
     }
 }
 
-#include "private/moc_currentcontainmentactionsmodel_p.cpp"
+#include "private/moc_currentcontainmentactionsmodel.cpp"

src/shell/desktopview.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "desktopview.h"
+#include "containmentconfigview.h"
 #include "shellcorona.h"
 #include "shellmanager.h"
 
@@ -108,7 +109,7 @@ void DesktopView::setDashboardShown(bool shown)
     }
 }
 
-/*
+
 void DesktopView::showConfigurationInterface(Plasma::Applet *applet)
 {
     if (m_configView) {
@@ -123,13 +124,13 @@ void DesktopView::showConfigurationInterface(Plasma::Applet *applet)
     Plasma::Containment *cont = qobject_cast<Plasma::Containment *>(applet);
 
     if (cont) {
-        m_configView = new PanelConfigView(cont, this);
+        m_configView = new ContainmentConfigView(cont);
     } else {
         m_configView = new ConfigView(applet);
     }
     m_configView.data()->init();
     m_configView.data()->show();
-}*/
+}
 
 
 #include "moc_desktopview.cpp"

src/shell/desktopview.h

@@ -47,9 +47,8 @@ public:
 protected Q_SLOTS:
     /**
      * It will be called when the configuration is requested
-     * FIXME: this should be moved here
      */
-    //virtual void showConfigurationInterface(Plasma::Applet *applet);
+    virtual void showConfigurationInterface(Plasma::Applet *applet);
 
 Q_SIGNALS:
     void stayBehindChanged();