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

List:       kde-commits
Subject:    kdebase/kmenuedit
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2004-10-25 2:12:25
Message-ID: 20041025021225.C7BEC16C40 () office ! kde ! org
[Download RAW message or body]

CVS commit by bmeyer: 

convert to use setupGUI


  M +3 -15     kmenuedit.cpp   1.67


--- kdebase/kmenuedit/kmenuedit.cpp  #1.66:1.67
@@ -41,10 +41,4 @@ KMenuEdit::KMenuEdit (bool controlCenter
   : KMainWindow (0, name), m_tree(0), m_basicTab(0), m_splitter(0), m_controlCenter(controlCenter)
 {
-    // restore size
-    KConfig *config = KGlobal::config();
-    config->setGroup("General");
-    int w = config->readNumEntry("Width",640);
-    int h = config->readNumEntry("Height", 480);
-    resize(w, h);
 #if 0
     m_showHidden = config->readBoolEntry("ShowHidden");
@@ -56,14 +50,10 @@ KMenuEdit::KMenuEdit (bool controlCenter
     setupActions();
     slotChangeView();
-    setAutoSaveSettings();
 }
 
 KMenuEdit::~KMenuEdit()
 {
-    // save size
     KConfig *config = KGlobal::config();
     config->setGroup("General");
-    config->writeEntry("Width", width());
-    config->writeEntry("Height", height());
     config->writeEntry("SplitterSizes", m_splitter->sizes());
 
@@ -85,6 +75,4 @@ void KMenuEdit::setupActions()
     KStdAction::copy(0, 0, actionCollection());
     KStdAction::paste(0, 0, actionCollection());
-    KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), actionCollection());
-    KStdAction::configureToolbars(this, SLOT(slotConfigureToolbars()), actionCollection());
 }
 
@@ -142,7 +130,7 @@ void KMenuEdit::slotChangeView()
        setupView();
     if (m_controlCenter)
-       createGUI("kcontroleditui.rc");
+       setupGUI(KMainWindow::ToolBar|Keys|Save|Create, "kcontroleditui.rc");
     else
-       createGUI("kmenueditui.rc");
+       setupGUI(KMainWindow::ToolBar|Keys|Save|Create, "kmenueditui.rc");
 
     m_tree->setViewMode(m_showHidden);


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