-rw-r--r-- | korganizer/calendarview.cpp | 60 |
1 files changed, 35 insertions, 25 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 697093e..776cdd3 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -368,10 +368,9 @@ void CalendarView::init() | |||
368 | setFocusPolicy ( NoFocus ); | 368 | setFocusPolicy ( NoFocus ); |
369 | mViewerCallerIsSearchDialog = false; | 369 | mViewerCallerIsSearchDialog = false; |
370 | mBlockShowDates = false; | 370 | mBlockShowDates = false; |
371 | beamDialog = new KOBeamPrefs(); | 371 | |
372 | mDatePickerMode = 0; | 372 | mDatePickerMode = 0; |
373 | mCurrentSyncDevice = ""; | 373 | mCurrentSyncDevice = ""; |
374 | writeLocale(); | ||
375 | mViewManager = new KOViewManager( this ); | 374 | mViewManager = new KOViewManager( this ); |
376 | mDialogManager = new KODialogManager( this ); | 375 | mDialogManager = new KODialogManager( this ); |
377 | mEventViewerDialog = 0; | 376 | mEventViewerDialog = 0; |
@@ -445,7 +444,9 @@ void CalendarView::init() | |||
445 | } | 444 | } |
446 | mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); | 445 | mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); |
447 | //QBoxLayout * leftFrameLayout; | 446 | //QBoxLayout * leftFrameLayout; |
447 | mDateScrollBar = new QScrollBar ( 0, 364, 1,30, 200,QScrollBar::Horizontal, this ); | ||
448 | topLayout->addWidget( mMainFrame ); | 448 | topLayout->addWidget( mMainFrame ); |
449 | topLayout->addWidget( mDateScrollBar ); | ||
449 | //mainBoxLayout->addWidget (mLeftFrame); | 450 | //mainBoxLayout->addWidget (mLeftFrame); |
450 | mDateNavigator = new DateNavigatorContainer( mLeftFrame, | 451 | mDateNavigator = new DateNavigatorContainer( mLeftFrame, |
451 | "CalendarView::DateNavigator" ); | 452 | "CalendarView::DateNavigator" ); |
@@ -468,6 +469,7 @@ void CalendarView::init() | |||
468 | connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) ); | 469 | connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) ); |
469 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) ); | 470 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) ); |
470 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) ); | 471 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) ); |
472 | connect( mDateScrollBar, SIGNAL( valueChanged ( int ) ),this, SLOT( scrollBarValue( int )) ); | ||
471 | mTodoList->setNavigator( mNavigator ); | 473 | mTodoList->setNavigator( mNavigator ); |
472 | #if 0 | 474 | #if 0 |
473 | if ( QApplication::desktop()->width() < 480 ) { | 475 | if ( QApplication::desktop()->width() < 480 ) { |
@@ -642,10 +644,33 @@ CalendarView::~CalendarView() | |||
642 | delete mViewManager; | 644 | delete mViewManager; |
643 | delete mStorage; | 645 | delete mStorage; |
644 | delete mDateFrame ; | 646 | delete mDateFrame ; |
645 | delete beamDialog; | ||
646 | delete mEventViewerDialog; | 647 | delete mEventViewerDialog; |
647 | //kdDebug() << "~CalendarView() done" << endl; | 648 | //kdDebug() << "~CalendarView() done" << endl; |
648 | } | 649 | } |
650 | void CalendarView::setScrollBarStep(int val ) | ||
651 | { | ||
652 | mDateScrollBar->setLineStep ( val ); | ||
653 | } | ||
654 | void CalendarView::scrollBarValue(int val ) | ||
655 | { | ||
656 | static bool block = false; | ||
657 | if ( block ) return; | ||
658 | block = true; | ||
659 | val = val/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep(); | ||
660 | //qDebug("VAL %d ",val ); | ||
661 | int count = mNavigator->selectedDates().count(); | ||
662 | int year = mNavigator->selectedDates().first().year(); | ||
663 | int day = mNavigator->selectedDates().first().dayOfYear(); | ||
664 | if ( val == day -1 ) { | ||
665 | block = false; | ||
666 | return; | ||
667 | } | ||
668 | QDate d ( year,1,1 ); | ||
669 | mNavigator->selectDates( d.addDays( val ), count ); | ||
670 | block = false; | ||
671 | |||
672 | } | ||
673 | |||
649 | void CalendarView::checkAlarms() | 674 | void CalendarView::checkAlarms() |
650 | { | 675 | { |
651 | KConfig *config = KOGlobals::config(); | 676 | KConfig *config = KOGlobals::config(); |
@@ -2467,27 +2492,9 @@ void CalendarView::goPreviousMonth() | |||
2467 | { | 2492 | { |
2468 | mNavigator->selectPreviousMonth(); | 2493 | mNavigator->selectPreviousMonth(); |
2469 | } | 2494 | } |
2470 | void CalendarView::writeLocale() | 2495 | |
2471 | { | ||
2472 | //KPimGlobalPrefs::instance()->setGlobalConfig(); | ||
2473 | #if 0 | ||
2474 | KGlobal::locale()->setHore24Format( !KOPrefs::instance()->mPreferredTime ); | ||
2475 | KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday ); | ||
2476 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)KOPrefs::instance()->mPreferredDate ); | ||
2477 | KGlobal::locale()->setLanguage( KOPrefs::instance()->mPreferredLanguage ); | ||
2478 | QString dummy = KOPrefs::instance()->mUserDateFormatLong; | ||
2479 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); | ||
2480 | dummy = KOPrefs::instance()->mUserDateFormatShort; | ||
2481 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); | ||
2482 | KGlobal::locale()->setDaylightSaving( KOPrefs::instance()->mUseDaylightsaving, | ||
2483 | KOPrefs::instance()->mDaylightsavingStart, | ||
2484 | KOPrefs::instance()->mDaylightsavingEnd ); | ||
2485 | KGlobal::locale()->setTimezone( KPimGlobalPrefs::instance()->mTimeZoneId ); | ||
2486 | #endif | ||
2487 | } | ||
2488 | void CalendarView::updateConfig() | 2496 | void CalendarView::updateConfig() |
2489 | { | 2497 | { |
2490 | writeLocale(); | ||
2491 | if ( KOPrefs::instance()->mUseAppColors ) | 2498 | if ( KOPrefs::instance()->mUseAppColors ) |
2492 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); | 2499 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); |
2493 | emit configChanged(); | 2500 | emit configChanged(); |
@@ -2577,6 +2584,7 @@ void CalendarView::updateTodoViews() | |||
2577 | 2584 | ||
2578 | void CalendarView::updateView(const QDate &start, const QDate &end) | 2585 | void CalendarView::updateView(const QDate &start, const QDate &end) |
2579 | { | 2586 | { |
2587 | mDateScrollBar->setValue( start.dayOfYear()-1); | ||
2580 | mTodoList->updateView(); | 2588 | mTodoList->updateView(); |
2581 | mViewManager->updateView(start, end); | 2589 | mViewManager->updateView(start, end); |
2582 | //mDateNavigator->updateView(); | 2590 | //mDateNavigator->updateView(); |
@@ -2844,7 +2852,9 @@ void CalendarView::beamFilteredCalendar() | |||
2844 | } | 2852 | } |
2845 | void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel ) | 2853 | void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel ) |
2846 | { | 2854 | { |
2847 | if ( beamDialog->exec () == QDialog::Rejected ) | 2855 | |
2856 | KOBeamPrefs beamDialog; | ||
2857 | if ( beamDialog.exec () == QDialog::Rejected ) | ||
2848 | return; | 2858 | return; |
2849 | #ifdef DESKTOP_VERSION | 2859 | #ifdef DESKTOP_VERSION |
2850 | QString fn = locateLocal( "tmp", "kopibeamfile" ); | 2860 | QString fn = locateLocal( "tmp", "kopibeamfile" ); |
@@ -2856,7 +2866,7 @@ void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel ) | |||
2856 | if ( createbup ) { | 2866 | if ( createbup ) { |
2857 | QString description = "\n"; | 2867 | QString description = "\n"; |
2858 | CalendarLocal* cal = new CalendarLocal(); | 2868 | CalendarLocal* cal = new CalendarLocal(); |
2859 | if ( beamDialog->beamLocal() ) | 2869 | if ( beamDialog.beamLocal() ) |
2860 | cal->setLocalTime(); | 2870 | cal->setLocalTime(); |
2861 | else | 2871 | else |
2862 | cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); | 2872 | cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
@@ -2880,7 +2890,7 @@ void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel ) | |||
2880 | cal->addIncidence( in ); | 2890 | cal->addIncidence( in ); |
2881 | incidence = delSel.next(); | 2891 | incidence = delSel.next(); |
2882 | } | 2892 | } |
2883 | if ( beamDialog->beamVcal() ) { | 2893 | if ( beamDialog.beamVcal() ) { |
2884 | fn += ".vcs"; | 2894 | fn += ".vcs"; |
2885 | FileStorage storage( cal, fn, new VCalFormat ); | 2895 | FileStorage storage( cal, fn, new VCalFormat ); |
2886 | storage.save(); | 2896 | storage.save(); |