author | zautrix <zautrix> | 2005-10-28 14:43:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-10-28 14:43:31 (UTC) |
commit | ab099bc1be027fe01dc252a9d7a0f8821e782d65 (patch) (unidiff) | |
tree | 85bfb03f334da60dffcc52d54202f51d0f947e3f | |
parent | caaa030d8bc2aa82c53e5d30abc314b992d7226f (diff) | |
download | kdepimpi-ab099bc1be027fe01dc252a9d7a0f8821e782d65.zip kdepimpi-ab099bc1be027fe01dc252a9d7a0f8821e782d65.tar.gz kdepimpi-ab099bc1be027fe01dc252a9d7a0f8821e782d65.tar.bz2 |
fixxxx
-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 6 | ||||
-rw-r--r-- | kabc/addressee.cpp | 4 | ||||
-rw-r--r-- | kabc/addressee.h | 2 | ||||
-rw-r--r-- | kabc/field.cpp | 8 | ||||
-rw-r--r-- | kaddressbook/phoneeditwidget.cpp | 33 |
5 files changed, 36 insertions, 17 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index f12f880..06f25e9 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -391,25 +391,25 @@ | |||
391 | { "Additional names:","Mittelnamen:" }, | 391 | { "Additional names:","Mittelnamen:" }, |
392 | { "Family names:","Nachname:" }, | 392 | { "Family names:","Nachname:" }, |
393 | { "Honorific suffixes:","Namenssuffixe:" }, | 393 | { "Honorific suffixes:","Namenssuffixe:" }, |
394 | { "Parse name automatically","Setze Namen automatisch" }, | 394 | { "Parse name automatically","Setze Namen automatisch" }, |
395 | { "Edit Phone Numbers","Bearbeite Telefonnummern" }, | 395 | { "Edit Phone Numbers","Bearbeite Telefonnummern" }, |
396 | { "Number","Nummer" }, | 396 | { "Number","Nummer" }, |
397 | { "Type","Typ" }, | 397 | { "Type","Typ" }, |
398 | { "Edit Phone Number","Bearbeite Telefonnummer" }, | 398 | { "Edit Phone Number","Bearbeite Telefonnummer" }, |
399 | { "Number:","Nummer:" }, | 399 | { "Number:","Nummer:" }, |
400 | { "This is the preferred phone number","Dies ist die bevorzugte Telefonnummer" }, | 400 | { "This is the preferred phone number","Dies ist die bevorzugte Telefonnummer" }, |
401 | { "Types","Typen" }, | 401 | { "Types","Typen" }, |
402 | { "Messenger","Messenger" }, | 402 | { "Messenger","Messenger" }, |
403 | { "Other","Anderes" }, | 403 | { "Other","Sonstiges" }, |
404 | { "Video","Video" }, | 404 | { "Video","Video" }, |
405 | { "Mailbox","Mailbox" }, | 405 | { "Mailbox","Mailbox" }, |
406 | { "Modem","Modem" }, | 406 | { "Modem","Modem" }, |
407 | { "Car","Auto" }, | 407 | { "Car","Auto" }, |
408 | { "PCS","PCS" }, | 408 | { "PCS","PCS" }, |
409 | { "Category","Kategorie" }, | 409 | { "Category","Kategorie" }, |
410 | { "Select Categories","Wähle Kategorien" }, | 410 | { "Select Categories","Wähle Kategorien" }, |
411 | { " &Deselect All "," &Deselektiere alle " }, | 411 | { " &Deselect All "," &Deselektiere alle " }, |
412 | { " &Edit Categories "," B&earbeite Kategorien " }, | 412 | { " &Edit Categories "," B&earbeite Kategorien " }, |
413 | { "&OK","&OK" }, | 413 | { "&OK","&OK" }, |
414 | { "&Cancel","Abbre&chen" }, | 414 | { "&Cancel","Abbre&chen" }, |
415 | { "Configure","Konfiguriere" }, | 415 | { "Configure","Konfiguriere" }, |
@@ -815,23 +815,23 @@ | |||
815 | { "Loading addressbook data ... please wait","Lade Adressbuchdaten ... bitte warten" }, | 815 | { "Loading addressbook data ... please wait","Lade Adressbuchdaten ... bitte warten" }, |
816 | { "Import Format","Import Format" }, | 816 | { "Import Format","Import Format" }, |
817 | { "Select import format!\nDefault and standard is Utf8.\nLatin1 may be the right\nfor some West Europian languages.","Wähle Import Format!\nDefault und Standard ist Utf8.\nLatin1 kann das richtige für\nWesteuropäische Sprachen sein." }, | 817 | { "Select import format!\nDefault and standard is Utf8.\nLatin1 may be the right\nfor some West Europian languages.","Wähle Import Format!\nDefault und Standard ist Utf8.\nLatin1 kann das richtige für\nWesteuropäische Sprachen sein." }, |
818 | { "Home2","Privat2" }, | 818 | { "Home2","Privat2" }, |
819 | { "Work2","Arbeit2" }, | 819 | { "Work2","Arbeit2" }, |
820 | { "Fax (Work)","Fax (Arbeit)" }, | 820 | { "Fax (Work)","Fax (Arbeit)" }, |
821 | { "Fax (Home)","Fax (Privat)" }, | 821 | { "Fax (Home)","Fax (Privat)" }, |
822 | { "Assistent","Sekretär(in)" }, | 822 | { "Assistent","Sekretär(in)" }, |
823 | { "Company","Firma" }, | 823 | { "Company","Firma" }, |
824 | { "Mobile2 (Work)","Handy2 (Arbeit)" }, | 824 | { "Mobile2 (Work)","Handy2 (Arbeit)" }, |
825 | { "Mobile2 (Car)","Handy2 (Auto)" }, | 825 | { "Mobile2 (Car)","Handy2 (Auto)" }, |
826 | { "Callback","Rückruf" }, | 826 | { "Callback","Rückruf" }, |
827 | { "Fax (Other)","Fax (Anderes)" }, | 827 | { "Fax (Other)","Fax (Sonst.)" }, |
828 | { "Primary","Bevorzugt" }, | 828 | { "Primary","Bevorzugt" }, |
829 | { "Mobile (Home)","Handy (Privat)" }, | 829 | { "Mobile (Home)","Handy (Privat)" }, |
830 | { "Unfiled","Nicht zugeordnet" }, | 830 | { "Unfiled","Nicht zugeordnet" }, |
831 | { "Format.n.:","Format.N.:" }, | 831 | { "Format.n.:","Format.N.:" }, |
832 | { "","" }, | 832 | { "Other Phone","Sonst. Telefon" }, |
833 | { "","" }, | 833 | { "","" }, |
834 | { "","" }, | 834 | { "","" }, |
835 | { "","" }, | 835 | { "","" }, |
836 | { "","" }, | 836 | { "","" }, |
837 | { "","" }, \ No newline at end of file | 837 | { "","" }, \ No newline at end of file |
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 789a694..0d8e8e8 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -1086,24 +1086,28 @@ QString Addressee::carPhoneLabel() | |||
1086 | 1086 | ||
1087 | 1087 | ||
1088 | QString Addressee::isdnLabel() | 1088 | QString Addressee::isdnLabel() |
1089 | { | 1089 | { |
1090 | return i18n("ISDN"); | 1090 | return i18n("ISDN"); |
1091 | } | 1091 | } |
1092 | 1092 | ||
1093 | 1093 | ||
1094 | QString Addressee::pagerLabel() | 1094 | QString Addressee::pagerLabel() |
1095 | { | 1095 | { |
1096 | return i18n("Pager"); | 1096 | return i18n("Pager"); |
1097 | } | 1097 | } |
1098 | QString Addressee::otherPhoneLabel() | ||
1099 | { | ||
1100 | return i18n("Other Phone"); | ||
1101 | } | ||
1098 | 1102 | ||
1099 | QString Addressee::sipLabel() | 1103 | QString Addressee::sipLabel() |
1100 | { | 1104 | { |
1101 | return i18n("SIP"); | 1105 | return i18n("SIP"); |
1102 | } | 1106 | } |
1103 | 1107 | ||
1104 | QString Addressee::emailLabel() | 1108 | QString Addressee::emailLabel() |
1105 | { | 1109 | { |
1106 | return i18n("Email Address"); | 1110 | return i18n("Email Address"); |
1107 | } | 1111 | } |
1108 | 1112 | ||
1109 | 1113 | ||
diff --git a/kabc/addressee.h b/kabc/addressee.h index 0c488eb..fcadda6 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h | |||
@@ -349,25 +349,25 @@ class Addressee | |||
349 | */ | 349 | */ |
350 | static QString carPhoneLabel(); | 350 | static QString carPhoneLabel(); |
351 | 351 | ||
352 | /** | 352 | /** |
353 | Return translated label for isdn field. | 353 | Return translated label for isdn field. |
354 | */ | 354 | */ |
355 | static QString isdnLabel(); | 355 | static QString isdnLabel(); |
356 | 356 | ||
357 | /** | 357 | /** |
358 | Return translated label for pager field. | 358 | Return translated label for pager field. |
359 | */ | 359 | */ |
360 | static QString pagerLabel(); | 360 | static QString pagerLabel(); |
361 | 361 | static QString otherPhoneLabel(); | |
362 | /** | 362 | /** |
363 | Return translated label for sip field. | 363 | Return translated label for sip field. |
364 | */ | 364 | */ |
365 | static QString sipLabel(); | 365 | static QString sipLabel(); |
366 | 366 | ||
367 | /** | 367 | /** |
368 | Return translated label for email field. | 368 | Return translated label for email field. |
369 | */ | 369 | */ |
370 | static QString emailLabel(); | 370 | static QString emailLabel(); |
371 | 371 | ||
372 | /** | 372 | /** |
373 | Set mail client. | 373 | Set mail client. |
diff --git a/kabc/field.cpp b/kabc/field.cpp index 20885de..6f2b307 100644 --- a/kabc/field.cpp +++ b/kabc/field.cpp | |||
@@ -79,25 +79,26 @@ class Field::FieldImpl | |||
79 | Isdn, | 79 | Isdn, |
80 | Pager, | 80 | Pager, |
81 | Email, | 81 | Email, |
82 | Mailer, | 82 | Mailer, |
83 | Title, | 83 | Title, |
84 | Role, | 84 | Role, |
85 | Organization, | 85 | Organization, |
86 | Note, | 86 | Note, |
87 | Url, | 87 | Url, |
88 | Resource, | 88 | Resource, |
89 | Sip, | 89 | Sip, |
90 | MobileWorkPhone, | 90 | MobileWorkPhone, |
91 | MobileHomePhone | 91 | MobileHomePhone, |
92 | OtherPhone | ||
92 | }; | 93 | }; |
93 | 94 | ||
94 | int fieldId() { return mFieldId; } | 95 | int fieldId() { return mFieldId; } |
95 | int category() { return mCategory; } | 96 | int category() { return mCategory; } |
96 | 97 | ||
97 | QString label() { return mLabel; } | 98 | QString label() { return mLabel; } |
98 | QString key() { return mKey; } | 99 | QString key() { return mKey; } |
99 | QString app() { return mApp; } | 100 | QString app() { return mApp; } |
100 | 101 | ||
101 | private: | 102 | private: |
102 | int mFieldId; | 103 | int mFieldId; |
103 | int mCategory; | 104 | int mCategory; |
@@ -197,24 +198,26 @@ QString Field::label() | |||
197 | case FieldImpl::Organization: | 198 | case FieldImpl::Organization: |
198 | return Addressee::organizationLabel(); | 199 | return Addressee::organizationLabel(); |
199 | case FieldImpl::Note: | 200 | case FieldImpl::Note: |
200 | return Addressee::noteLabel(); | 201 | return Addressee::noteLabel(); |
201 | case FieldImpl::Url: | 202 | case FieldImpl::Url: |
202 | return Addressee::urlLabel(); | 203 | return Addressee::urlLabel(); |
203 | case FieldImpl::Resource: | 204 | case FieldImpl::Resource: |
204 | return Addressee::resourceLabel(); | 205 | return Addressee::resourceLabel(); |
205 | case FieldImpl::Category: | 206 | case FieldImpl::Category: |
206 | return Addressee::categoryLabel(); | 207 | return Addressee::categoryLabel(); |
207 | case FieldImpl::Sip: | 208 | case FieldImpl::Sip: |
208 | return Addressee::sipLabel(); | 209 | return Addressee::sipLabel(); |
210 | case FieldImpl::OtherPhone: | ||
211 | return Addressee::otherPhoneLabel(); | ||
209 | case FieldImpl::CustomField: | 212 | case FieldImpl::CustomField: |
210 | return mImpl->label(); | 213 | return mImpl->label(); |
211 | default: | 214 | default: |
212 | return i18n("Unknown Field"); | 215 | return i18n("Unknown Field"); |
213 | } | 216 | } |
214 | } | 217 | } |
215 | 218 | ||
216 | int Field::category() | 219 | int Field::category() |
217 | { | 220 | { |
218 | return mImpl->category(); | 221 | return mImpl->category(); |
219 | } | 222 | } |
220 | 223 | ||
@@ -301,24 +304,26 @@ QString Field::value( const KABC::Addressee &a ) | |||
301 | case FieldImpl::HomeFax: | 304 | case FieldImpl::HomeFax: |
302 | return a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ).number(); | 305 | return a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ).number(); |
303 | case FieldImpl::BusinessFax: | 306 | case FieldImpl::BusinessFax: |
304 | return a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ).number(); | 307 | return a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ).number(); |
305 | case FieldImpl::CarPhone: | 308 | case FieldImpl::CarPhone: |
306 | return a.phoneNumber( PhoneNumber::Car ).number(); | 309 | return a.phoneNumber( PhoneNumber::Car ).number(); |
307 | case FieldImpl::Isdn: | 310 | case FieldImpl::Isdn: |
308 | return a.phoneNumber( PhoneNumber::Isdn ).number(); | 311 | return a.phoneNumber( PhoneNumber::Isdn ).number(); |
309 | case FieldImpl::Pager: | 312 | case FieldImpl::Pager: |
310 | return a.phoneNumber( PhoneNumber::Pager ).number(); | 313 | return a.phoneNumber( PhoneNumber::Pager ).number(); |
311 | case FieldImpl::Sip: | 314 | case FieldImpl::Sip: |
312 | return a.phoneNumber( PhoneNumber::Pcs | PhoneNumber::Pref ).number(); | 315 | return a.phoneNumber( PhoneNumber::Pcs | PhoneNumber::Pref ).number(); |
316 | case FieldImpl::OtherPhone: | ||
317 | return a.phoneNumber( PhoneNumber::Voice ).number(); | ||
313 | case FieldImpl::HomeAddressStreet: | 318 | case FieldImpl::HomeAddressStreet: |
314 | return a.address( Address::Home ).street(); | 319 | return a.address( Address::Home ).street(); |
315 | case FieldImpl::HomeAddressLocality: | 320 | case FieldImpl::HomeAddressLocality: |
316 | return a.address( Address::Home ).locality(); | 321 | return a.address( Address::Home ).locality(); |
317 | case FieldImpl::HomeAddressRegion: | 322 | case FieldImpl::HomeAddressRegion: |
318 | return a.address( Address::Home ).region(); | 323 | return a.address( Address::Home ).region(); |
319 | case FieldImpl::HomeAddressPostalCode: | 324 | case FieldImpl::HomeAddressPostalCode: |
320 | return a.address( Address::Home ).postalCode(); | 325 | return a.address( Address::Home ).postalCode(); |
321 | case FieldImpl::HomeAddressCountry: | 326 | case FieldImpl::HomeAddressCountry: |
322 | return a.address( Address::Home ).country(); | 327 | return a.address( Address::Home ).country(); |
323 | case FieldImpl::BusinessAddressStreet: | 328 | case FieldImpl::BusinessAddressStreet: |
324 | return a.address( Address::Work ).street(); | 329 | return a.address( Address::Work ).street(); |
@@ -433,24 +438,25 @@ Field::List Field::allFields() | |||
433 | createField( FieldImpl::CarPhone ); | 438 | createField( FieldImpl::CarPhone ); |
434 | createField( FieldImpl::Isdn ); | 439 | createField( FieldImpl::Isdn ); |
435 | createField( FieldImpl::Pager ); | 440 | createField( FieldImpl::Pager ); |
436 | createField( FieldImpl::Email, Email|Frequent ); | 441 | createField( FieldImpl::Email, Email|Frequent ); |
437 | createField( FieldImpl::Mailer, Email ); | 442 | createField( FieldImpl::Mailer, Email ); |
438 | createField( FieldImpl::Title, Organization ); | 443 | createField( FieldImpl::Title, Organization ); |
439 | createField( FieldImpl::Role, Organization ); | 444 | createField( FieldImpl::Role, Organization ); |
440 | createField( FieldImpl::Organization, Organization ); | 445 | createField( FieldImpl::Organization, Organization ); |
441 | createField( FieldImpl::Note ); | 446 | createField( FieldImpl::Note ); |
442 | createField( FieldImpl::Url ); | 447 | createField( FieldImpl::Url ); |
443 | createField( FieldImpl::Resource ); | 448 | createField( FieldImpl::Resource ); |
444 | createField( FieldImpl::Sip ); | 449 | createField( FieldImpl::Sip ); |
450 | createField( FieldImpl::OtherPhone ); | ||
445 | } | 451 | } |
446 | 452 | ||
447 | return mAllFields; | 453 | return mAllFields; |
448 | } | 454 | } |
449 | 455 | ||
450 | Field::List Field::defaultFields() | 456 | Field::List Field::defaultFields() |
451 | { | 457 | { |
452 | if ( mDefaultFields.isEmpty() ) { | 458 | if ( mDefaultFields.isEmpty() ) { |
453 | createDefaultField( FieldImpl::GivenName ); | 459 | createDefaultField( FieldImpl::GivenName ); |
454 | createDefaultField( FieldImpl::FamilyName ); | 460 | createDefaultField( FieldImpl::FamilyName ); |
455 | createDefaultField( FieldImpl::Email ); | 461 | createDefaultField( FieldImpl::Email ); |
456 | } | 462 | } |
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 9e7e221..66f0a5e 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp | |||
@@ -159,40 +159,49 @@ void PhoneEditWidget::pendingDelete() | |||
159 | { | 159 | { |
160 | mTypeNumberEditList.removeRef( mPendingDelete ); | 160 | mTypeNumberEditList.removeRef( mPendingDelete ); |
161 | emit modified(); | 161 | emit modified(); |
162 | } | 162 | } |
163 | 163 | ||
164 | void PhoneEditWidget::setPhoneNumbers( const KABC::PhoneNumber::List &li ) | 164 | void PhoneEditWidget::setPhoneNumbers( const KABC::PhoneNumber::List &li ) |
165 | { | 165 | { |
166 | if ( li.isEmpty() ) { | 166 | if ( li.isEmpty() ) { |
167 | setDefaults(); | 167 | setDefaults(); |
168 | return; | 168 | return; |
169 | } | 169 | } |
170 | mTypeNumberEditList.clear(); | 170 | mTypeNumberEditList.clear(); |
171 | KABC::PhoneNumber::List::Iterator it; | 171 | KABC::PhoneNumber::List::Iterator it; |
172 | KABC::PhoneNumber::List list = li; | 172 | KABC::PhoneNumber::List list2 = li; |
173 | PhoneTypeNumberEdit* edit = 0;//mTypeNumberEditList.first(); | 173 | KABC::PhoneNumber::List list ; |
174 | |||
175 | PhoneNumber::TypeList tList = PhoneNumber::supportedTypeList(); | ||
176 | int i = 0; | ||
177 | int max = tList.count(); | ||
178 | while ( i < max-1 ) { | ||
179 | for ( it = list2.begin(); it != list2.end(); ++it ) { | ||
180 | if ( (*it).type() == tList[i] ) { | ||
181 | list.append( (*it ) ); | ||
182 | break; | ||
183 | } | ||
184 | } | ||
185 | ++i; | ||
186 | } | ||
187 | for ( it = list2.begin(); it != list2.end(); ++it ) { | ||
188 | if ( (*it).type() == tList[ max-1 ] ) | ||
189 | list.append( (*it ) ); | ||
190 | } | ||
174 | for ( it = list.begin(); it != list.end(); ++it ) { | 191 | for ( it = list.begin(); it != list.end(); ++it ) { |
175 | if ( edit ) { | ||
176 | edit->setPhoneNumber( (*it ) ); | ||
177 | edit = mTypeNumberEditList.next(); | ||
178 | } else { | ||
179 | PhoneTypeNumberEdit* editNew = appendEditCombo(); | 192 | PhoneTypeNumberEdit* editNew = appendEditCombo(); |
180 | editNew->setPhoneNumber( (*it ) ); | 193 | editNew->setPhoneNumber( (*it ) ); |
181 | } | ||
182 | } | ||
183 | while ( edit ) { | ||
184 | edit->hide(); | ||
185 | edit = mTypeNumberEditList.next(); | ||
186 | } | 194 | } |
195 | |||
187 | } | 196 | } |
188 | KABC::PhoneNumber::List PhoneEditWidget::phoneNumbers() | 197 | KABC::PhoneNumber::List PhoneEditWidget::phoneNumbers() |
189 | { | 198 | { |
190 | KABC::PhoneNumber::List retList; | 199 | KABC::PhoneNumber::List retList; |
191 | 200 | ||
192 | PhoneTypeNumberEdit* edit = mTypeNumberEditList.first(); | 201 | PhoneTypeNumberEdit* edit = mTypeNumberEditList.first(); |
193 | while ( edit ) { | 202 | while ( edit ) { |
194 | if ( edit->isValid() ) { | 203 | if ( edit->isValid() ) { |
195 | retList.append( edit->phoneNumber()); | 204 | retList.append( edit->phoneNumber()); |
196 | } | 205 | } |
197 | edit = mTypeNumberEditList.next(); | 206 | edit = mTypeNumberEditList.next(); |
198 | 207 | ||