author | zautrix <zautrix> | 2005-06-29 20:23:04 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-29 20:23:04 (UTC) |
commit | 8954bae7bb5afc9706e37e808e9c1e237399f214 (patch) (unidiff) | |
tree | 18932b26b38e319cc4c568f4624678fa50531c37 /korganizer | |
parent | 77aa480c9891a90c9b492618ebfd2b20f2d0727a (diff) | |
download | kdepimpi-8954bae7bb5afc9706e37e808e9c1e237399f214.zip kdepimpi-8954bae7bb5afc9706e37e808e9c1e237399f214.tar.gz kdepimpi-8954bae7bb5afc9706e37e808e9c1e237399f214.tar.bz2 |
fixxx
-rw-r--r-- | korganizer/calendarview.cpp | 60 | ||||
-rw-r--r-- | korganizer/calendarview.h | 8 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 10 |
3 files changed, 50 insertions, 28 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 697093e..776cdd3 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -365,16 +365,15 @@ CalendarView::CalendarView( Calendar *calendar, | |||
365 | void CalendarView::init() | 365 | void CalendarView::init() |
366 | { | 366 | { |
367 | mNextAlarmDateTime = QDateTime::currentDateTime(); | 367 | mNextAlarmDateTime = QDateTime::currentDateTime(); |
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; |
378 | mModified = false; | 377 | mModified = false; |
379 | mReadOnly = false; | 378 | mReadOnly = false; |
380 | mSelectedIncidence = 0; | 379 | mSelectedIncidence = 0; |
@@ -442,13 +441,15 @@ void CalendarView::init() | |||
442 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left); | 441 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left); |
443 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame); | 442 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame); |
444 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); | 443 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); |
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" ); |
452 | #if 0 | 453 | #if 0 |
453 | // FIXME | 454 | // FIXME |
454 | mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE, | 455 | mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE, |
@@ -465,12 +466,13 @@ void CalendarView::init() | |||
465 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) ); | 466 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) ); |
466 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mViewManager, SLOT( setDefaultCalendar(int)) ); | 467 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mViewManager, SLOT( setDefaultCalendar(int)) ); |
467 | connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) ); | 468 | connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) ); |
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 ) { |
474 | leftFrameLayout->addWidget(mFilterView); | 476 | leftFrameLayout->addWidget(mFilterView); |
475 | leftFrameLayout->addWidget(mTodoList, 2 ); | 477 | leftFrameLayout->addWidget(mTodoList, 2 ); |
476 | 478 | ||
@@ -639,16 +641,39 @@ CalendarView::~CalendarView() | |||
639 | // kdDebug() << "~CalendarView()" << endl; | 641 | // kdDebug() << "~CalendarView()" << endl; |
640 | //qDebug("CalendarView::~CalendarView() "); | 642 | //qDebug("CalendarView::~CalendarView() "); |
641 | delete mDialogManager; | 643 | delete mDialogManager; |
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(); |
652 | config->setGroup( "AppRun" ); | 677 | config->setGroup( "AppRun" ); |
653 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); | 678 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); |
654 | int daysto = dt.daysTo( QDate::currentDate() ); | 679 | int daysto = dt.daysTo( QDate::currentDate() ); |
@@ -2464,33 +2489,15 @@ void CalendarView::goNextMonth() | |||
2464 | } | 2489 | } |
2465 | 2490 | ||
2466 | void CalendarView::goPreviousMonth() | 2491 | 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(); |
2494 | mTodoList->updateConfig(); | 2501 | mTodoList->updateConfig(); |
2495 | // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont); | 2502 | // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont); |
2496 | mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); | 2503 | mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
@@ -2574,12 +2581,13 @@ void CalendarView::updateTodoViews() | |||
2574 | 2581 | ||
2575 | } | 2582 | } |
2576 | 2583 | ||
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(); |
2583 | } | 2591 | } |
2584 | 2592 | ||
2585 | void CalendarView::clearAllViews() | 2593 | void CalendarView::clearAllViews() |
@@ -2841,25 +2849,27 @@ void CalendarView::beamFilteredCalendar() | |||
2841 | QPtrList<Incidence> delSel = mCalendar->incidences(); | 2849 | QPtrList<Incidence> delSel = mCalendar->incidences(); |
2842 | //qDebug("beamFilteredCalendar() "); | 2850 | //qDebug("beamFilteredCalendar() "); |
2843 | beamIncidenceList( delSel ); | 2851 | beamIncidenceList( delSel ); |
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" ); |
2851 | #else | 2861 | #else |
2852 | QString fn = "/tmp/kopibeamfile"; | 2862 | QString fn = "/tmp/kopibeamfile"; |
2853 | #endif | 2863 | #endif |
2854 | QString mes; | 2864 | QString mes; |
2855 | bool createbup = true; | 2865 | bool createbup = true; |
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); |
2863 | Incidence *incidence = delSel.first(); | 2873 | Incidence *incidence = delSel.first(); |
2864 | bool addText = false; | 2874 | bool addText = false; |
2865 | if ( delSel.count() < 10 ) | 2875 | if ( delSel.count() < 10 ) |
@@ -2877,13 +2887,13 @@ void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel ) | |||
2877 | } | 2887 | } |
2878 | if ( addText ) | 2888 | if ( addText ) |
2879 | description += in->summary() + "\n"; | 2889 | description += in->summary() + "\n"; |
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(); |
2887 | } else { | 2897 | } else { |
2888 | fn += ".ics"; | 2898 | fn += ".ics"; |
2889 | FileStorage storage( cal, fn, new ICalFormat( ) ); | 2899 | FileStorage storage( cal, fn, new ICalFormat( ) ); |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index be18e8f..c89bbf7 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -27,12 +27,13 @@ | |||
27 | #include <qframe.h> | 27 | #include <qframe.h> |
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qwidget.h> | 29 | #include <qwidget.h> |
30 | #include <qptrlist.h> | 30 | #include <qptrlist.h> |
31 | #include <qvbox.h> | 31 | #include <qvbox.h> |
32 | #include <qmap.h> | 32 | #include <qmap.h> |
33 | #include <qscrollbar.h> | ||
33 | #ifndef DESKTOP_VERSION | 34 | #ifndef DESKTOP_VERSION |
34 | #include <qtopia/ir.h> | 35 | #include <qtopia/ir.h> |
35 | #else | 36 | #else |
36 | #define Ir char | 37 | #define Ir char |
37 | #endif | 38 | #endif |
38 | #include <libkcal/calendar.h> | 39 | #include <libkcal/calendar.h> |
@@ -489,12 +490,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
489 | void setSyncDevice( QString ); | 490 | void setSyncDevice( QString ); |
490 | void setSyncName( QString ); | 491 | void setSyncName( QString ); |
491 | void showDay( QDate ); | 492 | void showDay( QDate ); |
492 | void undo_delete(); | 493 | void undo_delete(); |
493 | protected slots: | 494 | protected slots: |
494 | void resetFocus(); | 495 | void resetFocus(); |
496 | void scrollBarValue(int); | ||
495 | void slotViewerClosed(); | 497 | void slotViewerClosed(); |
496 | void timerAlarm(); | 498 | void timerAlarm(); |
497 | void suspendAlarm(); | 499 | void suspendAlarm(); |
498 | void beamDone( Ir *ir ); | 500 | void beamDone( Ir *ir ); |
499 | /** Select a view or adapt the current view to display the specified dates. */ | 501 | /** Select a view or adapt the current view to display the specified dates. */ |
500 | void showDates( const KCal::DateList & ); | 502 | void showDates( const KCal::DateList & ); |
@@ -519,23 +521,24 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
519 | */ | 521 | */ |
520 | void adaptNavigationUnits(); | 522 | void adaptNavigationUnits(); |
521 | bool synchronizeCalendar( Calendar* local, Calendar* remote, int mode ); | 523 | bool synchronizeCalendar( Calendar* local, Calendar* remote, int mode ); |
522 | int takeEvent( Incidence* local, Incidence* remote, int mode, bool full = false ); | 524 | int takeEvent( Incidence* local, Incidence* remote, int mode, bool full = false ); |
523 | //Attendee* getYourAttendee(Event *event); | 525 | //Attendee* getYourAttendee(Event *event); |
524 | void setBlockShowDates( bool b ) { mBlockShowDates = b ;} | 526 | void setBlockShowDates( bool b ) { mBlockShowDates = b ;} |
527 | void setScrollBarStep(int val ); | ||
528 | |||
525 | protected: | 529 | protected: |
526 | void schedule(Scheduler::Method, Incidence *incidence = 0); | 530 | void schedule(Scheduler::Method, Incidence *incidence = 0); |
527 | 531 | ||
528 | // returns KMsgBox::OKCandel() | 532 | // returns KMsgBox::OKCandel() |
529 | int msgItemDelete(const QString name); | 533 | int msgItemDelete(const QString name); |
530 | void showEventEditor(); | 534 | void showEventEditor(); |
531 | void showTodoEditor(); | 535 | void showTodoEditor(); |
532 | void writeLocale(); | ||
533 | Todo *selectedTodo(); | 536 | Todo *selectedTodo(); |
534 | |||
535 | private: | 537 | private: |
538 | QScrollBar * mDateScrollBar; | ||
536 | QDateTime mNextAlarmDateTime; | 539 | QDateTime mNextAlarmDateTime; |
537 | bool mViewerCallerIsSearchDialog; | 540 | bool mViewerCallerIsSearchDialog; |
538 | bool mBlockShowDates; | 541 | bool mBlockShowDates; |
539 | KSyncManager* mSyncManager; | 542 | KSyncManager* mSyncManager; |
540 | AlarmDialog * mAlarmDialog; | 543 | AlarmDialog * mAlarmDialog; |
541 | QString mAlarmNotification; | 544 | QString mAlarmNotification; |
@@ -550,13 +553,12 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
550 | QDateTime loadedFileVersion; | 553 | QDateTime loadedFileVersion; |
551 | void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ); | 554 | void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ); |
552 | void checkExternalId( Incidence * inc ); | 555 | void checkExternalId( Incidence * inc ); |
553 | int mGlobalSyncMode; | 556 | int mGlobalSyncMode; |
554 | QString mCurrentSyncDevice; | 557 | QString mCurrentSyncDevice; |
555 | QString mCurrentSyncName; | 558 | QString mCurrentSyncName; |
556 | KOBeamPrefs* beamDialog; | ||
557 | void init(); | 559 | void init(); |
558 | int mDatePickerMode; | 560 | int mDatePickerMode; |
559 | bool mFlagEditDescription; | 561 | bool mFlagEditDescription; |
560 | QDateTime mLastCalendarSync; | 562 | QDateTime mLastCalendarSync; |
561 | void createPrinter(); | 563 | void createPrinter(); |
562 | 564 | ||
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 7b307f7..bd191d8 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -465,12 +465,13 @@ void KOViewManager::showListView() | |||
465 | mMainView->setBlockShowDates( false ); | 465 | mMainView->setBlockShowDates( false ); |
466 | } | 466 | } |
467 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; | 467 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; |
468 | showView(mListView, KOPrefs::instance()->mFullViewTodo); | 468 | showView(mListView, KOPrefs::instance()->mFullViewTodo); |
469 | //mFlagShowNextxDays = temp; | 469 | //mFlagShowNextxDays = temp; |
470 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; | 470 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; |
471 | mMainView->setScrollBarStep( 7 ); | ||
471 | } | 472 | } |
472 | 473 | ||
473 | void KOViewManager::showAgendaView( bool fullScreen ) | 474 | void KOViewManager::showAgendaView( bool fullScreen ) |
474 | { | 475 | { |
475 | 476 | ||
476 | mMainView->dialogManager()->hideSearchDialog(); | 477 | mMainView->dialogManager()->hideSearchDialog(); |
@@ -532,12 +533,13 @@ void KOViewManager::showAgendaView( bool fullScreen ) | |||
532 | mAgendaView->updateConfig(); | 533 | mAgendaView->updateConfig(); |
533 | } | 534 | } |
534 | 535 | ||
535 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW; | 536 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW; |
536 | showView( mAgendaView, full); | 537 | showView( mAgendaView, full); |
537 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW; | 538 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW; |
539 | mMainView->setScrollBarStep( 1 ); | ||
538 | } | 540 | } |
539 | 541 | ||
540 | void KOViewManager::showDayView() | 542 | void KOViewManager::showDayView() |
541 | { | 543 | { |
542 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | 544 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); |
543 | mFlagShowNextxDays = false; | 545 | mFlagShowNextxDays = false; |
@@ -548,12 +550,13 @@ void KOViewManager::showDayView() | |||
548 | showAgendaView(); | 550 | showAgendaView(); |
549 | qApp->processEvents(); | 551 | qApp->processEvents(); |
550 | globalFlagBlockAgenda = 2; | 552 | globalFlagBlockAgenda = 2; |
551 | globalFlagBlockLabel = 0; | 553 | globalFlagBlockLabel = 0; |
552 | mMainView->dateNavigator()->selectDates( 1 ); | 554 | mMainView->dateNavigator()->selectDates( 1 ); |
553 | mCurrentAgendaView = 1 ; | 555 | mCurrentAgendaView = 1 ; |
556 | mMainView->setScrollBarStep( 1 ); | ||
554 | 557 | ||
555 | } | 558 | } |
556 | 559 | ||
557 | void KOViewManager::showWorkWeekView() | 560 | void KOViewManager::showWorkWeekView() |
558 | { | 561 | { |
559 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | 562 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); |
@@ -565,12 +568,13 @@ void KOViewManager::showWorkWeekView() | |||
565 | showAgendaView(); | 568 | showAgendaView(); |
566 | qApp->processEvents(); | 569 | qApp->processEvents(); |
567 | globalFlagBlockAgenda = 2; | 570 | globalFlagBlockAgenda = 2; |
568 | globalFlagBlockLabel = 0; | 571 | globalFlagBlockLabel = 0; |
569 | mMainView->dateNavigator()->selectWorkWeek(); | 572 | mMainView->dateNavigator()->selectWorkWeek(); |
570 | mCurrentAgendaView = 5 ; | 573 | mCurrentAgendaView = 5 ; |
574 | mMainView->setScrollBarStep( 1 ); | ||
571 | 575 | ||
572 | } | 576 | } |
573 | 577 | ||
574 | void KOViewManager::showWeekView() | 578 | void KOViewManager::showWeekView() |
575 | { | 579 | { |
576 | 580 | ||
@@ -583,12 +587,13 @@ void KOViewManager::showWeekView() | |||
583 | showAgendaView(); | 587 | showAgendaView(); |
584 | qApp->processEvents(); | 588 | qApp->processEvents(); |
585 | globalFlagBlockAgenda = 2; | 589 | globalFlagBlockAgenda = 2; |
586 | globalFlagBlockLabel = 0; | 590 | globalFlagBlockLabel = 0; |
587 | mMainView->dateNavigator()->selectWeek(); | 591 | mMainView->dateNavigator()->selectWeek(); |
588 | mCurrentAgendaView = 7 ; | 592 | mCurrentAgendaView = 7 ; |
593 | mMainView->setScrollBarStep( 1 ); | ||
589 | } | 594 | } |
590 | 595 | ||
591 | void KOViewManager::showNextXView() | 596 | void KOViewManager::showNextXView() |
592 | { | 597 | { |
593 | 598 | ||
594 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW; | 599 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW; |
@@ -599,12 +604,13 @@ void KOViewManager::showNextXView() | |||
599 | globalFlagBlockAgenda = 2; | 604 | globalFlagBlockAgenda = 2; |
600 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), | 605 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), |
601 | KOPrefs::instance()->mNextXDays ); | 606 | KOPrefs::instance()->mNextXDays ); |
602 | mFlagShowNextxDays = true; | 607 | mFlagShowNextxDays = true; |
603 | mCurrentAgendaView = 3 ; | 608 | mCurrentAgendaView = 3 ; |
604 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW; | 609 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW; |
610 | mMainView->setScrollBarStep( KOPrefs::instance()->mNextXDays ); | ||
605 | } | 611 | } |
606 | bool KOViewManager::showsNextDays() | 612 | bool KOViewManager::showsNextDays() |
607 | { | 613 | { |
608 | return mFlagShowNextxDays; | 614 | return mFlagShowNextxDays; |
609 | } | 615 | } |
610 | void KOViewManager::createMonthView() | 616 | void KOViewManager::createMonthView() |
@@ -692,12 +698,13 @@ void KOViewManager::showMonthViewWeek() | |||
692 | full = true; | 698 | full = true; |
693 | } | 699 | } |
694 | mMainView->dateNavigator()->selectWeek(); | 700 | mMainView->dateNavigator()->selectWeek(); |
695 | showView(mMonthView, full ); | 701 | showView(mMonthView, full ); |
696 | mMonthView->setKeyBFocus(); | 702 | mMonthView->setKeyBFocus(); |
697 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_ML_VIEW ; | 703 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_ML_VIEW ; |
704 | mMainView->setScrollBarStep( 7 ); | ||
698 | } | 705 | } |
699 | 706 | ||
700 | void KOViewManager::showMonth( const QDate & date ) | 707 | void KOViewManager::showMonth( const QDate & date ) |
701 | { | 708 | { |
702 | mMainView->dateNavigator()->blockSignals( true ); | 709 | mMainView->dateNavigator()->blockSignals( true ); |
703 | mMainView->dateNavigator()->selectDate( date ); | 710 | mMainView->dateNavigator()->selectDate( date ); |
@@ -724,12 +731,13 @@ void KOViewManager::showMonthView() | |||
724 | } | 731 | } |
725 | mMainView->dateNavigator()->selectMonth(); | 732 | mMainView->dateNavigator()->selectMonth(); |
726 | 733 | ||
727 | showView(mMonthView, full ); | 734 | showView(mMonthView, full ); |
728 | mMonthView->setKeyBFocus(); | 735 | mMonthView->setKeyBFocus(); |
729 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_M_VIEW ; | 736 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_M_VIEW ; |
737 | mMainView->setScrollBarStep( 7 ); | ||
730 | 738 | ||
731 | } | 739 | } |
732 | 740 | ||
733 | void KOViewManager::showTodoView() | 741 | void KOViewManager::showTodoView() |
734 | { | 742 | { |
735 | //mFlagShowNextxDays = false; | 743 | //mFlagShowNextxDays = false; |
@@ -781,12 +789,13 @@ void KOViewManager::showTodoView() | |||
781 | } | 789 | } |
782 | 790 | ||
783 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_T_VIEW ; | 791 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_T_VIEW ; |
784 | globalFlagBlockAgenda = 1; | 792 | globalFlagBlockAgenda = 1; |
785 | showView( mTodoView, true ); | 793 | showView( mTodoView, true ); |
786 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_T_VIEW ; | 794 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_T_VIEW ; |
795 | mMainView->setScrollBarStep( 7 ); | ||
787 | 796 | ||
788 | } | 797 | } |
789 | 798 | ||
790 | void KOViewManager::showJournalView() | 799 | void KOViewManager::showJournalView() |
791 | { | 800 | { |
792 | //mFlagShowNextxDays = false; | 801 | //mFlagShowNextxDays = false; |
@@ -800,12 +809,13 @@ void KOViewManager::showJournalView() | |||
800 | } | 809 | } |
801 | 810 | ||
802 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW ; | 811 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW ; |
803 | showView(mJournalView); | 812 | showView(mJournalView); |
804 | mMainView->dateNavigator()->selectDates( 1 ); | 813 | mMainView->dateNavigator()->selectDates( 1 ); |
805 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW ; | 814 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW ; |
815 | mMainView->setScrollBarStep( 1 ); | ||
806 | } | 816 | } |
807 | 817 | ||
808 | void KOViewManager::showTimeSpanView() | 818 | void KOViewManager::showTimeSpanView() |
809 | { | 819 | { |
810 | //mFlagShowNextxDays = false; | 820 | //mFlagShowNextxDays = false; |
811 | if (!mTimeSpanView) { | 821 | if (!mTimeSpanView) { |