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

List:       kde-commits
Subject:    kdevelop/parts/doctreeview
From:       Jens Dagerbo <jens.dagerbo () swipnet ! se>
Date:       2004-01-21 11:34:07
Message-ID: 20040121113407.9DA261A27 () office ! kde ! org
[Download RAW message or body]

CVS commit by dagerbo: 

Modified DocTreeViewPart to use demand loading of config widgets. 


  M +33 -6     doctreeviewpart.cpp   1.47
  M +7 -2      doctreeviewpart.h   1.8


--- kdevelop/parts/doctreeview/doctreeviewpart.cpp  #1.46:1.47
@@ -24,4 +24,5 @@
 #include <kstringhandler.h>
 #include <kaction.h>
+#include <configwidgetproxy.h>
 
 #include "kdevcore.h"
@@ -38,4 +39,6 @@
 #include "doctreeprojectconfigwidget.h"
 
+#define GLOBALDOC_OPTIONS 1
+#define PROJECTDOC_OPTIONS 2
 
 DocTreeViewPart::DocTreeViewPart( QObject *parent, const char *name, const \
QStringList & ) @@ -48,11 +51,14 @@ DocTreeViewPart::DocTreeViewPart( QObjec
     connect( core(), SIGNAL(projectOpened()), this, SLOT(projectOpened()) );
     connect( core(), SIGNAL(projectClosed()), this, SLOT(projectClosed()) );
-    connect( core(), SIGNAL(configWidget(KDialogBase*)),
-             this, SLOT(configWidget(KDialogBase*)) );
-    connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)),
-             this, SLOT(projectConfigWidget(KDialogBase*)) );
+//    connect( core(), SIGNAL(configWidget(KDialogBase*)), this, \
SLOT(configWidget(KDialogBase*)) ); +//    connect( core(), \
SIGNAL(projectConfigWidget(KDialogBase*)), this, \
SLOT(projectConfigWidget(KDialogBase*)) );  connect( core(), \
SIGNAL(contextMenu(QPopupMenu *, const Context *)),  this, \
SLOT(contextMenu(QPopupMenu *, const Context *)) );  
+    _configProxy = new ConfigWidgetProxy( core() );
+    _configProxy->createGlobalConfigPage( i18n("Documentation Tree"), \
GLOBALDOC_OPTIONS ); +    _configProxy->createProjectConfigPage( i18n("Project \
Documentation"), PROJECTDOC_OPTIONS ); +    connect( _configProxy, \
SIGNAL(insertConfigWidget(const QObject*, QWidget*, unsigned int )), this, \
SLOT(insertConfigWidget(const QObject*, QWidget*, unsigned int )) ); +    
     m_widget = new DocTreeViewWidget(this);
     m_widget->setIcon(SmallIcon("contents"));
@@ -104,5 +110,5 @@ void DocTreeViewPart::projectClosed()
     m_widget->projectChanged(0);
 }
-
+/*
 void DocTreeViewPart::configWidget(KDialogBase *dlg)
 {
@@ -127,5 +133,5 @@ void DocTreeViewPart::projectConfigWidge
     //kdDebug(9002) << "**** ProjectConfigWidget ****" << endl;
 }
-
+*/
 
 void DocTreeViewPart::contextMenu(QPopupMenu *popup, const Context *context)
@@ -211,3 +217,24 @@ void DocTreeViewPart::slotContextFulltex
 }
 
+void DocTreeViewPart::insertConfigWidget( const QObject * dlg, QWidget * page, \
unsigned int pagenumber ) +{
+        switch ( pagenumber )
+        {
+                case GLOBALDOC_OPTIONS:
+                {
+                        DocTreeGlobalConfigWidget *w1 = new \
DocTreeGlobalConfigWidget( this, m_widget, page, "doc tree config widget"); +         \
connect( dlg, SIGNAL(okClicked()), w1, SLOT(accept()) ); +                
+                break;
+                }
+                case PROJECTDOC_OPTIONS:
+                {
+                        DocTreeProjectConfigWidget *w1 = new \
DocTreeProjectConfigWidget(m_widget, page, project(), "doc tree project config"); +   \
connect( dlg, SIGNAL(okClicked()), w1, SLOT(accept()) ); +                
+                break;
+                }
+        }
+}
+
 #include "doctreeviewpart.moc"

--- kdevelop/parts/doctreeview/doctreeviewpart.h  #1.7:1.8
@@ -22,4 +22,5 @@ class DocTreeViewWidget;
 class Context;
 class QPopupMenu;
+class ConfigWidgetProxy;
 
 
@@ -33,6 +34,6 @@ public:
 
 private slots:
-    void projectConfigWidget(KDialogBase *dlg);
-    void configWidget(KDialogBase *dlg);
+//    void projectConfigWidget(KDialogBase *dlg);
+//    void configWidget(KDialogBase *dlg);
     void projectOpened();
     void projectClosed();
@@ -45,4 +46,7 @@ private slots:
 //  void slotContextLookupIndex();
     void slotContextFulltextSearch();
+    void insertConfigWidget( const QObject * dlg, QWidget * page, unsigned int \
pagenumber ); +
+
     
 private:
@@ -52,4 +56,5 @@ private:
 
     friend class DocTreeViewWidget;
+    ConfigWidgetProxy * _configProxy;
 };
 


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