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

List:       kde-commits
Subject:    kdepim/kpilot/kpilot
From:       David Faure <faure () kde ! org>
Date:       2002-12-10 15:54:01
[Download RAW message or body]

CVS commit by faure: 

Mainwindow settings and KEditToolbar fix, as usual. (untested, other than compilation)


  M +26 -19    kpilot.cc   1.82
  M +14 -10    kpilot.h   1.37


--- kdepim/kpilot/kpilot/kpilot.cc  #1.81:1.82
@@ -295,4 +295,5 @@ void KPilotInstaller::setupWidget()
                 << xmlFile() << " and " << localXMLFile() << endl;
 #endif
+        setAutoSaveSettings();
 }
 
@@ -673,11 +674,15 @@ void KPilotInstaller::optionsConfigureTo
         FUNCTIONSETUP;
         // use the standard toolbar editor
+        saveMainWindowSettings( KGlobal::config(), autoSaveGroup() );
         KEditToolbar dlg(actionCollection());
+        connect(&dlg, SIGNAL(newToolbarConfig()), this, SLOT(newToolbarConfig()));
+        dlg.exec();
+}
 
-        if (dlg.exec())
-        {
+void KPilotInstaller::slotNewToolbarConfig()
+{
                 // recreate our GUI
                 createGUI();
-        }
+        applyMainWindowSettings( KGlobal::config(), autoSaveGroup() );
 }
 
@@ -943,4 +947,7 @@ int main(int argc, char **argv)
 
 // $Log$
+// Revision 1.82  2002/12/10 15:54:00  faure
+// Mainwindow settings and KEditToolbar fix, as usual. (untested, other than compilation)
+//
 // Revision 1.81  2002/11/27 21:29:06  adridg
 // See larger ChangeLog entry

--- kdepim/kpilot/kpilot/kpilot.h  #1.36:1.37
@@ -181,4 +181,5 @@ protected slots:
         void slotConfigureConduits();
         void fileInstalled(int which);
+        void slotNewToolbarConfig();
 
         /**
@@ -202,4 +203,7 @@ signals:
 
 // $Log$
+// Revision 1.37  2002/12/10 15:54:00  faure
+// Mainwindow settings and KEditToolbar fix, as usual. (untested, other than compilation)
+//
 // Revision 1.36  2002/11/27 21:29:06  adridg
 // See larger ChangeLog entry


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