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

List:       kde-commits
Subject:    kdegames/kolf
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2004-06-09 12:36:01
Message-ID: 20040609123601.B67991731 () office ! kde ! org
[Download RAW message or body]

CVS commit by bmeyer: 

convert to setupGUI()


  M +2 -26     kolf.cpp   1.74
  M +0 -2      kolf.h   1.32


--- kdegames/kolf/kolf.cpp  #1.73:1.74
@@ -4,5 +4,4 @@
 #include <kdebug.h>
 #include <kdeversion.h>
-#include <kedittoolbar.h>
 #include <kfiledialog.h>
 #include <kglobal.h>
@@ -52,8 +51,4 @@ Kolf::Kolf()
     : KMainWindow(0, "Kolf")
 {
-#if KDE_VERSION > 305
-        setStandardToolBarMenuEnabled(true);
-#endif
-
         competition = false;
         game = 0;
@@ -74,5 +69,4 @@ Kolf::Kolf()
 
         resize(420, 480);
-        setAutoSaveSettings("TopLevelWindow");
 }
 
@@ -89,8 +83,4 @@ void Kolf::initGUI()
         newAction->setText(newAction->text() + QString("..."));
 
-        KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), 
-actionCollection());
-        
-        (void) KStdAction::configureToolbars(this, SLOT(configureToolBars()), \
                actionCollection());
         endAction = KStdGameAction::end(this, SLOT(closeGame()), \
                actionCollection());
         printAction = KStdGameAction::print(this, SLOT(print()), \
actionCollection()); @@ -160,5 +150,6 @@ actionCollection());
         tutorialAction = new KAction(i18n("&Tutorial"), 0, this, SLOT(tutorial()), \
actionCollection(), "tutorial");  
-        createGUI();
+        statusBar();
+        setupGUI();
 }
 
@@ -809,19 +800,4 @@ void Kolf::showPlugins()
 }
 
-void Kolf::configureToolBars()
-{
-        saveMainWindowSettings(KGlobal::config(), "TopLevelWindow");
-
-        KEditToolbar dlg(actionCollection());
-        connect(&dlg, SIGNAL(newToolbarConfig()), SLOT(newToolBarConfig()));
-        dlg.exec();
-}
-
-void Kolf::newToolBarConfig()
-{
-        createGUI();
-        applyMainWindowSettings(KGlobal::config(), "TopLevelWindow");
-}
-
 void Kolf::enableAllMessages()
 {

--- kdegames/kolf/kolf.h  #1.31:1.32
@@ -71,6 +71,4 @@ protected slots:
         void initPlugins();
         void showPlugins();
-        void configureToolBars();
-        void newToolBarConfig();
         void showHighScores();
         void enableAllMessages();


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