summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-07-03 18:49:19 (UTC)
committer zautrix <zautrix>2005-07-03 18:49:19 (UTC)
commitf9a1b1e8ac52218360731fae67993704c20f17fe (patch) (unidiff)
tree77da06abff6e8b12d2d6170909f77de213f0e172
parent58826b9705ceec6d21034ae166341509ca455481 (diff)
downloadkdepimpi-f9a1b1e8ac52218360731fae67993704c20f17fe.zip
kdepimpi-f9a1b1e8ac52218360731fae67993704c20f17fe.tar.gz
kdepimpi-f9a1b1e8ac52218360731fae67993704c20f17fe.tar.bz2
fixxii
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp44
1 files changed, 24 insertions, 20 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 1785b8a..7566c6f 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -675,29 +675,49 @@ void CalendarView::scrollBarValue(int val )
675 if ( block ) return; 675 if ( block ) return;
676 block = true; 676 block = true;
677 int count = mNavigator->selectedDates().count(); 677 int count = mNavigator->selectedDates().count();
678 int day = mNavigator->selectedDates().first().dayOfYear(); 678 int day = mNavigator->selectedDates().first().dayOfYear();
679 int stepdays = val; 679 int stepdays = val;
680 if ( mDateScrollBar->lineStep () <= count ) { 680 if ( mDateScrollBar->lineStep () <= count ) {
681 val = val/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep(); 681 //val = val/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep();
682 //qDebug("VAL %d ",val ); 682 //qDebug("VAL %d ",val );
683 stepdays = (val-day)/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep(); 683 stepdays = (val-day)/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep();
684 stepdays = day-1+stepdays; 684 stepdays = day+stepdays;
685 if ( stepdays < 0 ) stepdays = 0; 685 if ( stepdays < 0 ) stepdays = 0;
686 } 686 }
687 if ( stepdays == day -1 ) { 687 if ( stepdays == day ) {
688 block = false; 688 block = false;
689 return; 689 return;
690 } 690 }
691 int year = mNavigator->selectedDates().first().year(); 691 int year = mNavigator->selectedDates().first().year();
692 QDate d ( year,1,1 ); 692 QDate d ( year,1,1 );
693 mNavigator->selectDates( d.addDays( stepdays) , count ); 693 mNavigator->selectDates( d.addDays( stepdays-1) , count );
694 block = false; 694 block = false;
695#endif 695#endif
696 696
697} 697}
698void CalendarView::updateView(const QDate &start, const QDate &end)
699{
700#ifdef DESKTOP_VERSION
701 if ( ! mDateScrollBar->draggingSlider () ) {
702 int dof = start.dayOfYear();
703 //qDebug("dof %d day %d val %d ", dof, start.dayOfYear(),mDateScrollBar->value() );
704 if ( dof != mDateScrollBar->value() ) {
705 mDateScrollBar->blockSignals( true );
706 mDateScrollBar->setValue( start.dayOfYear());
707 mDateScrollBar->blockSignals( false );
708 }
709 }
710#endif
711 mTodoList->updateView();
712 mViewManager->updateView(start, end);
713 //mDateNavigator->updateView();
714}
715
716
717
698void CalendarView::checkFiles() 718void CalendarView::checkFiles()
699{ 719{
700 QString message; 720 QString message;
701 QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; 721 QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
702 KopiCalendarFile * cal = calendars.first(); 722 KopiCalendarFile * cal = calendars.first();
703 while ( cal ) { 723 while ( cal ) {
@@ -2630,28 +2650,12 @@ void CalendarView::updateTodoViews()
2630 mTodoList->updateView(); 2650 mTodoList->updateView();
2631 mViewManager->currentView()->updateView(); 2651 mViewManager->currentView()->updateView();
2632 2652
2633} 2653}
2634 2654
2635 2655
2636void CalendarView::updateView(const QDate &start, const QDate &end)
2637{
2638#ifdef DESKTOP_VERSION
2639 if ( ! mDateScrollBar->draggingSlider () ) {
2640 int dof = start.dayOfYear()-1;
2641 if ( dof != mDateScrollBar->value() ) {
2642 mDateScrollBar->blockSignals( true );
2643 mDateScrollBar->setValue( start.dayOfYear()-1);
2644 mDateScrollBar->blockSignals( false );
2645 }
2646 }
2647#endif
2648 mTodoList->updateView();
2649 mViewManager->updateView(start, end);
2650 //mDateNavigator->updateView();
2651}
2652 2656
2653void CalendarView::clearAllViews() 2657void CalendarView::clearAllViews()
2654{ 2658{
2655 mTodoList->clearList(); 2659 mTodoList->clearList();
2656 mViewManager->clearAllViews(); 2660 mViewManager->clearAllViews();
2657 SearchDialog * sd = mDialogManager->getSearchDialog(); 2661 SearchDialog * sd = mDialogManager->getSearchDialog();