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

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

SVN commit 789235 by aseigo:

introduce DesktopCorona which has desktopy stuff in it like responding to screens, \
the default setup for the desktop itself, etc. takes a stab at fixing the "new screen \
plugged in, contianment for screen already exists, screen doesn't get anything shown \
on it" problem


 M  +1 -0      CMakeLists.txt  
 A             desktopcorona.cpp   \
trunk/KDE/kdebase/workspace/libs/plasma/corona.cpp#789110 [License: LGPL (v2+)]  A    \
desktopcorona.h   trunk/KDE/kdebase/workspace/libs/plasma/corona.h#789110 [License: \
LGPL (v2+)]  M  +8 -6      plasmaapp.cpp  


--- trunk/KDE/kdebase/workspace/plasma/plasma/CMakeLists.txt #789234:789235
@@ -1,6 +1,7 @@
 include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs)
 
 set(plasma_SRCS
+    desktopcorona.cpp
     desktopview.cpp
     main.cpp
     plasmaapp.cpp
--- trunk/KDE/kdebase/workspace/plasma/plasma/plasmaapp.cpp #789234:789235
@@ -51,11 +51,11 @@
 #include <ksmserver_interface.h>
 
 #include "plasma/appletbrowser.h"
-#include <plasma/corona.h>
 #include <plasma/containment.h>
 #include <plasma/theme.h>
 
 #include "appadaptor.h"
+#include "desktopcorona.h"
 #include "rootwidget.h"
 #include "desktopview.h"
 #include "panelview.h"
@@ -269,14 +269,16 @@
     Q_ASSERT(m_root);
 
     if (!m_corona) {
-        m_corona = new Plasma::Corona(this);
-        connect(m_corona, SIGNAL(containmentAdded(Plasma::Containment*)),
+        DesktopCorona *c = new DesktopCorona(this);
+        connect(c, SIGNAL(containmentAdded(Plasma::Containment*)),
                 this, SLOT(createView(Plasma::Containment*)));
-        connect(m_corona, SIGNAL(screenOwnerChanged(int,int,Plasma::Containment*)),
+        connect(c, SIGNAL(screenOwnerChanged(int,int,Plasma::Containment*)),
                 m_root, SLOT(screenOwnerChanged(int,int,Plasma::Containment*)));
 
-        m_corona->setItemIndexMethod(QGraphicsScene::NoIndex);
-        m_corona->loadApplets();
+        c->setItemIndexMethod(QGraphicsScene::NoIndex);
+        c->loadApplets();
+        c->checkScreens();
+        m_corona = c;
     }
 
     return m_corona;


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