tz fixes

1 files changed, 17 insertions, 1 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index e0380fa..77de94f 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2238,34 +2238,50 @@ void CalendarView::edit_copy()
     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()
 {
+    QString tz = KPimGlobalPrefs::instance()->mTimeZoneId;
+    emit save();
+    emit saveStopTimer();
     mDialogManager->showOptionsDialog();
-    //writeSettings();
+    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::slotSelectPickerDate( QDate  d)
 {
     mDateFrame->hide();
     if ( mDatePickerMode == 1 ) {
         mNavigator->slotDaySelect( d );
     } else  if ( mDatePickerMode == 2 ) {
         if ( mMoveIncidence->type() == "Todo" ) {
             Todo * to = (Todo *) mMoveIncidence;
             QTime tim;
             if ( to->hasDueDate() ) 
                 tim = to->dtDue().time();
             else {
                 tim = QTime ( 0,0,0 );