-rw-r--r-- | korganizer/calendarview.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 7c7466b..4794414 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2517,19 +2517,18 @@ void CalendarView::edit_paste() | |||
2517 | 2517 | ||
2518 | DndFactory factory( mCalendar ); | 2518 | DndFactory factory( mCalendar ); |
2519 | Event *pastedEvent = (Event *)factory.pasteIncidence( date ); | 2519 | Event *pastedEvent = (Event *)factory.pasteIncidence( date ); |
2520 | 2520 | ||
2521 | changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); | 2521 | changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); |
2522 | } | 2522 | } |
2523 | 2523 | void CalendarView::edit_global_options() | |
2524 | void CalendarView::edit_options() | ||
2525 | { | 2524 | { |
2526 | QString tz = KPimGlobalPrefs::instance()->mTimeZoneId; | 2525 | QString tz = KPimGlobalPrefs::instance()->mTimeZoneId; |
2527 | emit save(); | 2526 | emit save(); |
2528 | emit saveStopTimer(); | 2527 | emit saveStopTimer(); |
2529 | mDialogManager->showOptionsDialog(); | 2528 | mDialogManager->showGlobalOptionsDialog(); |
2530 | if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) { | 2529 | if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) { |
2531 | emit saveStopTimer(); | 2530 | emit saveStopTimer(); |
2532 | 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!"), | 2531 | 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!"), |
2533 | i18n("Timezone settings"),i18n("Reload"))) { | 2532 | i18n("Timezone settings"),i18n("Reload"))) { |
2534 | qDebug("KO: TZ reload cancelled "); | 2533 | qDebug("KO: TZ reload cancelled "); |
2535 | return; | 2534 | return; |
@@ -2537,13 +2536,16 @@ void CalendarView::edit_options() | |||
2537 | qDebug("KO: Timezone change "); | 2536 | qDebug("KO: Timezone change "); |
2538 | openCalendar( MainWindow::defaultFileName() ); | 2537 | openCalendar( MainWindow::defaultFileName() ); |
2539 | setModified(true); | 2538 | setModified(true); |
2540 | } | 2539 | } |
2541 | else | 2540 | else |
2542 | qDebug("KO: No tz change "); | 2541 | qDebug("KO: No tz change "); |
2543 | 2542 | } | |
2543 | void CalendarView::edit_options() | ||
2544 | { | ||
2545 | mDialogManager->showOptionsDialog(); | ||
2544 | } | 2546 | } |
2545 | 2547 | ||
2546 | 2548 | ||
2547 | void CalendarView::slotSelectPickerDate( QDate d) | 2549 | void CalendarView::slotSelectPickerDate( QDate d) |
2548 | { | 2550 | { |
2549 | mDateFrame->hide(); | 2551 | mDateFrame->hide(); |