author | zautrix <zautrix> | 2005-02-02 11:55:36 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-02 11:55:36 (UTC) |
commit | e770226d68f5fdb8484003bbb9898848cec901a8 (patch) (unidiff) | |
tree | ecf8f795d6f8673405c22010c82fb167a41a7aa3 /korganizer/koviewmanager.cpp | |
parent | 2a184b0d9095c6175e7bdf2f5d5561470b8d6307 (diff) | |
download | kdepimpi-e770226d68f5fdb8484003bbb9898848cec901a8.zip kdepimpi-e770226d68f5fdb8484003bbb9898848cec901a8.tar.gz kdepimpi-e770226d68f5fdb8484003bbb9898848cec901a8.tar.bz2 |
jepp
-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 | |||
@@ -201,49 +201,49 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) | |||
201 | full = mMainView->leftFrame()->isVisible(); | 201 | full = mMainView->leftFrame()->isVisible(); |
202 | } else { | 202 | } else { |
203 | mCurrentView = view; | 203 | mCurrentView = view; |
204 | // bool full = fullScreen; | 204 | // bool full = fullScreen; |
205 | bool isFull = !mMainView->leftFrame()->isVisible(); | 205 | bool isFull = !mMainView->leftFrame()->isVisible(); |
206 | if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen ) | 206 | if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen ) |
207 | full = true; | 207 | full = true; |
208 | if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen ) | 208 | if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen ) |
209 | full = false; | 209 | full = false; |
210 | } | 210 | } |
211 | if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); | 211 | if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); |
212 | //raiseCurrentView( full ); | 212 | //raiseCurrentView( full ); |
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 ) |
238 | hei -= mMainView->leftFrame()->height(); | 238 | hei -= mMainView->leftFrame()->height(); |
239 | else | 239 | else |
240 | wid -= mMainView->leftFrame()->width(); | 240 | wid -= mMainView->leftFrame()->width(); |
241 | } | 241 | } |
242 | emit signalFullScreen( !fullScreen ); | 242 | emit signalFullScreen( !fullScreen ); |
243 | if ( callUpdateView ) | 243 | if ( callUpdateView ) |
244 | mMainView->updateView(); | 244 | mMainView->updateView(); |
245 | 245 | ||
246 | if ( globalFlagBlockAgenda == 5 ) { | 246 | if ( globalFlagBlockAgenda == 5 ) { |
247 | globalFlagBlockAgenda = 4; | 247 | globalFlagBlockAgenda = 4; |
248 | globalFlagBlockAgendaItemPaint = 1; | 248 | globalFlagBlockAgendaItemPaint = 1; |
249 | } | 249 | } |
@@ -497,49 +497,49 @@ void KOViewManager::showMonthView() | |||
497 | // mMonthView->show(); | 497 | // mMonthView->show(); |
498 | // SIGNALS/SLOTS FOR MONTH VIEW | 498 | // SIGNALS/SLOTS FOR MONTH VIEW |
499 | connect(mMonthView, SIGNAL(newEventSignal(QDateTime)), | 499 | connect(mMonthView, SIGNAL(newEventSignal(QDateTime)), |
500 | mMainView, SLOT(newEvent(QDateTime))); | 500 | mMainView, SLOT(newEvent(QDateTime))); |
501 | 501 | ||
502 | connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)), | 502 | connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)), |
503 | mMainView, SLOT(showIncidence(Incidence *))); | 503 | mMainView, SLOT(showIncidence(Incidence *))); |
504 | connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)), | 504 | connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)), |
505 | mMainView, SLOT(editIncidence(Incidence *))); | 505 | mMainView, SLOT(editIncidence(Incidence *))); |
506 | connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 506 | connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
507 | mMainView, SLOT(deleteIncidence(Incidence *))); | 507 | mMainView, SLOT(deleteIncidence(Incidence *))); |
508 | 508 | ||
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; |
534 | //mFlagShowNextxDays = false; | 534 | //mFlagShowNextxDays = false; |
535 | // if(mMonthView == mCurrentView) return; | 535 | // if(mMonthView == mCurrentView) return; |
536 | if ( KOPrefs::instance()->mMonthViewWeek ) | 536 | if ( KOPrefs::instance()->mMonthViewWeek ) |
537 | mMainView->dateNavigator()->selectWeek(); | 537 | mMainView->dateNavigator()->selectWeek(); |
538 | else | 538 | else |
539 | mMainView->dateNavigator()->selectMonth(); | 539 | mMainView->dateNavigator()->selectMonth(); |
540 | 540 | ||
541 | showView(mMonthView, true ); | 541 | showView(mMonthView, true ); |
542 | 542 | ||
543 | } | 543 | } |
544 | 544 | ||
545 | void KOViewManager::showTodoView() | 545 | void KOViewManager::showTodoView() |