author | zautrix <zautrix> | 2005-03-26 23:07:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-26 23:07:01 (UTC) |
commit | 9963563126c91d721406f24a49548b1d8f3dc415 (patch) (unidiff) | |
tree | 925a37684d46d8e89e9f5cbfb647d5b625a50c00 /korganizer | |
parent | 46b94158f6b115e175516a8432ec5b71f1403834 (diff) | |
download | kdepimpi-9963563126c91d721406f24a49548b1d8f3dc415.zip kdepimpi-9963563126c91d721406f24a49548b1d8f3dc415.tar.gz kdepimpi-9963563126c91d721406f24a49548b1d8f3dc415.tar.bz2 |
fix
-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 | |||
@@ -181,106 +181,107 @@ void KOViewManager::writeSettings(KConfig *config) | |||
181 | else if (mCurrentView == mJournalView) view = "Journal"; | 181 | else if (mCurrentView == mJournalView) view = "Journal"; |
182 | else if (mCurrentView == mTimeSpanView) view = "TimeSpan"; | 182 | else if (mCurrentView == mTimeSpanView) view = "TimeSpan"; |
183 | else if (mCurrentView == mTodoView) view = "Todo"; | 183 | else if (mCurrentView == mTodoView) view = "Todo"; |
184 | else view = "Agenda"; | 184 | else view = "Agenda"; |
185 | 185 | ||
186 | config->writeEntry("Current View",view); | 186 | config->writeEntry("Current View",view); |
187 | 187 | ||
188 | if (mAgendaView) { | 188 | if (mAgendaView) { |
189 | mAgendaView->writeSettings(config); | 189 | mAgendaView->writeSettings(config); |
190 | } | 190 | } |
191 | if (mTimeSpanView) { | 191 | if (mTimeSpanView) { |
192 | mTimeSpanView->writeSettings(config); | 192 | mTimeSpanView->writeSettings(config); |
193 | } | 193 | } |
194 | if (mListView) { | 194 | if (mListView) { |
195 | mListView->writeSettings(config); | 195 | mListView->writeSettings(config); |
196 | } | 196 | } |
197 | if (mTodoView) { | 197 | if (mTodoView) { |
198 | mTodoView->saveLayout(config,"Todo View"); | 198 | mTodoView->saveLayout(config,"Todo View"); |
199 | } | 199 | } |
200 | } | 200 | } |
201 | void KOViewManager::showNextView() | 201 | void 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 | } |
267 | void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) | 268 | void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) |
268 | { | 269 | { |
269 | 270 | ||
270 | //mFlagShowNextxDays = false; | 271 | //mFlagShowNextxDays = false; |
271 | //if(view == mCurrentView) return; | 272 | //if(view == mCurrentView) return; |
272 | if ( view == 0 ) { | 273 | if ( view == 0 ) { |
273 | view = mCurrentView; | 274 | view = mCurrentView; |
274 | if ( view == 0 ) | 275 | if ( view == 0 ) |
275 | return; | 276 | return; |
276 | } | 277 | } |
277 | bool callupdate = !(view == mCurrentView); | 278 | bool callupdate = !(view == mCurrentView); |
278 | bool full = fullScreen; | 279 | bool full = fullScreen; |
279 | if(view == mCurrentView && view != mWhatsNextView ) { | 280 | if(view == mCurrentView && view != mWhatsNextView ) { |
280 | if ( mCurrentAgendaView < 0 ) | 281 | if ( mCurrentAgendaView < 0 ) |
281 | return; | 282 | return; |
282 | if ( view != mMonthView ) | 283 | if ( view != mMonthView ) |
283 | full = mMainView->leftFrame()->isVisible(); | 284 | full = mMainView->leftFrame()->isVisible(); |
284 | } else { | 285 | } else { |
285 | if ( view == mMonthView && mMonthView) | 286 | if ( view == mMonthView && mMonthView) |
286 | ;//mMonthView->skipResize = true ; | 287 | ;//mMonthView->skipResize = true ; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index b947cac..24055af 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -988,64 +988,65 @@ void MainWindow::initActions() | |||
988 | action->addTo( helpMenu ); | 988 | action->addTo( helpMenu ); |
989 | connect( action, SIGNAL( activated() ), | 989 | connect( action, SIGNAL( activated() ), |
990 | SLOT( about() ) ); | 990 | SLOT( about() ) ); |
991 | //menuBar->insertSeparator(); | 991 | //menuBar->insertSeparator(); |
992 | 992 | ||
993 | // ****************************************************** | 993 | // ****************************************************** |
994 | // menubar icons | 994 | // menubar icons |
995 | 995 | ||
996 | 996 | ||
997 | iconToolBar->setHorizontalStretchable (true ); | 997 | iconToolBar->setHorizontalStretchable (true ); |
998 | //menuBar->insertItem( iconToolBar ); | 998 | //menuBar->insertItem( iconToolBar ); |
999 | //xdays_action | 999 | //xdays_action |
1000 | if (p-> mShowIconNewEvent) | 1000 | if (p-> mShowIconNewEvent) |
1001 | ne_action->addTo( iconToolBar ); | 1001 | ne_action->addTo( iconToolBar ); |
1002 | if (p->mShowIconNewTodo ) | 1002 | if (p->mShowIconNewTodo ) |
1003 | nt_action->addTo( iconToolBar ); | 1003 | nt_action->addTo( iconToolBar ); |
1004 | if (p-> mShowIconSearch) | 1004 | if (p-> mShowIconSearch) |
1005 | search_action->addTo( iconToolBar ); | 1005 | search_action->addTo( iconToolBar ); |
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() ) ); |
1034 | action->addTo( iconToolBar ); | 1035 | action->addTo( iconToolBar ); |
1035 | } | 1036 | } |
1036 | icon = loadPixmap( pathString + "1leftarrowB" ); | 1037 | icon = loadPixmap( pathString + "1leftarrowB" ); |
1037 | configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15); | 1038 | configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15); |
1038 | if (p-> mShowIconBack) { | 1039 | if (p-> mShowIconBack) { |
1039 | action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); | 1040 | action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); |
1040 | connect( action, SIGNAL( activated() ), | 1041 | connect( action, SIGNAL( activated() ), |
1041 | mView, SLOT( goPrevious() ) ); | 1042 | mView, SLOT( goPrevious() ) ); |
1042 | action->addTo( iconToolBar ); | 1043 | action->addTo( iconToolBar ); |
1043 | } | 1044 | } |
1044 | icon = loadPixmap( pathString + "today" ); | 1045 | icon = loadPixmap( pathString + "today" ); |
1045 | configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); | 1046 | configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); |
1046 | if (p-> mShowIconToday) | 1047 | if (p-> mShowIconToday) |
1047 | today_action->addTo( iconToolBar ); | 1048 | today_action->addTo( iconToolBar ); |
1048 | icon = loadPixmap( pathString + "1rightarrowB" ); | 1049 | icon = loadPixmap( pathString + "1rightarrowB" ); |
1049 | configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220); | 1050 | configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220); |
1050 | if (p-> mShowIconForward) { | 1051 | if (p-> mShowIconForward) { |
1051 | action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); | 1052 | action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); |