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

List:       kde-commits
Subject:    new_kcm_code: kdelibs/kutils
From:       Frans Englich <frans.englich () telia ! com>
Date:       2004-11-19 16:19:57
Message-ID: 20041119161957.0ECD316D02 () office ! kde ! org
[Download RAW message or body]

CVS commit by englich: 

Small annoyances, and don't call load() in show()


  M +17 -10    kcmultidialog.cpp   1.51.2.4


--- kdelibs/kutils/kcmultidialog.cpp  #1.51.2.3:1.51.2.4
@@ -80,5 +80,5 @@ KCMultiDialog::KCMultiDialog( int dialog
     , dialogface( dialogFace ), d( new KCMultiDialogPrivate )
 {
-    kdDebug( 710 ) << "With this constructor any root modules will not work. Please \
see the API documentation." << endl; +    kdDebug( 710 ) << "Root modules will not \
work with this constructor. See the API documentation." << endl;  init();
 }
@@ -137,6 +137,4 @@ void KCMultiDialog::apply()
     {
         KCModuleProxy * m = ( *it ).kcm;
-        //kdDebug(710) << k_funcinfo << m->name() << ' ' <<
-        //    ( m->aboutData() ? m->aboutData()->appName() : "" ) << endl;
         if( m->changed() )
         {
@@ -218,6 +216,6 @@ void KCMultiDialog::addModule(const KCMo
         QStringList parentmodulenames, bool withfallback)
 {
-    kdDebug(710) << "KCMultiDialog::addModule " << moduleinfo.moduleName() <<
-        endl;
+    kdDebug(710) << "KCMultiDialog::addModule " 
+        << moduleinfo.moduleName() << endl;
 
     if ( !kapp->authorizeControlModule( moduleinfo.service()->menuId() ))
@@ -262,5 +260,5 @@ void KCMultiDialog::addModule(const KCMo
         module = m_orphanModules[ moduleinfo.service() ];
         m_orphanModules.remove( moduleinfo.service() );
-        kdDebug( 710 ) << "use KCModule from the list of orphans for " <<
+        kdDebug( 710 ) << "Use KCModule from the list of orphans for " <<
             moduleinfo.moduleName() << ": " << module << endl;
 
@@ -278,6 +276,4 @@ void KCMultiDialog::addModule(const KCMo
         QStringList parentComponents = moduleinfo.service()->property(
                 "X-KDE-ParentComponents" ).toStringList();
-        kdDebug(710) << k_funcinfo << "ParentComponents=" << parentComponents
-            << endl;
         moduleParentComponents.insert( module,
                 new QStringList( parentComponents ) );
@@ -328,11 +324,17 @@ void KCMultiDialog::removeAllModules()
 void KCMultiDialog::show()
 {
-    if( ! isVisible() )
+    /*
+    if( !isVisible() )
     {
         // call load() method of all KCMs
+        *
         ModuleList::Iterator end = m_modules.end();
         for( ModuleList::Iterator it = m_modules.begin(); it != end; ++it )
             ( *it ).kcm->load();
+        m_modules.first().kcm->load();
+        /
+          // aboutToShowPage( mainWidget() );
     }
+    */
     KDialogBase::show();
 }
@@ -340,4 +342,6 @@ void KCMultiDialog::show()
 void KCMultiDialog::slotAboutToShow(QWidget *page)
 {
+    kdDebug(710) << k_funcinfo << endl;
+
     QObject * obj = page->child( 0, "KCModuleProxy" );
     if( ! obj )
@@ -354,5 +359,6 @@ void KCMultiDialog::slotAboutToShow(QWid
             d->currentModule->buttons() & KCModule::Default );
 
-    disconnect( this, SIGNAL(user2Clicked()), 0, 0);
+    disconnect( this, SIGNAL(user2Clicked()), 0, 0 );
+
     /* Enable the Admin Mode button */
     if (d->currentModule->moduleInfo().needsRootPrivileges())


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