-rw-r--r-- | korganizer/koviewmanager.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index e8d5ab1..a88276e 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -286,52 +286,57 @@ void KOViewManager::showListView() | |||
286 | mMainView->setBlockShowDates( false ); | 286 | mMainView->setBlockShowDates( false ); |
287 | } | 287 | } |
288 | showView(mListView, KOPrefs::instance()->mFullViewTodo); | 288 | showView(mListView, KOPrefs::instance()->mFullViewTodo); |
289 | //mFlagShowNextxDays = temp; | 289 | //mFlagShowNextxDays = temp; |
290 | } | 290 | } |
291 | 291 | ||
292 | void KOViewManager::showAgendaView( bool fullScreen ) | 292 | void KOViewManager::showAgendaView( bool fullScreen ) |
293 | { | 293 | { |
294 | 294 | ||
295 | mMainView->dialogManager()->hideSearchDialog(); | 295 | mMainView->dialogManager()->hideSearchDialog(); |
296 | // qDebug("KOViewManager::showAgendaView "); | 296 | // qDebug("KOViewManager::showAgendaView "); |
297 | bool full; | 297 | bool full; |
298 | full = fullScreen; | 298 | full = fullScreen; |
299 | if (!mAgendaView) { | 299 | if (!mAgendaView) { |
300 | full = false; | 300 | full = false; |
301 | mAgendaView = new KOAgendaView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::AgendaView"); | 301 | mAgendaView = new KOAgendaView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::AgendaView"); |
302 | addView(mAgendaView); | 302 | addView(mAgendaView); |
303 | #ifndef DESKTOP_VERSION | 303 | #ifndef DESKTOP_VERSION |
304 | QPEApplication::setStylusOperation( mAgendaView, QPEApplication::RightOnHold ); | 304 | QPEApplication::setStylusOperation( mAgendaView, QPEApplication::RightOnHold ); |
305 | #endif | 305 | #endif |
306 | connect( mAgendaView, SIGNAL( incidenceChanged(Incidence *, int )), | 306 | connect( mAgendaView, SIGNAL( incidenceChanged(Incidence *, int )), |
307 | mMainView, SLOT( changeIncidenceDisplay( Incidence *, int ) )); | 307 | mMainView, SLOT( changeIncidenceDisplay( Incidence *, int ) )); |
308 | 308 | ||
309 | // SIGNALS/SLOTS FOR DAY/WEEK VIEW | 309 | // SIGNALS/SLOTS FOR DAY/WEEK VIEW |
310 | |||
311 | |||
312 | |||
313 | connect(mAgendaView,SIGNAL(newTodoSignal(QDateTime,bool)), | ||
314 | mMainView, SLOT(newTodoDateTime(QDateTime,bool))); | ||
310 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)), | 315 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)), |
311 | mMainView, SLOT(newEvent(QDateTime))); | 316 | mMainView, SLOT(newEvent(QDateTime))); |
312 | // connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)), | 317 | connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)), |
313 | // mMainView, SLOT(newEvent(QDateTime,QDateTime))); | 318 | mMainView, SLOT(newEvent(QDateTime,QDateTime))); |
314 | connect(mAgendaView,SIGNAL(newEventSignal(QDate)), | 319 | connect(mAgendaView,SIGNAL(newEventSignal(QDate)), |
315 | mMainView, SLOT(newEvent(QDate))); | 320 | mMainView, SLOT(newEvent(QDate))); |
316 | 321 | ||
317 | connect(mAgendaView, SIGNAL(editIncidenceSignal(Incidence *)), | 322 | connect(mAgendaView, SIGNAL(editIncidenceSignal(Incidence *)), |
318 | mMainView, SLOT(editIncidence(Incidence *))); | 323 | mMainView, SLOT(editIncidence(Incidence *))); |
319 | connect(mAgendaView, SIGNAL(showIncidenceSignal(Incidence *)), | 324 | connect(mAgendaView, SIGNAL(showIncidenceSignal(Incidence *)), |
320 | mMainView, SLOT(showIncidence(Incidence *))); | 325 | mMainView, SLOT(showIncidence(Incidence *))); |
321 | connect(mAgendaView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 326 | connect(mAgendaView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
322 | mMainView, SLOT(deleteIncidence(Incidence *))); | 327 | mMainView, SLOT(deleteIncidence(Incidence *))); |
323 | 328 | ||
324 | connect( mAgendaView, SIGNAL( incidenceSelected( Incidence * ) ), | 329 | connect( mAgendaView, SIGNAL( incidenceSelected( Incidence * ) ), |
325 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 330 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
326 | 331 | ||
327 | connect(mAgendaView, SIGNAL( toggleExpand() ), | 332 | connect(mAgendaView, SIGNAL( toggleExpand() ), |
328 | mMainView, SLOT( toggleExpand() ) ); | 333 | mMainView, SLOT( toggleExpand() ) ); |
329 | 334 | ||
330 | connect(mMainView, SIGNAL( calendarViewExpanded( bool ) ), | 335 | connect(mMainView, SIGNAL( calendarViewExpanded( bool ) ), |
331 | mAgendaView, SLOT( setExpandedButton( bool ) ) ); | 336 | mAgendaView, SLOT( setExpandedButton( bool ) ) ); |
332 | connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), | 337 | connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), |
333 | mMainView, SLOT(cloneIncidence(Incidence *) ) ) ; | 338 | mMainView, SLOT(cloneIncidence(Incidence *) ) ) ; |
334 | connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), | 339 | connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), |
335 | mMainView, SLOT(cancelIncidence(Incidence *) ) ) ; | 340 | mMainView, SLOT(cancelIncidence(Incidence *) ) ) ; |
336 | connect(mMainView, SIGNAL(configChanged()), mAgendaView, SLOT(updateConfig())); | 341 | connect(mMainView, SIGNAL(configChanged()), mAgendaView, SLOT(updateConfig())); |
337 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mAgendaView, | 342 | connect( mMainView, SIGNAL( todoModified( Todo *, int )), mAgendaView, |