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

List:       kde-commits
Subject:    kdebase/kicker/core
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2004-12-01 1:10:02
Message-ID: 20041201011002.EF3421B953 () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

move the childpanelextension straight into kicker itself.
the plugin manager short-circuits on childpanel creation to simply
instantiating the built-in KPanelExtension subclass, now known as
PanelExtension.

should make startup faster in the common case, fix the default panel
loading problems and maybe even fix the badly sizeHint'd applets that some
are seeing


  A            childpanelextension.desktop   1.1
  A            panelextension.cpp   1.1 [X11 (BSD like)]
  A            panelextension.h   1.1 [X11 (BSD like)]
  M +6 -1      Makefile.am   1.32
  M +7 -0      pluginmanager.cpp   1.21


--- kdebase/kicker/core/Makefile.am  #1.31:1.32
@@ -9,5 +9,6 @@
         container_applet.cpp container_extension.cpp extensionmanager.cpp \
         menumanager.cpp pluginmanager.cpp showdesktop.cpp \
-        unhidetrigger.cpp containerarealayout.cpp paneldrag.cpp
+        unhidetrigger.cpp containerarealayout.cpp paneldrag.cpp \
+        panelextension.cpp panelextension.skel
 
 libkicker_core_la_LDFLAGS = $(all_libraries)
@@ -17,2 +18,6 @@
 kicker_core_data_DATA = default-apps
 kicker_core_datadir = $(kde_datadir)/kicker
+
+lnkdir = $(kde_datadir)/kicker/extensions
+lnk_DATA = childpanelextension.desktop
+

--- kdebase/kicker/core/pluginmanager.cpp  #1.20:1.21
@@ -37,4 +37,5 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 #include "container_applet.h"
 #include "container_extension.h"
+#include "panelextension.h"
 #include "pluginmanager.h"
 
@@ -132,4 +133,10 @@ KPanelExtension* PluginManager::loadExte
     const AppletInfo& info, QWidget* parent )
 {
+    if (info.library() == "childpanel_panelextension"
+        /* KDE4? || info.library() == "panel" */)
+    {
+        return new PanelExtension(info.configFile(), parent, "panelextension");
+    }
+
     KLibLoader* loader = KLibLoader::self();
     KLibrary* lib = loader->library( QFile::encodeName(info.library()) );


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