From 4077f19dbf07ad8538cdf9cf6d0863e63000f09f Mon Sep 17 00:00:00 2001
From: Benjamin Meyer <ben@meyerhome.net>
Date: Mon, 17 Mar 2003 00:48:10 +0000
Subject: [PATCH] KMainWindow can now handle the statusbar and toolbar, removed
 unnecessary functionality.

svn path=/trunk/kdepim/; revision=214409
---
 kmcomposewin.cpp | 25 +++----------------------
 kmcomposewin.h   |  3 ---
 kmmainwin.cpp    | 29 ++++-------------------------
 kmmainwin.h      |  5 -----
 4 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index a7e4cfd04..dcde17c03 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -202,8 +202,6 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   setupEditor();
   setupActions();
   applyMainWindowSettings(KMKernel::config(), "Composer");
-  toolbarAction->setChecked(!toolBar()->isHidden());
-  statusbarAction->setChecked(!statusBar()->isHidden());
 
   connect(mEdtSubject,SIGNAL(textChanged(const QString&)),
 	  SLOT(slotUpdWinTitle(const QString&)));
@@ -950,10 +948,9 @@ void KMComposeWin::setupActions(void)
                       SLOT(slotAttachProperties()),
                       actionCollection(), "attach_properties");
 
-  toolbarAction = KStdAction::showToolbar(this, SLOT(slotToggleToolBar()),
-    actionCollection());
-  statusbarAction = KStdAction::showStatusbar(this, SLOT(slotToggleStatusBar()),
-    actionCollection());
+  createStandardStatusBarAction();
+  setStandardToolBarMenuEnabled(true);
+    
   KStdAction::keyBindings(this, SLOT(slotEditKeys()), actionCollection());
   KStdAction::configureToolbars(this, SLOT(slotEditToolbars()), actionCollection());
   KStdAction::preferences(kernel, SLOT(slotShowConfigurationDialog()), actionCollection());
@@ -5024,21 +5021,6 @@ void KMComposeWin::slotSpellcheckConfig()
 }
 
 //-----------------------------------------------------------------------------
-void KMComposeWin::slotToggleToolBar()
-{
-  if(toolBar("mainToolBar")->isVisible())
-    toolBar("mainToolBar")->hide();
-  else
-    toolBar("mainToolBar")->show();
-}
-
-void KMComposeWin::slotToggleStatusBar()
-{
-  if (statusBar()->isVisible())
-    statusBar()->hide();
-  else
-    statusBar()->show();
-}
 
 void KMComposeWin::slotStatusMessage(const QString &message)
 {
@@ -5060,7 +5042,6 @@ void KMComposeWin::slotUpdateToolbars()
 {
   createGUI("kmcomposerui.rc");
   applyMainWindowSettings(KMKernel::config(), "Composer");
-  toolbarAction->setChecked(!toolBar()->isHidden());
 }
 
 void KMComposeWin::slotEditKeys()
diff --git a/kmcomposewin.h b/kmcomposewin.h
index 2a0576dd1..d16fcef30 100644
--- a/kmcomposewin.h
+++ b/kmcomposewin.h
@@ -363,8 +363,6 @@ public slots:
   /**
    * XML-GUI stuff
    */
-  void slotToggleToolBar();
-  void slotToggleStatusBar();
   void slotStatusMessage(const QString &message);
   void slotEditToolbars();
   void slotUpdateToolbars();
@@ -716,7 +714,6 @@ protected:
   KToggleAction *urgentAction, *allFieldsAction, *fromAction;
   KToggleAction *replyToAction, *toAction, *ccAction, *bccAction, *subjectAction;
   KToggleAction *identityAction, *transportAction, *fccAction;
-  KToggleAction *toolbarAction, *statusbarAction;
   KToggleAction *wordWrapAction, *fixedFontAction;
 
   KSelectAction *encodingAction;
diff --git a/kmmainwin.cpp b/kmmainwin.cpp
index 7e194d7d2..88d4dc7cb 100644
--- a/kmmainwin.cpp
+++ b/kmmainwin.cpp
@@ -21,18 +21,14 @@ KMMainWin::KMMainWin(QWidget *)
   setCentralWidget(mKMMainWidget);
   setupStatusBar();
 
+  createStandardStatusBarAction();
+  setStandardToolBarMenuEnabled(true);
+    
   KStdAction::configureToolbars(this, SLOT(slotEditToolbars()),
 				actionCollection(), "kmail_configure_toolbars" );
-  mToolbarAction = KStdAction::showToolbar(this,
-					   SLOT(slotToggleToolBar()),
-					   actionCollection());
-  mStatusbarAction = KStdAction::showStatusbar(this,
-					       SLOT(slotToggleStatusBar()),
-					       actionCollection());
+  
   KStdAction::quit( this, SLOT(slotQuit()), actionCollection());
   createGUI( "kmmainwin.rc", false );
-  mToolbarAction->setChecked(!toolBar()->isHidden());
-  mStatusbarAction->setChecked(!statusBar()->isHidden());
 
   connect( guiFactory()->container("folder", this),
 	   SIGNAL( aboutToShow() ), mKMMainWidget,
@@ -99,22 +95,6 @@ void KMMainWin::displayStatusMsg(const QString& aText)
   statusBar()->changeItem(text, mMessageStatusId);
 }
 
-void KMMainWin::slotToggleToolBar()
-{
-  if(toolBar("mainToolBar")->isVisible())
-    toolBar("mainToolBar")->hide();
-  else
-    toolBar("mainToolBar")->show();
-}
-
-void KMMainWin::slotToggleStatusBar()
-{
-  if (statusBar()->isVisible())
-    statusBar()->hide();
-  else
-    statusBar()->show();
-}
-
 void KMMainWin::slotEditToolbars()
 {
   saveMainWindowSettings(KMKernel::config(), "MainWindow");
@@ -130,7 +110,6 @@ void KMMainWin::slotUpdateToolbars()
 {
   createGUI("kmmainwin.rc");
   applyMainWindowSettings(KMKernel::config(), "MainWindow");
-  mToolbarAction->setChecked(!toolBar()->isHidden());
 }
 
 void KMMainWin::setupStatusBar()
diff --git a/kmmainwin.h b/kmmainwin.h
index b0fbf1755..5f46846ef 100644
--- a/kmmainwin.h
+++ b/kmmainwin.h
@@ -10,7 +10,6 @@
 
 class KMMainWidget;
 class KMLittleProgressDlg;
-class KToggleAction;
 
 class KMMainWin : public KMTopLevelWidget
 {
@@ -35,8 +34,6 @@ public slots:
   void statusMsg(const QString&);
   void htmlStatusMsg(const QString&);
   void displayStatusMsg(const QString&);
-  void slotToggleToolBar();
-  void slotToggleStatusBar();
   void slotEditToolbars();
   void slotUpdateToolbars();
   void setupStatusBar();
@@ -45,8 +42,6 @@ protected slots:
   void slotQuit();
 
 private:
-  KToggleAction *mToolbarAction;
-  KToggleAction *mStatusbarAction;
   KMMainWidget *mKMMainWidget;
   QString      mLastStatusMsg;
   KMLittleProgressDlg *littleProgress;