-rw-r--r-- | korganizer/calendarview.cpp | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 77de94f..0fbaa9a 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -285,9 +285,6 @@ void CalendarView::init() | |||
285 | QWidget *rightBox = new QWidget( mPanner ); | 285 | QWidget *rightBox = new QWidget( mPanner ); |
286 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 286 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); |
287 | 287 | ||
288 | mNavigatorBar = new NavigatorBar( QDate::currentDate(), rightBox, "useBigPixmaps" ); | ||
289 | rightLayout->addWidget( mNavigatorBar ); | ||
290 | |||
291 | mRightFrame = new QWidgetStack( rightBox ); | 288 | mRightFrame = new QWidgetStack( rightBox ); |
292 | rightLayout->addWidget( mRightFrame, 1 ); | 289 | rightLayout->addWidget( mRightFrame, 1 ); |
293 | 290 | ||
@@ -327,9 +324,7 @@ void CalendarView::init() | |||
327 | QWidget *rightBox = new QWidget( mainBox ); | 324 | QWidget *rightBox = new QWidget( mainBox ); |
328 | mainBoxLayout->addWidget ( rightBox, 10 ); | 325 | mainBoxLayout->addWidget ( rightBox, 10 ); |
329 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 326 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); |
330 | mNavigatorBar = new NavigatorBar( QDate::currentDate(), rightBox, "useBigPixmaps" ); | ||
331 | mRightFrame = new QWidgetStack( rightBox ); | 327 | mRightFrame = new QWidgetStack( rightBox ); |
332 | rightLayout->addWidget( mNavigatorBar ); | ||
333 | rightLayout->addWidget( mRightFrame, 10 ); | 328 | rightLayout->addWidget( mRightFrame, 10 ); |
334 | 329 | ||
335 | mLeftFrame = leftFrame; | 330 | mLeftFrame = leftFrame; |
@@ -350,19 +345,7 @@ void CalendarView::init() | |||
350 | 345 | ||
351 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 346 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
352 | mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); | 347 | mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); |
353 | connect( mNavigatorBar, SIGNAL( goPrevYear() ), | 348 | |
354 | mNavigator, SLOT( selectPreviousYear() ) ); | ||
355 | connect( mNavigatorBar, SIGNAL( goNextYear() ), | ||
356 | mNavigator, SLOT( selectNextYear() ) ); | ||
357 | connect( mNavigatorBar, SIGNAL( goPrevMonth() ), | ||
358 | mNavigator, SLOT( selectPreviousMonth() ) ); | ||
359 | connect( mNavigatorBar, SIGNAL( goNextMonth() ), | ||
360 | mNavigator, SLOT( selectNextMonth() ) ); | ||
361 | connect( mNavigatorBar, SIGNAL( selectWeek( int ) ), | ||
362 | mNavigator, SLOT( selectWeek( int ) ) ); | ||
363 | |||
364 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | ||
365 | mNavigatorBar, SLOT( selectDates( const KCal::DateList & ) ) ); | ||
366 | 349 | ||
367 | connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), | 350 | connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), |
368 | mNavigator, SLOT( selectWeek( const QDate & ) ) ); | 351 | mNavigator, SLOT( selectWeek( const QDate & ) ) ); |
@@ -382,8 +365,6 @@ void CalendarView::init() | |||
382 | mNavigator, SLOT( selectNext() ) ); | 365 | mNavigator, SLOT( selectNext() ) ); |
383 | connect( mDateNavigator, SIGNAL( monthSelected ( int ) ), | 366 | connect( mDateNavigator, SIGNAL( monthSelected ( int ) ), |
384 | mNavigator, SLOT( slotMonthSelect( int ) ) ); | 367 | mNavigator, SLOT( slotMonthSelect( int ) ) ); |
385 | connect( mNavigatorBar, SIGNAL( monthSelected ( int ) ), | ||
386 | mNavigator, SLOT( slotMonthSelect( int ) ) ); | ||
387 | 368 | ||
388 | connect( mDateNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 369 | connect( mDateNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
389 | mNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); | 370 | mNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); |
@@ -3868,18 +3849,6 @@ void CalendarView::slotCalendarChanged() | |||
3868 | ; | 3849 | ; |
3869 | } | 3850 | } |
3870 | 3851 | ||
3871 | NavigatorBar *CalendarView::navigatorBar() | ||
3872 | { | ||
3873 | return mNavigatorBar; | ||
3874 | } | ||
3875 | void CalendarView::showNavigatorBar( bool b) | ||
3876 | { | ||
3877 | if ( b ) mNavigatorBar->show(); | ||
3878 | else mNavigatorBar->hide(); | ||
3879 | } | ||
3880 | |||
3881 | |||
3882 | |||
3883 | void CalendarView::keyPressEvent ( QKeyEvent *e) | 3852 | void CalendarView::keyPressEvent ( QKeyEvent *e) |
3884 | { | 3853 | { |
3885 | //qDebug(" alendarView::keyPressEvent "); | 3854 | //qDebug(" alendarView::keyPressEvent "); |