dialog fixes

6 files changed, 54 insertions, 23 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 7c7466b..4794414 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2499,69 +2499,71 @@ void CalendarView::edit_copy()
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->typeID() == eventID ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
     DndFactory factory( mCalendar );
     factory.copyIncidence(anEvent);
 }
 
 void CalendarView::edit_paste()
 {
     QDate date = mNavigator->selectedDates().first();
 
     DndFactory factory( mCalendar );
     Event *pastedEvent = (Event *)factory.pasteIncidence( date );
 
     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();
         if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto apply timezone changes?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"),
                                                  i18n("Timezone settings"),i18n("Reload"))) {
             qDebug("KO: TZ reload cancelled ");
             return;
         }
         qDebug("KO: Timezone change ");
         openCalendar( MainWindow::defaultFileName() );
         setModified(true);
     }
     else
         qDebug("KO: No tz change ");
-
+}
+void CalendarView::edit_options()
+{
+    mDialogManager->showOptionsDialog();
 }
 
 
 void  CalendarView::slotSelectPickerDate( QDate  d)
 {
     mDateFrame->hide();
     if ( mDatePickerMode == 1 ) {
         mNavigator->slotDaySelect( d );
     } else  if ( mDatePickerMode == 2 ) {
         if ( mMoveIncidence->typeID() == todoID ) {
             Todo * to = (Todo *) mMoveIncidence;
             QTime tim;
             int len  = 0;
             if ( to->hasStartDate() &&  to->hasDueDate() )
                 len = to->dtStart().secsTo( to->dtDue());
             if ( to->hasDueDate() ) 
                 tim = to->dtDue().time();
             else {
                 tim = QTime ( 0,0,0 );
                 to->setFloats( true );
                 to->setHasDueDate( true );
             }
             QDateTime dt ( d,tim );
             to->setDtDue( dt );
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 4600090..1215a99 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -328,48 +328,49 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void todoChanged(Todo *);
     void todoToBeDeleted(Todo *);
     void todoDeleted();
 
     void updateView(const QDate &start, const QDate &end);
     void updateView();
     void clearAllViews();
   
     /** Full update of visible todo views */
     void updateTodoViews();
 
     void updateUnmanagedViews();
   
     /** cut the current appointment to the clipboard */
     void edit_cut();
   
     /** copy the current appointment(s) to the clipboard */
     void edit_copy();
 
     /** paste the current vobject(s) in the clipboard buffer into calendar */
     void edit_paste();
   
     /** edit viewing and configuration options. */
     void edit_options();
+    void edit_global_options();
     /**
       Functions for printing, previewing a print, and setting up printing
       parameters.
     */
     void print();
     void printSetup();
     void printPreview();
 
     /** Export as iCalendar file */
     void exportICalendar();
   
     /** Export as vCalendar file */
     bool exportVCalendar( QString fn);
   
     /** pop up a dialog to show an existing appointment. */
     void appointment_show();
     /**
              * pop up an Appointment Dialog to edit an existing appointment.Get
      * information on the appointment from the list of unique IDs that is
      * currently in the View, called currIds.
      */
     void appointment_edit();
     /**
      * pop up dialog confirming deletion of currently selected event in the
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index c927b37..aa30c52 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -67,74 +67,90 @@ KODialogManager::~KODialogManager()
   delete mArchiveDialog;
 #endif
   delete mFilterEditDialog;
 #ifndef KORG_NOPLUGINS
   delete mPluginDialog;
 #endif
 }
 
 OutgoingDialog *KODialogManager::outgoingDialog()
 {
   createOutgoingDialog();
   return mOutgoingDialog;
 }
 
 void KODialogManager::createOutgoingDialog()
 {
   if (!mOutgoingDialog) {
     mOutgoingDialog = new OutgoingDialog(mMainView->calendar(),mMainView);
     if (mIncomingDialog) mIncomingDialog->setOutgoingDialog(mOutgoingDialog);
     connect(mOutgoingDialog,SIGNAL(numMessagesChanged(int)),
             mMainView,SIGNAL(numOutgoingChanged(int)));
   }
 }
 
+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 )
 {
    
   if (!mOptionsDialog) {
     mOptionsDialog = new KOPrefsDialog(mMainView);
-    //mOptionsDialog->readConfig();
     connect(mOptionsDialog,SIGNAL(configChanged()),
             mMainView,SLOT(updateConfig()));
-    //connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()),
-    //      mOptionsDialog,SLOT(updateCategories()));
-    
   }
   mOptionsDialog->readConfig();
 #ifndef DESKTOP_VERSION  
   mOptionsDialog->showMaximized();
 #else
   mOptionsDialog->show();
 #endif
   if ( showSync )
       mOptionsDialog->showSyncPage();
   mOptionsDialog->exec();
-  
+  delete mOptionsDialog;
+  mOptionsDialog = 0;
 }
 void KODialogManager::showSyncOptions()
 {
-    showOptionsDialog( true );
+    showGlobalOptionsDialog( true );
 
 }
 void KODialogManager::showOutgoingDialog()
 {
   createOutgoingDialog();
   mOutgoingDialog->show();
   mOutgoingDialog->raise();
 }
 
 IncomingDialog *KODialogManager::incomingDialog()
 {
   createOutgoingDialog();
   if (!mIncomingDialog) {
     mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView);
     connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)),
             mMainView,SIGNAL(numIncomingChanged(int)));
     connect(mIncomingDialog,SIGNAL(calendarUpdated()),
             mMainView,SLOT(updateView()));
   }
   return mIncomingDialog;
 }
 
 void KODialogManager::createIncomingDialog()
 {
diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h
index a6cc621..b68ddc2 100644
--- a/korganizer/kodialogmanager.h
+++ b/korganizer/kodialogmanager.h
@@ -50,48 +50,49 @@ using namespace KCal;
 */
 class KODialogManager : public QObject
 {
     Q_OBJECT
   public:
     KODialogManager( CalendarView * );
     virtual ~KODialogManager();
 
     /** Get an editor dialog for an Event. */
     KOEventEditor *getEventEditor();
     
     /** Get an editor dialog for a Todo. */
     KOTodoEditor *getTodoEditor();
 
     OutgoingDialog *outgoingDialog();
     
     IncomingDialog *incomingDialog();
     void writeSettings( KConfig *config);
     void updateSearchDialog();
     SearchDialog * getSearchDialog();
     void setDocumentId( const QString &id );
     
   public slots:
     void showOptionsDialog( bool showSync = false);
+    void showGlobalOptionsDialog(bool showSync = false);
     void showSyncOptions();
     void showIncomingDialog();
     void showOutgoingDialog();
     //  void showCategoryEditDialog();
     void showSearchDialog();
     void showArchiveDialog();
     void showFilterEditDialog(QPtrList<CalFilter> *filters);
     void showPluginDialog();
     void hideSearchDialog();
 
   private:
     void createOutgoingDialog();
     void createIncomingDialog();
 
     CalendarView *mMainView;
     
     OutgoingDialog *mOutgoingDialog;
     IncomingDialog *mIncomingDialog;
     KOPrefsDialog *mOptionsDialog;
     //  KPIM::CategoryEditDialog *mCategoryEditDialog;
     SearchDialog *mSearchDialog;
     ArchiveDialog *mArchiveDialog;
     FilterEditDialog *mFilterEditDialog;
     PluginDialog *mPluginDialog;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index c9477e3..4b5b66a 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -65,77 +65,79 @@
 #define INITFILE       "/etc/default/init"
 #endif
 
 #include "koprefs.h"
 
 #include "koprefsdialog.h"
 #include "kpimglobalprefs.h"
 
 
 KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   KPrefsDialog(KOPrefs::instance(),parent,name,true)
 {
 
     setFont( KGlobalSettings::generalMaxFont() );
   setCaption( i18n("Preferences - some settings need a restart (nr)"));
   mCategoryDict.setAutoDelete(true);
 
   KGlobal::locale()->insertCatalogue("timezones");
   mSpacingHint = spacingHintSmall();
    mMarginHint = marginHintSmall();
 #ifndef DESKTOP_VERSION
   if ( QApplication::desktop()->height() == 480  )
       hideButtons();
 #endif
-
+  kdelibcfg = 0;
+  if ( !parent ) 
   setupGlobalTab();
+  else {
   setupMainTab();
   // setupLocaleTab();
   //setupTimeZoneTab();
   setupTimeTab();
   //setupLocaleDateTab();
   setupFontsTab();
   setupColorsTab();
   setupViewsTab();
   //setupSyncTab();
   //setupSyncAlgTab();
   //setupPrinterTab();
   //setupGroupSchedulingTab();
   //setupGroupAutomationTab();
-
+  }
 
 }
 
 
 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"));
 
 
 } 
 void KOPrefsDialog::setupLocaleDateTab()
 {
 #if 0
 QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
    topLayout->setSpacing(mSpacingHint);
    topLayout->setMargin(mMarginHint);  
    int iii = 0;
 
    
    KPrefsDialogWidRadios *syncPrefsGroup =
        addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);
    QString format;
    if ( QApplication::desktop()->width() < 480 )
        format = "(%d.%m.%Y)";
    else 
        format = "(%d.%m.%Y|%A %d %B %Y)";
    syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
    if ( QApplication::desktop()->width() < 480 )
        format = "(%m.%d.%Y)";
    else 
@@ -219,49 +221,49 @@ void  KOPrefsDialog::setupLocaleTab()
        QHBoxLayout  *hbLayout = new QHBoxLayout(hb);
        sb =
            addWidBool(i18n("Week starts on Sunday"),
                       &(KOPrefs::instance()->mWeekStartsOnSunday),hb);
        hbLayout->addWidget(sb->checkBox()  );
        sb =
            addWidBool(i18n("Use short date in (WN/E) view"),
                       &(KOPrefs::instance()->mShortDateInViewer),hb);
        hbLayout->addWidget(sb->checkBox()  );
        topLayout->addMultiCellWidget(hb, iii,iii,0,1);
 
    }
   //   KPrefsDialogWidBool *sb;  //#ifndef DESKTOP_VERSION
 #if 0
   ++iii;
   sb =
            addWidBool(i18n("Quick load/save (w/o Unicode)"), 
                       &(KOPrefs::instance()->mUseQuicksave),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 #endif
 #endif
 }
 void KOPrefsDialog::showSyncPage()
 {
-    showPage ( 0 ) ;
+    // showPage ( 0 ) ;
     kdelibcfg->showTimeZoneTab() ;
 
 }
 void KOPrefsDialog::setupSyncAlgTab()
 {
 #if 0
   QLabel * lab;
    QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
    mSetupSyncAlgTab = topFrame;
    QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
    topLayout->setSpacing(mSpacingHint);
    topLayout->setMargin(mMarginHint);  
    int iii = 0;  
    
    KPrefsDialogWidBool *sb =
        addWidBool(i18n("Ask for preferences before syncing"),
                   &(KOPrefs::instance()->mAskForPreferences),topFrame);
    topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 
    ++iii;
 
    KPrefsDialogWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs),
                    topFrame);
@@ -1437,99 +1439,103 @@ void KOPrefsDialog::setupGroupAutomationTab()
 void KOPrefsDialog::showPrinterTab()
 {
   showPage(pageIndex(mPrinterTab));
 }
 
 
 void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text,
                                const QStringList *tags)
 {
   if (tags) {
     int i = tags->findIndex(text);
     if (i > 0) combo->setCurrentItem(i);
   } else {
     for(int i=0;i<combo->count();++i) {
       if (combo->text(i) == text) {
         combo->setCurrentItem(i);
         break;
       }
     }
   }
 }
 
 void KOPrefsDialog::usrReadConfig()
 {
-  kdelibcfg->readConfig();
+    if ( kdelibcfg )
+        kdelibcfg->readConfig();
+    else {
   mNameEdit->setText(KOPrefs::instance()->fullName());
   mEmailEdit->setText(KOPrefs::instance()->email());
 
   mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval);
   // QDate current ( 2001, 1,1);
   //mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
   //mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1));
   //setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId));
   //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset);
   mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime);
   mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration);
   mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime);
   // if  (KOPrefs::instance()->mAllDaySize > 47  )
   //   KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize/2;
   //mHourSizeSlider->setValue(KOPrefs::instance()->mAllDaySize);
 
   mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays);
   mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays);
   mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios);
   // mAMails->clear();
  //  for ( QStringList::Iterator it = KOPrefs::instance()->mAdditionalMails.begin();
 //             it != KOPrefs::instance()->mAdditionalMails.end(); ++it ) {
 //     QListViewItem *item = new QListViewItem(mAMails);
 //     item->setText(0,*it);
 //     mAMails->insertItem(item);
 //   }
 
   // mRemoteIPEdit->setText(KOPrefs::instance()->mRemoteIP);
   //mRemoteUser->setText(KOPrefs::instance()->mRemoteUser);
   //mRemotePassWd->setText(KOPrefs::instance()->mRemotePassWd);
   //mRemoteFile->setText(KOPrefs::instance()->mRemoteFile);
 
   //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile);
   mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile);
   //QString dummy = KOPrefs::instance()->mUserDateFormatLong;
   //mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") ));
   //dummy = KOPrefs::instance()->mUserDateFormatShort;
   //mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") ));
   updateCategories();
   mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps );
   mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime );
   mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount );
   mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval );
+    }
 }
 
 
 void KOPrefsDialog::usrWriteConfig()
 {
-
-  kdelibcfg->writeConfig();
+    if ( kdelibcfg )
+        kdelibcfg->writeConfig();
+    else {
     // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text();
     //KOPrefs::instance()->mRemoteUser =  mRemoteUser->text();
     //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text();
     //KOPrefs::instance()->mRemoteFile= mRemoteFile->text();
     //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text();
     KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text();
 
     //KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") );
     //KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") );
     KOPrefs::instance()->setFullName(mNameEdit->text());
     KOPrefs::instance()->setEmail(mEmailEdit->text());
     
     KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value();
     
     // KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText();
     //QDate date;
     //date = mStartDateSavingEdit->date();
     //int sub = 0;
     //if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 )
     //     sub = 1;
 //     KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub;
 //     date = mEndDateSavingEdit->date();
 //     if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59  )
 //         sub = 1;
@@ -1545,49 +1551,49 @@ void KOPrefsDialog::usrWriteConfig()
     //KOPrefs::instance()->mAllDaySize = mHourSizeSlider->value();
     
     QDictIterator<QColor> it(mCategoryDict);
     while (it.current()) {
         KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current());
         ++it;
     }
     
     KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value();
     KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value();
     KOPrefs::instance()->mWhatsNextPrios = mPrioSpin->value();
     
     KOPrefs::instance()->mAdditionalMails.clear();
     //  QListViewItem *item;
     //  item = mAMails->firstChild();
     //   while (item)
     //   {
     //     KOPrefs::instance()->mAdditionalMails.append( item->text(0) );
     //     item = item->nextSibling();
     //   }
   KOPrefs::instance()->mAlarmPlayBeeps  = mAlarmPlayBeeps->value();
   KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ;
   KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ;
   KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ;
-    
+    }
 }
 
 void KOPrefsDialog::updateCategories()
 {
   mCategoryCombo->clear();
   mCategoryDict.clear();
   mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories);
   updateCategoryColor();
 }
 
 void KOPrefsDialog::warningGroupScheduling()
 {
   warningExperimental(mEnableGroupScheduling->checkBox()->isChecked());
 }
 
 void KOPrefsDialog::warningProjectView()
 {
   warningExperimental(mEnableProjectView->checkBox()->isChecked());
 }
 
 void KOPrefsDialog::warningExperimental(bool on)
 {
   if (on) {
     KMessageBox::information(this,i18n("This is an experimental feature. "
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 25e76ee..2c04852 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -703,52 +703,57 @@ void MainWindow::initActions()
         actionFilterMenuTB->addTo( iconToolBar  );
         selectFilterMenuTB = new QPopupMenu( this );
         selectFilterMenuTB->setCheckable( true ); 
         connect ( selectFilterMenuTB, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     }
 
     //#endif
     // ******************
     QAction *action;
     // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
     configureToolBarMenu->setCheckable( true );
 
    
     configureAgendaMenu->setCheckable( true );
     int iii ;
     for ( iii = 1;iii<= 10 ;++iii ){
         configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
     }
     //configureMenu->insertItem( "AgendaSize",configureAgendaMenu  );
 
     connect( configureAgendaMenu, SIGNAL( aboutToShow()),
              this, SLOT( showConfigureAgenda( ) ) );
 
     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() ) );
+             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();
 
     action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( undo_delete() ) );
     actionMenu->insertSeparator();
 
     icon = loadPixmap( pathString + "newevent" );
     configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
     configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
     configureToolBarMenu->insertSeparator();
     configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
     configureToolBarMenu->insertSeparator();
     configureToolBarMenu->insertItem(i18n("Week Number"), 400);
     configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
     QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
     ne_action->addTo( actionMenu );
     connect( ne_action, SIGNAL( activated() ),
              mView, SLOT( newEvent() ) );
     icon = loadPixmap( pathString + "newtodo" );
     configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
     QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
     nt_action->addTo( actionMenu );