-rw-r--r-- | korganizer/calendarview.cpp | 72 |
1 files changed, 45 insertions, 27 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 6eaac1c..00285a5 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -94,32 +94,33 @@ | |||
94 | #endif | 94 | #endif |
95 | #ifndef KORG_NOPLUGINS | 95 | #ifndef KORG_NOPLUGINS |
96 | #include "kocore.h" | 96 | #include "kocore.h" |
97 | #endif | 97 | #endif |
98 | #include "koeventeditor.h" | 98 | #include "koeventeditor.h" |
99 | #include "kotodoeditor.h" | 99 | #include "kotodoeditor.h" |
100 | #include "koprefs.h" | 100 | #include "koprefs.h" |
101 | #include "koeventviewerdialog.h" | 101 | #include "koeventviewerdialog.h" |
102 | #include "publishdialog.h" | 102 | #include "publishdialog.h" |
103 | #include "kofilterview.h" | 103 | #include "kofilterview.h" |
104 | #include "koglobals.h" | 104 | #include "koglobals.h" |
105 | #include "koviewmanager.h" | 105 | #include "koviewmanager.h" |
106 | #include "koagendaview.h" | 106 | #include "koagendaview.h" |
107 | #include "kodialogmanager.h" | 107 | #include "kodialogmanager.h" |
108 | #include "outgoingdialog.h" | 108 | #include "outgoingdialog.h" |
109 | #include "incomingdialog.h" | 109 | #include "incomingdialog.h" |
110 | #include "datenavigatorcontainer.h" | ||
110 | #include "statusdialog.h" | 111 | #include "statusdialog.h" |
111 | #include "kdatenavigator.h" | 112 | #include "kdatenavigator.h" |
112 | #include "kotodoview.h" | 113 | #include "kotodoview.h" |
113 | #include "datenavigator.h" | 114 | #include "datenavigator.h" |
114 | #include "resourceview.h" | 115 | #include "resourceview.h" |
115 | #include "navigatorbar.h" | 116 | #include "navigatorbar.h" |
116 | #include "searchdialog.h" | 117 | #include "searchdialog.h" |
117 | #include "mainwindow.h" | 118 | #include "mainwindow.h" |
118 | 119 | ||
119 | #include "calendarview.h" | 120 | #include "calendarview.h" |
120 | #ifndef DESKTOP_VERSION | 121 | #ifndef DESKTOP_VERSION |
121 | #include <qtopia/alarmserver.h> | 122 | #include <qtopia/alarmserver.h> |
122 | #endif | 123 | #endif |
123 | #ifndef _WIN32_ | 124 | #ifndef _WIN32_ |
124 | #include <stdlib.h> | 125 | #include <stdlib.h> |
125 | #include <stdio.h> | 126 | #include <stdio.h> |
@@ -254,142 +255,155 @@ void CalendarView::init() | |||
254 | mCalendar->registerObserver( this ); | 255 | mCalendar->registerObserver( this ); |
255 | // TODO: Make sure that view is updated, when calendar is changed. | 256 | // TODO: Make sure that view is updated, when calendar is changed. |
256 | 257 | ||
257 | mStorage = new FileStorage( mCalendar ); | 258 | mStorage = new FileStorage( mCalendar ); |
258 | mNavigator = new DateNavigator( this, "datevav", mViewManager ); | 259 | mNavigator = new DateNavigator( this, "datevav", mViewManager ); |
259 | 260 | ||
260 | QBoxLayout *topLayout = (QBoxLayout*)layout(); | 261 | QBoxLayout *topLayout = (QBoxLayout*)layout(); |
261 | #ifndef KORG_NOSPLITTER | 262 | #ifndef KORG_NOSPLITTER |
262 | // create the main layout frames. | 263 | // create the main layout frames. |
263 | mPanner = new QSplitter(QSplitter::Horizontal,this,"CalendarView::Panner"); | 264 | mPanner = new QSplitter(QSplitter::Horizontal,this,"CalendarView::Panner"); |
264 | topLayout->addWidget(mPanner); | 265 | topLayout->addWidget(mPanner); |
265 | 266 | ||
266 | mLeftSplitter = new QSplitter(QSplitter::Vertical,mPanner, | 267 | mLeftSplitter = new QSplitter(QSplitter::Vertical,mPanner, |
267 | "CalendarView::LeftFrame"); | 268 | "CalendarView::LeftFrame"); |
268 | mPanner->setResizeMode(mLeftSplitter,QSplitter::KeepSize); | 269 | mPanner->setResizeMode(mLeftSplitter,QSplitter::KeepSize); |
269 | 270 | ||
270 | mDateNavigator = new KDateNavigator(mLeftSplitter, mCalendar, TRUE, | 271 | mDateNavigator = new DateNavigatorContainer( mLeftSplitter, |
271 | "CalendarView::DateNavigator", QDate::currentDate() ); | 272 | "CalendarView::DateNavigator" ); |
273 | |||
272 | mLeftSplitter->setResizeMode(mDateNavigator,QSplitter::KeepSize); | 274 | mLeftSplitter->setResizeMode(mDateNavigator,QSplitter::KeepSize); |
273 | mTodoList = new KOTodoView(mCalendar, mLeftSplitter, "todolist_small2"); | 275 | mTodoList = new KOTodoView(mCalendar, mLeftSplitter, "todolist_small2"); |
274 | mTodoList->setNavigator( mNavigator ); | 276 | mTodoList->setNavigator( mNavigator ); |
275 | mFilterView = new KOFilterView(&mFilters,mLeftSplitter,"CalendarView::FilterView"); | 277 | mFilterView = new KOFilterView(&mFilters,mLeftSplitter,"CalendarView::FilterView"); |
276 | 278 | ||
277 | #ifdef KORG_NORESOURCEVIEW | 279 | #ifdef KORG_NORESOURCEVIEW |
278 | mResourceView = 0; | 280 | mResourceView = 0; |
279 | #else | 281 | #else |
280 | if ( mResourceManager ) { | 282 | if ( mResourceManager ) { |
281 | mResourceView = new ResourceView( mResourceManager, mLeftSplitter ); | 283 | mResourceView = new ResourceView( mResourceManager, mLeftSplitter ); |
282 | mResourceView->updateView(); | 284 | mResourceView->updateView(); |
283 | connect( mResourceView, SIGNAL( resourcesChanged() ), | 285 | connect( mResourceView, SIGNAL( resourcesChanged() ), |
284 | SLOT( updateView() ) ); | 286 | SLOT( updateView() ) ); |
285 | } else { | 287 | } else { |
286 | mResourceView = 0; | 288 | mResourceView = 0; |
287 | } | 289 | } |
288 | #endif | 290 | #endif |
289 | QWidget *rightBox = new QWidget( mPanner ); | 291 | QWidget *rightBox = new QWidget( mPanner ); |
290 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 292 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); |
291 | 293 | ||
292 | mRightFrame = new QWidgetStack( rightBox ); | 294 | mRightFrame = new QWidgetStack( rightBox ); |
293 | rightLayout->addWidget( mRightFrame, 1 ); | 295 | rightLayout->addWidget( mRightFrame, 1 ); |
294 | 296 | ||
295 | mLeftFrame = mLeftSplitter; | 297 | mLeftFrame = mLeftSplitter; |
296 | #else | 298 | #else |
297 | QWidget *mainBox = new QWidget( this ); | 299 | QWidget *mainBox = new QWidget( this ); |
298 | QWidget *leftFrame = new QWidget( mainBox ); | 300 | //QWidget *leftFrame = new QWidget( mainBox ); |
299 | |||
300 | QBoxLayout * mainBoxLayout; | 301 | QBoxLayout * mainBoxLayout; |
301 | QBoxLayout * leftFrameLayout; | ||
302 | if ( KOPrefs::instance()->mVerticalScreen ) { | 302 | if ( KOPrefs::instance()->mVerticalScreen ) { |
303 | mainBoxLayout = new QVBoxLayout(mainBox); | 303 | mainBoxLayout = new QVBoxLayout(mainBox); |
304 | leftFrameLayout = new QHBoxLayout(leftFrame ); | 304 | //leftFrameLayout = new QHBoxLayout(leftFrame ); |
305 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, mainBox);; | ||
306 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left ); | ||
305 | } else { | 307 | } else { |
306 | mainBoxLayout = new QHBoxLayout(mainBox); | 308 | mainBoxLayout = new QHBoxLayout(mainBox); |
307 | leftFrameLayout = new QVBoxLayout(leftFrame ); | 309 | //leftFrameLayout = new QVBoxLayout(leftFrame ); |
310 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mainBox);; | ||
311 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); | ||
308 | } | 312 | } |
313 | //QBoxLayout * leftFrameLayout; | ||
309 | topLayout->addWidget( mainBox ); | 314 | topLayout->addWidget( mainBox ); |
310 | mainBoxLayout->addWidget (leftFrame); | 315 | mainBoxLayout->addWidget (mLeftFrame); |
311 | mDateNavigator = new KDateNavigator(leftFrame, mCalendar, TRUE, | 316 | mDateNavigator = new DateNavigatorContainer( mLeftFrame, |
317 | "CalendarView::DateNavigator" ); | ||
318 | #if 0 | ||
319 | // FIXME | ||
320 | mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE, | ||
312 | "CalendarView::DateNavigator", QDate::currentDate()); | 321 | "CalendarView::DateNavigator", QDate::currentDate()); |
322 | #endif | ||
313 | // mDateNavigator->blockSignals( true ); | 323 | // mDateNavigator->blockSignals( true ); |
314 | leftFrameLayout->addWidget( mDateNavigator ); | 324 | //leftFrameLayout->addWidget( mDateNavigator ); |
315 | mFilterView = new KOFilterView(&mFilters,leftFrame,"CalendarView::FilterView"); | 325 | mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall"); |
316 | mTodoList = new KOTodoView(mCalendar, leftFrame, "todolistsmall"); | 326 | mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); |
317 | mTodoList->setNavigator( mNavigator ); | 327 | mTodoList->setNavigator( mNavigator ); |
318 | 328 | #if 0 | |
319 | if ( QApplication::desktop()->width() < 480 ) { | 329 | if ( QApplication::desktop()->width() < 480 ) { |
320 | leftFrameLayout->addWidget(mFilterView); | 330 | leftFrameLayout->addWidget(mFilterView); |
321 | leftFrameLayout->addWidget(mTodoList, 2 ); | 331 | leftFrameLayout->addWidget(mTodoList, 2 ); |
322 | 332 | ||
323 | } else { | 333 | } else { |
324 | leftFrameLayout->addWidget(mTodoList,2 ); | 334 | leftFrameLayout->addWidget(mTodoList,2 ); |
325 | leftFrameLayout->addWidget(mFilterView ); | 335 | leftFrameLayout->addWidget(mFilterView ); |
326 | } | 336 | } |
337 | #endif | ||
327 | mFilterView->hide(); | 338 | mFilterView->hide(); |
328 | QWidget *rightBox = new QWidget( mainBox ); | 339 | QWidget *rightBox = new QWidget( mainBox ); |
329 | mainBoxLayout->addWidget ( rightBox, 10 ); | 340 | mainBoxLayout->addWidget ( rightBox, 10 ); |
330 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 341 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); |
331 | mRightFrame = new QWidgetStack( rightBox ); | 342 | mRightFrame = new QWidgetStack( rightBox ); |
332 | rightLayout->addWidget( mRightFrame, 10 ); | 343 | rightLayout->addWidget( mRightFrame, 10 ); |
333 | 344 | ||
334 | mLeftFrame = leftFrame; | 345 | //mLeftFrame = (QWidget *)leftFrame; |
335 | if ( KOPrefs::instance()->mVerticalScreen ) { | 346 | if ( KOPrefs::instance()->mVerticalScreen ) { |
336 | mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() ); | 347 | mDateNavigator->setFixedHeight( mDateNavigator->sizeHint().height() ); |
337 | leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() ); | 348 | //mDateNavigator->setMinimumWidth( mDateNavigator->sizeHint().width() ); |
349 | //mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() ); | ||
350 | //leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() ); | ||
338 | } else { | 351 | } else { |
339 | mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); | 352 | mDateNavigator->setFixedWidth( mDateNavigator->sizeHint().width() ); |
340 | leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); | 353 | //mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); |
354 | //leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); | ||
341 | } | 355 | } |
342 | if ( !KOPrefs::instance()->mShowDateNavigator) | 356 | if ( !KOPrefs::instance()->mShowDateNavigator) |
343 | mDateNavigator->hide(); | 357 | mLeftFrame->toggle(); |
344 | //qDebug("Calendarview Size %d %d ", width(), height()); | 358 | //qDebug("Calendarview Size %d %d ", width(), height()); |
345 | #endif | 359 | #endif |
346 | 360 | ||
347 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 361 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
348 | SLOT( showDates( const KCal::DateList & ) ) ); | 362 | SLOT( showDates( const KCal::DateList & ) ) ); |
349 | 363 | ||
350 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 364 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
351 | mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); | 365 | mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); |
352 | 366 | ||
353 | 367 | ||
354 | connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), | 368 | connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), |
355 | mNavigator, SLOT( selectWeek( const QDate & ) ) ); | 369 | mNavigator, SLOT( selectWeek( const QDate & ) ) ); |
356 | 370 | ||
357 | connect( mDateNavigator, SIGNAL( goPrevYear() ), | 371 | connect( mDateNavigator, SIGNAL( goPrevYear() ), |
358 | mNavigator, SLOT( selectPreviousYear() ) ); | 372 | mNavigator, SLOT( selectPreviousYear() ) ); |
359 | connect( mDateNavigator, SIGNAL( goNextYear() ), | 373 | connect( mDateNavigator, SIGNAL( goNextYear() ), |
360 | mNavigator, SLOT( selectNextYear() ) ); | 374 | mNavigator, SLOT( selectNextYear() ) ); |
361 | connect( mDateNavigator, SIGNAL( goPrevMonth() ), | 375 | connect( mDateNavigator, SIGNAL( goPrevMonth() ), |
362 | mNavigator, SLOT( selectPreviousMonth() ) ); | 376 | mNavigator, SLOT( selectPreviousMonth() ) ); |
363 | connect( mDateNavigator, SIGNAL( goNextMonth() ), | 377 | connect( mDateNavigator, SIGNAL( goNextMonth() ), |
364 | mNavigator, SLOT( selectNextMonth() ) ); | 378 | mNavigator, SLOT( selectNextMonth() ) ); |
365 | 379 | ||
366 | connect( mDateNavigator, SIGNAL( goPrevious() ), | 380 | connect( mDateNavigator, SIGNAL( goPrevious() ), |
367 | mNavigator, SLOT( selectPrevious() ) ); | 381 | mNavigator, SLOT( selectPrevious() ) ); |
368 | connect( mDateNavigator, SIGNAL( goNext() ), | 382 | connect( mDateNavigator, SIGNAL( goNext() ), |
369 | mNavigator, SLOT( selectNext() ) ); | 383 | mNavigator, SLOT( selectNext() ) ); |
370 | connect( mDateNavigator, SIGNAL( monthSelected ( int ) ), | 384 | connect( mDateNavigator, SIGNAL( monthSelected ( int ) ), |
371 | mNavigator, SLOT( slotMonthSelect( int ) ) ); | 385 | mNavigator, SLOT( slotMonthSelect( int ) ) ); |
372 | 386 | ||
373 | connect( mDateNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 387 | connect( mDateNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
374 | mNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); | 388 | mNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); |
375 | 389 | #if 0 | |
376 | connect( mDateNavigator, SIGNAL( eventDropped( Event * ) ), | 390 | connect( mDateNavigator, SIGNAL( incidenceDropped( Incidence * ) ), |
377 | SLOT( eventAdded( Event *) ) ); | 391 | SLOT( incidenceAdded( Incidence *) ) ); |
378 | 392 | #endif | |
379 | connect(mDateNavigator,SIGNAL(dayPassed(QDate)),SLOT(updateView())); | 393 | // connect(mDateNavigator,SIGNAL(dayPassed(QDate)),SLOT(updateView())); |
380 | 394 | ||
381 | connect( this, SIGNAL( configChanged() ), | 395 | connect( this, SIGNAL( configChanged() ), |
382 | mDateNavigator, SLOT( updateConfig() ) ); | 396 | mDateNavigator, SLOT( updateConfig() ) ); |
383 | 397 | ||
384 | connect( mTodoList, SIGNAL( newTodoSignal() ), | 398 | connect( mTodoList, SIGNAL( newTodoSignal() ), |
385 | SLOT( newTodo() ) ); | 399 | SLOT( newTodo() ) ); |
386 | connect( mTodoList, SIGNAL( newSubTodoSignal( Todo *) ), | 400 | connect( mTodoList, SIGNAL( newSubTodoSignal( Todo *) ), |
387 | SLOT( newSubTodo( Todo * ) ) ); | 401 | SLOT( newSubTodo( Todo * ) ) ); |
388 | connect( mTodoList, SIGNAL( editTodoSignal( Todo * ) ), | 402 | connect( mTodoList, SIGNAL( editTodoSignal( Todo * ) ), |
389 | SLOT( editTodo( Todo * ) ) ); | 403 | SLOT( editTodo( Todo * ) ) ); |
390 | connect( mTodoList, SIGNAL( showTodoSignal( Todo * ) ), | 404 | connect( mTodoList, SIGNAL( showTodoSignal( Todo * ) ), |
391 | SLOT( showTodo( Todo *) ) ); | 405 | SLOT( showTodo( Todo *) ) ); |
392 | connect( mTodoList, SIGNAL( deleteTodoSignal( Todo *) ), | 406 | connect( mTodoList, SIGNAL( deleteTodoSignal( Todo *) ), |
393 | SLOT( deleteTodo( Todo *) ) ); | 407 | SLOT( deleteTodo( Todo *) ) ); |
394 | connect( this, SIGNAL( configChanged()), mTodoList, SLOT( updateConfig() ) ); | 408 | connect( this, SIGNAL( configChanged()), mTodoList, SLOT( updateConfig() ) ); |
395 | connect( mTodoList, SIGNAL( purgeCompletedSignal() ), | 409 | connect( mTodoList, SIGNAL( purgeCompletedSignal() ), |
@@ -454,33 +468,33 @@ void CalendarView::init() | |||
454 | mAlarmTimer = new QTimer( this ); | 468 | mAlarmTimer = new QTimer( this ); |
455 | mRecheckAlarmTimer = new QTimer( this ); | 469 | mRecheckAlarmTimer = new QTimer( this ); |
456 | connect( mRecheckAlarmTimer, SIGNAL( timeout () ), SLOT( recheckTimerAlarm() ) ); | 470 | connect( mRecheckAlarmTimer, SIGNAL( timeout () ), SLOT( recheckTimerAlarm() ) ); |
457 | connect( mSuspendTimer, SIGNAL( timeout () ), SLOT( suspendAlarm() ) ); | 471 | connect( mSuspendTimer, SIGNAL( timeout () ), SLOT( suspendAlarm() ) ); |
458 | connect( mAlarmTimer, SIGNAL( timeout () ), SLOT( timerAlarm() ) ); | 472 | connect( mAlarmTimer, SIGNAL( timeout () ), SLOT( timerAlarm() ) ); |
459 | mAlarmDialog = new AlarmDialog( this ); | 473 | mAlarmDialog = new AlarmDialog( this ); |
460 | connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString & ) ) ); | 474 | connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString & ) ) ); |
461 | mAlarmDialog->setServerNotification( false ); | 475 | mAlarmDialog->setServerNotification( false ); |
462 | mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime ); | 476 | mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime ); |
463 | 477 | ||
464 | 478 | ||
465 | #ifndef DESKTOP_VERSION | 479 | #ifndef DESKTOP_VERSION |
466 | //US listen for arriving address resultsets | 480 | //US listen for arriving address resultsets |
467 | connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), | 481 | connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), |
468 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); | 482 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); |
469 | #endif | 483 | #endif |
470 | 484 | mDateNavigator->setCalendar( mCalendar ); | |
471 | } | 485 | } |
472 | 486 | ||
473 | 487 | ||
474 | CalendarView::~CalendarView() | 488 | CalendarView::~CalendarView() |
475 | { | 489 | { |
476 | // kdDebug() << "~CalendarView()" << endl; | 490 | // kdDebug() << "~CalendarView()" << endl; |
477 | //qDebug("CalendarView::~CalendarView() "); | 491 | //qDebug("CalendarView::~CalendarView() "); |
478 | delete mDialogManager; | 492 | delete mDialogManager; |
479 | delete mViewManager; | 493 | delete mViewManager; |
480 | delete mStorage; | 494 | delete mStorage; |
481 | delete mDateFrame ; | 495 | delete mDateFrame ; |
482 | delete beamDialog; | 496 | delete beamDialog; |
483 | delete mEventViewerDialog; | 497 | delete mEventViewerDialog; |
484 | //kdDebug() << "~CalendarView() done" << endl; | 498 | //kdDebug() << "~CalendarView() done" << endl; |
485 | } | 499 | } |
486 | 500 | ||
@@ -3672,51 +3686,55 @@ void CalendarView::takeOverCalendar() | |||
3672 | 3686 | ||
3673 | updateView(); | 3687 | updateView(); |
3674 | } | 3688 | } |
3675 | 3689 | ||
3676 | void CalendarView::showIntro() | 3690 | void CalendarView::showIntro() |
3677 | { | 3691 | { |
3678 | kdDebug() << "To be implemented." << endl; | 3692 | kdDebug() << "To be implemented." << endl; |
3679 | } | 3693 | } |
3680 | 3694 | ||
3681 | QWidgetStack *CalendarView::viewStack() | 3695 | QWidgetStack *CalendarView::viewStack() |
3682 | { | 3696 | { |
3683 | return mRightFrame; | 3697 | return mRightFrame; |
3684 | } | 3698 | } |
3685 | 3699 | ||
3686 | QWidget *CalendarView::leftFrame() | 3700 | QWidget *CalendarView::leftFrame() |
3687 | { | 3701 | { |
3688 | return mLeftFrame; | 3702 | return ( QWidget *)mLeftFrame; |
3689 | } | 3703 | } |
3690 | 3704 | ||
3691 | DateNavigator *CalendarView::dateNavigator() | 3705 | DateNavigator *CalendarView::dateNavigator() |
3692 | { | 3706 | { |
3693 | return mNavigator; | 3707 | return mNavigator; |
3694 | } | 3708 | } |
3695 | 3709 | ||
3696 | KDateNavigator* CalendarView::dateNavigatorWidget() | 3710 | KDateNavigator* CalendarView::dateNavigatorWidget() |
3697 | { | 3711 | { |
3698 | return mDateNavigator; | 3712 | return mDateNavigator->navigatorView(); |
3699 | } | 3713 | } |
3700 | void CalendarView::toggleDateNavigatorWidget() | 3714 | void CalendarView::toggleDateNavigatorWidget() |
3701 | { | 3715 | { |
3702 | KOPrefs::instance()->mShowDateNavigator = !KOPrefs::instance()->mShowDateNavigator ; | 3716 | KOPrefs::instance()->mShowDateNavigator = !KOPrefs::instance()->mShowDateNavigator ; |
3717 | mLeftFrame->toggle(); | ||
3718 | // FIXME mShowDateNavigator is not the toggle state of mLeftFrame | ||
3719 | #if 0 | ||
3703 | if (!KOPrefs::instance()->mShowDateNavigator ) | 3720 | if (!KOPrefs::instance()->mShowDateNavigator ) |
3704 | mDateNavigator->hide(); | 3721 | mDateNavigator->hide(); |
3705 | else | 3722 | else |
3706 | mDateNavigator->show(); | 3723 | mDateNavigator->show(); |
3724 | #endif | ||
3707 | } | 3725 | } |
3708 | void CalendarView::addView(KOrg::BaseView *view) | 3726 | void CalendarView::addView(KOrg::BaseView *view) |
3709 | { | 3727 | { |
3710 | mViewManager->addView(view); | 3728 | mViewManager->addView(view); |
3711 | } | 3729 | } |
3712 | 3730 | ||
3713 | void CalendarView::showView(KOrg::BaseView *view) | 3731 | void CalendarView::showView(KOrg::BaseView *view) |
3714 | { | 3732 | { |
3715 | mViewManager->showView(view, mLeftFrame->isVisible()); | 3733 | mViewManager->showView(view, mLeftFrame->isVisible()); |
3716 | } | 3734 | } |
3717 | 3735 | ||
3718 | Incidence *CalendarView::currentSelection() | 3736 | Incidence *CalendarView::currentSelection() |
3719 | { | 3737 | { |
3720 | return mViewManager->currentSelection(); | 3738 | return mViewManager->currentSelection(); |
3721 | } | 3739 | } |
3722 | void CalendarView::toggleAllDaySize() | 3740 | void CalendarView::toggleAllDaySize() |