summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt12
-rw-r--r--korganizer/kofilterview.cpp14
-rw-r--r--korganizer/kofilterview.h2
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
@@ -2,6 +2,8 @@ Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.1.6 ************ 3********** VERSION 2.1.6 ************
4 4
5This release is for testing only.
6
5KO/Pi: 7KO/Pi:
6Added to the list view (the list view is used in search dialog as well) the possibility to print it. 8Added to the list view (the list view is used in search dialog as well) the possibility to print it.
7Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view. 9Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view.
@@ -10,6 +12,16 @@ Added to the search dialog the possibility to make an additive search such that
10Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus. 12Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus.
11Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly. 13Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly.
12 14
15Added support for multiple calendar files in KO/Pi. Only local ical (*.ics) files are supported as calendars.
16In the sync profile config it is still missing to specify a particular calendar to sync with this profile. That setting will be added later.
17Now on every sync the set of calendars is synced which are enabled in the resource view.
18
19A calendar is enabled in the resource view if the "eye" column is checked.
20You can set a calendar to be the default for new items( "+" column ).
21You can tell KO/Pi to ignore all alarm of a calendar ( "bell" column ) and you can set it readonly.
22To find out how to add a new calendar and how to remove a calendar is left as an exercise to the reader ...
23
24
13********** VERSION 2.1.5 ************ 25********** VERSION 2.1.5 ************
14 26
15This is the new stable version. 27This is the new stable version.
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 9633b2c..3333ac2 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -206,7 +206,13 @@ void KOCalEditView::selectReadOnly(int id ,bool b )
206{ 206{
207 KOPrefs::instance()->getCalendar( id )->isReadOnly = b; 207 KOPrefs::instance()->getCalendar( id )->isReadOnly = b;
208 emit calendarReadonly ( id , b ); 208 emit calendarReadonly ( id , b );
209 if ( KOPrefs::instance()->getCalendar( id )->isStandard && b && id > 1 ) {
210 KOPrefs::instance()->getCalendar( id )->isStandard = false;
211 KOPrefs::instance()->getCalendar( 1 )->isStandard = true;
212 emit setCalendarDefault ( 1 );
213 }
209 emit needsUpdate(); 214 emit needsUpdate();
215 QTimer::singleShot( 0, this, SLOT ( readConfig() ) );
210 216
211} 217}
212void KOCalEditView::setColor( const QColor& c, int id ) 218void KOCalEditView::setColor( const QColor& c, int id )
@@ -225,7 +231,7 @@ void KOCalEditView::deleteCal( int id )
225 emit removeCalendar ( id ); 231 emit removeCalendar ( id );
226 KOPrefs::instance()->mCalendars.remove ( kkf ); 232 KOPrefs::instance()->mCalendars.remove ( kkf );
227 emit needsUpdate(); 233 emit needsUpdate();
228 readConfig(); 234 QTimer::singleShot( 0, this, SLOT ( readConfig() ) );
229} 235}
230void KOCalEditView::infoCal( int id ) 236void KOCalEditView::infoCal( int id )
231{ 237{
@@ -234,8 +240,8 @@ void KOCalEditView::infoCal( int id )
234 if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) { 240 if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) {
235 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) ) ) { 241 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) ) ) {
236 emit calendarAdded( id ); 242 emit calendarAdded( id );
237 readConfig();
238 emit needsUpdate(); 243 emit needsUpdate();
244 QTimer::singleShot( 0, this, SLOT ( readConfig() ) );
239 } 245 }
240 } 246 }
241 else 247 else
@@ -302,7 +308,7 @@ void KOCalEditView::readConfig()
302 cb->setChecked( kkf->isStandard ); 308 cb->setChecked( kkf->isStandard );
303 cb->setNum( kkf->mCalNumber ); 309 cb->setNum( kkf->mCalNumber );
304 connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); 310 connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) );
305 if ( kkf->mErrorOnLoad ) 311 if ( kkf->mErrorOnLoad || kkf->isReadOnly )
306 cb->setEnabled( false ); 312 cb->setEnabled( false );
307 cb = new KOCalCheckButton( mw ); 313 cb = new KOCalCheckButton( mw );
308 mainLayout->addWidget( cb,row,1 );mEnabledB.append( cb ); 314 mainLayout->addWidget( cb,row,1 );mEnabledB.append( cb );
@@ -368,8 +374,8 @@ void KOCalEditView::addCal()
368 kkf->mName = name; 374 kkf->mName = name;
369 kkf->mFileName = file; 375 kkf->mFileName = file;
370 emit calendarAdded( kkf->mCalNumber ); 376 emit calendarAdded( kkf->mCalNumber );
371 readConfig();
372 emit needsUpdate(); 377 emit needsUpdate();
378 QTimer::singleShot( 0, this, SLOT ( readConfig() ) );
373} 379}
374void KOCalEditView::enableAll() 380void KOCalEditView::enableAll()
375{ 381{
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 4a0cd8a..1849e36 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -117,7 +117,6 @@ class KOCalEditView : public QWidget
117 KOCalEditView( QWidget* parent=0,const char* name=0); 117 KOCalEditView( QWidget* parent=0,const char* name=0);
118 ~KOCalEditView(); 118 ~KOCalEditView();
119 119
120 void readConfig();
121 public slots: 120 public slots:
122 void addCal(); 121 void addCal();
123 void enableAll(); 122 void enableAll();
@@ -131,6 +130,7 @@ class KOCalEditView : public QWidget
131 void setColor(const QColor &,int) ; 130 void setColor(const QColor &,int) ;
132 void deleteCal(int) ; 131 void deleteCal(int) ;
133 void infoCal(int) ; 132 void infoCal(int) ;
133 void readConfig();
134 signals: 134 signals:
135 void alarmEnabled ( int cal, bool enable ); 135 void alarmEnabled ( int cal, bool enable );
136 void calendarEnabled ( int cal, bool enable ); 136 void calendarEnabled ( int cal, bool enable );