-rw-r--r-- | korganizer/koviewmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 8752636..53cd011 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -231,65 +231,65 @@ void KOViewManager::showNextView() | |||
231 | if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;} | 231 | if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;} |
232 | DAY_5: | 232 | DAY_5: |
233 | if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;} | 233 | if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;} |
234 | DAY_7: | 234 | DAY_7: |
235 | if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;} | 235 | if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;} |
236 | DAY_6: | 236 | DAY_6: |
237 | if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;} | 237 | if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;} |
238 | MONTH: | 238 | MONTH: |
239 | if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;} | 239 | if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;} |
240 | LIST: | 240 | LIST: |
241 | if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;} | 241 | if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;} |
242 | TODO: | 242 | TODO: |
243 | if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} | 243 | if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} |
244 | 244 | ||
245 | if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;} | 245 | if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;} |
246 | 246 | ||
247 | if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;} | 247 | if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;} |
248 | 248 | ||
249 | if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;} | 249 | if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;} |
250 | 250 | ||
251 | if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;} | 251 | if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;} |
252 | 252 | ||
253 | if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;} | 253 | if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;} |
254 | 254 | ||
255 | if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;} | 255 | if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;} |
256 | 256 | ||
257 | if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;} | 257 | if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;} |
258 | 258 | ||
259 | if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;} | 259 | if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;} |
260 | 260 | ||
261 | if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;} | 261 | if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;} |
262 | 262 | ||
263 | if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} | 263 | //if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} |
264 | 264 | ||
265 | 265 | ||
266 | 266 | ||
267 | } | 267 | } |
268 | void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) | 268 | void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) |
269 | { | 269 | { |
270 | 270 | ||
271 | //mFlagShowNextxDays = false; | 271 | //mFlagShowNextxDays = false; |
272 | //if(view == mCurrentView) return; | 272 | //if(view == mCurrentView) return; |
273 | if ( view == 0 ) { | 273 | if ( view == 0 ) { |
274 | view = mCurrentView; | 274 | view = mCurrentView; |
275 | if ( view == 0 ) | 275 | if ( view == 0 ) |
276 | return; | 276 | return; |
277 | } | 277 | } |
278 | bool callupdate = !(view == mCurrentView); | 278 | bool callupdate = !(view == mCurrentView); |
279 | bool full = fullScreen; | 279 | bool full = fullScreen; |
280 | if(view == mCurrentView && view != mWhatsNextView ) { | 280 | if(view == mCurrentView && view != mWhatsNextView ) { |
281 | if ( mCurrentAgendaView < 0 ) | 281 | if ( mCurrentAgendaView < 0 ) |
282 | return; | 282 | return; |
283 | if ( view != mMonthView ) | 283 | if ( view != mMonthView ) |
284 | full = mMainView->leftFrame()->isVisible(); | 284 | full = mMainView->leftFrame()->isVisible(); |
285 | } else { | 285 | } else { |
286 | if ( view == mMonthView && mMonthView) | 286 | if ( view == mMonthView && mMonthView) |
287 | ;//mMonthView->skipResize = true ; | 287 | ;//mMonthView->skipResize = true ; |
288 | mCurrentView = view; | 288 | mCurrentView = view; |
289 | // bool full = fullScreen; | 289 | // bool full = fullScreen; |
290 | bool isFull = !mMainView->leftFrame()->isVisible(); | 290 | bool isFull = !mMainView->leftFrame()->isVisible(); |
291 | if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen ) | 291 | if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen ) |
292 | full = true; | 292 | full = true; |
293 | if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen ) | 293 | if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen ) |
294 | full = false; | 294 | full = false; |
295 | } | 295 | } |