6 files changed, 22 insertions, 8 deletions

diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 7de7064..017f1f7 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -107,6 +107,3 @@ void KOPrefsDialog::setupGlobalTab()
 {
-   QFrame *topFrame = addPage(i18n("Global"),0,0);
-   kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
-   QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
-   topLayout->addWidget( kdelibcfg );
+   
 
@@ -230,3 +227,2 @@ void KOPrefsDialog::usrReadConfig()
   //mCodecEdit->setText(KOPrefs::instance()->mSendCodec);
-  kdelibcfg->readConfig();
 }
@@ -237,3 +233,2 @@ void KOPrefsDialog::usrWriteConfig()
     //KOPrefs::instance()->mSendCodec = mCodecEdit->text();
-    kdelibcfg->writeConfig();
  
diff --git a/kmicromail/koprefsdialog.h b/kmicromail/koprefsdialog.h
index a0416ae..7fa9261 100644
--- a/kmicromail/koprefsdialog.h
+++ b/kmicromail/koprefsdialog.h
@@ -63,3 +63,2 @@ protected:
  private:
-    KDEPIMConfigWidget* kdelibcfg;
     QLineEdit *mNameEdit;
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 9a52d1b..e3c5ec3 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -97,3 +97,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 
-    editSettings = new QAction( i18n( "Edit settings" ), SmallIcon("SettingsIcon")  ,
+    editSettings = new QAction( i18n( "Configure OM/Pi..." ), SmallIcon("SettingsIcon")  ,
                                 0, 0, this );
@@ -102,2 +102,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
              SLOT( slotEditSettings() ) );
+
+
+    QAction * editSettings2 = new QAction( i18n( "Global Settings..." ), SmallIcon("SettingsIcon")  ,
+                                0, 0, this );
+    editSettings2->addTo( settingsMenu );
+    connect( editSettings2, SIGNAL( activated() ),
+             SLOT( slotEditGlobalSettings() ) );
+
+
+
     editAccounts = new QAction( i18n( "Configure accounts" ),  SmallIcon("editaccounts")  ,
@@ -371,2 +381,5 @@ void MainWindow::slotEditSettings()
 }
+void MainWindow::slotEditGlobalSettings()
+{
+}
 
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index ddb3fca..6894039 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -54,2 +54,3 @@ protected slots:
     virtual void slotEditSettings();
+    virtual void slotEditGlobalSettings();
     virtual void mailLeftClicked( QListViewItem * );
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 4436ad6..8ac3451 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -246,2 +246,7 @@ void OpieMail::slotSearchMails()
 }
+void OpieMail::slotEditGlobalSettings()
+{
+    KPimPrefsGlobalDialog gc ( this );
+    gc.exec();
+}
 
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index 4f75b3f..48c5dda 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -37,2 +37,3 @@ protected slots:
     virtual void slotEditSettings();
+    virtual void slotEditGlobalSettings();
     virtual void slotEditAccounts();