| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 12 | ||||
| -rw-r--r-- | korganizer/kofilterview.cpp | 14 | ||||
| -rw-r--r-- | korganizer/kofilterview.h | 2 |
3 files changed, 23 insertions, 5 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index a11fab3..9b7f6ea 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -3,4 +3,6 @@ Info about the changes in new versions of KDE-Pim/Pi ********** VERSION 2.1.6 ************ +This release is for testing only. + KO/Pi: Added to the list view (the list view is used in search dialog as well) the possibility to print it. @@ -11,4 +13,14 @@ Added to the search dialog the possibility to hide the checkboxes such that ther Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly. +Added support for multiple calendar files in KO/Pi. Only local ical (*.ics) files are supported as calendars. +In the sync profile config it is still missing to specify a particular calendar to sync with this profile. That setting will be added later. +Now on every sync the set of calendars is synced which are enabled in the resource view. + +A calendar is enabled in the resource view if the "eye" column is checked. +You can set a calendar to be the default for new items( "+" column ). +You can tell KO/Pi to ignore all alarm of a calendar ( "bell" column ) and you can set it readonly. +To find out how to add a new calendar and how to remove a calendar is left as an exercise to the reader ... + + ********** VERSION 2.1.5 ************ diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index 9633b2c..3333ac2 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp @@ -207,5 +207,11 @@ void KOCalEditView::selectReadOnly(int id ,bool b ) KOPrefs::instance()->getCalendar( id )->isReadOnly = b; emit calendarReadonly ( id , b ); + if ( KOPrefs::instance()->getCalendar( id )->isStandard && b && id > 1 ) { + KOPrefs::instance()->getCalendar( id )->isStandard = false; + KOPrefs::instance()->getCalendar( 1 )->isStandard = true; + emit setCalendarDefault ( 1 ); + } emit needsUpdate(); + QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); } @@ -226,5 +232,5 @@ void KOCalEditView::deleteCal( int id ) KOPrefs::instance()->mCalendars.remove ( kkf ); emit needsUpdate(); - readConfig(); + QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); } void KOCalEditView::infoCal( int id ) @@ -235,6 +241,6 @@ void KOCalEditView::infoCal( int id ) if ( KMessageBox::Yes == KMessageBox::questionYesNo( this, i18n("The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>").arg(name).arg(file) ) ) { emit calendarAdded( id ); - readConfig(); emit needsUpdate(); + QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); } } @@ -303,5 +309,5 @@ void KOCalEditView::readConfig() cb->setNum( kkf->mCalNumber ); connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); - if ( kkf->mErrorOnLoad ) + if ( kkf->mErrorOnLoad || kkf->isReadOnly ) cb->setEnabled( false ); cb = new KOCalCheckButton( mw ); @@ -369,6 +375,6 @@ void KOCalEditView::addCal() kkf->mFileName = file; emit calendarAdded( kkf->mCalNumber ); - readConfig(); emit needsUpdate(); + QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); } void KOCalEditView::enableAll() diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h index 4a0cd8a..1849e36 100644 --- a/korganizer/kofilterview.h +++ b/korganizer/kofilterview.h @@ -118,5 +118,4 @@ class KOCalEditView : public QWidget ~KOCalEditView(); - void readConfig(); public slots: void addCal(); @@ -132,4 +131,5 @@ class KOCalEditView : public QWidget void deleteCal(int) ; void infoCal(int) ; + void readConfig(); signals: void alarmEnabled ( int cal, bool enable ); |