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

List:       kde-commits
Subject:    KDE/kdebase/kicker
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-08-19 20:40:55
Message-ID: 1124484055.272596.32015.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 451087 by aseigo:

introduce AbstractPanelManager

right now this is pretty lame but it's needed to take the next steps
forward without killing ourselves in the meantime. next step:

get rid of ExtensionContainer by making KPanelExtension do what it
does currently


 M  +4 -4      kicker/core/container_extension.cpp  
 M  +9 -7      kicker/core/extensionmanager.cpp  
 M  +5 -5      kicker/core/extensionmanager.h  
 M  +2 -2      kicker/ui/addappletvisualfeedback.cpp  
 M  +8 -6      libkicker/Makefile.am  
 A             libkicker/abstractpanelmanager.cpp   [License: LGPL]
 A             libkicker/abstractpanelmanager.h   [License: LGPL]


--- trunk/KDE/kdebase/kicker/kicker/core/container_extension.cpp #451086:451087
@@ -580,7 +580,7 @@
         return;
     }
 
-    if (xineramaScreen() != XineramaAllScreens &&
+    if (xineramaScreen() != Plasma::XineramaAllScreens &&
         XineramaScreen != xineramaScreen())
     {
         if (s->unhideLocation() != Plasma::NoEdge)
@@ -1704,7 +1704,7 @@
                                            UserHidden userHidden)
 {
     QRect wholeScreen;
-    if (XineramaScreen == XineramaAllScreens)
+    if (XineramaScreen == Plasma::XineramaAllScreens)
     {
         wholeScreen = QApplication::desktop()->geometry();
     }
@@ -1853,7 +1853,7 @@
 
     /* -2 means all screens, -1 primary screens, the rest are valid screen numbers */
     ExtensionSettings* s = m_extension->settings();
-    if (XineramaAllScreens <= s->xineramaScreen() &&
+    if (Plasma::XineramaAllScreens <= s->xineramaScreen() &&
         s->xineramaScreen() < QApplication::desktop()->numScreens())
     {
         return s->xineramaScreen();
@@ -1891,7 +1891,7 @@
 
     /*kdDebug(1210) << "initialGeometry() Computing geometry for " << name() <<
         " on screen " << XineramaScreen << endl;*/
-    QRect workArea = ExtensionManager::the()->workArea(XineramaScreen, this);
+    QRect workArea = ExtensionManager::the()->workArea(this, XineramaScreen);
     QSize size = initialSize(p, workArea);
     QPoint point = initialLocation(p, a, XineramaScreen,
                                    size, workArea,
--- trunk/KDE/kdebase/kicker/kicker/core/extensionmanager.cpp #451086:451087
@@ -52,7 +52,7 @@
 
 ExtensionManager* ExtensionManager::the()
 {
-    if (!m_self)
+    if (!m_manager)
     {
         extensionManagerDeleter.setObject(m_self, new ExtensionManager());
     }
@@ -61,7 +61,7 @@
 }
 
 ExtensionManager::ExtensionManager()
-    : QObject(0),
+    : AbstractPanelManager(),
       m_menubarPanel(0),
       m_mainPanel(0),
       m_panelCounter(-1)
@@ -80,6 +80,7 @@
 
     delete m_menubarPanel;
     delete m_mainPanel;
+    m_self= 0;
 }
 
 void ExtensionManager::initialize()
@@ -201,7 +202,7 @@
         m_menubarPanel->setPanelOrder(-1);
         m_menubarPanel->readConfig();
         m_menubarPanel->setPosition(Plasma::Top);
-        m_menubarPanel->setXineramaScreen(XineramaAllScreens);
+        m_menubarPanel->setXineramaScreen(Plasma::XineramaAllScreens);
         m_menubarPanel->setHideButtons(false, false);
 
         // this takes care of resizing the panel so it shows with the right height
@@ -512,8 +513,8 @@
         return true;
     }
 
-    if (extension->xineramaScreen()!= XineramaAllScreens &&
-        exclude->xineramaScreen() != XineramaAllScreens &&
+    if (extension->xineramaScreen()!= Plasma::XineramaAllScreens &&
+        exclude->xineramaScreen() != Plasma::XineramaAllScreens &&
         exclude->xineramaScreen() != XineramaScreen)
     {
         // Rule 1 exclusion
@@ -597,7 +598,8 @@
     return true;
 }
 
-QRect ExtensionManager::workArea(int XineramaScreen, ExtensionContainer* extension)
+QRect ExtensionManager::workArea(ExtensionContainer* extension,
+                                 int XineramaScreen)
 {
     if (!extension)
     {
@@ -649,7 +651,7 @@
     }
 
     QRect workArea;
-    if (XineramaScreen == XineramaAllScreens)
+    if (XineramaScreen == Plasma::XineramaAllScreens)
     {
          /* special value for all screens */
          workArea = Kicker::the()->kwinModule()->workArea(list);
--- trunk/KDE/kdebase/kicker/kicker/core/extensionmanager.h #451086:451087
@@ -29,11 +29,10 @@
 #include <kstaticdeleter.h>
 
 #include "utils.h"
-#include <container_extension.h>
+#include "container_extension.h"
+#include "abstractpanelmanager.h"
 
-const int XineramaAllScreens = -2;
-
-class ExtensionManager : public QObject
+class ExtensionManager : public QObject, public AbstractPanelManager
 {
     Q_OBJECT
 
@@ -49,7 +48,7 @@
     ExtensionContainer::List containers() const { return _containers; }
 
     Plasma::Position initialPanelPosition(Plasma::Position preferred);
-    QRect workArea(int XineramaScreen, ExtensionContainer* container);
+    QRect workArea(ExtensionContainer* container, int XineramaScreen);
     int nextPanelOrder();
 
 public slots:
@@ -79,6 +78,7 @@
     ExtensionContainer* m_menubarPanel;
     ExtensionContainer* m_mainPanel;
     int m_panelCounter;
+
     static ExtensionManager* m_self;
 };
 
--- trunk/KDE/kdebase/kicker/kicker/ui/addappletvisualfeedback.cpp #451086:451087
@@ -70,7 +70,7 @@
 
     displayInternal();
 
-    m_destination = Plasma::popupPosition(m_direction, this, m_destination);
+    m_destination = Plasma::popupPosition(m_direction, this, m_target);
     QPoint startAt = widget->itemPixmap->geometry().topLeft();
     startAt = widget->itemPixmap->mapToGlobal(startAt);
     move(startAt);
@@ -145,7 +145,7 @@
 
     if (m_frames < 1)
     {
-        move(KickerLib::popupPosition(m_direction, this, m_target));
+        move(Plasma::popupPosition(m_direction, this, m_target));
     }
 
     // create and set transparency mask
--- trunk/KDE/kdebase/kicker/libkicker/Makefile.am #451086:451087
@@ -2,7 +2,8 @@
 
 lib_LTLIBRARIES = libkickermain.la
 
-libkickermain_la_SOURCES = appletinfo.cpp utils.cpp kickertip.cpp \
+libkickermain_la_SOURCES = abstractpanelmanager.cpp \
+                           appletinfo.cpp utils.cpp kickertip.cpp \
                            menuinfo.cpp panelbutton.cpp panner.cpp \
                            kickerSettings.kcfgc kshadowsettings.cpp \
                            kshadowengine.cpp paneldrag.cpp \
@@ -17,15 +18,16 @@
 
 libkickermain_la_includedir = $(includedir)/plasma
 
-noinst_HEADERS = appletinfo.h kickertip.h kpanelappmenu.h \
+noinst_HEADERS = abstractpanelmanager.h appletinfo.h kickertip.h kpanelappmenu.h \
                  kshadowsettings.h panelbutton.h panner.h \
-                 kshadowengine.h menuinfo.h paneldrag.h
-libkickermain_la_include_HEADERS = utils.h kpanelapplet.h \
+                 kshadowengine.h menuinfo.h paneldrag.h \
+                 abstractpanelmanager.h
+libkickermain_la_include_HEADERS = kpanelapplet.h \
                                    kpanelextension.h \
                                    kpanelmenu.h \
-                                   kickertip.h
+                                   kickertip.h \
+                                   utils.h
 
-
 kde_kcfg_DATA = kickerSettings.kcfg extensionSettings.kcfg
 
 messages: rc.cpp
[prev in list] [next in list] [prev in thread] [next in thread]