-rw-r--r-- | korganizer/calendarview.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 07ec459..6e60c56 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -418,96 +418,99 @@ 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( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) ); | ||
467 | connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) ); | ||
468 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) ); | ||
466 | mTodoList->setNavigator( mNavigator ); | 469 | mTodoList->setNavigator( mNavigator ); |
467 | #if 0 | 470 | #if 0 |
468 | if ( QApplication::desktop()->width() < 480 ) { | 471 | if ( QApplication::desktop()->width() < 480 ) { |
469 | leftFrameLayout->addWidget(mFilterView); | 472 | leftFrameLayout->addWidget(mFilterView); |
470 | leftFrameLayout->addWidget(mTodoList, 2 ); | 473 | leftFrameLayout->addWidget(mTodoList, 2 ); |
471 | 474 | ||
472 | } else { | 475 | } else { |
473 | leftFrameLayout->addWidget(mTodoList,2 ); | 476 | leftFrameLayout->addWidget(mTodoList,2 ); |
474 | leftFrameLayout->addWidget(mFilterView ); | 477 | leftFrameLayout->addWidget(mFilterView ); |
475 | } | 478 | } |
476 | #endif | 479 | #endif |
477 | mFilterView->hide(); | 480 | mFilterView->hide(); |
478 | mCalEditView->hide(); | 481 | mCalEditView->hide(); |
479 | QWidget *rightBox = new QWidget( mMainFrame ); | 482 | QWidget *rightBox = new QWidget( mMainFrame ); |
480 | //mainBoxLayout->addWidget ( rightBox, 10 ); | 483 | //mainBoxLayout->addWidget ( rightBox, 10 ); |
481 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 484 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); |
482 | mRightFrame = new QWidgetStack( rightBox ); | 485 | mRightFrame = new QWidgetStack( rightBox ); |
483 | rightLayout->addWidget( mRightFrame, 10 ); | 486 | rightLayout->addWidget( mRightFrame, 10 ); |
484 | 487 | ||
485 | //mLeftFrame = (QWidget *)leftFrame; | 488 | //mLeftFrame = (QWidget *)leftFrame; |
486 | if ( KOPrefs::instance()->mVerticalScreen ) { | 489 | if ( KOPrefs::instance()->mVerticalScreen ) { |
487 | //mDateNavigator->setFixedHeight( mDateNavigator->sizeHint().height() ); | 490 | //mDateNavigator->setFixedHeight( mDateNavigator->sizeHint().height() ); |
488 | //mDateNavigator->setMinimumWidth( mDateNavigator->sizeHint().width() ); | 491 | //mDateNavigator->setMinimumWidth( mDateNavigator->sizeHint().width() ); |
489 | //mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() ); | 492 | //mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() ); |
490 | //leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() ); | 493 | //leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() ); |
491 | } else { | 494 | } else { |
492 | //mDateNavigator->setFixedWidth( mDateNavigator->sizeHint().width() ); | 495 | //mDateNavigator->setFixedWidth( mDateNavigator->sizeHint().width() ); |
493 | //mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); | 496 | //mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); |
494 | //leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); | 497 | //leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); |
495 | } | 498 | } |
496 | if ( !KOPrefs::instance()->mShowDateNavigator) | 499 | if ( !KOPrefs::instance()->mShowDateNavigator) |
497 | mDateNavigator->hide(); | 500 | mDateNavigator->hide(); |
498 | //qDebug("Calendarview Size %d %d ", width(), height()); | 501 | //qDebug("Calendarview Size %d %d ", width(), height()); |
499 | #endif | 502 | #endif |
500 | 503 | ||
501 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 504 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
502 | SLOT( showDates( const KCal::DateList & ) ) ); | 505 | SLOT( showDates( const KCal::DateList & ) ) ); |
503 | 506 | ||
504 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 507 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
505 | mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); | 508 | mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) ); |
506 | 509 | ||
507 | 510 | ||
508 | 511 | ||
509 | connect( mDateNavigator, SIGNAL( showMonth( const QDate & ) ), | 512 | connect( mDateNavigator, SIGNAL( showMonth( const QDate & ) ), |
510 | mViewManager, SLOT( showMonth( const QDate & ) ) ); | 513 | mViewManager, SLOT( showMonth( const QDate & ) ) ); |
511 | 514 | ||
512 | connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), | 515 | connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ), |
513 | mNavigator, SLOT( selectWeek( const QDate & ) ) ); | 516 | mNavigator, SLOT( selectWeek( const QDate & ) ) ); |
@@ -1824,96 +1827,101 @@ bool CalendarView::importQtopia( const QString &categories, | |||
1824 | 1827 | ||
1825 | 1828 | ||
1826 | #endif | 1829 | #endif |
1827 | 1830 | ||
1828 | } | 1831 | } |
1829 | 1832 | ||
1830 | void CalendarView::setSyncEventsReadOnly() | 1833 | void CalendarView::setSyncEventsReadOnly() |
1831 | { | 1834 | { |
1832 | Event * ev; | 1835 | Event * ev; |
1833 | QPtrList<Event> eL = mCalendar->rawEvents(); | 1836 | QPtrList<Event> eL = mCalendar->rawEvents(); |
1834 | ev = eL.first(); | 1837 | ev = eL.first(); |
1835 | while ( ev ) { | 1838 | while ( ev ) { |
1836 | if ( ev->uid().left(15) == QString("last-syncEvent-") ) | 1839 | if ( ev->uid().left(15) == QString("last-syncEvent-") ) |
1837 | ev->setReadOnly( true ); | 1840 | ev->setReadOnly( true ); |
1838 | ev = eL.next(); | 1841 | ev = eL.next(); |
1839 | } | 1842 | } |
1840 | } | 1843 | } |
1841 | 1844 | ||
1842 | bool CalendarView::loadCalendars() | 1845 | bool CalendarView::loadCalendars() |
1843 | { | 1846 | { |
1844 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 1847 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
1845 | KopiCalendarFile * cal = calendars.first(); | 1848 | KopiCalendarFile * cal = calendars.first(); |
1846 | mCalendar->setDefaultCalendar( 1 ); | 1849 | mCalendar->setDefaultCalendar( 1 ); |
1847 | openCalendar( MainWindow::defaultFileName(), false ); | 1850 | openCalendar( MainWindow::defaultFileName(), false ); |
1848 | cal = calendars.next(); | 1851 | cal = calendars.next(); |
1849 | while ( cal ) { | 1852 | while ( cal ) { |
1850 | addCalendar( cal ); | 1853 | addCalendar( cal ); |
1851 | cal = calendars.next(); | 1854 | cal = calendars.next(); |
1852 | } | 1855 | } |
1853 | restoreCalendarSettings(); | 1856 | restoreCalendarSettings(); |
1854 | mCalendar->reInitAlarmSettings(); | 1857 | mCalendar->reInitAlarmSettings(); |
1855 | setSyncEventsReadOnly(); | 1858 | setSyncEventsReadOnly(); |
1856 | updateUnmanagedViews(); | 1859 | updateUnmanagedViews(); |
1857 | updateView(); | 1860 | updateView(); |
1858 | } | 1861 | } |
1859 | bool CalendarView::restoreCalendarSettings() | 1862 | bool CalendarView::restoreCalendarSettings() |
1860 | { | 1863 | { |
1861 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 1864 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
1862 | KopiCalendarFile * cal = calendars.first(); | 1865 | KopiCalendarFile * cal = calendars.first(); |
1863 | while ( cal ) { | 1866 | while ( cal ) { |
1864 | mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled ); | 1867 | mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled ); |
1865 | mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled ); | 1868 | mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled ); |
1866 | mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly ); | 1869 | mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly ); |
1867 | if ( cal->isStandard ) | 1870 | if ( cal->isStandard ) |
1868 | mCalendar->setDefaultCalendar( cal->mCalNumber ); | 1871 | mCalendar->setDefaultCalendar( cal->mCalNumber ); |
1869 | cal = calendars.next(); | 1872 | cal = calendars.next(); |
1870 | } | 1873 | } |
1871 | } | 1874 | } |
1875 | void CalendarView::addCalendarId( int id ) | ||
1876 | { | ||
1877 | KopiCalendarFile * cal = KOPrefs::instance()->getCalendar( id ); | ||
1878 | addCalendar( cal ); | ||
1879 | } | ||
1872 | bool CalendarView::addCalendar( KopiCalendarFile * cal ) | 1880 | bool CalendarView::addCalendar( KopiCalendarFile * cal ) |
1873 | { | 1881 | { |
1874 | 1882 | ||
1875 | if ( mCalendar->addCalendarFile( cal->mFileName, cal->mCalNumber )) | 1883 | if ( mCalendar->addCalendarFile( cal->mFileName, cal->mCalNumber )) |
1876 | return true; | 1884 | return true; |
1877 | qDebug("KO: Error adding calendar file %1 ",cal->mFileName.latin1() ); | 1885 | qDebug("KO: Error adding calendar file %1 ",cal->mFileName.latin1() ); |
1878 | KMessageBox::error(this,i18n("Error loading calendar file\n%1.").arg(cal->mFileName)); | 1886 | KMessageBox::error(this,i18n("Error loading calendar file\n%1.").arg(cal->mFileName)); |
1879 | return false; | 1887 | return false; |
1880 | } | 1888 | } |
1881 | bool CalendarView::openCalendar(QString filename, bool merge) | 1889 | bool CalendarView::openCalendar(QString filename, bool merge) |
1882 | { | 1890 | { |
1883 | 1891 | ||
1884 | if (filename.isEmpty()) { | 1892 | if (filename.isEmpty()) { |
1885 | return false; | 1893 | return false; |
1886 | } | 1894 | } |
1887 | 1895 | ||
1888 | if (!QFile::exists(filename)) { | 1896 | if (!QFile::exists(filename)) { |
1889 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); | 1897 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); |
1890 | return false; | 1898 | return false; |
1891 | } | 1899 | } |
1892 | 1900 | ||
1893 | globalFlagBlockAgenda = 1; | 1901 | globalFlagBlockAgenda = 1; |
1894 | clearAllViews(); | 1902 | clearAllViews(); |
1895 | if (!merge) { | 1903 | if (!merge) { |
1896 | mViewManager->setDocumentId( filename ); | 1904 | mViewManager->setDocumentId( filename ); |
1897 | mCalendar->close(); | 1905 | mCalendar->close(); |
1898 | } | 1906 | } |
1899 | mStorage->setFileName( filename ); | 1907 | mStorage->setFileName( filename ); |
1900 | 1908 | ||
1901 | if ( mStorage->load() ) { | 1909 | if ( mStorage->load() ) { |
1902 | if ( merge ) ;//setModified( true ); | 1910 | if ( merge ) ;//setModified( true ); |
1903 | else { | 1911 | else { |
1904 | //setModified( true ); | 1912 | //setModified( true ); |
1905 | mViewManager->setDocumentId( filename ); | 1913 | mViewManager->setDocumentId( filename ); |
1906 | mDialogManager->setDocumentId( filename ); | 1914 | mDialogManager->setDocumentId( filename ); |
1907 | mTodoList->setDocumentId( filename ); | 1915 | mTodoList->setDocumentId( filename ); |
1908 | } | 1916 | } |
1909 | globalFlagBlockAgenda = 2; | 1917 | globalFlagBlockAgenda = 2; |
1910 | // if ( getLastSyncEvent() ) | 1918 | // if ( getLastSyncEvent() ) |
1911 | // getLastSyncEvent()->setReadOnly( true ); | 1919 | // getLastSyncEvent()->setReadOnly( true ); |
1912 | mCalendar->reInitAlarmSettings(); | 1920 | mCalendar->reInitAlarmSettings(); |
1913 | setSyncEventsReadOnly(); | 1921 | setSyncEventsReadOnly(); |
1914 | updateUnmanagedViews(); | 1922 | updateUnmanagedViews(); |
1915 | updateView(); | 1923 | updateView(); |
1916 | if ( filename != MainWindow::defaultFileName() ) { | 1924 | if ( filename != MainWindow::defaultFileName() ) { |
1917 | saveCalendar( MainWindow::defaultFileName() ); | 1925 | saveCalendar( MainWindow::defaultFileName() ); |
1918 | } else { | 1926 | } else { |
1919 | QFileInfo finf ( MainWindow::defaultFileName()); | 1927 | QFileInfo finf ( MainWindow::defaultFileName()); |