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

List:       kde-commits
Subject:    kdeutils/kjots
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2004-06-24 12:52:00
Message-ID: 20040624125200.6E27898EA () office ! kde ! org
[Download RAW message or body]

CVS commit by bmeyer: 

small patch to convert to setupGUI()
CCMAIL: aseigo@olympusproject.org


  M +1 -43     KJotsMain.cpp   1.133
  M +0 -4      KJotsMain.h   1.48


--- kdeutils/kjots/KJotsMain.cpp  #1.132:1.133
@@ -31,5 +31,4 @@
 #include <kdebug.h>
 #include <keditcl.h>
-#include <kedittoolbar.h>
 #include <kfiledialog.h>
 #include <kglobalsettings.h>
@@ -42,6 +41,4 @@
 #include <ktextbrowser.h>
 
-//#include <kglobal.h>
-
 #include "KJotsMain.h"
 #include "KJotsSettings.h"
@@ -164,8 +161,4 @@ KJotsMain::KJotsMain(const char* name)
             SLOT(insertDate()), actionCollection(), "insert_date");
 
-    action = KStdAction::showToolbar(this, SLOT(slotShowHideToolbars()), \
                actionCollection());
-    KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), 
-actionCollection());
-    action = KStdAction::configureToolbars(this, SLOT(configureToolbars()), \
                actionCollection());
     action = KStdAction::preferences(this, SLOT(configure()), actionCollection());
 
@@ -176,5 +169,5 @@ actionCollection());
                       bookmarks, bookmarkMenu->popupMenu(),
                       actionCollection(), true);
-    createGUI();
+    setupGUI();
     /*
      * TODO: add a bookmark bar, something like this
@@ -229,14 +222,6 @@ actionCollection());
 }
 
-
-KJotsMain::~KJotsMain()
-{
-
-}
-
 void KJotsMain::slotSetupInterface()
 {
-    static_cast<KToggleAction*>(actionCollection()->action("options_show_toolbar"))->setChecked(toolBar()->isVisible());
                
-
     if (subjectList->childCount() == 0)
         createFolder();
@@ -412,19 +397,4 @@ void KJotsMain::deleteEntry()
 }
 
-void KJotsMain::configureToolbars()
-{
-  saveMainWindowSettings(kapp->config(), "kjots");
-  KEditToolbar dlg(actionCollection());
-  connect( &dlg, SIGNAL(newToolbarConfig()), SLOT(updateToolbars()) );
-  dlg.exec();
-}
-
-void KJotsMain::updateToolbars()
-{
-  createGUI();
-  applyMainWindowSettings(kapp->config(), "kjots");
-  updateMenu();
-}
-
 void KJotsMain::configure()
 {
@@ -460,16 +430,4 @@ void KJotsMain::slotReplace()
 }
 
-void KJotsMain::slotShowHideToolbars()
-{
-    if (toolBar()->isVisible())
-    {
-        toolBar()->hide();
-    }
-    else
-    {
-        toolBar()->show();
-    }
-}
-
 void KJotsMain::updateConfiguration()
 {

--- kdeutils/kjots/KJotsMain.h  #1.47:1.48
@@ -59,5 +59,4 @@ class KJotsMain : public KMainWindow
     public:
         KJotsMain( const char* name = 0 );
-        virtual ~KJotsMain();
 
         QString currentTitle();
@@ -72,6 +71,4 @@ class KJotsMain : public KMainWindow
         void slotRenameEntry();
         void configure();
-        void configureToolbars();
-        void updateToolbars();
         void updateConfiguration();
 
@@ -83,5 +80,4 @@ class KJotsMain : public KMainWindow
         void slotReplace();
         void slotQuit();
-        void slotShowHideToolbars();
         void slotFindSuccessful();
 


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