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

List:       kde-commits
Subject:    KDE/kdepim/kontact/src
From:       Allen Winter <winter () kde ! org>
Date:       2008-11-13 23:35:39
Message-ID: 1226619339.034632.24767.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 884017 by winterz:

tell the configuration dialog Help button how to find the docs
for Kontact Configuration.
BUG: 174994


 M  +14 -7     mainwindow.cpp  


--- trunk/KDE/kdepim/kontact/src/mainwindow.cpp #884016:884017
@@ -249,7 +249,8 @@
 MainWindow::~MainWindow()
 {
   if ( mCurrentPlugin ) {
-    saveMainWindowSettings( KGlobal::config()->group( QString( \
"MainWindow%1" ).arg( mCurrentPlugin->identifier() ) ) ); +    \
saveMainWindowSettings( KGlobal::config()->group( +                         \
QString( "MainWindow%1" ).arg( mCurrentPlugin->identifier() ) ) );  }
 
   createGUI( 0 );
@@ -284,8 +285,9 @@
 
 bool MainWindow::pluginActionWeightLessThan( const QAction *left, const \
QAction *right )  {
-  // Since this lessThan method is used only for the toolbar (which is on \
                the inverse layout direction
-  // than the rest of the system), we add the elements on the exactly \
inverse order. (ereslibre) +  // Since this lessThan method is used only \
for the toolbar (which is on +  // the inverse layout direction than the \
rest of the system), we add the +  // elements on the exactly inverse \
order. (ereslibre)  return !pluginWeightLessThan( \
                left->data().value<Kontact::Plugin*>(),
                                 right->data().value<Kontact::Plugin*>() );
 }
@@ -743,7 +745,8 @@
   QApplication::setOverrideCursor( QCursor( Qt::WaitCursor ) );
 
   if ( mCurrentPlugin ) {
-    saveMainWindowSettings( KGlobal::config()->group( QString( \
"MainWindow%1" ).arg( mCurrentPlugin->identifier() ) ) ); +    \
saveMainWindowSettings( KGlobal::config()->group( +                         \
QString( "MainWindow%1" ).arg( mCurrentPlugin->identifier() ) ) );  }
 
   KParts::Part *part = plugin->part();
@@ -876,7 +879,8 @@
     addToolBar( toolBarArea( navigatorToolBar ), navigatorToolBar );
   }
 
-  applyMainWindowSettings( KGlobal::config()->group( QString( \
"MainWindow%1" ).arg( plugin->identifier() ) ) ); +  \
applyMainWindowSettings( KGlobal::config()->group( +                        \
QString( "MainWindow%1" ).arg( plugin->identifier() ) ) );  
   QApplication::restoreOverrideCursor();
 }
@@ -990,6 +994,7 @@
       }
     }
 
+    dlg->setHelp( "main-config", "kontact" );
     dlg->addPluginInfos( filteredPlugins );
     connect( dlg, SIGNAL(pluginSelectionChanged()), SLOT(pluginsChanged()) \
);  }
@@ -1043,7 +1048,8 @@
 void MainWindow::configureToolbars()
 {
   if ( mCurrentPlugin ) {
-    saveMainWindowSettings( KGlobal::config()->group( QString( \
"MainWindow%1" ).arg( mCurrentPlugin->identifier() ) ) ); +    \
saveMainWindowSettings( KGlobal::config()->group( +                         \
QString( "MainWindow%1" ).arg( mCurrentPlugin->identifier() ) ) );  }
   KEditToolBar edit( factory() );
   connect( &edit, SIGNAL(newToolbarConfig()), this, \
SLOT(slotNewToolbarConfig()) ); @@ -1056,7 +1062,8 @@
     createGUI( mCurrentPlugin->part() );
   }
   if ( mCurrentPlugin ) {
-    applyMainWindowSettings( KGlobal::config()->group( QString( \
"MainWindow%1" ).arg( mCurrentPlugin->identifier() ) ) ); +    \
applyMainWindowSettings( KGlobal::config()->group( +                        \
QString( "MainWindow%1" ).arg( mCurrentPlugin->identifier() ) ) );  }
 }
 


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