| -rw-r--r-- | korganizer/koviewmanager.cpp | 33 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 13 |
2 files changed, 24 insertions, 22 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index b5de4a1..e80b3fc 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -202,9 +202,9 @@ void KOViewManager::showNextView() { if (mCurrentView == mWhatsNextView) goto NEXT_X; - if (mCurrentView == mAgendaView && mFlagShowNextxDays) goto LIST; + if (mCurrentView == mAgendaView && mFlagShowNextxDays) goto JOURNAL; - if (mCurrentView == mListView ) goto DAY_1; + if (mCurrentView == mJournalView ) goto DAY_1; if (mCurrentView == mAgendaView && mCurrentAgendaView == 1 ) goto DAY_5; @@ -214,16 +214,19 @@ void KOViewManager::showNextView() if (mCurrentView == mMonthView && KOPrefs::instance()->mMonthViewWeek) goto MONTH; - if (mCurrentView == mMonthView ) goto TODO; + if (mCurrentView == mMonthView ) goto LIST; + + if (mCurrentView == mListView ) goto TODO; + + // if (mCurrentView == mTodoView ) goto LIST; - if (mCurrentView == mTodoView ) goto JOURNAL; NEXT: if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;} NEXT_X: - if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;} - LIST: - if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;} + if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;} + JOURNAL: + if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;} DAY_1: if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;} DAY_5: @@ -234,21 +237,19 @@ void KOViewManager::showNextView() if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;} MONTH: if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;} + LIST: + if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;} TODO: if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} - JOURNAL: - if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;} - - if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;} if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;} - - if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;} - if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;} + if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;} + if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;} + if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;} if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;} @@ -257,9 +258,9 @@ void KOViewManager::showNextView() if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;} - if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} + if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;} - if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;} + if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index b947cac..24055af 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1009,8 +1009,8 @@ void MainWindow::initActions() whatsnext_action->addTo( iconToolBar ); if (p-> mShowIconNextDays) xdays_action->addTo( iconToolBar ); - if (p-> mShowIconList) - showlist_action->addTo( iconToolBar ); + if (p-> mShowIconJournal) + viewjournal_action->addTo( iconToolBar ); if (p-> mShowIconDay1) day1_action->addTo( iconToolBar ); if (p-> mShowIconDay5) @@ -1020,11 +1020,12 @@ void MainWindow::initActions() if (p-> mShowIconDay6) day6_action->addTo( iconToolBar ); if (p-> mShowIconMonth) - month_action->addTo( iconToolBar ); + month_action->addTo( iconToolBar ); + if (p-> mShowIconList) + showlist_action->addTo( iconToolBar ); if (p-> mShowIconTodoview) - todoview_action->addTo( iconToolBar ); - if (p-> mShowIconJournal) - viewjournal_action->addTo( iconToolBar ); + todoview_action->addTo( iconToolBar ); + icon = loadPixmap( pathString + "2leftarrowB" ); configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14); if (p-> mShowIconBackFast) { |