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
@@ -96,28 +96,25 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   //setupGroupSchedulingTab();
   //setupGroupAutomationTab();
 #endif
 }
 
 #include "kpimglobalprefs.h"
 
 KOPrefsDialog::~KOPrefsDialog()
 {
 }
 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 );
+   
 
 
 } 
 void KOPrefsDialog::setupMainTab() 
 {
     QFrame *topFrame = addPage(i18n("General"),0,0);
 
   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
 
@@ -219,32 +216,30 @@ void KOPrefsDialog::setupFontsTab()
   ++i;
 
   topLayout->setColStretch(1,1);
   topLayout->setRowStretch(4,1);
 
 }
 void KOPrefsDialog::usrReadConfig()
 {
  
   mNameEdit->setText(KOPrefs::instance()->mName);
   mEmailEdit->setText(KOPrefs::instance()->mEmail);
   //mCodecEdit->setText(KOPrefs::instance()->mSendCodec);
-  kdelibcfg->readConfig();
 }
 void KOPrefsDialog::usrWriteConfig()
 {
     KOPrefs::instance()->mName = mNameEdit->text();
     KOPrefs::instance()->mEmail = mEmailEdit->text();
     //KOPrefs::instance()->mSendCodec = mCodecEdit->text();
-    kdelibcfg->writeConfig();
  
     
 }
 
 #if 0
 void KOPrefsDialog::setupLocaleDateTab()
 {
 QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
    int iii = 0;
diff --git a/kmicromail/koprefsdialog.h b/kmicromail/koprefsdialog.h
index a0416ae..7fa9261 100644
--- a/kmicromail/koprefsdialog.h
+++ b/kmicromail/koprefsdialog.h
@@ -52,25 +52,24 @@ class KOPrefsDialog : public KPrefsDialog
     KOPrefsDialog(QWidget *parent=0,char *name=0,bool modal=false);
     ~KOPrefsDialog(); 
 
 protected:
     void usrReadConfig();
     void usrWriteConfig();
 
     void setupMainTab();
     void setupGlobalTab();
     void setupMailTab();
     void setupFontsTab();
  private:
-    KDEPIMConfigWidget* kdelibcfg;
     QLineEdit *mNameEdit;
     QLineEdit *mCodecEdit;
     QLineEdit *mEmailEdit;
     QLabel *mNameLabel;
     QLabel *mEmailLabel;
 #if 0
     /*
   public slots:
     void showPrinterTab();
     
    
     void updateCategories();
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 9a52d1b..e3c5ec3 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -86,29 +86,39 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
       searchMails = new QAction( i18n( "Search mails" ), SmallIcon("find") ),
                                0, 0, this );
     searchMails->kopddTo( toolBar );
     searchMails->addTo( mailMenu );
     */
 
     deleteMails = new QAction(i18n("Delete Mail"),  SmallIcon("trash"), 0, 0, this);
     deleteMails->addTo( toolBar );
     deleteMails->addTo( mailMenu );
     connect( deleteMails, SIGNAL( activated() ),
              SLOT( slotDeleteAllMail() ) );
 
-    editSettings = new QAction( i18n( "Edit settings" ), SmallIcon("SettingsIcon")  ,
+    editSettings = new QAction( i18n( "Configure OM/Pi..." ), SmallIcon("SettingsIcon")  ,
                                 0, 0, this );
     editSettings->addTo( settingsMenu );
     connect( editSettings, SIGNAL( activated() ),
              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")  ,
                                 0, 0, this );
     editAccounts->addTo( settingsMenu );
     codecMenu = new QPopupMenu( menuBar );
     codecMenu->insertItem( "Western (iso-8859-1)",0,0);
     codecMenu->insertItem( "Cyrillic (iso-8859-5)",1,1);
     codecMenu->insertItem( "Western (iso-8859-15)",2,2);
     codecMenu->insertItem( "Chinese (big-5)",3,3);
     codecMenu->insertItem( "Unicode (utf-8)",4,4);
     codecMenu->insertItem( "Userdefined ("+KOPrefs::instance()->mSendCodec+")",5,5);
     //disabled
     //settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu);
@@ -360,24 +370,27 @@ void MainWindow::slotAdjustColumns()
     mailView->setColumnWidth( 0, 10 );
     mailView->setColumnWidth( 1, 100 );
     mailView->setColumnWidth( 2, 100 );
     mailView->setColumnWidth( 3, 50 );
     mailView->setColumnWidth( 4, 120 );
     if ( KOPrefs::instance()->mShowToField )
         mailView->setColumnWidth( 5, 100 );
 }
 
 void MainWindow::slotEditSettings()
 {
 }
+void MainWindow::slotEditGlobalSettings()
+{
+}
 
 void MainWindow::slotShowFolders( bool )
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::refreshMailView(const QValueList<RecMailP>&)
 { 
     qDebug("not implemented:  ");
 }
 
 void MainWindow::mailLeftClicked(QListViewItem * )
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index ddb3fca..6894039 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -43,24 +43,25 @@ protected slots:
     virtual void slotEditAccounts();
     virtual void slotShowFolders( bool show );
     virtual void refreshMailView(const QValueList<RecMailP>&);
     virtual void displayMail();
     virtual void slotGetMail() = 0;
     virtual void slotGetAllMail() = 0;
     virtual void slotDeleteMail();
     virtual void slotDeleteAllMail() = 0;
     virtual void slotSetCodec(int);
     virtual void mailHold(int, QListViewItem *,const QPoint&,int);
     virtual void slotAdjustLayout();
     virtual void slotEditSettings();
+    virtual void slotEditGlobalSettings();
     virtual void mailLeftClicked( QListViewItem * );
     void showLicence();
     void showAbout();
     void showEtpanLicence(); 
 
 protected:
     QToolBar *toolBar;
     StatusWidget *statusWidget;
     QPEMenuBar *menuBar;
     QPopupMenu *mailMenu, *settingsMenu, *codecMenu;
     QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails,
             *editSettings, *editAccounts, *syncFolders;
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 4436ad6..8ac3451 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -235,24 +235,29 @@ void OpieMail::slotSendQueued()
         {
             Global::statusMessage("Mails sent!");
         } 
         delete wrap;
     }
     folderView->refreshOutgoing();
 }
 
 void OpieMail::slotSearchMails()
 {
     qDebug("OpieMail::slotSearchMails():not implemented ");
 }
+void OpieMail::slotEditGlobalSettings()
+{
+    KPimPrefsGlobalDialog gc ( this );
+    gc.exec();
+}
 
 void OpieMail::slotEditSettings()
 {
 
     KOPrefsDialog settingsDialog( this,  "koprefs", true );
 #ifndef DESKTOP_VERSION
     settingsDialog.showMaximized();
 #endif
     settingsDialog.exec();
 
    slotSetCodec( KOPrefs::instance()->mCurrentCodec );
     //    KApplication::execDialog(settingsDialog);
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index 4f75b3f..48c5dda 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -26,24 +26,25 @@ public slots:
     virtual void slotwriteMail2(const QString&nameemail);
     virtual void slotComposeMail();
     virtual void slotExtAppHandler();
     virtual void appMessage(const QCString &msg, const QByteArray &data);
     virtual void message(const QCString &msg, const QByteArray &data);
     void insertAttendees(const QString&, const QStringList& namelist, const QStringList& emaillist, const QStringList& uidlist);
 protected slots:
     virtual void deleteAndDisplayNextMail(ViewMail * vm);
     virtual void displayNextMail(ViewMail * vm);
     virtual void slotSendQueued();
     virtual void slotSearchMails();
     virtual void slotEditSettings();
+    virtual void slotEditGlobalSettings();
     virtual void slotEditAccounts();
     virtual void displayMail();
     virtual void replyMail();
     virtual void slotDeleteMail();
     virtual void slotGetMail();
     virtual void slotGetAllMail();
     virtual void slotDeleteAllMail();
     virtual void mailHold(int, QListViewItem *,const QPoint&,int);
     virtual void slotShowFolders( bool show );
     virtual void refreshMailView(const QValueList<RecMailP>&);
     virtual void mailLeftClicked(  QListViewItem * );
     virtual void slotMoveCopyMail();