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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/shells/mid
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-09-22 23:17:22
Message-ID: 1222125442.680270.30199.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 863724 by aseigo:

add code to create and load a panel; we can now start adding default applets here as \
well (they new systray, etc)


 M  +6 -4      midcorona.cpp  
 M  +2 -1      midcorona.h  
 M  +6 -2      midview.cpp  
 M  +3 -2      midview.h  
 M  +7 -5      plasmaapp.cpp  


--- trunk/KDE/kdebase/workspace/plasma/shells/mid/midcorona.cpp #863723:863724
@@ -33,8 +33,9 @@
 #include <plasma/containment.h>
 #include <plasma/dataenginemanager.h>
 
-MidCorona::MidCorona(QObject *parent)
-    : Plasma::Corona(parent)
+MidCorona::MidCorona(QObject *parent, QWidget *mainWindow)
+    : Plasma::Corona(parent),
+      m_mainWindow(mainWindow)
 {
     init();
 }
@@ -83,9 +84,10 @@
 
     emit containmentAdded(c);
 
+    QVariantList midPanelArgs;
+    midPanelArgs << m_mainWindow->width();
+    c = addContainment("midpanel", midPanelArgs);
     /*
-    todo: replace with an applet layout at the top
-
     loadDefaultApplet("systemtray", panel);
 
     foreach (Plasma::Applet* applet, panel->applets()) {
--- trunk/KDE/kdebase/workspace/plasma/shells/mid/midcorona.h #863723:863724
@@ -37,7 +37,7 @@
     Q_OBJECT
 
 public:
-    explicit MidCorona(QObject * parent = 0);
+    MidCorona(QObject * parent, QWidget *mainWindow);
 
     /**
      * Loads the default (system wide) layout for this user
@@ -56,6 +56,7 @@
     void init();
     Plasma::Applet *loadDefaultApplet(const QString &pluginName, Plasma::Containment \
*c);  
+    QWidget *m_mainWindow;
     int m_numScreens;
 };
 
--- trunk/KDE/kdebase/workspace/plasma/shells/mid/midview.cpp #863723:863724
@@ -27,8 +27,8 @@
 #include "plasma/corona.h"
 #include "plasma/containment.h"
 
-MidView::MidView(Plasma::Containment *containment, QWidget *parent)
-    : Plasma::View(containment, defaultId(), parent)
+MidView::MidView(Plasma::Containment *containment, int uid, QWidget *parent)
+    : Plasma::View(containment, uid, parent)
 {
     setFocusPolicy(Qt::NoFocus);
     connectContainment(containment);
@@ -69,6 +69,10 @@
 
     Plasma::View::setContainment(c);
     connectContainment(c);
+    if (id() == controlBarId()) {
+        //TODO: probably needs to be configurable =)
+        c->setLocation(Plasma::TopEdge);
+    }
     c->resize(size());
 }
 
--- trunk/KDE/kdebase/workspace/plasma/shells/mid/midview.h #863723:863724
@@ -36,7 +36,7 @@
     Q_OBJECT
 
 public:
-    MidView(Plasma::Containment *containment, QWidget *parent = 0);
+    MidView(Plasma::Containment *containment, int uid, QWidget *parent = 0);
     ~MidView();
 
     /**
@@ -44,7 +44,8 @@
      */
     void connectContainment(Plasma::Containment *containment);
 
-    static uint defaultId() { return 1; }
+    static uint mainViewId() { return 1; }
+    static uint controlBarId() { return 2; }
 
 public slots:
     void showAppletBrowser();
--- trunk/KDE/kdebase/workspace/plasma/shells/mid/plasmaapp.cpp #863723:863724
@@ -141,10 +141,10 @@
     layout->setMargin(0);
     layout->setSpacing(0);
 
-    m_controlBar = new MidView(0, m_window);
+    m_controlBar = new MidView(0, MidView::controlBarId(), m_window);
     m_controlBar->setFixedHeight(CONTROL_BAR_HEIGHT);
     m_controlBar->setBackgroundBrush(Qt::red);
-    m_mainView = new MidView(0, m_window);
+    m_mainView = new MidView(0, MidView::mainViewId(), m_window);
 
     layout->addWidget(m_controlBar);
     layout->addWidget(m_mainView);
@@ -263,7 +263,7 @@
 Plasma::Corona* PlasmaApp::corona()
 {
     if (!m_corona) {
-        m_corona = new MidCorona(this);
+        m_corona = new MidCorona(this, m_window);
         connect(m_corona, SIGNAL(containmentAdded(Plasma::Containment*)),
                 this, SLOT(createView(Plasma::Containment*)));
         connect(m_corona, SIGNAL(configSynced()), this, SLOT(syncConfig()));
@@ -301,9 +301,11 @@
 
 void PlasmaApp::createView(Plasma::Containment *containment)
 {
-    if (m_mainView && containment->id() == MidView::defaultId()) {
-        kDebug() << "setting the mainview containment!";
+    //kDebug() << "new containment" << (QObject*)containment << containment->id();
+    if (m_mainView && containment->id() == MidView::mainViewId()) {
         m_mainView->setContainment(containment);
+    } else if (m_controlBar && containment->id() == MidView::controlBarId()) {
+        m_controlBar->setContainment(containment);
     }
 }
 


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