From f6e88d5b59ba971827771ba09bc58f9cb5b399f9 Mon Sep 17 00:00:00 2001
From: Michael Haeckel <haeckel@kde.org>
Date: Mon, 7 May 2001 21:05:49 +0000
Subject: [PATCH] "Integrate" kmailcvt into KMail, that even mail client review
 article writers and other analphabets who are unable to have a look into the
 documentation or at out homepage are able to find it.

svn path=/trunk/kdenetwork/kmail/; revision=95702
---
 kmmainwin.cpp | 12 ++++++++++--
 kmmainwin.h   |  1 +
 kmmainwin.rc  |  3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/kmmainwin.cpp b/kmmainwin.cpp
index 3be2df688..523ed4820 100644
--- a/kmmainwin.cpp
+++ b/kmmainwin.cpp
@@ -570,8 +570,6 @@ void KMMainWin::slotSettings()
 }
 
 
-
-
 //-----------------------------------------------------------------------------
 void KMMainWin::slotFilter()
 {
@@ -586,6 +584,13 @@ void KMMainWin::slotAddrBook()
 }
 
 
+//-----------------------------------------------------------------------------
+void KMMainWin::slotImport()
+{
+  KRun::runCommand("kmailcvt");
+}
+
+
 //-----------------------------------------------------------------------------
 void KMMainWin::slotAddFolder()
 {
@@ -1601,6 +1606,9 @@ void KMMainWin::setupMenuBar()
   (void) new KAction( i18n("Address &Book..."), "contents", 0, this,
 		      SLOT(slotAddrBook()), actionCollection(), "addressbook" );
 
+  (void) new KAction( i18n("&Import..."), "kmailcvt", 0, this,
+		      SLOT(slotImport()), actionCollection(), "import" );
+
   KStdAction::close( this, SLOT(slotClose()), actionCollection());
   //KStdAction::quit( this, SLOT(quit()), actionCollection());
 
diff --git a/kmmainwin.h b/kmmainwin.h
index 0318eaa78..8a667bd4e 100644
--- a/kmmainwin.h
+++ b/kmmainwin.h
@@ -122,6 +122,7 @@ protected slots:
   void slotSettings();
   void slotFilter();
   void slotAddrBook();
+  void slotImport();
   void slotViewChange();
   void slotAddFolder();
   void slotCompose();
diff --git a/kmmainwin.rc b/kmmainwin.rc
index 289f6aca7..a5a291f9a 100644
--- a/kmmainwin.rc
+++ b/kmmainwin.rc
@@ -1,4 +1,4 @@
-<!DOCTYPE kpartgui ><kpartgui version="18" name="kmmainwin" >
+<!DOCTYPE kpartgui ><kpartgui version="19" name="kmmainwin" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -14,6 +14,7 @@
    <Action name="send_queued" />
    <Separator/>
    <Action name="addressbook" />
+   <Action name="import" />
    <Separator/>
    <Action name="file_close" />
   </Menu>