From kde-commits  Thu Jul 15 22:28:15 2004
From: Jens Dagerbo <jens.dagerbo () swipnet ! se>
Date: Thu, 15 Jul 2004 22:28:15 +0000
To: kde-commits
Subject: kdevelop/lib/util
Message-Id: <20040715222815.8C91A16B01 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=108993050209849

CVS commit by dagerbo: 

Adding support for settings page icons


  M +8 -19     configwidgetproxy.cpp   1.2
  M +3 -3      configwidgetproxy.h   1.2


--- kdevelop/lib/util/configwidgetproxy.cpp  #1.1:1.2
@@ -25,4 +25,5 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
+#include <kiconloader.h>
 
 #include <kdevcore.h>
@@ -34,6 +35,4 @@
 ConfigWidgetProxy::ConfigWidgetProxy( KDevCore * core )
 {
-        kdDebug() << k_funcinfo << endl;
-        
         connect( core, SIGNAL(configWidget(KDialogBase*)), this, SLOT(slotConfigWidget( KDialogBase*)) );
         connect( core, SIGNAL(projectConfigWidget(KDialogBase*)), this, SLOT(slotProjectConfigWidget( KDialogBase*)) );
@@ -41,16 +40,14 @@ ConfigWidgetProxy::ConfigWidgetProxy( KD
 
 ConfigWidgetProxy::~ConfigWidgetProxy()
-{
-        kdDebug() << k_funcinfo << endl;
-}
+{}
 
-void ConfigWidgetProxy::createGlobalConfigPage( QString const & title, unsigned int pagenumber )
+void ConfigWidgetProxy::createGlobalConfigPage( QString const & title, unsigned int pagenumber, QString const & icon )
 {
-        _globalTitleMap.insert( pagenumber, title);
+        _globalTitleMap.insert( pagenumber, qMakePair( title, icon ) );
 }
 
-void ConfigWidgetProxy::createProjectConfigPage( QString const & title, unsigned int pagenumber )
+void ConfigWidgetProxy::createProjectConfigPage( QString const & title, unsigned int pagenumber, QString const & icon )
 {
-        _projectTitleMap.insert( pagenumber, title);
+        _projectTitleMap.insert( pagenumber, qMakePair( title, icon ) );
 }
 
@@ -63,10 +60,8 @@ void ConfigWidgetProxy::removeConfigPage
 void ConfigWidgetProxy::slotConfigWidget( KDialogBase * dlg )
 {
-        kdDebug() << k_funcinfo << endl;
-        
         TitleMap::Iterator it = _globalTitleMap.begin();
         while ( it != _globalTitleMap.end() )
         {
-                _pageMap.insert( dlg->addVBoxPage( it.data() ), it.key() );
+                _pageMap.insert( dlg->addVBoxPage( it.data().first, it.data().first, BarIcon( it.data().second, KIcon::SizeMedium ) ), it.key() );
                 ++it;
         }
@@ -78,10 +73,8 @@ void ConfigWidgetProxy::slotConfigWidget
 void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg )
 {
-        kdDebug() << k_funcinfo << endl;
-        
         TitleMap::Iterator it = _projectTitleMap.begin();
         while ( it != _projectTitleMap.end() )
         {
-                _pageMap.insert( dlg->addVBoxPage( it.data() ), it.key() );
+                _pageMap.insert( dlg->addVBoxPage( it.data().first, it.data().first, BarIcon( it.data().second, KIcon::SizeMedium ) ), it.key() );
                 ++it;
         }
@@ -93,6 +86,4 @@ void ConfigWidgetProxy::slotProjectConfi
 void ConfigWidgetProxy::slotConfigWidgetDestroyed( )
 {
-        kdDebug() << k_funcinfo << endl;
-        
         _pageMap.clear();
 }
@@ -100,6 +91,4 @@ void ConfigWidgetProxy::slotConfigWidget
 void ConfigWidgetProxy::slotAboutToShowPage( QWidget * page )
 {
-        kdDebug() << k_funcinfo << endl;
-        
         if ( !page ) return;
         

--- kdevelop/lib/util/configwidgetproxy.h  #1.1:1.2
@@ -75,5 +75,5 @@ public:
         * @param pagenumber A per-proxy unique identifier, used when responding to insertConfigWidget() signal
         */
-        void createGlobalConfigPage( QString const & title, unsigned int pagenumber );
+        void createGlobalConfigPage( QString const & title, unsigned int pagenumber, QString const & icon = "kdevelop" );
         
         /**
@@ -82,5 +82,5 @@ public:
         * @param pagenumber A per-proxy unique identifier, used when responding to insertConfigWidget() signal
         */
-        void createProjectConfigPage( QString const & title, unsigned int pagenumber );
+        void createProjectConfigPage( QString const & title, unsigned int pagenumber, QString const & icon = "kdevelop" );
         
         /**
@@ -106,5 +106,5 @@ private slots:
 
 private:
-        typedef QMap<unsigned int, QString> TitleMap;
+        typedef QMap<unsigned int, QPair<QString,QString> > TitleMap;
         typedef QMap<QWidget*, int> PageMap;