summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koviewmanager.cpp33
-rw-r--r--korganizer/mainwindow.cpp13
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
@@ -199,70 +199,71 @@ void KOViewManager::writeSettings(KConfig *config)
199 } 199 }
200} 200}
201void KOViewManager::showNextView() 201void KOViewManager::showNextView()
202{ 202{
203 if (mCurrentView == mWhatsNextView) goto NEXT_X; 203 if (mCurrentView == mWhatsNextView) goto NEXT_X;
204 204
205 if (mCurrentView == mAgendaView && mFlagShowNextxDays) goto LIST; 205 if (mCurrentView == mAgendaView && mFlagShowNextxDays) goto JOURNAL;
206 206
207 if (mCurrentView == mListView ) goto DAY_1; 207 if (mCurrentView == mJournalView ) goto DAY_1;
208 208
209 if (mCurrentView == mAgendaView && mCurrentAgendaView == 1 ) goto DAY_5; 209 if (mCurrentView == mAgendaView && mCurrentAgendaView == 1 ) goto DAY_5;
210 210
211 if (mCurrentView == mAgendaView && mCurrentAgendaView == 5 ) goto DAY_7; 211 if (mCurrentView == mAgendaView && mCurrentAgendaView == 5 ) goto DAY_7;
212 212
213 if (mCurrentView == mAgendaView ) goto DAY_6; 213 if (mCurrentView == mAgendaView ) goto DAY_6;
214 214
215 if (mCurrentView == mMonthView && KOPrefs::instance()->mMonthViewWeek) goto MONTH; 215 if (mCurrentView == mMonthView && KOPrefs::instance()->mMonthViewWeek) goto MONTH;
216 216
217 if (mCurrentView == mMonthView ) goto TODO; 217 if (mCurrentView == mMonthView ) goto LIST;
218
219 if (mCurrentView == mListView ) goto TODO;
220
221 // if (mCurrentView == mTodoView ) goto LIST;
218 222
219 if (mCurrentView == mTodoView ) goto JOURNAL;
220 223
221 NEXT: 224 NEXT:
222 if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;} 225 if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;}
223 NEXT_X: 226 NEXT_X:
224 if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;} 227 if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;}
225 LIST: 228 JOURNAL:
226 if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;} 229 if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;}
227 DAY_1: 230 DAY_1:
228 if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;} 231 if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;}
229 DAY_5: 232 DAY_5:
230 if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;} 233 if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;}
231 DAY_7: 234 DAY_7:
232 if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;} 235 if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;}
233 DAY_6: 236 DAY_6:
234 if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;} 237 if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;}
235 MONTH: 238 MONTH:
236 if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;} 239 if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;}
240 LIST:
241 if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;}
237 TODO: 242 TODO:
238 if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} 243 if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;}
239 JOURNAL:
240 if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;}
241
242
243 244
244 if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;} 245 if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;}
245 246
246 if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;} 247 if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;}
247
248 if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;}
249 248
250 if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;} 249 if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;}
251 250
251 if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;}
252
252 if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;} 253 if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;}
253 254
254 if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;} 255 if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;}
255 256
256 if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;} 257 if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;}
257 258
258 if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;} 259 if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;}
259 260
260 if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} 261 if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;}
261 262
262 if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;} 263 if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;}
263 264
264 265
265 266
266} 267}
267void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) 268void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
268{ 269{
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index b947cac..24055af 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1006,28 +1006,29 @@ void MainWindow::initActions()
1006 if (p-> mShowIconWhatsThis) 1006 if (p-> mShowIconWhatsThis)
1007 QWhatsThis::whatsThisButton ( iconToolBar ); 1007 QWhatsThis::whatsThisButton ( iconToolBar );
1008 if (p-> mShowIconNext) 1008 if (p-> mShowIconNext)
1009 whatsnext_action->addTo( iconToolBar ); 1009 whatsnext_action->addTo( iconToolBar );
1010 if (p-> mShowIconNextDays) 1010 if (p-> mShowIconNextDays)
1011 xdays_action->addTo( iconToolBar ); 1011 xdays_action->addTo( iconToolBar );
1012 if (p-> mShowIconList) 1012 if (p-> mShowIconJournal)
1013 showlist_action->addTo( iconToolBar ); 1013 viewjournal_action->addTo( iconToolBar );
1014 if (p-> mShowIconDay1) 1014 if (p-> mShowIconDay1)
1015 day1_action->addTo( iconToolBar ); 1015 day1_action->addTo( iconToolBar );
1016 if (p-> mShowIconDay5) 1016 if (p-> mShowIconDay5)
1017 day5_action->addTo( iconToolBar ); 1017 day5_action->addTo( iconToolBar );
1018 if (p-> mShowIconDay7) 1018 if (p-> mShowIconDay7)
1019 day7_action->addTo( iconToolBar ); 1019 day7_action->addTo( iconToolBar );
1020 if (p-> mShowIconDay6) 1020 if (p-> mShowIconDay6)
1021 day6_action->addTo( iconToolBar ); 1021 day6_action->addTo( iconToolBar );
1022 if (p-> mShowIconMonth) 1022 if (p-> mShowIconMonth)
1023 month_action->addTo( iconToolBar ); 1023 month_action->addTo( iconToolBar );
1024 if (p-> mShowIconList)
1025 showlist_action->addTo( iconToolBar );
1024 if (p-> mShowIconTodoview) 1026 if (p-> mShowIconTodoview)
1025 todoview_action->addTo( iconToolBar ); 1027 todoview_action->addTo( iconToolBar );
1026 if (p-> mShowIconJournal) 1028
1027 viewjournal_action->addTo( iconToolBar );
1028 icon = loadPixmap( pathString + "2leftarrowB" ); 1029 icon = loadPixmap( pathString + "2leftarrowB" );
1029 configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14); 1030 configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14);
1030 if (p-> mShowIconBackFast) { 1031 if (p-> mShowIconBackFast) {
1031 action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); 1032 action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
1032 connect( action, SIGNAL( activated() ), 1033 connect( action, SIGNAL( activated() ),
1033 mView, SLOT( goPreviousMonth() ) ); 1034 mView, SLOT( goPreviousMonth() ) );