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

List:       kde-commits
Subject:    KDE/kdebase/workspace/systemsettings/core
From:       Ben Cooksley <sourtooth () gmail ! com>
Date:       2009-09-01 5:49:26
Message-ID: 1251784166.404159.2375.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1018071 by bcooksley:

Fix coding style issues.
Reduce code duplication

 M  +8 -11     ModuleView.cpp  
 M  +1 -5      ModuleView.h  


--- trunk/KDE/kdebase/workspace/systemsettings/core/ModuleView.cpp #1018070:1018071
@@ -165,6 +165,9 @@
     moduleScroll->viewport()->setAutoFillBackground( false );
     // Create the page
     KPageWidgetItem *page = new KPageWidgetItem( moduleScroll, module->moduleName() \
); +    // Provide information to the users
+    page->setHeader( module->comment() );
+    page->setIcon( KIcon( module->icon() ) );
 
     if( module->service()->hasServiceType("SystemSettingsExternalApp") ) { // Is it \
                an external app?
         QProcess::startDetached( module->service()->exec() ); // Launch it!
@@ -174,21 +177,16 @@
         d->externalModule.PbRelaunch->setText( i18n("Relaunch %1", \
                module->moduleName()) );
         connect( d->externalModule.PbRelaunch, SIGNAL(clicked()), this, \
SLOT(runExternal()) );  moduleScroll->setWidget( externalWidget );
-        // Provide information to the users
-        page->setIcon( KIcon( module->service()->icon() ) );
-        page->setHeader( module->service()->comment() );
     } else { // It must be a normal module then
         KCModuleProxy * moduleProxy = new KCModuleProxy( *module, moduleScroll );
         moduleScroll->setWidget( moduleProxy );
         moduleProxy->setAutoFillBackground( false );
         connect( moduleProxy, SIGNAL(changed(bool)), this, SLOT(stateChanged()));
         d->mPages.insert( page, moduleProxy );
-        if (moduleProxy->useRootOnlyMessage()) {
-            page->setHeader( "<b>"+module->comment() + "</b><br><i>" + \
moduleProxy->rootOnlyMessage() + "</i>" ); +        // We show the root only message \
if it is needed +        if( moduleProxy->useRootOnlyMessage() ) {
+            page->setHeader( "<b>" + module->comment() + "</b><br><i>" + \
                moduleProxy->rootOnlyMessage() + "</i>" );
             page->setIcon( KIcon( module->icon(), 0, QStringList() << \
                "dialog-warning" ) );
-        } else {
-            page->setHeader( module->comment() );
-            page->setIcon( KIcon( module->icon() ) );
         }
     }
 
@@ -330,9 +328,8 @@
 
         disconnect( d->mApply, SIGNAL(authorized(KAuth::Action*)), this, \
                SLOT(moduleSave()) );
         disconnect( d->mApply, SIGNAL(clicked()), this, SLOT(moduleSave()) );
-
-        if (activeModule->realModule()->authAction()) {
-            d->mApply->setAuthAction(activeModule->realModule()->authAction());
+        if( activeModule->realModule()->authAction() ) {
+            d->mApply->setAuthAction( activeModule->realModule()->authAction() );
             connect( d->mApply, SIGNAL(authorized(KAuth::Action*)), this, \
SLOT(moduleSave()) );  } else {
             d->mApply->setAuthAction(0);
--- trunk/KDE/kdebase/workspace/systemsettings/core/ModuleView.h #1018070:1018071
@@ -113,11 +113,6 @@
      * Causes the active module to save its configuration, applying all changes.
      */
     bool moduleSave();
-    
-    /**
-     * Causes the specified module to save its configuration, applying all changes.
-     */ 
-    bool moduleSave(KCModuleProxy *module);
 
     /**
      * Causes the active module to revert all changes to the configuration, and \
return to defaults. @@ -132,6 +127,7 @@
 private:
     bool resolveChanges( KCModuleProxy *currentProxy );
     void addModule( KCModuleInfo *module );
+    bool moduleSave( KCModuleProxy *module );
 
 private Q_SLOTS:
     void activeModuleChanged( KPageWidgetItem* current, KPageWidgetItem* previous);


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