Index: kmcomposerui.rc
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmcomposerui.rc,v
retrieving revision 1.9
diff -u -3 -p -r1.9 kmcomposerui.rc
--- kmcomposerui.rc	2000/08/10 15:27:41	1.9
+++ kmcomposerui.rc	2000/08/31 18:26:07
@@ -1,4 +1,4 @@
-<!DOCTYPE kpartgui ><kpartgui version="2" name="kmcomposer" >
+<!DOCTYPE kpartgui ><kpartgui version="3" name="kmcomposer" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;Message</text>
@@ -54,10 +54,9 @@
    <Action name="attach_save" />
    <Action name="attach_properties" />
   </Menu>
-  <Menu noMerge="1" name="settings" >
+  <Menu name="settings" >
    <text>&amp;Settings</text>
    <Action name="setup_spellchecker" />
-   <Action name="options_configure_toolbars" />
   </Menu>
  </MenuBar>
  <ToolBar noMerge="1" name="mainToolBar" fullWidth="true" >
Index: kmcomposewin.cpp
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmcomposewin.cpp,v
retrieving revision 1.239
diff -u -3 -p -r1.239 kmcomposewin.cpp
--- kmcomposewin.cpp	2000/08/29 16:53:20	1.239
+++ kmcomposewin.cpp	2000/08/31 18:26:07
@@ -30,6 +30,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
+#include <kkeydialog.h>
 #include <kdebug.h>
 
 #ifndef KRN
@@ -143,7 +144,6 @@ KMComposeWin::KMComposeWin(KMMessage *aM
 #endif
 {
   //setWFlags( WType_TopLevel | WStyle_Dialog );
-
   mDone = false;
   mGrid = NULL;
   mAtmListBox = NULL;
@@ -179,10 +179,6 @@ KMComposeWin::KMComposeWin(KMMessage *aM
   setupStatusBar();
   setupEditor();
   setupActions();
-  if(mShowToolBar)
-    toolBar()->show();
-  else
-    toolBar()->hide();
 
   connect(&mEdtSubject,SIGNAL(textChanged(const QString&)),
 	  SLOT(slotUpdWinTitle(const QString&)));
@@ -275,7 +271,6 @@ void KMComposeWin::readConfig(void)
 
   config->setGroup("Composer");
   mAutoSign = config->readEntry("signature","auto") == "auto";
-  mShowToolBar = config->readNumEntry("show-toolbar", 1);
   mDefEncoding = config->readEntry("encoding", "base64");
   mShowHeaders = config->readNumEntry("headers", HDR_STANDARD);
   mWordWrap = config->readNumEntry("word-wrap", 1);
@@ -386,7 +381,6 @@ void KMComposeWin::writeConfig(void)
 
   config->setGroup("Composer");
   config->writeEntry("signature", mAutoSign?"auto":"manual");
-  config->writeEntry("show-toolbar", mShowToolBar);
   config->writeEntry("encoding", mDefEncoding);
   config->writeEntry("headers", mShowHeaders);
   config->writeEntry("sticky-transport", mBtnTransport.isChecked());
@@ -732,14 +726,11 @@ void KMComposeWin::setupActions(void)
                                               "confirm_delivery");
   confirmReadAction = new KToggleAction (i18n("Confirm &read"), 0,
                                          actionCollection(), "confirm_read");
-  (void) new KAction (i18n("&Spellchecker..."), 0, this, SLOT(slotSpellcheckConfig()),
-                      actionCollection(), "setup_spellchecker");
 #if defined CHARSETS
   (void) new KAction (i18n("&Charsets..."), 0, this, SLOT(slotConfigureCharsets()),
                       actionCollection(), "charsets");
 #endif
 
-  KStdAction::configureToolbars(this, SLOT(slotEditToolbars()), actionCollection());
   //these are checkable!!!
   allFieldsAction = new KToggleAction (i18n("&All Fields"), 0, this,
                                        SLOT(slotView()),
@@ -800,9 +791,13 @@ void KMComposeWin::setupActions(void)
   (void) new KAction (i18n("Pr&operties..."), 0, this,
                       SLOT(slotAttachProperties()),
                       actionCollection(), "attach_properties");
-
 
-
+  KStdAction::showToolbar(this, SLOT(slotToggleToolBar()), actionCollection());
+  KStdAction::showStatusbar(this, SLOT(slotToggleStatusBar()), actionCollection());
+  KStdAction::keyBindings(this, SLOT(slotEditKeys()), actionCollection());
+  KStdAction::configureToolbars(this, SLOT(slotEditToolbars()), actionCollection());
+  (void) new KAction (i18n("&Spellchecker..."), 0, this, SLOT(slotSpellcheckConfig()),
+                      actionCollection(), "setup_spellchecker");
 
   encryptAction = new KToggleAction (i18n("Encrypt message"),
                                      "pub_key_red", 0,
@@ -1649,15 +1644,6 @@ void KMComposeWin::slotAttachRemove()
 
 
 //-----------------------------------------------------------------------------
-void KMComposeWin::slotToggleToolBar()
-{
-  enableToolBar(KToolBar::Toggle);
-  mShowToolBar = !mShowToolBar;
-  repaint();
-}
-
-
-//-----------------------------------------------------------------------------
 void KMComposeWin::slotFind()
 {
   mEditor->search();
@@ -2355,6 +2341,22 @@ 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::slotEditToolbars()
 {
   KEditToolbar dlg(actionCollection(), "kmcomposerui.rc");
@@ -2363,6 +2365,11 @@ void KMComposeWin::slotEditToolbars()
   {
     createGUI("kmcomposerui.rc");
   }
+}
+
+void KMComposeWin::slotEditKeys()
+{
+  KKeyDialog::configureKeys(actionCollection(), xmlFile(), true, this);
 }
 
 
Index: kmcomposewin.h
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmcomposewin.h,v
retrieving revision 1.88
diff -u -3 -p -r1.88 kmcomposewin.h
--- kmcomposewin.h	2000/07/21 05:29:16	1.88
+++ kmcomposewin.h	2000/08/31 18:26:08
@@ -202,7 +202,13 @@ public slots:
 
   void slotSpellcheck(); // Check spelling of text.
   void slotSpellcheckConfig();
+
+  // XML-GUI stuff
+  void slotToggleToolBar();
+  void slotToggleStatusBar();
   void slotEditToolbars();
+  void slotEditKeys();
+  
   void readConfig(void); // Read settings from app's config file.
   
   void slotUpdWinTitle(const QString& ); // Change window title to given string.
@@ -219,9 +225,6 @@ public slots:
   /** Popup a nice "not implemented" message. */
   void slotToDo();
 
-  /** Show/hide toolbar. */
-  void slotToggleToolBar();
-
   /** Open a popup-menu in the attachments-listbox. */
   void slotAttachPopupMenu(QListViewItem *, const QPoint &, int);
 
@@ -358,7 +361,7 @@ protected:
   QListView *mAtmListBox;
   QList<QListViewItem> mAtmItemList;
   KMMsgPartList mAtmList;
-  bool mAutoSign, mAutoPgpSign, mShowToolBar, mAutoDeleteMsg;
+  bool mAutoSign, mAutoPgpSign, mAutoDeleteMsg;
   long mShowHeaders;
   QString mDefEncoding;
 #ifndef KRN