summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koviewmanager.cpp27
-rw-r--r--korganizer/mainwindow.cpp9
2 files changed, 19 insertions, 17 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index b5de4a1..e80b3fc 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -189,90 +189,91 @@ void KOViewManager::writeSettings(KConfig *config)
mAgendaView->writeSettings(config);
}
if (mTimeSpanView) {
mTimeSpanView->writeSettings(config);
}
if (mListView) {
mListView->writeSettings(config);
}
if (mTodoView) {
mTodoView->saveLayout(config,"Todo View");
}
}
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;
if (mCurrentView == mAgendaView && mCurrentAgendaView == 5 ) goto DAY_7;
if (mCurrentView == mAgendaView ) goto DAY_6;
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 ;}
+ JOURNAL:
+ if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;}
DAY_1:
if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;}
DAY_5:
if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;}
DAY_7:
if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;}
DAY_6:
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()->mShowIconJournal ) { showJournalView() ;return ;}
if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;}
if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;}
if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;}
if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;}
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 ;}
}
void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
{
//mFlagShowNextxDays = false;
//if(view == mCurrentView) return;
if ( view == 0 ) {
view = mCurrentView;
if ( view == 0 )
return;
}
bool callupdate = !(view == mCurrentView);
bool full = fullScreen;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index b947cac..24055af 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -996,48 +996,49 @@ void MainWindow::initActions()
iconToolBar->setHorizontalStretchable (true );
//menuBar->insertItem( iconToolBar );
//xdays_action
if (p-> mShowIconNewEvent)
ne_action->addTo( iconToolBar );
if (p->mShowIconNewTodo )
nt_action->addTo( iconToolBar );
if (p-> mShowIconSearch)
search_action->addTo( iconToolBar );
if (p-> mShowIconWhatsThis)
QWhatsThis::whatsThisButton ( iconToolBar );
if (p-> mShowIconNext)
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)
day5_action->addTo( iconToolBar );
if (p-> mShowIconDay7)
day7_action->addTo( iconToolBar );
if (p-> mShowIconDay6)
day6_action->addTo( iconToolBar );
if (p-> mShowIconMonth)
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 );
+
icon = loadPixmap( pathString + "2leftarrowB" );
configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14);
if (p-> mShowIconBackFast) {
action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
connect( action, SIGNAL( activated() ),
mView, SLOT( goPreviousMonth() ) );
action->addTo( iconToolBar );
}
icon = loadPixmap( pathString + "1leftarrowB" );
configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15);
if (p-> mShowIconBack) {
action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
connect( action, SIGNAL( activated() ),
mView, SLOT( goPrevious() ) );
action->addTo( iconToolBar );
}