7 files changed, 53 insertions, 22 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 6b62d4e..bb3a00d 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1379,6 +1379,6 @@
 { "Print List View...","Drucke Listenansicht..." },
 { "You can make a printout of the <b>List View</b> and the list view in the <b>Search Dialog</b>! To do this, please go to the <b>List View/Search Dialog</b>. Right click on the list. Select in the popup menu the entry <b>Print complete list</b>. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose <b>Hide selected items</b>. After that you can print the list without these items.","Sie können die <b>Listenansicht</b> und die Listenansicht im <b>Suchdialog</b> ausdrucken! Um das zu machen gehen Sie bitte zur <b>Listenansicht</b> oder zum <b>Suchdialog</b>. Rechtsklicken Sie auf die Liste. Wählen Sie im Popupmenu den Eintrag <b>Drucke komplette Liste</b>. Das druckt die Liste so, wie man sie sieht. Sie können Listeneinträge entfernen ohne die korrespondierenden Ereignisse/Todos zu löschen! Selektieren sie einfach alle Einträge, die sie nicht ausdrucken möchten. Dann Rechtsklicken Sie auf einen Eintrag und wählen <b>Verstecke Selektierte</b>. Danach können Sie die Liste ohne diese Einträge ausdrucken." },
-{ "","" },
-{ "","" },
+{ "Configure KO/Pi...","Konfiguriere KO/Pi..." },
+{ "Global Settings...","Globale Einstellungen..." },
 { "","" },
 { "","" },
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 7c7466b..4794414 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2521,11 +2521,10 @@ void CalendarView::edit_paste()
     changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED );
 }
-
-void CalendarView::edit_options()
+void CalendarView::edit_global_options()
 {
     QString tz = KPimGlobalPrefs::instance()->mTimeZoneId;
     emit save();
     emit saveStopTimer();
-    mDialogManager->showOptionsDialog();
+    mDialogManager->showGlobalOptionsDialog();
     if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) {
         emit saveStopTimer();
@@ -2541,5 +2540,8 @@ void CalendarView::edit_options()
     else
         qDebug("KO: No tz change ");
-
+}
+void CalendarView::edit_options()
+{
+    mDialogManager->showOptionsDialog();
 }
 
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 4600090..1215a99 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -350,4 +350,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     /** edit viewing and configuration options. */
     void edit_options();
+    void edit_global_options();
     /**
       Functions for printing, previewing a print, and setting up printing
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index c927b37..aa30c52 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -89,4 +89,23 @@ void KODialogManager::createOutgoingDialog()
 }
 
+void KODialogManager::showGlobalOptionsDialog( bool showSync )
+{
+ if (!mOptionsDialog) {
+    mOptionsDialog = new KOPrefsDialog(0);
+    connect(mOptionsDialog,SIGNAL(configChanged()),
+            mMainView,SLOT(updateConfig()));
+  }
+  mOptionsDialog->readConfig();
+#ifndef DESKTOP_VERSION  
+  mOptionsDialog->showMaximized();
+#else
+  mOptionsDialog->show();
+#endif
+  if ( showSync )
+      mOptionsDialog->showSyncPage();
+  mOptionsDialog->exec();
+  delete mOptionsDialog;
+  mOptionsDialog = 0;
+}
 void KODialogManager::showOptionsDialog( bool showSync )
 {
@@ -94,10 +113,6 @@ void KODialogManager::showOptionsDialog( bool showSync )
   if (!mOptionsDialog) {
     mOptionsDialog = new KOPrefsDialog(mMainView);
-    //mOptionsDialog->readConfig();
     connect(mOptionsDialog,SIGNAL(configChanged()),
             mMainView,SLOT(updateConfig()));
-    //connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()),
-    //      mOptionsDialog,SLOT(updateCategories()));
-    
   }
   mOptionsDialog->readConfig();
@@ -110,9 +125,10 @@ void KODialogManager::showOptionsDialog( bool showSync )
       mOptionsDialog->showSyncPage();
   mOptionsDialog->exec();
-  
+  delete mOptionsDialog;
+  mOptionsDialog = 0;
 }
 void KODialogManager::showSyncOptions()
 {
-    showOptionsDialog( true );
+    showGlobalOptionsDialog( true );
 
 }
diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h
index a6cc621..b68ddc2 100644
--- a/korganizer/kodialogmanager.h
+++ b/korganizer/kodialogmanager.h
@@ -72,4 +72,5 @@ class KODialogManager : public QObject
   public slots:
     void showOptionsDialog( bool showSync = false);
+    void showGlobalOptionsDialog(bool showSync = false);
     void showSyncOptions();
     void showIncomingDialog();
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index c9477e3..4b5b66a 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -87,6 +87,8 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
       hideButtons();
 #endif
-
+  kdelibcfg = 0;
+  if ( !parent ) 
   setupGlobalTab();
+  else {
   setupMainTab();
   // setupLocaleTab();
@@ -102,5 +104,5 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   //setupGroupSchedulingTab();
   //setupGroupAutomationTab();
-
+  }
 
 }
@@ -112,8 +114,8 @@ 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 );
+    //QFrame *topFrame = addPage(i18n("Global"),0,0);
+   kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), this, "KCMKdeLibConfig" );
+   setMainWidget( kdelibcfg );
+   setCaption( i18n("KDE-Pim Global Settings"));
 
 
@@ -241,5 +243,5 @@ void  KOPrefsDialog::setupLocaleTab()
 void KOPrefsDialog::showSyncPage()
 {
-    showPage ( 0 ) ;
+    // showPage ( 0 ) ;
     kdelibcfg->showTimeZoneTab() ;
 
@@ -1459,5 +1461,7 @@ void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text,
 void KOPrefsDialog::usrReadConfig()
 {
+    if ( kdelibcfg )
   kdelibcfg->readConfig();
+    else {
   mNameEdit->setText(KOPrefs::instance()->fullName());
   mEmailEdit->setText(KOPrefs::instance()->email());
@@ -1504,10 +1508,12 @@ void KOPrefsDialog::usrReadConfig()
   mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval );
 }
+}
 
 
 void KOPrefsDialog::usrWriteConfig()
 {
-
+    if ( kdelibcfg )
   kdelibcfg->writeConfig();
+    else {
     // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text();
     //KOPrefs::instance()->mRemoteUser =  mRemoteUser->text();
@@ -1567,5 +1573,5 @@ void KOPrefsDialog::usrWriteConfig()
   KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ;
   KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ;
-    
+    }
 }
 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 25e76ee..2c04852 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -725,8 +725,13 @@ void MainWindow::initActions()
 
     icon = loadPixmap( pathString + "configure" );
-    action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this );
+    action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( edit_options() ) );
+    icon = loadPixmap( pathString + "configure" );
+    action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
+    action->addTo( actionMenu );
+    connect( action, SIGNAL( activated() ),
+             mView, SLOT( edit_global_options() ) );
     actionMenu->insertSeparator();