-rw-r--r-- | korganizer/calendarview.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 776cdd3..623cf9d 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -443,11 +443,14 @@ void CalendarView::init() | |||
443 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); | 443 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); |
444 | } | 444 | } |
445 | mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); | 445 | mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); |
446 | //QBoxLayout * leftFrameLayout; | 446 | //QBoxLayout * leftFrameLayout; |
447 | mDateScrollBar = new QScrollBar ( 0, 364, 1,30, 200,QScrollBar::Horizontal, this ); | ||
448 | topLayout->addWidget( mMainFrame ); | 447 | topLayout->addWidget( mMainFrame ); |
449 | topLayout->addWidget( mDateScrollBar ); | 448 | #ifdef DESKTOP_VERSION |
449 | mDateScrollBar = new QScrollBar ( 0, 364, 1,30, 200,QScrollBar::Horizontal, this ); | ||
450 | topLayout->addWidget( mDateScrollBar ); | ||
451 | connect( mDateScrollBar, SIGNAL( valueChanged ( int ) ),this, SLOT( scrollBarValue( int )) ); | ||
452 | #endif | ||
450 | //mainBoxLayout->addWidget (mLeftFrame); | 453 | //mainBoxLayout->addWidget (mLeftFrame); |
451 | mDateNavigator = new DateNavigatorContainer( mLeftFrame, | 454 | mDateNavigator = new DateNavigatorContainer( mLeftFrame, |
452 | "CalendarView::DateNavigator" ); | 455 | "CalendarView::DateNavigator" ); |
453 | #if 0 | 456 | #if 0 |
@@ -468,9 +471,9 @@ void CalendarView::init() | |||
468 | connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) ); | 471 | connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) ); |
469 | connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) ); | 472 | connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) ); |
470 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) ); | 473 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) ); |
471 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) ); | 474 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) ); |
472 | connect( mDateScrollBar, SIGNAL( valueChanged ( int ) ),this, SLOT( scrollBarValue( int )) ); | 475 | |
473 | mTodoList->setNavigator( mNavigator ); | 476 | mTodoList->setNavigator( mNavigator ); |
474 | #if 0 | 477 | #if 0 |
475 | if ( QApplication::desktop()->width() < 480 ) { | 478 | if ( QApplication::desktop()->width() < 480 ) { |
476 | leftFrameLayout->addWidget(mFilterView); | 479 | leftFrameLayout->addWidget(mFilterView); |
@@ -648,12 +651,16 @@ CalendarView::~CalendarView() | |||
648 | //kdDebug() << "~CalendarView() done" << endl; | 651 | //kdDebug() << "~CalendarView() done" << endl; |
649 | } | 652 | } |
650 | void CalendarView::setScrollBarStep(int val ) | 653 | void CalendarView::setScrollBarStep(int val ) |
651 | { | 654 | { |
655 | #ifdef DESKTOP_VERSION | ||
652 | mDateScrollBar->setLineStep ( val ); | 656 | mDateScrollBar->setLineStep ( val ); |
657 | #endif | ||
653 | } | 658 | } |
654 | void CalendarView::scrollBarValue(int val ) | 659 | void CalendarView::scrollBarValue(int val ) |
655 | { | 660 | { |
661 | #ifdef DESKTOP_VERSION | ||
662 | if ( QApplication::desktop()->width() < 800 ) return; | ||
656 | static bool block = false; | 663 | static bool block = false; |
657 | if ( block ) return; | 664 | if ( block ) return; |
658 | block = true; | 665 | block = true; |
659 | val = val/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep(); | 666 | val = val/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep(); |
@@ -667,8 +674,9 @@ void CalendarView::scrollBarValue(int val ) | |||
667 | } | 674 | } |
668 | QDate d ( year,1,1 ); | 675 | QDate d ( year,1,1 ); |
669 | mNavigator->selectDates( d.addDays( val ), count ); | 676 | mNavigator->selectDates( d.addDays( val ), count ); |
670 | block = false; | 677 | block = false; |
678 | #endif | ||
671 | 679 | ||
672 | } | 680 | } |
673 | 681 | ||
674 | void CalendarView::checkAlarms() | 682 | void CalendarView::checkAlarms() |
@@ -2583,9 +2591,11 @@ void CalendarView::updateTodoViews() | |||
2583 | 2591 | ||
2584 | 2592 | ||
2585 | void CalendarView::updateView(const QDate &start, const QDate &end) | 2593 | void CalendarView::updateView(const QDate &start, const QDate &end) |
2586 | { | 2594 | { |
2595 | #ifdef DESKTOP_VERSION | ||
2587 | mDateScrollBar->setValue( start.dayOfYear()-1); | 2596 | mDateScrollBar->setValue( start.dayOfYear()-1); |
2597 | #endif | ||
2588 | mTodoList->updateView(); | 2598 | mTodoList->updateView(); |
2589 | mViewManager->updateView(start, end); | 2599 | mViewManager->updateView(start, end); |
2590 | //mDateNavigator->updateView(); | 2600 | //mDateNavigator->updateView(); |
2591 | } | 2601 | } |