-rw-r--r-- | korganizer/koviewmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 8aa0697..ca3de59 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -213,25 +213,25 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) | |||
213 | mMainView->processIncidenceSelection( 0 ); | 213 | mMainView->processIncidenceSelection( 0 ); |
214 | //mMainView->updateView(); | 214 | //mMainView->updateView(); |
215 | raiseCurrentView( full, true ); | 215 | raiseCurrentView( full, true ); |
216 | mMainView->adaptNavigationUnits(); | 216 | mMainView->adaptNavigationUnits(); |
217 | } | 217 | } |
218 | 218 | ||
219 | void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) | 219 | void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) |
220 | { | 220 | { |
221 | mCurrentAgendaView = 0; | 221 | mCurrentAgendaView = 0; |
222 | int wid = mMainView->width() ; | 222 | int wid = mMainView->width() ; |
223 | int hei = mMainView->height(); | 223 | int hei = mMainView->height(); |
224 | if ( mCurrentView == mMonthView ) { | 224 | if ( mCurrentView == mMonthView ) { |
225 | if ( !KOPrefs::instance()->mMonthViewWeek ) { | 225 | if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) { |
226 | mMainView->navigatorBar()->show(); | 226 | mMainView->navigatorBar()->show(); |
227 | hei -= mMainView->navigatorBar()->sizeHint().height(); | 227 | hei -= mMainView->navigatorBar()->sizeHint().height(); |
228 | } | 228 | } |
229 | //mMainView->navigatorBar()->hide(); | 229 | //mMainView->navigatorBar()->hide(); |
230 | } else { | 230 | } else { |
231 | mMainView->navigatorBar()->hide(); | 231 | mMainView->navigatorBar()->hide(); |
232 | } | 232 | } |
233 | if ( fullScreen ) { | 233 | if ( fullScreen ) { |
234 | mMainView->leftFrame()->hide(); | 234 | mMainView->leftFrame()->hide(); |
235 | } else { | 235 | } else { |
236 | mMainView->leftFrame()->show(); | 236 | mMainView->leftFrame()->show(); |
237 | if ( KOPrefs::instance()->mVerticalScreen ) | 237 | if ( KOPrefs::instance()->mVerticalScreen ) |
@@ -509,25 +509,25 @@ void KOViewManager::showMonthView() | |||
509 | connect( mMonthView, SIGNAL( incidenceSelected( Incidence * ) ), | 509 | connect( mMonthView, SIGNAL( incidenceSelected( Incidence * ) ), |
510 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 510 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
511 | connect( mMonthView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), | 511 | connect( mMonthView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), |
512 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); | 512 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); |
513 | connect( mMonthView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), | 513 | connect( mMonthView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), |
514 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); | 514 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); |
515 | 515 | ||
516 | connect( mMonthView, SIGNAL( moveIncidenceSignal( Incidence * ) ), | 516 | connect( mMonthView, SIGNAL( moveIncidenceSignal( Incidence * ) ), |
517 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); | 517 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); |
518 | connect( mMonthView, SIGNAL( beamIncidenceSignal( Incidence * ) ), | 518 | connect( mMonthView, SIGNAL( beamIncidenceSignal( Incidence * ) ), |
519 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); | 519 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); |
520 | connect( mMonthView, SIGNAL( selectWeekNum( int ) ), | 520 | connect( mMonthView, SIGNAL( selectWeekNum( int ) ), |
521 | mMainView, SLOT ( selectWeekNum( int ) ) ); | 521 | mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) ); |
522 | connect( mMonthView, SIGNAL( showDaySignal( QDate ) ), | 522 | connect( mMonthView, SIGNAL( showDaySignal( QDate ) ), |
523 | mMainView, SLOT ( showDay( QDate ) ) ); | 523 | mMainView, SLOT ( showDay( QDate ) ) ); |
524 | connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); | 524 | connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); |
525 | connect( mMonthView, SIGNAL(nextMonth() ), | 525 | connect( mMonthView, SIGNAL(nextMonth() ), |
526 | mMainView->navigatorBar(), SIGNAL(goNextMonth() ) ); | 526 | mMainView->navigatorBar(), SIGNAL(goNextMonth() ) ); |
527 | connect( mMonthView, SIGNAL(prevMonth() ), | 527 | connect( mMonthView, SIGNAL(prevMonth() ), |
528 | mMainView->navigatorBar(), SIGNAL(goPrevMonth() ) ); | 528 | mMainView->navigatorBar(), SIGNAL(goPrevMonth() ) ); |
529 | connect( mMonthView, SIGNAL( showNavigator(bool) ), | 529 | connect( mMonthView, SIGNAL( showNavigator(bool) ), |
530 | mMainView, SLOT ( showNavigatorBar(bool) ) ); | 530 | mMainView, SLOT ( showNavigatorBar(bool) ) ); |
531 | } | 531 | } |
532 | 532 | ||
533 | globalFlagBlockAgenda = 1; | 533 | globalFlagBlockAgenda = 1; |