-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 4 | ||||
-rw-r--r-- | korganizer/koeditordetails.cpp | 8 | ||||
-rw-r--r-- | libkcal/incidencebase.cpp | 13 | ||||
-rw-r--r-- | libkcal/incidencebase.h | 2 |
4 files changed, 21 insertions, 6 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index 75df50f..85ca87d 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -348,9 +348,9 @@ | |||
348 | { "Dr.","Dr." }, | 348 | { "Dr.","Dr." }, |
349 | { "Miss","Frl." }, | 349 | { "Miss","Frl." }, |
350 | { "Mr.","Herr" }, | 350 | { "Mr.","Herr" }, |
351 | { "Mrs.","Frau" }, | 351 | { "Mrs.","Frau" }, |
352 | { "Ms.","Frau" }, | 352 | { "Ms.","Fr." }, |
353 | { "Prof.","Prof." }, | 353 | { "Prof.","Prof." }, |
354 | { "I","I" }, | 354 | { "I","I" }, |
355 | { "II","II" }, | 355 | { "II","II" }, |
356 | { "III","III" }, | 356 | { "III","III" }, |
@@ -372,9 +372,9 @@ | |||
372 | { "West","West" }, | 372 | { "West","West" }, |
373 | { "Undefined","Unbestimmt" }, | 373 | { "Undefined","Unbestimmt" }, |
374 | { "Edit Address","Bearbeite Adresse" }, | 374 | { "Edit Address","Bearbeite Adresse" }, |
375 | { "Street:","Strasse:" }, | 375 | { "Street:","Strasse:" }, |
376 | { "Post office box:","PLZ:" }, | 376 | { "Post office box:","Postfach:" }, |
377 | { "Locality:","Stadt:" }, | 377 | { "Locality:","Stadt:" }, |
378 | { "Region:","Region:" }, | 378 | { "Region:","Region:" }, |
379 | { "Postal code:","PLZ:" }, | 379 | { "Postal code:","PLZ:" }, |
380 | { "Country:","Staat:" }, | 380 | { "Country:","Staat:" }, |
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index 2e1ae6e..66f6977 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp | |||
@@ -298,11 +298,17 @@ void KOEditorDetails::insertAttendees(const QString& uid,const QStringList& name | |||
298 | } | 298 | } |
299 | 299 | ||
300 | } | 300 | } |
301 | 301 | ||
302 | |||
303 | void KOEditorDetails::insertAttendee(Attendee *a) | 302 | void KOEditorDetails::insertAttendee(Attendee *a) |
304 | { | 303 | { |
304 | AttendeeListItem *first = (AttendeeListItem*) mListView->firstChild(); | ||
305 | while (first) { | ||
306 | if ( first->data()->name() == a->name() && first->data()->email() == a->email() ) | ||
307 | return; | ||
308 | first = (AttendeeListItem*) first->nextSibling(); | ||
309 | } | ||
310 | |||
305 | AttendeeListItem *item = new AttendeeListItem(a,mListView); | 311 | AttendeeListItem *item = new AttendeeListItem(a,mListView); |
306 | mListView->setSelected( item, true ); | 312 | mListView->setSelected( item, true ); |
307 | } | 313 | } |
308 | 314 | ||
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index 9aa517c..7525a4a 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp | |||
@@ -212,16 +212,25 @@ void IncidenceBase::setFloats(bool f) | |||
212 | updated(); | 212 | updated(); |
213 | } | 213 | } |
214 | 214 | ||
215 | 215 | ||
216 | void IncidenceBase::addAttendee(Attendee *a, bool doupdate) | 216 | bool IncidenceBase::addAttendee(Attendee *a, bool doupdate) |
217 | { | 217 | { |
218 | if (mReadOnly) return; | 218 | if (mReadOnly) return false; |
219 | if (a->name().left(7).upper() == "MAILTO:") | 219 | if (a->name().left(7).upper() == "MAILTO:") |
220 | a->setName(a->name().remove(0,7)); | 220 | a->setName(a->name().remove(0,7)); |
221 | 221 | ||
222 | QPtrListIterator<Attendee> qli(mAttendees); | ||
223 | |||
224 | qli.toFirst(); | ||
225 | while (qli) { | ||
226 | if (*qli.current() == *a) | ||
227 | return false; | ||
228 | ++qli; | ||
229 | } | ||
222 | mAttendees.append(a); | 230 | mAttendees.append(a); |
223 | if (doupdate) updated(); | 231 | if (doupdate) updated(); |
232 | return true; | ||
224 | } | 233 | } |
225 | 234 | ||
226 | #if 0 | 235 | #if 0 |
227 | void IncidenceBase::removeAttendee(Attendee *a) | 236 | void IncidenceBase::removeAttendee(Attendee *a) |
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index e02d03a..f9a6558 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h | |||
@@ -99,9 +99,9 @@ class IncidenceBase : public CustomProperties | |||
99 | /** | 99 | /** |
100 | Add Attendee to this incidence. IncidenceBase takes ownership of the | 100 | Add Attendee to this incidence. IncidenceBase takes ownership of the |
101 | Attendee object. | 101 | Attendee object. |
102 | */ | 102 | */ |
103 | void addAttendee(Attendee *a, bool doupdate=true ); | 103 | bool addAttendee(Attendee *a, bool doupdate=true ); |
104 | // void removeAttendee(Attendee *a); | 104 | // void removeAttendee(Attendee *a); |
105 | // void removeAttendee(const char *n); | 105 | // void removeAttendee(const char *n); |
106 | /** Remove all Attendees. */ | 106 | /** Remove all Attendees. */ |
107 | void clearAttendees(); | 107 | void clearAttendees(); |