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

List:       kde-commits
Subject:    kdeutils/kedit
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2004-06-18 18:45:15
Message-ID: 20040618184515.B8AB41E76 () office ! kde ! org
[Download RAW message or body]

CVS commit by bmeyer: 

convert to setupGUI()


  M +4 -34     kedit.cpp   1.200
  M +1 -3      kedit.h   1.75


--- kdeutils/kedit/kedit.cpp  #1.199:1.200
@@ -39,9 +39,7 @@
 #include <kcursor.h>
 #include <keditcl.h>
-#include <kedittoolbar.h>
 #include <kfileitem.h>
 #include <kfontdialog.h>
 #include <kio/netaccess.h>
-#include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
@@ -68,5 +66,4 @@ TopLevel::TopLevel (QWidget *, const cha
   eframe(0), newWindow(false), kspell(0)
 {
-  setAutoSaveSettings();
   if (!windowList)
   {
@@ -81,9 +78,9 @@ TopLevel::TopLevel (QWidget *, const cha
   connect(kapp,SIGNAL(kdisplayPaletteChanged()),this,SLOT(set_colors()));
 
+  resize(550,400); // Default size
+
   setupStatusBar();
   setupActions();
 
-  resize(550,400); // Default size
-
   readSettings();
 
@@ -233,16 +230,7 @@ void TopLevel::setupActions()
     KStdAction::gotoLine(this, SLOT(gotoLine()), actionCollection());
 
-    // setup Settings menu
-    createStandardStatusBarAction();
-    setStandardToolBarMenuEnabled(true);
-
     KStdAction::preferences(this, SLOT(showSettings()), actionCollection());
 
-     KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()),
-actionCollection());
-
-    KStdAction::configureToolbars(this, SLOT(editToolbars()), actionCollection());
-
-    createGUI();
+    setupGUI();
 }
 
@@ -842,21 +830,4 @@ void TopLevel::initSpellConfig()
 }
 
-
-void TopLevel::editToolbars()
-{
-  saveMainWindowSettings(KGlobal::config(), "MainWindow");
-  KEditToolbar dlg(actionCollection());
-  connect(&dlg, SIGNAL( newToolbarConfig() ), this, SLOT( slotNewToolbarConfig() ));
-  dlg.exec();
-}
-
-
-void TopLevel::slotNewToolbarConfig()
-{
-  createGUI();
-  applyMainWindowSettings(KGlobal::config(), "MainWindow");
-}
-
-
 void TopLevel::search_again()
 {

--- kdeutils/kedit/kedit.h  #1.74:1.75
@@ -200,7 +200,5 @@ private slots:
     void readSettings();
     void showSettings();
-    void editToolbars();
     void slotSelectionChanged();
-    void slotNewToolbarConfig();
 };
 


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