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

List:       kde-commits
Subject:    kdeedu/keduca
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2004-06-09 21:17:37
Message-ID: 20040609211737.E5D8620B6 () office ! kde ! org
[Download RAW message or body]

CVS commit by annma: 

more setupGUI() fixes


  M +0 -7      keduca/keduca.cpp   1.26
  M +0 -2      keduca/keduca.h   1.16
  M +1 -28     keducabuilder/keducabuilder.cpp   1.13
  M +0 -6      keducabuilder/keducabuilder.h   1.5


--- kdeedu/keduca/keduca/keduca.cpp  #1.25:1.26
@@ -25,5 +25,4 @@
 #include <kstandarddirs.h>
 #include <kfiledialog.h>
-#include <kedittoolbar.h>
 #include <kdebug.h>
 
@@ -118,10 +117,4 @@ void Keduca::configWrite()
 }
 
-void Keduca::slotNewToolbarConfig()
-{
-        createGUI( "keducaui.rc" );
-        this->applyMainWindowSettings( KGlobal::config(), "keduca" );
-}
-
 void Keduca::slotConfigure()
 {

--- kdeedu/keduca/keduca/keduca.h  #1.15:1.16
@@ -76,6 +76,4 @@ private slots:
     /** Configure keduca */
     void slotConfigure();
-    /** OK/Apply pressed in toolbar editor */
-    void slotNewToolbarConfig();
   /** Open gallery dialog */
   void slotGallery();

--- kdeedu/keduca/keducabuilder/keducabuilder.cpp  #1.12:1.13
@@ -28,5 +28,4 @@
 #include <kfiledialog.h>
 #include <kedittoolbar.h>
-#include <kkeydialog.h>
 #include <kdebug.h>
 #include <kio/netaccess.h>
@@ -124,9 +123,5 @@ void KEducaBuilder::initMenuBar()
     (void)new KAction(i18n("Down"), "down", 0, this, SLOT( slotDown() ), \
actionCollection(), "question_down");  
-      setStandardToolBarMenuEnabled(true);
-    KStdAction::keyBindings                             (this, SLOT( \
                slotConfigureKeys() ), actionCollection());
-    KStdAction::configureToolbars       (this, SLOT( slotConfigureToolbar() ), \
                actionCollection());
-
-    createGUI( "keducabuilderui.rc" );
+    setupGUI( );
 }
 
@@ -551,26 +546,4 @@ bool KEducaBuilder::checkSave()
 }
 
-/** Configure keys */
-void KEducaBuilder::slotConfigureKeys()
-{
-    KKeyDialog::configure( actionCollection() );
-}
-
-/** Configure toolbar */
-void KEducaBuilder::slotConfigureToolbar()
-{
-    this->saveMainWindowSettings( KGlobal::config(), "keducacontrol" );
-    KEditToolbar edit( actionCollection(), "keducacontrolui.rc", this );
-    connect(&edit,SIGNAL(newToolbarConfig()),this,SLOT(slotNewToolbarConfig()));
-    edit.exec();
-}
-
-/** OK/Apply pressed in toolbar editor */
-void KEducaBuilder::slotNewToolbarConfig()
-{
-    createGUI( "keducacontrolui.rc" );
-    this->applyMainWindowSettings( KGlobal::config(), "keducacontrol" );
-}
-
 bool KEducaBuilder::startChooser() {
     KEducaEditorStartDialog startDialog(this, "KEducaEditorStartDialog", true);

--- kdeedu/keduca/keducabuilder/keducabuilder.h  #1.4:1.5
@@ -118,10 +118,4 @@ private slots:
     /** Header info */
     int slotHeader();
-    /** Configure toolbar */
-    void slotConfigureToolbar();
-    /** Configure keys */
-    void slotConfigureKeys();
-    /** OK/Apply pressed in toolbar editor */
-    void slotNewToolbarConfig();
     /** Init Gallery */
     void slotGallery();


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