-rw-r--r-- | korganizer/calendarview.cpp | 16 | ||||
-rw-r--r-- | korganizer/calendarview.h | 2 |
2 files changed, 15 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 | |||
@@ -441,15 +441,18 @@ void CalendarView::init() | |||
441 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left); | 441 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left); |
442 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame); | 442 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame); |
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 |
454 | // FIXME | 457 | // FIXME |
455 | mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE, | 458 | mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE, |
@@ -466,13 +469,13 @@ void CalendarView::init() | |||
466 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) ); | 469 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) ); |
467 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mViewManager, SLOT( setDefaultCalendar(int)) ); | 470 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mViewManager, SLOT( setDefaultCalendar(int)) ); |
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); |
477 | leftFrameLayout->addWidget(mTodoList, 2 ); | 480 | leftFrameLayout->addWidget(mTodoList, 2 ); |
478 | 481 | ||
@@ -646,16 +649,20 @@ CalendarView::~CalendarView() | |||
646 | delete mDateFrame ; | 649 | delete mDateFrame ; |
647 | delete mEventViewerDialog; | 650 | delete mEventViewerDialog; |
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(); |
660 | //qDebug("VAL %d ",val ); | 667 | //qDebug("VAL %d ",val ); |
661 | int count = mNavigator->selectedDates().count(); | 668 | int count = mNavigator->selectedDates().count(); |
@@ -665,12 +672,13 @@ void CalendarView::scrollBarValue(int val ) | |||
665 | block = false; | 672 | block = false; |
666 | return; | 673 | return; |
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() |
675 | { | 683 | { |
676 | KConfig *config = KOGlobals::config(); | 684 | KConfig *config = KOGlobals::config(); |
@@ -2581,13 +2589,15 @@ void CalendarView::updateTodoViews() | |||
2581 | 2589 | ||
2582 | } | 2590 | } |
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 | } |
2592 | 2602 | ||
2593 | void CalendarView::clearAllViews() | 2603 | void CalendarView::clearAllViews() |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index c89bbf7..f7e5366 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -532,13 +532,15 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
532 | // returns KMsgBox::OKCandel() | 532 | // returns KMsgBox::OKCandel() |
533 | int msgItemDelete(const QString name); | 533 | int msgItemDelete(const QString name); |
534 | void showEventEditor(); | 534 | void showEventEditor(); |
535 | void showTodoEditor(); | 535 | void showTodoEditor(); |
536 | Todo *selectedTodo(); | 536 | Todo *selectedTodo(); |
537 | private: | 537 | private: |
538 | #ifdef DESKTOP_VERSION | ||
538 | QScrollBar * mDateScrollBar; | 539 | QScrollBar * mDateScrollBar; |
540 | #endif | ||
539 | QDateTime mNextAlarmDateTime; | 541 | QDateTime mNextAlarmDateTime; |
540 | bool mViewerCallerIsSearchDialog; | 542 | bool mViewerCallerIsSearchDialog; |
541 | bool mBlockShowDates; | 543 | bool mBlockShowDates; |
542 | KSyncManager* mSyncManager; | 544 | KSyncManager* mSyncManager; |
543 | AlarmDialog * mAlarmDialog; | 545 | AlarmDialog * mAlarmDialog; |
544 | QString mAlarmNotification; | 546 | QString mAlarmNotification; |