author | zautrix <zautrix> | 2005-06-29 10:36:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-29 10:36:31 (UTC) |
commit | b7044dfc9516d546683973985555c481d59fc677 (patch) (unidiff) | |
tree | b521090cfc8eb6c8c6a6f6f8167c83058ea1361b /korganizer/calendarview.cpp | |
parent | f226b4cd2ce06a6948811fe04d80fe3ffa44f695 (diff) | |
download | kdepimpi-b7044dfc9516d546683973985555c481d59fc677.zip kdepimpi-b7044dfc9516d546683973985555c481d59fc677.tar.gz kdepimpi-b7044dfc9516d546683973985555c481d59fc677.tar.bz2 |
journal fixxx
-rw-r--r-- | korganizer/calendarview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index a62145a..697093e 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -418,96 +418,97 @@ void CalendarView::init() | |||
418 | } | 418 | } |
419 | #endif | 419 | #endif |
420 | QWidget *rightBox = new QWidget( mPanner ); | 420 | QWidget *rightBox = new QWidget( mPanner ); |
421 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 421 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); |
422 | 422 | ||
423 | mRightFrame = new QWidgetStack( rightBox ); | 423 | mRightFrame = new QWidgetStack( rightBox ); |
424 | rightLayout->addWidget( mRightFrame, 1 ); | 424 | rightLayout->addWidget( mRightFrame, 1 ); |
425 | 425 | ||
426 | mLeftFrame = mLeftSplitter; | 426 | mLeftFrame = mLeftSplitter; |
427 | #else | 427 | #else |
428 | //QWidget *mainBox = new QWidget( this ); | 428 | //QWidget *mainBox = new QWidget( this ); |
429 | //QWidget *leftFrame = new QWidget( mainBox ); | 429 | //QWidget *leftFrame = new QWidget( mainBox ); |
430 | //QBoxLayout * mainBoxLayout; | 430 | //QBoxLayout * mainBoxLayout; |
431 | if ( KOPrefs::instance()->mVerticalScreen ) { | 431 | if ( KOPrefs::instance()->mVerticalScreen ) { |
432 | //mainBoxLayout = new QVBoxLayout(mainBox); | 432 | //mainBoxLayout = new QVBoxLayout(mainBox); |
433 | //leftFrameLayout = new QHBoxLayout(leftFrame ); | 433 | //leftFrameLayout = new QHBoxLayout(leftFrame ); |
434 | mMainFrame = new KDGanttMinimizeSplitter( Qt::Vertical, this ); | 434 | mMainFrame = new KDGanttMinimizeSplitter( Qt::Vertical, this ); |
435 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); | 435 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); |
436 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, mMainFrame);; | 436 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, mMainFrame);; |
437 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 437 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
438 | } else { | 438 | } else { |
439 | //mainBoxLayout = new QHBoxLayout(mainBox); | 439 | //mainBoxLayout = new QHBoxLayout(mainBox); |
440 | //leftFrameLayout = new QVBoxLayout(leftFrame ); | 440 | //leftFrameLayout = new QVBoxLayout(leftFrame ); |
441 | mMainFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, this); | 441 | mMainFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, this); |
442 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left); | 442 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left); |
443 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame); | 443 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame); |
444 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); | 444 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); |
445 | } | 445 | } |
446 | mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); | 446 | mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); |
447 | //QBoxLayout * leftFrameLayout; | 447 | //QBoxLayout * leftFrameLayout; |
448 | topLayout->addWidget( mMainFrame ); | 448 | topLayout->addWidget( mMainFrame ); |
449 | //mainBoxLayout->addWidget (mLeftFrame); | 449 | //mainBoxLayout->addWidget (mLeftFrame); |
450 | mDateNavigator = new DateNavigatorContainer( mLeftFrame, | 450 | mDateNavigator = new DateNavigatorContainer( mLeftFrame, |
451 | "CalendarView::DateNavigator" ); | 451 | "CalendarView::DateNavigator" ); |
452 | #if 0 | 452 | #if 0 |
453 | // FIXME | 453 | // FIXME |
454 | mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE, | 454 | mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE, |
455 | "CalendarView::DateNavigator", QDate::currentDate()); | 455 | "CalendarView::DateNavigator", QDate::currentDate()); |
456 | #endif | 456 | #endif |
457 | // mDateNavigator->blockSignals( true ); | 457 | // mDateNavigator->blockSignals( true ); |
458 | //leftFrameLayout->addWidget( mDateNavigator ); | 458 | //leftFrameLayout->addWidget( mDateNavigator ); |
459 | mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall"); | 459 | mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall"); |
460 | mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); | 460 | mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); |
461 | mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView"); | 461 | mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView"); |
462 | connect( mCalEditView, SIGNAL( calendarEnabled (int,bool) ),mCalendar, SLOT( setCalendarEnabled(int,bool)) ); | 462 | connect( mCalEditView, SIGNAL( calendarEnabled (int,bool) ),mCalendar, SLOT( setCalendarEnabled(int,bool)) ); |
463 | connect( mCalEditView, SIGNAL( alarmEnabled(int,bool) ),mCalendar, SLOT( setAlarmEnabled(int,bool)) ); | 463 | connect( mCalEditView, SIGNAL( alarmEnabled(int,bool) ),mCalendar, SLOT( setAlarmEnabled(int,bool)) ); |
464 | connect( mCalEditView, SIGNAL( calendarReadonly(int,bool) ),mCalendar, SLOT( setReadOnly(int,bool)) ); | 464 | connect( mCalEditView, SIGNAL( calendarReadonly(int,bool) ),mCalendar, SLOT( setReadOnly(int,bool)) ); |
465 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) ); | 465 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) ); |
466 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mViewManager, SLOT( setDefaultCalendar(int)) ); | ||
466 | connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) ); | 467 | connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) ); |
467 | connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) ); | 468 | connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) ); |
468 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) ); | 469 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) ); |
469 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) ); | 470 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) ); |
470 | mTodoList->setNavigator( mNavigator ); | 471 | mTodoList->setNavigator( mNavigator ); |
471 | #if 0 | 472 | #if 0 |
472 | if ( QApplication::desktop()->width() < 480 ) { | 473 | if ( QApplication::desktop()->width() < 480 ) { |
473 | leftFrameLayout->addWidget(mFilterView); | 474 | leftFrameLayout->addWidget(mFilterView); |
474 | leftFrameLayout->addWidget(mTodoList, 2 ); | 475 | leftFrameLayout->addWidget(mTodoList, 2 ); |
475 | 476 | ||
476 | } else { | 477 | } else { |
477 | leftFrameLayout->addWidget(mTodoList,2 ); | 478 | leftFrameLayout->addWidget(mTodoList,2 ); |
478 | leftFrameLayout->addWidget(mFilterView ); | 479 | leftFrameLayout->addWidget(mFilterView ); |
479 | } | 480 | } |
480 | #endif | 481 | #endif |
481 | mFilterView->hide(); | 482 | mFilterView->hide(); |
482 | mCalEditView->hide(); | 483 | mCalEditView->hide(); |
483 | QWidget *rightBox = new QWidget( mMainFrame ); | 484 | QWidget *rightBox = new QWidget( mMainFrame ); |
484 | //mainBoxLayout->addWidget ( rightBox, 10 ); | 485 | //mainBoxLayout->addWidget ( rightBox, 10 ); |
485 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 486 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); |
486 | mRightFrame = new QWidgetStack( rightBox ); | 487 | mRightFrame = new QWidgetStack( rightBox ); |
487 | rightLayout->addWidget( mRightFrame, 10 ); | 488 | rightLayout->addWidget( mRightFrame, 10 ); |
488 | 489 | ||
489 | //mLeftFrame = (QWidget *)leftFrame; | 490 | //mLeftFrame = (QWidget *)leftFrame; |
490 | if ( KOPrefs::instance()->mVerticalScreen ) { | 491 | if ( KOPrefs::instance()->mVerticalScreen ) { |
491 | //mDateNavigator->setFixedHeight( mDateNavigator->sizeHint().height() ); | 492 | //mDateNavigator->setFixedHeight( mDateNavigator->sizeHint().height() ); |
492 | //mDateNavigator->setMinimumWidth( mDateNavigator->sizeHint().width() ); | 493 | //mDateNavigator->setMinimumWidth( mDateNavigator->sizeHint().width() ); |
493 | //mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() ); | 494 | //mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() ); |
494 | //leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() ); | 495 | //leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() ); |
495 | } else { | 496 | } else { |
496 | //mDateNavigator->setFixedWidth( mDateNavigator->sizeHint().width() ); | 497 | //mDateNavigator->setFixedWidth( mDateNavigator->sizeHint().width() ); |
497 | //mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); | 498 | //mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); |
498 | //leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); | 499 | //leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); |
499 | } | 500 | } |
500 | if ( !KOPrefs::instance()->mShowDateNavigator) | 501 | if ( !KOPrefs::instance()->mShowDateNavigator) |
501 | mDateNavigator->hide(); | 502 | mDateNavigator->hide(); |
502 | //qDebug("Calendarview Size %d %d ", width(), height()); | 503 | //qDebug("Calendarview Size %d %d ", width(), height()); |
503 | #endif | 504 | #endif |
504 | 505 | ||
505 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 506 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
506 | SLOT( showDates( const KCal::DateList & ) ) ); | 507 | SLOT( showDates( const KCal::DateList & ) ) ); |
507 | 508 | ||
508 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 509 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
509 | mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); | 510 | mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); |
510 | 511 | ||
511 | 512 | ||
512 | 513 | ||
513 | connect( mDateNavigator, SIGNAL( showMonth( const QDate & ) ), | 514 | connect( mDateNavigator, SIGNAL( showMonth( const QDate & ) ), |