author | zautrix <zautrix> | 2005-07-02 05:23:23 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-02 05:23:23 (UTC) |
commit | b51bfb06293b34b77c46954253ab1b5220c8dd03 (patch) (unidiff) | |
tree | 63caa6a4df764e14b49440800c8744b42ce94d82 | |
parent | 36a9df18a9789d0f44d0485b5f47c4f0329abb22 (diff) | |
download | kdepimpi-b51bfb06293b34b77c46954253ab1b5220c8dd03.zip kdepimpi-b51bfb06293b34b77c46954253ab1b5220c8dd03.tar.gz kdepimpi-b51bfb06293b34b77c46954253ab1b5220c8dd03.tar.bz2 |
fixxx
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 8 | ||||
-rw-r--r-- | korganizer/kofilterview.cpp | 89 | ||||
-rw-r--r-- | korganizer/kofilterview.h | 14 |
3 files changed, 64 insertions, 47 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 350d6b1..9c22730 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -358,17 +358,17 @@ | |||
358 | { "Show summary after syncing","Zeige Zusammenfassung nach Sync." }, | 358 | { "Show summary after syncing","Zeige Zusammenfassung nach Sync." }, |
359 | { "Show time as:","Zeige Zeit als" }, | 359 | { "Show time as:","Zeige Zeit als" }, |
360 | { "Show Todo...","Zeige To-Do" }, | 360 | { "Show Todo...","Zeige To-Do" }, |
361 | { "Vertical screen layout(Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" }, | 361 | { "Vertical screen layout(Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" }, |
362 | { "&Show","Zeige" }, | 362 | { "&Show","Zeige" }, |
363 | { "Show...","Zeige..." }, | 363 | { "Show...","Zeige..." }, |
364 | { "Show","Zeige" }, | 364 | { "Show","Zeige" }, |
365 | { "Small","Klein" }, | 365 | { "Small","Klein" }, |
366 | { "Sorry","Entschuldigung" }, | 366 | { "Sorry","Tut mir leid" }, |
367 | {"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"}, | 367 | {"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"}, |
368 | { "Start:","Start:" }, | 368 | { "Start:","Start:" }, |
369 | { "Start Date","Start Datum" }, | 369 | { "Start Date","Start Datum" }, |
370 | { "Start date: %1","Start Datum: %1" }, | 370 | { "Start date: %1","Start Datum: %1" }, |
371 | { "Start Time","Start Zeit" }, | 371 | { "Start Time","Start Zeit" }, |
372 | { "Status:","Status:" }, | 372 | { "Status:","Status:" }, |
373 | { "Status","Status:" }, | 373 | { "Status","Status:" }, |
374 | { "Summaries","Titel" }, | 374 | { "Summaries","Titel" }, |
@@ -1480,18 +1480,18 @@ | |||
1480 | { "Alarm Options","Alarm Einstellungen" }, | 1480 | { "Alarm Options","Alarm Einstellungen" }, |
1481 | { "Delete selected...","Lösche Ausgewählte..." }, | 1481 | { "Delete selected...","Lösche Ausgewählte..." }, |
1482 | { "None","Nichts" }, | 1482 | { "None","Nichts" }, |
1483 | { "Selection","Auswahl" }, | 1483 | { "Selection","Auswahl" }, |
1484 | { "Set categories","Setze Kategorien" }, | 1484 | { "Set categories","Setze Kategorien" }, |
1485 | { "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" }, | 1485 | { "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" }, |
1486 | { "Reset","Neu setzen" }, | 1486 | { "Reset","Neu setzen" }, |
1487 | { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, | 1487 | { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, |
1488 | { "","" }, | 1488 | { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, |
1489 | { "","" }, | 1489 | { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, |
1490 | { "","" }, | 1490 | { "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" }, |
1491 | { "","" }, | 1491 | { "","" }, |
1492 | { "","" }, | 1492 | { "","" }, |
1493 | { "","" }, | 1493 | { "","" }, |
1494 | { "","" }, | 1494 | { "","" }, |
1495 | { "","" }, | 1495 | { "","" }, |
1496 | { "","" }, | 1496 | { "","" }, |
1497 | { "","" }, \ No newline at end of file | 1497 | { "","" }, \ No newline at end of file |
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index 20118aa..1335d7e 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -127,87 +127,95 @@ KOCalEditView::~KOCalEditView() | |||
127 | } | 127 | } |
128 | void KOCalEditView::selectCal(int id ,bool b) | 128 | void KOCalEditView::selectCal(int id ,bool b) |
129 | { | 129 | { |
130 | KOPrefs::instance()->getCalendar( id )->isEnabled = b; | 130 | KOPrefs::instance()->getCalendar( id )->isEnabled = b; |
131 | emit calendarEnabled ( id, b ); | 131 | emit calendarEnabled ( id, b ); |
132 | emit needsUpdate(); | 132 | emit needsUpdate(); |
133 | 133 | ||
134 | } | 134 | } |
135 | void KOCalEditView::selectStdCal( int id, bool b ) | 135 | void KOCalEditView::selectStdCal( int id ) |
136 | { | 136 | { |
137 | |||
138 | if ( !b ) { | ||
139 | KOCalCheckButton* it = (KOCalCheckButton*) sender(); | ||
140 | if ( it ) { | ||
141 | it->blockSignals( true ); | ||
142 | it->setChecked( true ); | ||
143 | it->blockSignals( false ); | ||
144 | return; | ||
145 | } | ||
146 | return; | ||
147 | } | ||
148 | KOCalRadioButton* sen = (KOCalRadioButton*) sender(); | ||
149 | KOCalRadioButton* it = mStdandardB.first(); | 137 | KOCalRadioButton* it = mStdandardB.first(); |
150 | while ( it ) { | 138 | while ( it ) { |
151 | if ( it->isChecked() ) { | ||
152 | if ( it != sen ) { | ||
153 | it->blockSignals( true ); | 139 | it->blockSignals( true ); |
154 | it->setChecked( false ); | 140 | it->setChecked( it->num() == id ); |
155 | it->blockSignals( false ); | 141 | it->blockSignals( false ); |
156 | break; | ||
157 | } | ||
158 | } | ||
159 | it = mStdandardB.next(); | 142 | it = mStdandardB.next(); |
160 | } | 143 | } |
161 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 144 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
162 | while ( kkf ) { | 145 | while ( kkf ) { |
163 | kkf->isStandard = false; | 146 | kkf->isStandard = (kkf->mCalNumber == id ); |
164 | kkf = KOPrefs::instance()->mCalendars.next(); | 147 | kkf = KOPrefs::instance()->mCalendars.next(); |
165 | } | 148 | } |
166 | KOPrefs::instance()->getCalendar( id )->isStandard = true; | ||
167 | emit setCalendarDefault ( id ); | 149 | emit setCalendarDefault ( id ); |
168 | } | 150 | } |
169 | 151 | ||
170 | void KOCalEditView::selectCalAlarm(int id ,bool b ) | 152 | void KOCalEditView::selectCalAlarm(int id ,bool b ) |
171 | { | 153 | { |
172 | KOPrefs::instance()->getCalendar( id )->isAlarmEnabled = b; | 154 | KOPrefs::instance()->getCalendar( id )->isAlarmEnabled = b; |
173 | emit alarmEnabled ( id , b ); | 155 | emit alarmEnabled ( id , b ); |
174 | emit needsUpdate(); | 156 | emit needsUpdate(); |
175 | } | 157 | } |
176 | void KOCalEditView::selectReadOnly(int id ,bool b ) | 158 | void KOCalEditView::selectReadOnly(int id ,bool b ) |
177 | { | 159 | { |
178 | KOPrefs::instance()->getCalendar( id )->isReadOnly = b; | 160 | KOPrefs::instance()->getCalendar( id )->isReadOnly = b; |
179 | emit calendarReadonly ( id , b ); | 161 | emit calendarReadonly ( id , b ); |
180 | if ( KOPrefs::instance()->getCalendar( id )->isStandard && b && id > 1 ) { | 162 | if ( KOPrefs::instance()->getCalendar( id )->isStandard && b ) { |
181 | KOPrefs::instance()->getCalendar( id )->isStandard = false; | 163 | findNewStandard(); |
182 | KOPrefs::instance()->getCalendar( 1 )->isStandard = true; | 164 | } else { |
183 | mStdandardB.at(0)->setChecked( true ); | 165 | if ( !b ){ |
184 | mStdandardB.at(id-1)->setChecked( false ); | 166 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
185 | emit setCalendarDefault ( 1 ); | 167 | while ( kkf ) { |
168 | if (kkf->isReadOnly && kkf->isStandard ) { | ||
169 | selectStdCal( id ); | ||
170 | break; | ||
171 | } | ||
172 | kkf = KOPrefs::instance()->mCalendars.next(); | ||
173 | } | ||
174 | } | ||
186 | } | 175 | } |
187 | mStdandardB.at(id-1)->setEnabled( !b ); | 176 | mStdandardB.at(id-1)->setEnabled( !b ); |
188 | emit needsUpdate(); | 177 | emit needsUpdate(); |
189 | 178 | ||
190 | } | 179 | } |
180 | void KOCalEditView::findNewStandard() | ||
181 | { | ||
182 | bool found = false; | ||
183 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | ||
184 | while ( kkf ) { | ||
185 | if (!kkf->isReadOnly && !kkf->mErrorOnLoad ) { | ||
186 | found = true; | ||
187 | selectStdCal( kkf->mCalNumber ); | ||
188 | break; | ||
189 | } | ||
190 | kkf = KOPrefs::instance()->mCalendars.next(); | ||
191 | } | ||
192 | if ( !found ) { | ||
193 | KMessageBox::error( this,i18n("\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n"), | ||
194 | i18n("Houston, we have a problem!") ); | ||
195 | |||
196 | } | ||
197 | } | ||
198 | |||
191 | void KOCalEditView::setColor( const QColor& c, int id ) | 199 | void KOCalEditView::setColor( const QColor& c, int id ) |
192 | { | 200 | { |
193 | KOPrefs::instance()->getCalendar( id )->mDefaultColor = c; | 201 | KOPrefs::instance()->getCalendar( id )->mDefaultColor = c; |
194 | emit needsUpdate(); | 202 | emit needsUpdate(); |
195 | } | 203 | } |
196 | void KOCalEditView::deleteCal( int id ) | 204 | void KOCalEditView::deleteCal( int id ) |
197 | { | 205 | { |
198 | KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id ); | 206 | KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id ); |
199 | QString name = kkf->mName; | 207 | QString name = kkf->mName; |
200 | QString file = KGlobal::formatMessage ( kkf->mFileName ,0 ); | 208 | QString file = KGlobal::formatMessage ( kkf->mFileName ,0 ); |
201 | if ( KMessageBox::warningContinueCancel( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)").arg(name).arg(file) ) != KMessageBox::Continue ) return; | 209 | if ( KMessageBox::warningContinueCancel( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)").arg(name).arg(file) ) != KMessageBox::Continue ) return; |
202 | if ( kkf->isStandard ) | 210 | bool findnewstd = kkf->isStandard; |
203 | selectStdCal( 1, true ); | ||
204 | emit removeCalendar ( id ); | 211 | emit removeCalendar ( id ); |
205 | KOPrefs::instance()->mCalendars.remove ( kkf ); | 212 | KOPrefs::instance()->mCalendars.remove ( kkf ); |
213 | if ( findnewstd ) findNewStandard(); | ||
206 | emit needsUpdate(); | 214 | emit needsUpdate(); |
207 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | 215 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |
208 | } | 216 | } |
209 | void KOCalEditView::infoCal( int id ) | 217 | void KOCalEditView::infoCal( int id ) |
210 | { | 218 | { |
211 | QString name = KOPrefs::instance()->getCalendar( id )->mName; | 219 | QString name = KOPrefs::instance()->getCalendar( id )->mName; |
212 | QString file = KGlobal::formatMessage ( KOPrefs::instance()->getCalendar( id )->mFileName, 0 ); | 220 | QString file = KGlobal::formatMessage ( KOPrefs::instance()->getCalendar( id )->mFileName, 0 ); |
213 | if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) { | 221 | if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) { |
@@ -279,42 +287,45 @@ void KOCalEditView::readConfig() | |||
279 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); | 287 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); |
280 | 288 | ||
281 | lab = new QLabel ( " ", mw ); | 289 | lab = new QLabel ( " ", mw ); |
282 | mainLayout->addWidget( lab,0,++ii ); | 290 | mainLayout->addWidget( lab,0,++ii ); |
283 | 291 | ||
284 | 292 | ||
285 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 293 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
286 | int row = 1; | 294 | int row = 1; |
295 | bool errorLoadStandard = false; | ||
287 | while ( kkf ) { | 296 | while ( kkf ) { |
288 | int iii = 0; | 297 | int iii = 0; |
289 | KOCalRadioButton* rb = new KOCalRadioButton( mw ); | 298 | KOCalRadioButton* rb = new KOCalRadioButton( mw ); |
290 | mainLayout->addWidget( rb,row,0 );mStdandardB.append( rb ); | 299 | mainLayout->addWidget( rb,row,0 );mStdandardB.append( rb ); |
291 | rb->setChecked( kkf->isStandard ); | 300 | rb->setChecked( kkf->isStandard ); |
301 | if ( kkf->isStandard && ( kkf->mErrorOnLoad || kkf->isReadOnly ) ) | ||
302 | errorLoadStandard = true; | ||
292 | rb->setNum( kkf->mCalNumber ); | 303 | rb->setNum( kkf->mCalNumber ); |
293 | connect (rb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); | 304 | connect (rb, SIGNAL (selectNum(int)), SLOT ( selectStdCal(int) ) ); |
294 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) | 305 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) |
295 | rb->setEnabled( false ); | 306 | rb->setEnabled( false ); |
296 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); | 307 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); |
297 | mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb ); | 308 | mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb ); |
298 | cb->setChecked( kkf->isEnabled ); | 309 | cb->setChecked( kkf->isEnabled && !kkf->mErrorOnLoad ); |
299 | cb->setNum( kkf->mCalNumber ); | 310 | cb->setNum( kkf->mCalNumber ); |
300 | if ( kkf->mErrorOnLoad ) | 311 | if ( kkf->mErrorOnLoad ) |
301 | cb->setEnabled( false ); | 312 | cb->setEnabled( false ); |
302 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) ); | 313 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) ); |
303 | KOCalButton* name = new KOCalButton( mw ); | 314 | KOCalButton* name = new KOCalButton( mw ); |
304 | name->setNum( kkf->mCalNumber ); | 315 | name->setNum( kkf->mCalNumber ); |
305 | name->setText( kkf->mName ); | 316 | name->setText( kkf->mName ); |
306 | mainLayout->addWidget( name,row,++iii ); | 317 | mainLayout->addWidget( name,row,++iii ); |
307 | connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) ); | 318 | connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) ); |
308 | //lab = new QLabel (" ", mw ); | 319 | //lab = new QLabel (" ", mw ); |
309 | //mainLayout->addWidget( lab,row,++iii ); | 320 | //mainLayout->addWidget( lab,row,++iii ); |
310 | cb = new KOCalCheckButton( mw ); | 321 | cb = new KOCalCheckButton( mw ); |
311 | mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb ); | 322 | mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb ); |
312 | cb->setChecked( kkf->isAlarmEnabled ); | 323 | cb->setChecked( kkf->isAlarmEnabled && !kkf->mErrorOnLoad); |
313 | cb->setNum( kkf->mCalNumber ); | 324 | cb->setNum( kkf->mCalNumber ); |
314 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) ); | 325 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) ); |
315 | if ( kkf->mErrorOnLoad ) | 326 | if ( kkf->mErrorOnLoad ) |
316 | cb->setEnabled( false ); | 327 | cb->setEnabled( false ); |
317 | cb = new KOCalCheckButton( mw ); | 328 | cb = new KOCalCheckButton( mw ); |
318 | mainLayout->addWidget( cb,row,++iii );mROB.append( cb ); | 329 | mainLayout->addWidget( cb,row,++iii );mROB.append( cb ); |
319 | cb->setChecked( kkf->isReadOnly ); | 330 | cb->setChecked( kkf->isReadOnly ); |
320 | cb->setNum( kkf->mCalNumber ); | 331 | cb->setNum( kkf->mCalNumber ); |
@@ -333,23 +344,24 @@ void KOCalEditView::readConfig() | |||
333 | calb->setPixmap ( SmallIcon("minus")); | 344 | calb->setPixmap ( SmallIcon("minus")); |
334 | connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) ); | 345 | connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) ); |
335 | int hei = calb->sizeHint().height(); | 346 | int hei = calb->sizeHint().height(); |
336 | //calb->setMaximumSize( hei*9/10, hei*9/10 ); | 347 | //calb->setMaximumSize( hei*9/10, hei*9/10 ); |
337 | } | 348 | } |
338 | ++row; | 349 | ++row; |
339 | kkf = KOPrefs::instance()->mCalendars.next(); | 350 | kkf = KOPrefs::instance()->mCalendars.next(); |
340 | } | 351 | } |
352 | if ( errorLoadStandard ) | ||
353 | findNewStandard(); | ||
341 | lab = new QLabel ( "", mw ); | 354 | lab = new QLabel ( "", mw ); |
342 | mainLayout->addWidget( lab,row,0 ); | 355 | mainLayout->addWidget( lab,row,0 ); |
343 | mw->show(); | 356 | mw->show(); |
344 | 357 | ||
345 | } | 358 | } |
346 | 359 | ||
347 | |||
348 | void KOCalEditView::defaultInfo() | 360 | void KOCalEditView::defaultInfo() |
349 | { | 361 | { |
350 | KMessageBox::information( this, i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") ); | 362 | KMessageBox::information( this, i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") ); |
351 | } | 363 | } |
352 | void KOCalEditView::addCal() | 364 | void KOCalEditView::addCal() |
353 | { | 365 | { |
354 | bool tryagain = true; | 366 | bool tryagain = true; |
355 | QString name, file; | 367 | QString name, file; |
@@ -426,31 +438,32 @@ void KOCalEditView::enableAll() | |||
426 | toggleList( mEnabledB ); | 438 | toggleList( mEnabledB ); |
427 | } | 439 | } |
428 | void KOCalEditView::enableAlarm() | 440 | void KOCalEditView::enableAlarm() |
429 | { | 441 | { |
430 | toggleList( mAlarmB ); | 442 | toggleList( mAlarmB ); |
431 | } | 443 | } |
432 | void KOCalEditView::disableRO() | 444 | void KOCalEditView::disableRO() |
433 | { | 445 | { |
434 | toggleList( mROB ); | 446 | toggleList( mROB, false ); |
435 | } | 447 | } |
436 | void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list ) | 448 | void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list , bool enable ) |
437 | { | 449 | { |
438 | bool dis = false; | 450 | bool dis = !enable; |
439 | KOCalCheckButton* it = list.first(); | 451 | KOCalCheckButton* it = list.first(); |
440 | while ( it ) { | 452 | while ( it ) { |
441 | if ( !it->isChecked() ) { | 453 | if ( !it->isChecked() == enable && it->isEnabled() ) { |
442 | dis = true; | 454 | dis = !dis; |
443 | break; | 455 | break; |
444 | } | 456 | } |
445 | it = list.next(); | 457 | it = list.next(); |
446 | } | 458 | } |
447 | it = list.first(); | 459 | it = list.first(); |
448 | while ( it ) { | 460 | while ( it ) { |
461 | if ( it->isEnabled() ) | ||
449 | it->setChecked(dis); | 462 | it->setChecked(dis); |
450 | it = list.next(); | 463 | it = list.next(); |
451 | } | 464 | } |
452 | } | 465 | } |
453 | void KOCalEditView::deleteAll() | 466 | void KOCalEditView::deleteAll() |
454 | { | 467 | { |
455 | qDebug("delteAll"); | 468 | qDebug("delteAll"); |
456 | } | 469 | } |
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h index 02107cf..874fc6a 100644 --- a/korganizer/kofilterview.h +++ b/korganizer/kofilterview.h | |||
@@ -65,17 +65,19 @@ class KONewCalPrefs : public QDialog | |||
65 | url = new KURLRequester ( this ); | 65 | url = new KURLRequester ( this ); |
66 | lay->addWidget( url ); | 66 | lay->addWidget( url ); |
67 | QPushButton * ok = new QPushButton( i18n("OK"), this ); | 67 | QPushButton * ok = new QPushButton( i18n("OK"), this ); |
68 | lay->addWidget( ok ); | 68 | lay->addWidget( ok ); |
69 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); | 69 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); |
70 | lay->addWidget( cancel ); | 70 | lay->addWidget( cancel ); |
71 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( checkValid() ) ); | 71 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( checkValid() ) ); |
72 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | 72 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); |
73 | setMinimumWidth( 220 ); | 73 | int minwid = 220; |
74 | if ( QApplication::desktop()->width() >= 320 ) minwid = 300; | ||
75 | setMinimumWidth( minwid ); | ||
74 | resize(sizeHint() ); | 76 | resize(sizeHint() ); |
75 | } | 77 | } |
76 | 78 | ||
77 | QString calName() { return nameE->text(); } | 79 | QString calName() { return nameE->text(); } |
78 | QString calFileName() { return url->url(); } | 80 | QString calFileName() { return url->url(); } |
79 | 81 | ||
80 | public slots: | 82 | public slots: |
81 | void checkValid() { | 83 | void checkValid() { |
@@ -158,28 +160,29 @@ class KOCalRadioButton : public QRadioButton | |||
158 | { | 160 | { |
159 | connect( this, SIGNAL( toggled ( bool ) ), | 161 | connect( this, SIGNAL( toggled ( bool ) ), |
160 | SLOT( bottonClicked( bool ) )); | 162 | SLOT( bottonClicked( bool ) )); |
161 | mNumber = -1; | 163 | mNumber = -1; |
162 | setFocusPolicy(NoFocus); | 164 | setFocusPolicy(NoFocus); |
163 | //setMaximumWidth( 10 ); | 165 | //setMaximumWidth( 10 ); |
164 | 166 | ||
165 | } | 167 | } |
168 | int num() { return mNumber;} | ||
166 | void setNum ( int num ) {mNumber = num; } | 169 | void setNum ( int num ) {mNumber = num; } |
167 | signals: | 170 | signals: |
168 | void selectNum ( int, bool ); | 171 | void selectNum ( int ); |
169 | private: | 172 | private: |
170 | int mNumber; | 173 | int mNumber; |
171 | void keyPressEvent ( QKeyEvent * e ) | 174 | void keyPressEvent ( QKeyEvent * e ) |
172 | { | 175 | { |
173 | e->ignore(); | 176 | e->ignore(); |
174 | } | 177 | } |
175 | 178 | ||
176 | private slots : | 179 | private slots : |
177 | void bottonClicked( bool b) { if ( mNumber > 0 ) emit selectNum ( mNumber , b); } | 180 | void bottonClicked( bool b) { if ( mNumber > 0 ) emit selectNum ( mNumber); } |
178 | }; | 181 | }; |
179 | 182 | ||
180 | 183 | ||
181 | 184 | ||
182 | class KOFilterView : public KOFilterView_base | 185 | class KOFilterView : public KOFilterView_base |
183 | { | 186 | { |
184 | Q_OBJECT | 187 | Q_OBJECT |
185 | public: | 188 | public: |
@@ -211,38 +214,39 @@ class KOCalEditView : public QScrollView | |||
211 | int addCalendar( QString calName, QString fileName, bool ask = true ); | 214 | int addCalendar( QString calName, QString fileName, bool ask = true ); |
212 | int getBirtdayID(); | 215 | int getBirtdayID(); |
213 | public slots: | 216 | public slots: |
214 | void addCal(); | 217 | void addCal(); |
215 | void enableAll(); | 218 | void enableAll(); |
216 | void enableAlarm(); | 219 | void enableAlarm(); |
217 | void disableRO(); | 220 | void disableRO(); |
218 | void deleteAll(); | 221 | void deleteAll(); |
219 | void selectStdCal(int,bool ); | 222 | void selectStdCal(int); |
220 | void selectCal(int,bool ); | 223 | void selectCal(int,bool ); |
221 | void selectCalAlarm(int,bool ); | 224 | void selectCalAlarm(int,bool ); |
222 | void selectReadOnly(int,bool ); | 225 | void selectReadOnly(int,bool ); |
223 | void setColor(const QColor &,int) ; | 226 | void setColor(const QColor &,int) ; |
224 | void deleteCal(int) ; | 227 | void deleteCal(int) ; |
225 | void infoCal(int) ; | 228 | void infoCal(int) ; |
226 | void readConfig(); | 229 | void readConfig(); |
227 | void defaultInfo(); | 230 | void defaultInfo(); |
231 | void findNewStandard(); | ||
228 | signals: | 232 | signals: |
229 | void alarmEnabled ( int cal, bool enable ); | 233 | void alarmEnabled ( int cal, bool enable ); |
230 | void calendarEnabled ( int cal, bool enable ); | 234 | void calendarEnabled ( int cal, bool enable ); |
231 | void calendarReadonly ( int cal, bool readonly ); | 235 | void calendarReadonly ( int cal, bool readonly ); |
232 | void setCalendarDefault ( int cal ); | 236 | void setCalendarDefault ( int cal ); |
233 | void removeCalendar ( int cal ); | 237 | void removeCalendar ( int cal ); |
234 | void calendarAdded( int ); | 238 | void calendarAdded( int ); |
235 | void needsUpdate(); | 239 | void needsUpdate(); |
236 | void checkCalendar(); | 240 | void checkCalendar(); |
237 | 241 | ||
238 | private: | 242 | private: |
239 | QWidget *mw; | 243 | QWidget *mw; |
240 | void toggleList ( QPtrList<KOCalCheckButton> ); | 244 | void toggleList ( QPtrList<KOCalCheckButton> , bool b = true ); |
241 | QPtrList<KOCalRadioButton> mStdandardB; | 245 | QPtrList<KOCalRadioButton> mStdandardB; |
242 | QPtrList<KOCalCheckButton> mEnabledB; | 246 | QPtrList<KOCalCheckButton> mEnabledB; |
243 | QPtrList<KOCalCheckButton> mAlarmB; | 247 | QPtrList<KOCalCheckButton> mAlarmB; |
244 | QPtrList<KOCalCheckButton> mROB; | 248 | QPtrList<KOCalCheckButton> mROB; |
245 | QGridLayout* mainLayout; | 249 | QGridLayout* mainLayout; |
246 | }; | 250 | }; |
247 | 251 | ||
248 | 252 | ||