From 4481ce9842b3820087b24a8bfce2c194974aae73 Mon Sep 17 00:00:00 2001 From: zautrix Date: Mon, 08 Nov 2004 08:05:08 +0000 Subject: some small fixes --- 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 @@ -349,7 +349,7 @@ { "Miss","Frl." }, { "Mr.","Herr" }, { "Mrs.","Frau" }, -{ "Ms.","Frau" }, +{ "Ms.","Fr." }, { "Prof.","Prof." }, { "I","I" }, { "II","II" }, @@ -373,7 +373,7 @@ { "Undefined","Unbestimmt" }, { "Edit Address","Bearbeite Adresse" }, { "Street:","Strasse:" }, -{ "Post office box:","PLZ:" }, +{ "Post office box:","Postfach:" }, { "Locality:","Stadt:" }, { "Region:","Region:" }, { "Postal code:","PLZ:" }, diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index 2e1ae6e..66f6977 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -299,9 +299,15 @@ void KOEditorDetails::insertAttendees(const QString& uid,const QStringList& name } - void KOEditorDetails::insertAttendee(Attendee *a) { + AttendeeListItem *first = (AttendeeListItem*) mListView->firstChild(); + while (first) { + if ( first->data()->name() == a->name() && first->data()->email() == a->email() ) + return; + first = (AttendeeListItem*) first->nextSibling(); + } + AttendeeListItem *item = new AttendeeListItem(a,mListView); mListView->setSelected( item, true ); } diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index 9aa517c..7525a4a 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp @@ -213,14 +213,23 @@ void IncidenceBase::setFloats(bool f) } -void IncidenceBase::addAttendee(Attendee *a, bool doupdate) +bool IncidenceBase::addAttendee(Attendee *a, bool doupdate) { - if (mReadOnly) return; + if (mReadOnly) return false; if (a->name().left(7).upper() == "MAILTO:") a->setName(a->name().remove(0,7)); + QPtrListIterator qli(mAttendees); + + qli.toFirst(); + while (qli) { + if (*qli.current() == *a) + return false; + ++qli; + } mAttendees.append(a); if (doupdate) updated(); + return true; } #if 0 diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index e02d03a..f9a6558 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h @@ -100,7 +100,7 @@ class IncidenceBase : public CustomProperties Add Attendee to this incidence. IncidenceBase takes ownership of the Attendee object. */ - void addAttendee(Attendee *a, bool doupdate=true ); + bool addAttendee(Attendee *a, bool doupdate=true ); // void removeAttendee(Attendee *a); // void removeAttendee(const char *n); /** Remove all Attendees. */ -- cgit v0.9.0.2