Diffstat (limited to 'korganizer/koviewmanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koviewmanager.cpp | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index ba15f7f..b551e2a 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -108,231 +108,216 @@ void KOViewManager::showDateView( int view, QDate date) | |||
108 | 108 | ||
109 | //qDebug("%d %d ", lastNDMode, mFlagShowNextxDays ); | 109 | //qDebug("%d %d ", lastNDMode, mFlagShowNextxDays ); |
110 | bool savemFlagShowNextxDays = mFlagShowNextxDays; | 110 | bool savemFlagShowNextxDays = mFlagShowNextxDays; |
111 | mFlagShowNextxDays = false; | 111 | mFlagShowNextxDays = false; |
112 | if ( view == 3 ) { | 112 | if ( view == 3 ) { |
113 | //mCurrentAgendaView = 1 ; | 113 | //mCurrentAgendaView = 1 ; |
114 | lastDate = mMainView->dateNavigator()->selectedDates().first(); | 114 | lastDate = mMainView->dateNavigator()->selectedDates().first(); |
115 | lastCount = mMainView->dateNavigator()->selectedDates().count(); | 115 | lastCount = mMainView->dateNavigator()->selectedDates().count(); |
116 | lastNDMode = savemFlagShowNextxDays; | 116 | lastNDMode = savemFlagShowNextxDays; |
117 | mMainView->showDay( date ); | 117 | mMainView->showDay( date ); |
118 | } else if (view == 4 ) { | 118 | } else if (view == 4 ) { |
119 | mCurrentAgendaView = 7 ; | 119 | mCurrentAgendaView = 7 ; |
120 | mMainView->dateNavigator()->selectDates( date, 7 ); | 120 | mMainView->dateNavigator()->selectDates( date, 7 ); |
121 | } else if (view == 5 ) { | 121 | } else if (view == 5 ) { |
122 | mCurrentAgendaView = 14 ; | 122 | mCurrentAgendaView = 14 ; |
123 | mMainView->dateNavigator()->selectDates( date, 14); | 123 | mMainView->dateNavigator()->selectDates( date, 14); |
124 | } else if (view == 6 ) { | 124 | } else if (view == 6 ) { |
125 | //mMainView->dateNavigator()->selectDates( date, 7 ); | 125 | //mMainView->dateNavigator()->selectDates( date, 7 ); |
126 | showMonthView(); | 126 | showMonthView(); |
127 | } else if (view == 7 ) { | 127 | } else if (view == 7 ) { |
128 | mMainView->dateNavigator()->selectDate( date ); | 128 | mMainView->dateNavigator()->selectDate( date ); |
129 | showJournalView(); | 129 | showJournalView(); |
130 | } else if (view == 8 ) { | 130 | } else if (view == 8 ) { |
131 | globalFlagBlockAgenda = 1; | 131 | globalFlagBlockAgenda = 1; |
132 | if ( mCurrentAgendaView != 3 ) | 132 | if ( mCurrentAgendaView != 3 ) |
133 | mCurrentAgendaView = -1; | 133 | mCurrentAgendaView = -1; |
134 | showAgendaView(KOPrefs::instance()->mFullViewMonth); | 134 | showAgendaView(KOPrefs::instance()->mFullViewMonth); |
135 | globalFlagBlockAgenda = 2; | 135 | globalFlagBlockAgenda = 2; |
136 | mMainView->dateNavigator()->selectDates( date , | 136 | mMainView->dateNavigator()->selectDates( date , |
137 | KOPrefs::instance()->mNextXDays ); | 137 | KOPrefs::instance()->mNextXDays ); |
138 | mFlagShowNextxDays = true; | 138 | mFlagShowNextxDays = true; |
139 | mCurrentAgendaView = 3 ; | 139 | mCurrentAgendaView = 3 ; |
140 | } if (view == 9) { // return behaviour, for getting back from mode == 3 (single day mode ) | 140 | } if (view == 9) { // return behaviour, for getting back from mode == 3 (single day mode ) |
141 | if ( lastMode ) { | 141 | if ( lastMode ) { |
142 | mCurrentAgendaView = lastCount ; | 142 | mCurrentAgendaView = lastCount ; |
143 | mMainView->dateNavigator()->selectDates( lastDate, lastCount); | 143 | mMainView->dateNavigator()->selectDates( lastDate, lastCount); |
144 | mFlagShowNextxDays = lastNDMode; | 144 | mFlagShowNextxDays = lastNDMode; |
145 | if ( mFlagShowNextxDays ) { | 145 | if ( mFlagShowNextxDays ) { |
146 | mCurrentAgendaView = 3 ; | 146 | mCurrentAgendaView = 3 ; |
147 | } | 147 | } |
148 | } else | 148 | } else |
149 | showWeekView(); | 149 | showWeekView(); |
150 | } else if (view == 10) { | 150 | } else if (view == 10) { |
151 | mMainView->dateNavigator()->selectDates( date,mMainView->dateNavigator()->selectedDates().count() ); | 151 | mMainView->dateNavigator()->selectDates( date,mMainView->dateNavigator()->selectedDates().count() ); |
152 | } | 152 | } |
153 | lastMode = view; | 153 | lastMode = view; |
154 | } | 154 | } |
155 | 155 | ||
156 | 156 | ||
157 | 157 | ||
158 | void KOViewManager::writeSettings(KConfig *config) | 158 | void KOViewManager::writeSettings(KConfig *config) |
159 | { | 159 | { |
160 | config->setGroup("General"); | 160 | config->setGroup("General"); |
161 | 161 | ||
162 | QString view; | 162 | QString view; |
163 | if (mCurrentView == mWhatsNextView) view = "WhatsNext"; | 163 | if (mCurrentView == mWhatsNextView) view = "WhatsNext"; |
164 | else if (mCurrentView == mMonthView) view = "Month"; | 164 | else if (mCurrentView == mMonthView) view = "Month"; |
165 | else if (mCurrentView == mListView) view = "List"; | 165 | else if (mCurrentView == mListView) view = "List"; |
166 | else if (mCurrentView == mJournalView) view = "Journal"; | 166 | else if (mCurrentView == mJournalView) view = "Journal"; |
167 | else if (mCurrentView == mTimeSpanView) view = "TimeSpan"; | 167 | else if (mCurrentView == mTimeSpanView) view = "TimeSpan"; |
168 | else if (mCurrentView == mTodoView) view = "Todo"; | 168 | else if (mCurrentView == mTodoView) view = "Todo"; |
169 | else view = "Agenda"; | 169 | else view = "Agenda"; |
170 | 170 | ||
171 | config->writeEntry("Current View",view); | 171 | config->writeEntry("Current View",view); |
172 | 172 | ||
173 | if (mAgendaView) { | 173 | if (mAgendaView) { |
174 | mAgendaView->writeSettings(config); | 174 | mAgendaView->writeSettings(config); |
175 | } | 175 | } |
176 | if (mTimeSpanView) { | 176 | if (mTimeSpanView) { |
177 | mTimeSpanView->writeSettings(config); | 177 | mTimeSpanView->writeSettings(config); |
178 | } | 178 | } |
179 | if (mListView) { | 179 | if (mListView) { |
180 | mListView->writeSettings(config); | 180 | mListView->writeSettings(config); |
181 | } | 181 | } |
182 | if (mTodoView) { | 182 | if (mTodoView) { |
183 | mTodoView->saveLayout(config,"Todo View"); | 183 | mTodoView->saveLayout(config,"Todo View"); |
184 | } | 184 | } |
185 | } | 185 | } |
186 | 186 | ||
187 | void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) | 187 | void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) |
188 | { | 188 | { |
189 | 189 | ||
190 | //mFlagShowNextxDays = false; | 190 | //mFlagShowNextxDays = false; |
191 | //if(view == mCurrentView) return; | 191 | //if(view == mCurrentView) return; |
192 | if ( view == 0 ) { | 192 | if ( view == 0 ) { |
193 | view = mCurrentView; | 193 | view = mCurrentView; |
194 | if ( view == 0 ) | 194 | if ( view == 0 ) |
195 | return; | 195 | return; |
196 | } | 196 | } |
197 | bool full = fullScreen; | 197 | bool full = fullScreen; |
198 | if(view == mCurrentView && view != mWhatsNextView ) { | 198 | if(view == mCurrentView && view != mWhatsNextView ) { |
199 | if ( mCurrentAgendaView < 0 ) | 199 | if ( mCurrentAgendaView < 0 ) |
200 | return; | 200 | return; |
201 | full = mMainView->leftFrame()->isVisible(); | 201 | full = mMainView->leftFrame()->isVisible(); |
202 | } else { | 202 | } else { |
203 | if ( view == mMonthView && mMonthView) | 203 | if ( view == mMonthView && mMonthView) |
204 | mMonthView->skipResize = true ; | 204 | ;//mMonthView->skipResize = true ; |
205 | mCurrentView = view; | 205 | mCurrentView = view; |
206 | // bool full = fullScreen; | 206 | // bool full = fullScreen; |
207 | bool isFull = !mMainView->leftFrame()->isVisible(); | 207 | bool isFull = !mMainView->leftFrame()->isVisible(); |
208 | if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen ) | 208 | if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen ) |
209 | full = true; | 209 | full = true; |
210 | if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen ) | 210 | if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen ) |
211 | full = false; | 211 | full = false; |
212 | } | 212 | } |
213 | if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); | 213 | if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); |
214 | //raiseCurrentView( full ); | 214 | //raiseCurrentView( full ); |
215 | mMainView->processIncidenceSelection( 0 ); | 215 | mMainView->processIncidenceSelection( 0 ); |
216 | //mMainView->updateView(); | 216 | //mMainView->updateView(); |
217 | raiseCurrentView( full, true ); | 217 | raiseCurrentView( full, true ); |
218 | mMainView->adaptNavigationUnits(); | 218 | mMainView->adaptNavigationUnits(); |
219 | } | 219 | } |
220 | 220 | ||
221 | void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) | 221 | void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) |
222 | { | 222 | { |
223 | mCurrentAgendaView = 0; | 223 | mCurrentAgendaView = 0; |
224 | int wid = mMainView->width() ; | ||
225 | int hei = mMainView->height(); | ||
226 | if ( mCurrentView == mMonthView ) { | ||
227 | if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) { | ||
228 | mMainView->navigatorBar()->show(); | ||
229 | hei -= mMainView->navigatorBar()->sizeHint().height(); | ||
230 | } | ||
231 | //mMainView->navigatorBar()->hide(); | ||
232 | } else { | ||
233 | mMainView->navigatorBar()->hide(); | ||
234 | } | ||
235 | if ( fullScreen ) { | 224 | if ( fullScreen ) { |
236 | mMainView->leftFrame()->hide(); | 225 | mMainView->leftFrame()->hide(); |
237 | } else { | 226 | } else { |
238 | mMainView->leftFrame()->show(); | 227 | mMainView->leftFrame()->show(); |
239 | if ( KOPrefs::instance()->mVerticalScreen ) | ||
240 | hei -= mMainView->leftFrame()->height(); | ||
241 | else | ||
242 | wid -= mMainView->leftFrame()->width(); | ||
243 | } | 228 | } |
244 | emit signalFullScreen( !fullScreen ); | 229 | emit signalFullScreen( !fullScreen ); |
245 | if ( callUpdateView ) | 230 | if ( callUpdateView ) |
246 | mMainView->updateView(); | 231 | mMainView->updateView(); |
247 | 232 | ||
248 | if ( globalFlagBlockAgenda == 5 ) { | 233 | if ( globalFlagBlockAgenda == 5 ) { |
249 | globalFlagBlockAgenda = 4; | 234 | globalFlagBlockAgenda = 4; |
250 | globalFlagBlockAgendaItemPaint = 1; | 235 | globalFlagBlockAgendaItemPaint = 1; |
251 | } | 236 | } |
252 | mMainView->viewStack()->raiseWidget(mCurrentView); | 237 | mMainView->viewStack()->raiseWidget(mCurrentView); |
253 | if ( globalFlagBlockAgenda == 4 ) { | 238 | if ( globalFlagBlockAgenda == 4 ) { |
254 | if ( mCurrentView == mAgendaView ) { | 239 | if ( mCurrentView == mAgendaView ) { |
255 | //globalFlagBlockAgenda =1 ; | 240 | //globalFlagBlockAgenda =1 ; |
256 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) | 241 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) |
257 | mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins ); | 242 | mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins ); |
258 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) | 243 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) |
259 | mAgendaView->setStartHour( QTime::currentTime ().hour() ); | 244 | mAgendaView->setStartHour( QTime::currentTime ().hour() ); |
260 | qApp->processEvents(); | 245 | qApp->processEvents(); |
261 | //qDebug("qApp->processEvents() "); | 246 | //qDebug("qApp->processEvents() "); |
262 | globalFlagBlockAgenda = 0; | 247 | globalFlagBlockAgenda = 0; |
263 | mAgendaView->repaintAgenda(); | 248 | mAgendaView->repaintAgenda(); |
264 | 249 | ||
265 | } | 250 | } |
266 | globalFlagBlockAgenda = 0; | 251 | globalFlagBlockAgenda = 0; |
267 | } | 252 | } |
268 | emit signalAgendaView( mCurrentView == mAgendaView ); | 253 | emit signalAgendaView( mCurrentView == mAgendaView ); |
269 | //qDebug("raiseCurrentView ende "); | 254 | //qDebug("raiseCurrentView ende "); |
270 | 255 | ||
271 | } | 256 | } |
272 | 257 | ||
273 | void KOViewManager::updateView() | 258 | void KOViewManager::updateView() |
274 | { | 259 | { |
275 | // qDebug("KOViewManager::updateView() "); | 260 | // qDebug("KOViewManager::updateView() "); |
276 | // if we are updating mTodoView, we get endless recursion | 261 | // if we are updating mTodoView, we get endless recursion |
277 | if ( mTodoView == mCurrentView ) | 262 | if ( mTodoView == mCurrentView ) |
278 | return; | 263 | return; |
279 | if ( mCurrentView ) mCurrentView->updateView(); | 264 | if ( mCurrentView ) mCurrentView->updateView(); |
280 | 265 | ||
281 | } | 266 | } |
282 | 267 | ||
283 | void KOViewManager::updateView(const QDate &start, const QDate &end) | 268 | void KOViewManager::updateView(const QDate &start, const QDate &end) |
284 | { | 269 | { |
285 | // kdDebug() << "KOViewManager::updateView()" << endl; | 270 | // kdDebug() << "KOViewManager::updateView()" << endl; |
286 | 271 | ||
287 | if (mCurrentView) mCurrentView->showDates(start, end); | 272 | if (mCurrentView) mCurrentView->showDates(start, end); |
288 | 273 | ||
289 | if (mTodoView && mTodoView == mCurrentView ) mTodoView->updateView(); | 274 | if (mTodoView && mTodoView == mCurrentView ) mTodoView->updateView(); |
290 | } | 275 | } |
291 | 276 | ||
292 | 277 | ||
293 | void KOViewManager::updateWNview() | 278 | void KOViewManager::updateWNview() |
294 | { | 279 | { |
295 | if ( mCurrentView == mWhatsNextView && mWhatsNextView ) | 280 | if ( mCurrentView == mWhatsNextView && mWhatsNextView ) |
296 | mWhatsNextView->updateView(); | 281 | mWhatsNextView->updateView(); |
297 | 282 | ||
298 | } | 283 | } |
299 | void KOViewManager::showWhatsNextView() | 284 | void KOViewManager::showWhatsNextView() |
300 | { | 285 | { |
301 | if (!mWhatsNextView) { | 286 | if (!mWhatsNextView) { |
302 | mWhatsNextView = new KOWhatsNextView(mMainView->calendar(),mMainView->viewStack(), | 287 | mWhatsNextView = new KOWhatsNextView(mMainView->calendar(),mMainView->viewStack(), |
303 | "KOViewManager::WhatsNextView"); | 288 | "KOViewManager::WhatsNextView"); |
304 | mWhatsNextView->setEventViewer( mMainView->getEventViewerDialog()); | 289 | mWhatsNextView->setEventViewer( mMainView->getEventViewerDialog()); |
305 | connect(mMainView, SIGNAL(configChanged()), mWhatsNextView, SLOT(updateConfig())); | 290 | connect(mMainView, SIGNAL(configChanged()), mWhatsNextView, SLOT(updateConfig())); |
306 | addView(mWhatsNextView); | 291 | addView(mWhatsNextView); |
307 | connect(this, SIGNAL( printWNV() ), | 292 | connect(this, SIGNAL( printWNV() ), |
308 | mWhatsNextView, SLOT( printMe() ) ); | 293 | mWhatsNextView, SLOT( printMe() ) ); |
309 | } | 294 | } |
310 | globalFlagBlockAgenda = 1; | 295 | globalFlagBlockAgenda = 1; |
311 | showView(mWhatsNextView, true ); | 296 | showView(mWhatsNextView, true ); |
312 | //mWhatsNextView->updateView(); | 297 | //mWhatsNextView->updateView(); |
313 | 298 | ||
314 | } | 299 | } |
315 | 300 | ||
316 | void KOViewManager::showListView() | 301 | void KOViewManager::showListView() |
317 | { | 302 | { |
318 | if (!mListView) { | 303 | if (!mListView) { |
319 | mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView"); | 304 | mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView"); |
320 | addView(mListView); | 305 | addView(mListView); |
321 | 306 | ||
322 | connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)), | 307 | connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)), |
323 | mMainView, SLOT(showIncidence(Incidence *))); | 308 | mMainView, SLOT(showIncidence(Incidence *))); |
324 | connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)), | 309 | connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)), |
325 | mMainView, SLOT(editIncidence(Incidence *))); | 310 | mMainView, SLOT(editIncidence(Incidence *))); |
326 | connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 311 | connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
327 | mMainView, SLOT(deleteIncidence(Incidence *))); | 312 | mMainView, SLOT(deleteIncidence(Incidence *))); |
328 | connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ), | 313 | connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ), |
329 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 314 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
330 | connect( mListView, SIGNAL( signalNewEvent() ), | 315 | connect( mListView, SIGNAL( signalNewEvent() ), |
331 | mMainView, SLOT( newEvent() ) ); | 316 | mMainView, SLOT( newEvent() ) ); |
332 | connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); | 317 | connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); |
333 | connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), | 318 | connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), |
334 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); | 319 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); |
335 | connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), | 320 | connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), |
336 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); | 321 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); |
337 | connect( mListView, SIGNAL( moveIncidenceSignal( Incidence * ) ), | 322 | connect( mListView, SIGNAL( moveIncidenceSignal( Incidence * ) ), |
338 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); | 323 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); |
@@ -434,197 +419,213 @@ void KOViewManager::showDayView() | |||
434 | mCurrentAgendaView = 1 ; | 419 | mCurrentAgendaView = 1 ; |
435 | 420 | ||
436 | } | 421 | } |
437 | 422 | ||
438 | void KOViewManager::showWorkWeekView() | 423 | void KOViewManager::showWorkWeekView() |
439 | { | 424 | { |
440 | mFlagShowNextxDays = false; | 425 | mFlagShowNextxDays = false; |
441 | globalFlagBlockAgenda = 1; | 426 | globalFlagBlockAgenda = 1; |
442 | globalFlagBlockLabel = 1; | 427 | globalFlagBlockLabel = 1; |
443 | if ( mCurrentAgendaView != 5 ) | 428 | if ( mCurrentAgendaView != 5 ) |
444 | mCurrentAgendaView = -1; | 429 | mCurrentAgendaView = -1; |
445 | showAgendaView(); | 430 | showAgendaView(); |
446 | qApp->processEvents(); | 431 | qApp->processEvents(); |
447 | globalFlagBlockAgenda = 2; | 432 | globalFlagBlockAgenda = 2; |
448 | globalFlagBlockLabel = 0; | 433 | globalFlagBlockLabel = 0; |
449 | mMainView->dateNavigator()->selectWorkWeek(); | 434 | mMainView->dateNavigator()->selectWorkWeek(); |
450 | mCurrentAgendaView = 5 ; | 435 | mCurrentAgendaView = 5 ; |
451 | 436 | ||
452 | } | 437 | } |
453 | 438 | ||
454 | void KOViewManager::showWeekView() | 439 | void KOViewManager::showWeekView() |
455 | { | 440 | { |
456 | /* | 441 | /* |
457 | globalFlagBlockAgenda = 2; | 442 | globalFlagBlockAgenda = 2; |
458 | qDebug("4globalFlagBlockAgenda = 2; "); | 443 | qDebug("4globalFlagBlockAgenda = 2; "); |
459 | //globalFlagBlockPainting = true; | 444 | //globalFlagBlockPainting = true; |
460 | mMainView->dateNavigator()->selectWeek(); | 445 | mMainView->dateNavigator()->selectWeek(); |
461 | showAgendaView(); | 446 | showAgendaView(); |
462 | */ | 447 | */ |
463 | 448 | ||
464 | 449 | ||
465 | mFlagShowNextxDays = false; | 450 | mFlagShowNextxDays = false; |
466 | globalFlagBlockAgenda = 1; | 451 | globalFlagBlockAgenda = 1; |
467 | globalFlagBlockLabel = 1; | 452 | globalFlagBlockLabel = 1; |
468 | if ( mCurrentAgendaView != 7 ) | 453 | if ( mCurrentAgendaView != 7 ) |
469 | mCurrentAgendaView = -1; | 454 | mCurrentAgendaView = -1; |
470 | showAgendaView(); | 455 | showAgendaView(); |
471 | qApp->processEvents(); | 456 | qApp->processEvents(); |
472 | globalFlagBlockAgenda = 2; | 457 | globalFlagBlockAgenda = 2; |
473 | globalFlagBlockLabel = 0; | 458 | globalFlagBlockLabel = 0; |
474 | mMainView->dateNavigator()->selectWeek(); | 459 | mMainView->dateNavigator()->selectWeek(); |
475 | mCurrentAgendaView = 7 ; | 460 | mCurrentAgendaView = 7 ; |
476 | } | 461 | } |
477 | 462 | ||
478 | void KOViewManager::showNextXView() | 463 | void KOViewManager::showNextXView() |
479 | { | 464 | { |
480 | 465 | ||
481 | globalFlagBlockAgenda = 1; | 466 | globalFlagBlockAgenda = 1; |
482 | if ( mCurrentAgendaView != 3 ) | 467 | if ( mCurrentAgendaView != 3 ) |
483 | mCurrentAgendaView = -1; | 468 | mCurrentAgendaView = -1; |
484 | showAgendaView(KOPrefs::instance()->mFullViewMonth); | 469 | showAgendaView(KOPrefs::instance()->mFullViewMonth); |
485 | globalFlagBlockAgenda = 2; | 470 | globalFlagBlockAgenda = 2; |
486 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), | 471 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), |
487 | KOPrefs::instance()->mNextXDays ); | 472 | KOPrefs::instance()->mNextXDays ); |
488 | mFlagShowNextxDays = true; | 473 | mFlagShowNextxDays = true; |
489 | mCurrentAgendaView = 3 ; | 474 | mCurrentAgendaView = 3 ; |
490 | } | 475 | } |
491 | bool KOViewManager::showsNextDays() | 476 | bool KOViewManager::showsNextDays() |
492 | { | 477 | { |
493 | return mFlagShowNextxDays; | 478 | return mFlagShowNextxDays; |
494 | } | 479 | } |
495 | void KOViewManager::showMonthView() | 480 | void KOViewManager::showMonthView() |
496 | { | 481 | { |
497 | if (!mMonthView) { | 482 | if (!mMonthView) { |
498 | mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView"); | 483 | mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView"); |
499 | 484 | ||
500 | addView(mMonthView); | 485 | addView(mMonthView); |
501 | // mMonthView->show(); | 486 | // mMonthView->show(); |
502 | // SIGNALS/SLOTS FOR MONTH VIEW | 487 | // SIGNALS/SLOTS FOR MONTH VIEW |
503 | connect(mMonthView, SIGNAL(newEventSignal(QDateTime)), | 488 | connect(mMonthView, SIGNAL(newEventSignal(QDateTime)), |
504 | mMainView, SLOT(newEvent(QDateTime))); | 489 | mMainView, SLOT(newEvent(QDateTime))); |
505 | 490 | ||
506 | connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)), | 491 | connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)), |
507 | mMainView, SLOT(showIncidence(Incidence *))); | 492 | mMainView, SLOT(showIncidence(Incidence *))); |
508 | connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)), | 493 | connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)), |
509 | mMainView, SLOT(editIncidence(Incidence *))); | 494 | mMainView, SLOT(editIncidence(Incidence *))); |
510 | connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 495 | connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
511 | mMainView, SLOT(deleteIncidence(Incidence *))); | 496 | mMainView, SLOT(deleteIncidence(Incidence *))); |
512 | 497 | ||
513 | connect( mMonthView, SIGNAL( incidenceSelected( Incidence * ) ), | 498 | connect( mMonthView, SIGNAL( incidenceSelected( Incidence * ) ), |
514 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 499 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
515 | connect( mMonthView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), | 500 | connect( mMonthView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), |
516 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); | 501 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); |
517 | connect( mMonthView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), | 502 | connect( mMonthView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), |
518 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); | 503 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); |
519 | 504 | ||
520 | connect( mMonthView, SIGNAL( moveIncidenceSignal( Incidence * ) ), | 505 | connect( mMonthView, SIGNAL( moveIncidenceSignal( Incidence * ) ), |
521 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); | 506 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); |
522 | connect( mMonthView, SIGNAL( beamIncidenceSignal( Incidence * ) ), | 507 | connect( mMonthView, SIGNAL( beamIncidenceSignal( Incidence * ) ), |
523 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); | 508 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); |
524 | connect( mMonthView, SIGNAL( selectWeekNum( int ) ), | 509 | connect( mMonthView, SIGNAL( selectWeekNum( int ) ), |
525 | mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) ); | 510 | mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) ); |
526 | connect( mMonthView, SIGNAL( showDaySignal( QDate ) ), | 511 | connect( mMonthView, SIGNAL( showDaySignal( QDate ) ), |
527 | mMainView, SLOT ( showDay( QDate ) ) ); | 512 | mMainView, SLOT ( showDay( QDate ) ) ); |
528 | connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); | 513 | connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); |
529 | connect( mMonthView, SIGNAL(nextMonth() ), | 514 | connect( mMonthView, SIGNAL(nextMonth() ), |
530 | mMainView->navigatorBar(), SIGNAL(goNextMonth() ) ); | 515 | mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) ); |
531 | connect( mMonthView, SIGNAL(prevMonth() ), | 516 | connect( mMonthView, SIGNAL(prevMonth() ), |
532 | mMainView->navigatorBar(), SIGNAL(goPrevMonth() ) ); | 517 | mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) ); |
533 | connect( mMonthView, SIGNAL( showNavigator(bool) ), | 518 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ), |
534 | mMainView, SLOT ( showNavigatorBar(bool) ) ); | 519 | mMainView->dateNavigator(), SLOT( selectPreviousYear() ) ); |
520 | connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ), | ||
521 | mMainView->dateNavigator(), SLOT( selectNextYear() ) ); | ||
522 | connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ), | ||
523 | mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) ); | ||
524 | connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ), | ||
525 | mMainView->dateNavigator(), SLOT( selectNextMonth() ) ); | ||
526 | connect( mMonthView->navigatorBar(), SIGNAL( selectWeek( int ) ), | ||
527 | mMainView->dateNavigator(), SLOT( selectWeek( int ) ) ); | ||
528 | |||
529 | connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), | ||
530 | mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) ); | ||
531 | |||
532 | |||
533 | connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ), | ||
534 | mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) ); | ||
535 | |||
535 | } | 536 | } |
536 | 537 | ||
537 | globalFlagBlockAgenda = 1; | 538 | globalFlagBlockAgenda = 1; |
538 | //mFlagShowNextxDays = false; | 539 | //mFlagShowNextxDays = false; |
539 | // if(mMonthView == mCurrentView) return; | 540 | // if(mMonthView == mCurrentView) return; |
540 | if ( KOPrefs::instance()->mMonthViewWeek ) | 541 | if ( KOPrefs::instance()->mMonthViewWeek ) |
541 | mMainView->dateNavigator()->selectWeek(); | 542 | mMainView->dateNavigator()->selectWeek(); |
542 | else | 543 | else |
543 | mMainView->dateNavigator()->selectMonth(); | 544 | mMainView->dateNavigator()->selectMonth(); |
544 | 545 | ||
545 | showView(mMonthView, true ); | 546 | showView(mMonthView, true ); |
546 | 547 | ||
547 | } | 548 | } |
548 | 549 | ||
549 | void KOViewManager::showTodoView() | 550 | void KOViewManager::showTodoView() |
550 | { | 551 | { |
551 | //mFlagShowNextxDays = false; | 552 | //mFlagShowNextxDays = false; |
552 | if ( !mTodoView ) { | 553 | if ( !mTodoView ) { |
553 | mTodoView = new KOTodoView( mMainView->calendar(), mMainView->viewStack(), | 554 | mTodoView = new KOTodoView( mMainView->calendar(), mMainView->viewStack(), |
554 | "KOViewManager::TodoView" ); | 555 | "KOViewManager::TodoView" ); |
555 | 556 | ||
556 | addView( mTodoView ); | 557 | addView( mTodoView ); |
557 | // QPEApplication::setStylusOperation( mTodoView, QPEApplication::RightOnHold ); | 558 | // QPEApplication::setStylusOperation( mTodoView, QPEApplication::RightOnHold ); |
558 | 559 | ||
559 | // SIGNALS/SLOTS FOR TODO VIEW | 560 | // SIGNALS/SLOTS FOR TODO VIEW |
560 | connect( mTodoView, SIGNAL( newTodoSignal() ), | 561 | connect( mTodoView, SIGNAL( newTodoSignal() ), |
561 | mMainView, SLOT( newTodo() ) ); | 562 | mMainView, SLOT( newTodo() ) ); |
562 | connect( mTodoView, SIGNAL( newSubTodoSignal( Todo * ) ), | 563 | connect( mTodoView, SIGNAL( newSubTodoSignal( Todo * ) ), |
563 | mMainView, SLOT( newSubTodo( Todo *) ) ); | 564 | mMainView, SLOT( newSubTodo( Todo *) ) ); |
564 | connect( mTodoView, SIGNAL( showTodoSignal( Todo *) ), | 565 | connect( mTodoView, SIGNAL( showTodoSignal( Todo *) ), |
565 | mMainView, SLOT( showTodo( Todo * ) ) ); | 566 | mMainView, SLOT( showTodo( Todo * ) ) ); |
566 | connect( mTodoView, SIGNAL( editTodoSignal( Todo * ) ), | 567 | connect( mTodoView, SIGNAL( editTodoSignal( Todo * ) ), |
567 | mMainView, SLOT( editTodo( Todo * ) ) ); | 568 | mMainView, SLOT( editTodo( Todo * ) ) ); |
568 | connect( mTodoView, SIGNAL( deleteTodoSignal( Todo * ) ), | 569 | connect( mTodoView, SIGNAL( deleteTodoSignal( Todo * ) ), |
569 | mMainView, SLOT( deleteTodo( Todo * ) ) ); | 570 | mMainView, SLOT( deleteTodo( Todo * ) ) ); |
570 | connect( mTodoView, SIGNAL( purgeCompletedSignal() ), | 571 | connect( mTodoView, SIGNAL( purgeCompletedSignal() ), |
571 | mMainView, SLOT( purgeCompleted() ) ); | 572 | mMainView, SLOT( purgeCompleted() ) ); |
572 | 573 | ||
573 | connect( mTodoView, SIGNAL( incidenceSelected( Incidence * ) ), | 574 | connect( mTodoView, SIGNAL( incidenceSelected( Incidence * ) ), |
574 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 575 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
575 | 576 | ||
576 | connect( mMainView, SIGNAL( configChanged() ), mTodoView, | 577 | connect( mMainView, SIGNAL( configChanged() ), mTodoView, |
577 | SLOT( updateConfig() ) ); | 578 | SLOT( updateConfig() ) ); |
578 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mTodoView, | 579 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mTodoView, |
579 | SLOT( updateTodo( Todo *, int ) ) ); | 580 | SLOT( updateTodo( Todo *, int ) ) ); |
580 | connect( mTodoView, SIGNAL( todoModifiedSignal( Todo *, int ) ), | 581 | connect( mTodoView, SIGNAL( todoModifiedSignal( Todo *, int ) ), |
581 | mMainView, SIGNAL ( todoModified( Todo *, int ) ) ); | 582 | mMainView, SIGNAL ( todoModified( Todo *, int ) ) ); |
582 | connect( mTodoView, SIGNAL( cloneTodoSignal( Incidence * ) ), | 583 | connect( mTodoView, SIGNAL( cloneTodoSignal( Incidence * ) ), |
583 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); | 584 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); |
584 | connect( mTodoView, SIGNAL( cancelTodoSignal( Incidence * ) ), | 585 | connect( mTodoView, SIGNAL( cancelTodoSignal( Incidence * ) ), |
585 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); | 586 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); |
586 | connect( mTodoView, SIGNAL( unparentTodoSignal( Todo * ) ), | 587 | connect( mTodoView, SIGNAL( unparentTodoSignal( Todo * ) ), |
587 | mMainView, SLOT ( todo_unsub( Todo * ) ) ); | 588 | mMainView, SLOT ( todo_unsub( Todo * ) ) ); |
588 | connect( mTodoView, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ), | 589 | connect( mTodoView, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ), |
589 | mMainView, SLOT ( todo_resub( Todo *, Todo *) ) ); | 590 | mMainView, SLOT ( todo_resub( Todo *, Todo *) ) ); |
590 | connect( mTodoView, SIGNAL( moveTodoSignal( Incidence * ) ), | 591 | connect( mTodoView, SIGNAL( moveTodoSignal( Incidence * ) ), |
591 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); | 592 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); |
592 | connect( mTodoView, SIGNAL( beamTodoSignal( Incidence * ) ), | 593 | connect( mTodoView, SIGNAL( beamTodoSignal( Incidence * ) ), |
593 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); | 594 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); |
594 | KConfig *config = KOGlobals::config(); | 595 | KConfig *config = KOGlobals::config(); |
595 | mTodoView->restoreLayout(config,"Todo View"); | 596 | mTodoView->restoreLayout(config,"Todo View"); |
596 | mTodoView->setNavigator( mMainView->dateNavigator() ); | 597 | mTodoView->setNavigator( mMainView->dateNavigator() ); |
597 | } | 598 | } |
598 | 599 | ||
599 | globalFlagBlockAgenda = 1; | 600 | globalFlagBlockAgenda = 1; |
600 | showView( mTodoView, true ); | 601 | showView( mTodoView, true ); |
601 | 602 | ||
602 | } | 603 | } |
603 | 604 | ||
604 | void KOViewManager::showJournalView() | 605 | void KOViewManager::showJournalView() |
605 | { | 606 | { |
606 | //mFlagShowNextxDays = false; | 607 | //mFlagShowNextxDays = false; |
607 | if (!mJournalView) { | 608 | if (!mJournalView) { |
608 | mJournalView = new KOJournalView(mMainView->calendar(),mMainView->viewStack(), | 609 | mJournalView = new KOJournalView(mMainView->calendar(),mMainView->viewStack(), |
609 | "KOViewManager::JournalView"); | 610 | "KOViewManager::JournalView"); |
610 | connect( mMainView, SIGNAL( configChanged() ), mJournalView, | 611 | connect( mMainView, SIGNAL( configChanged() ), mJournalView, |
611 | SLOT( updateConfig() ) ); | 612 | SLOT( updateConfig() ) ); |
612 | connect(mJournalView, SIGNAL(deleteJournal(Journal *) ), mMainView,SLOT(deleteJournal(Journal *)) ); | 613 | connect(mJournalView, SIGNAL(deleteJournal(Journal *) ), mMainView,SLOT(deleteJournal(Journal *)) ); |
613 | addView(mJournalView); | 614 | addView(mJournalView); |
614 | } | 615 | } |
615 | 616 | ||
616 | showView(mJournalView); | 617 | showView(mJournalView); |
617 | mMainView->dateNavigator()->selectDates( 1 ); | 618 | mMainView->dateNavigator()->selectDates( 1 ); |
618 | } | 619 | } |
619 | 620 | ||
620 | void KOViewManager::showTimeSpanView() | 621 | void KOViewManager::showTimeSpanView() |
621 | { | 622 | { |
622 | //mFlagShowNextxDays = false; | 623 | //mFlagShowNextxDays = false; |
623 | if (!mTimeSpanView) { | 624 | if (!mTimeSpanView) { |
624 | mTimeSpanView = new KOTimeSpanView(mMainView->calendar(),mMainView->viewStack(), | 625 | mTimeSpanView = new KOTimeSpanView(mMainView->calendar(),mMainView->viewStack(), |
625 | "KOViewManager::TimeSpanView"); | 626 | "KOViewManager::TimeSpanView"); |
626 | addView(mTimeSpanView); | 627 | addView(mTimeSpanView); |
627 | 628 | ||
628 | mTimeSpanView->readSettings(); | 629 | mTimeSpanView->readSettings(); |
629 | } | 630 | } |
630 | 631 | ||