summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt6
-rw-r--r--kaddressbook/kabcore.cpp24
2 files changed, 18 insertions, 12 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index d767757..75df50f 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -333,201 +333,207 @@
333{ "If custom colors are enabled, you may choose the colors for the view below. Otherwise colors from your current KDE color scheme are used.","#If custom colors are enabled, you may choose the colors for the view below. Otherwise colors from your current KDE color scheme are used." }, 333{ "If custom colors are enabled, you may choose the colors for the view below. Otherwise colors from your current KDE color scheme are used.","#If custom colors are enabled, you may choose the colors for the view below. Otherwise colors from your current KDE color scheme are used." },
334{ "Double click or press RETURN on a item to select a color for the related strings in the view.","#Double click or press RETURN on a item to select a color for the related strings in the view." }, 334{ "Double click or press RETURN on a item to select a color for the related strings in the view.","#Double click or press RETURN on a item to select a color for the related strings in the view." },
335{ "&Enable custom fonts","B&enutzerdefinierte Schriften" }, 335{ "&Enable custom fonts","B&enutzerdefinierte Schriften" },
336{ "&Text font:","Textschriftart:" }, 336{ "&Text font:","Textschriftart:" },
337{ "&Header font:","Titelschriftart:" }, 337{ "&Header font:","Titelschriftart:" },
338{ "If custom fonts are enabled, you may choose which fonts to use for this view below. Otherwise the default KDE font will be used, in bold style for the header and normal style for the data.","#If custom fonts are enabled, you may choose which fonts to use for this view below. Otherwise the default KDE font will be used, in bold style for the header and normal style for the data." }, 338{ "If custom fonts are enabled, you may choose which fonts to use for this view below. Otherwise the default KDE font will be used, in bold style for the header and normal style for the data.","#If custom fonts are enabled, you may choose which fonts to use for this view below. Otherwise the default KDE font will be used, in bold style for the header and normal style for the data." },
339{ "&Fonts","Schri&ften" }, 339{ "&Fonts","Schri&ften" },
340{ "Background Color","Hintergrundfarbe" }, 340{ "Background Color","Hintergrundfarbe" },
341{ "Text Color","Textfarbe" }, 341{ "Text Color","Textfarbe" },
342{ "Header Background Color","Titel Hintergrundfarbe" }, 342{ "Header Background Color","Titel Hintergrundfarbe" },
343{ "Header Text Color","Titel Farbe" }, 343{ "Header Text Color","Titel Farbe" },
344{ "Highlight Color","Auswahlfarbe" }, 344{ "Highlight Color","Auswahlfarbe" },
345{ "Highlighted Text Color","Auswahltextfarbe" }, 345{ "Highlighted Text Color","Auswahltextfarbe" },
346{ "Alternating Background Color","Abwechselnder Hintergrundfarbe" }, 346{ "Alternating Background Color","Abwechselnder Hintergrundfarbe" },
347{ "Postal","Post" }, 347{ "Postal","Post" },
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.","Frau" },
353{ "Prof.","Prof." }, 353{ "Prof.","Prof." },
354{ "I","I" }, 354{ "I","I" },
355{ "II","II" }, 355{ "II","II" },
356{ "III","III" }, 356{ "III","III" },
357{ "Jr.","Jr." }, 357{ "Jr.","Jr." },
358{ "Sr.","Sr." }, 358{ "Sr.","Sr." },
359{ "Name:","Name:" }, 359{ "Name:","Name:" },
360{ "Documents","Dokumente" }, 360{ "Documents","Dokumente" },
361{ "Files","Dateien" }, 361{ "Files","Dateien" },
362{ "All Files","Alle Dateien" }, 362{ "All Files","Alle Dateien" },
363{ "Name","Name" }, 363{ "Name","Name" },
364{ "Size","Größe" }, 364{ "Size","Größe" },
365{ "Date","Datum" }, 365{ "Date","Datum" },
366{ "Mime Type","Mime Typ" }, 366{ "Mime Type","Mime Typ" },
367{ "Geo Data Input","Geo Dateneingabe" }, 367{ "Geo Data Input","Geo Dateneingabe" },
368{ "Sexagesimal","Sexagesimal" }, 368{ "Sexagesimal","Sexagesimal" },
369{ "North","Nord" }, 369{ "North","Nord" },
370{ "South","Süd" }, 370{ "South","Süd" },
371{ "East","Ost" }, 371{ "East","Ost" },
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:","PLZ:" },
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:" },
381{ "This is the preferred address","Dies ist die bevorzugte Adresse" }, 381{ "This is the preferred address","Dies ist die bevorzugte Adresse" },
382{ "New...","Neu..." }, 382{ "New...","Neu..." },
383{ "Change Type","Ändere Art" }, 383{ "Change Type","Ändere Art" },
384{ "Edit Address Type","Ändere Address Art" }, 384{ "Edit Address Type","Ändere Address Art" },
385{ "Address Types","Address Art" }, 385{ "Address Types","Address Art" },
386{ "Domestic","Inland" }, 386{ "Domestic","Inland" },
387{ "International","International" }, 387{ "International","International" },
388{ "Parcel","Paket" }, 388{ "Parcel","Paket" },
389{ "Edit Contact Name","Ändere Kontakt Name" }, 389{ "Edit Contact Name","Ändere Kontakt Name" },
390{ "Honorific prefixes:","Namensprefixes:" }, 390{ "Honorific prefixes:","Namensprefixes:" },
391{ "Given name:","Vorname:" }, 391{ "Given name:","Vorname:" },
392{ "Additional names:","Mittelnamen:" }, 392{ "Additional names:","Mittelnamen:" },
393{ "Family names:","Nachname:" }, 393{ "Family names:","Nachname:" },
394{ "Honorific suffixes:","Namenssuffixe:" }, 394{ "Honorific suffixes:","Namenssuffixe:" },
395{ "Parse name automatically","Setze Namen automatisch" }, 395{ "Parse name automatically","Setze Namen automatisch" },
396{ "Edit Phone Numbers","Bearbeite Telefonnummern" }, 396{ "Edit Phone Numbers","Bearbeite Telefonnummern" },
397{ "Number","Nummer" }, 397{ "Number","Nummer" },
398{ "Type","Typ" }, 398{ "Type","Typ" },
399{ "Edit Phone Number","Bearbeite Telefonnummer" }, 399{ "Edit Phone Number","Bearbeite Telefonnummer" },
400{ "Number:","Nummer:" }, 400{ "Number:","Nummer:" },
401{ "This is the preferred phone number","Dies ist die bevorzugte Telefonnummer" }, 401{ "This is the preferred phone number","Dies ist die bevorzugte Telefonnummer" },
402{ "Types","Typen" }, 402{ "Types","Typen" },
403{ "Messenger","Messenger" }, 403{ "Messenger","Messenger" },
404{ "Other","Anderes" }, 404{ "Other","Anderes" },
405{ "Video","Video" }, 405{ "Video","Video" },
406{ "Mailbox","Mailbox" }, 406{ "Mailbox","Mailbox" },
407{ "Modem","Modem" }, 407{ "Modem","Modem" },
408{ "Car","Auto" }, 408{ "Car","Auto" },
409{ "PCS","PCS" }, 409{ "PCS","PCS" },
410{ "Category","Kategorie" }, 410{ "Category","Kategorie" },
411{ "Select Categories","Wähle Kategorien" }, 411{ "Select Categories","Wähle Kategorien" },
412{ " &Deselect All "," &Deselektiere alle " }, 412{ " &Deselect All "," &Deselektiere alle " },
413{ " &Edit Categories "," B&earbeite Kategorien " }, 413{ " &Edit Categories "," B&earbeite Kategorien " },
414{ "&OK","&OK" }, 414{ "&OK","&OK" },
415{ "&Cancel","Abbre&chen" }, 415{ "&Cancel","Abbre&chen" },
416{ "Configure","Konfiguriere" }, 416{ "Configure","Konfiguriere" },
417{ "Default","Voreinstellungen" }, 417{ "Default","Voreinstellungen" },
418{ "Addressbook","Adressbuch" }, 418{ "Addressbook","Adressbuch" },
419{ "Details view font","Schriftart Detailansicht" }, 419{ "Details view font","Schriftart Detailansicht" },
420{ "phone:123","phone:123" }, 420{ "phone:123","phone:123" },
421{ "Search only after <return> key pressed","Suche nur nach <return> Taste" }, 421{ "Search only after <return> key pressed","Suche nur nach <return> Taste" },
422{ "Honor KDE single click","Benutze KDE Einzelklick" }, 422{ "Honor KDE single click","Benutze KDE Einzelklick" },
423{ "Automatic name parsing for new addressees","Automa. Name Parsen für neue Einträge" }, 423{ "Automatic name parsing for new addressees","Automa. Name Parsen für neue Einträge" },
424{ "Display List and Details at once (restart)","Zeige Liste und Details zusammen(neustart)" }, 424{ "Display List and Details at once (restart)","Zeige Liste und Details zusammen(neustart)" },
425{ "Ask for quit when closing Ka/Pi","Vor Beenden von Ka/Pi nachfragen" }, 425{ "Ask for quit when closing Ka/Pi","Vor Beenden von Ka/Pi nachfragen" },
426{ "General","Algemein" }, 426{ "General","Algemein" },
427{ "Extensions (restart)","Extensions (restart)" }, 427{ "Extensions (restart)","Extensions (restart)" },
428{ "Description","Beschreibungen" }, 428{ "Description","Beschreibungen" },
429{ "Extensions","Extensions" }, 429{ "Extensions","Extensions" },
430{ "Prefixes","Prefixe" }, 430{ "Prefixes","Prefixe" },
431{ "Inclusions","Inclusions" }, 431{ "Inclusions","Inclusions" },
432{ "Suffixes","Suffixe" }, 432{ "Suffixes","Suffixe" },
433{ "Default formatted name:","Default format. Name:" }, 433{ "Default formatted name:","Default format. Name:" },
434{ "Empty","Leer" }, 434{ "Empty","Leer" },
435{ "Simple Name","Einfacher Name" }, 435{ "Simple Name","Einfacher Name" },
436{ "Full Name","Voller Name" }, 436{ "Full Name","Voller Name" },
437{ "Reverse Name","Namen umdrehen" }, 437{ "Reverse Name","Namen umdrehen" },
438{ "Contact","Kontakt" }, 438{ "Contact","Kontakt" },
439{ "Global","Allgemein" }, 439{ "Global","Allgemein" },
440{ "Phone","Telefon" }, 440{ "Phone","Telefon" },
441{ "SMS","SMS" }, 441{ "SMS","SMS" },
442{ "Language:(needs restart)","Sprache:(Neustart)" }, 442{ "Language:(needs restart)","Sprache:(Neustart)" },
443{ "English","English" }, 443{ "English","English" },
444{ "German","Deutsch" }, 444{ "German","Deutsch" },
445{ "French","Französisch" }, 445{ "French","Französisch" },
446{ "Italian","Italienisch" }, 446{ "Italian","Italienisch" },
447{ "User defined (usertranslation.txt)","Benutzerdef. (usertranslation.txt)" }, 447{ "User defined (usertranslation.txt)","Benutzerdef. (usertranslation.txt)" },
448{ "Time Format(nr):","Zeit Format(nr):" }, 448{ "Time Format(nr):","Zeit Format(nr):" },
449{ "24:00","24:00" }, 449{ "24:00","24:00" },
450{ "12:00am","12:00am" }, 450{ "12:00am","12:00am" },
451{ "Week starts on Sunday","Woche beginnt Sonntags" }, 451{ "Week starts on Sunday","Woche beginnt Sonntags" },
452{ "Locale","Locale" }, 452{ "Locale","Locale" },
453{ "Date Format:","Datums Format:" }, 453{ "Date Format:","Datums Format:" },
454{ "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" }, 454{ "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" },
455{ "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" }, 455{ "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" },
456{ "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" }, 456{ "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" },
457{ "User defined","Benutzerdefiniert" }, 457{ "User defined","Benutzerdefiniert" },
458{ "User long date:","Format langes Datum:" }, 458{ "User long date:","Format langes Datum:" },
459{ "User short date:","Format kurzes Datum:" }, 459{ "User short date:","Format kurzes Datum:" },
460{ "Daylight start:","Sommerzeit Beginn:" }, 460{ "Daylight start:","Sommerzeit Beginn:" },
461{ "Daylight end:","Sommerzeit Ende:" }, 461{ "Daylight end:","Sommerzeit Ende:" },
462{ "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" }, 462{ "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" },
463{ "Monday 19 April 2004: %A %d %B %Y","Monday 19 April 2004: %A %d %B %Y" }, 463{ "Monday 19 April 2004: %A %d %B %Y","Monday 19 April 2004: %A %d %B %Y" },
464{ "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" }, 464{ "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" },
465{ "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" }, 465{ "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" },
466{ "Date Format","Datums Format" }, 466{ "Date Format","Datums Format" },
467{ "Timezone:","Zeitzone:" }, 467{ "Timezone:","Zeitzone:" },
468{ "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, 468{ "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },
469{ "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, 469{ "Timezone has daylight saving","Zeitzone hat Sommerzeit" },
470{ "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" }, 470{ "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" },
471{ "Used Mail Client","Benutzter Mail Client" }, 471{ "Used Mail Client","Benutzter Mail Client" },
472{ "Channel:","Channel:" }, 472{ "Channel:","Channel:" },
473{ "Message:","Message:" }, 473{ "Message:","Message:" },
474{ "Parameters:","Parameter:" }, 474{ "Parameters:","Parameter:" },
475{ "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" }, 475{ "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" },
476{ "extra Message:","extra Message:" }, 476{ "extra Message:","extra Message:" },
477{ "extra Parameters:","extra Parameter:" }, 477{ "extra Parameters:","extra Parameter:" },
478{ "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" }, 478{ "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" },
479{ "External Apps.","Externe Appl." }, 479{ "External Apps.","Externe Appl." },
480{ "Used %1 Client","Benutzer %1 Client" }, 480{ "Used %1 Client","Benutzer %1 Client" },
481{ "No email client installed","Keine Email Client installiert" }, 481{ "No email client installed","Keine Email Client installiert" },
482{ "Userdefined email client","Benutzerdef. Email Client" }, 482{ "Userdefined email client","Benutzerdef. Email Client" },
483{ "OM/Pi email client","OM/Pi Email Client" }, 483{ "OM/Pi email client","OM/Pi Email Client" },
484{ "Close KA/Pi?","Schließe KA/Pi?" }, 484{ "Close KA/Pi?","Schließe KA/Pi?" },
485{ "\nChanges will be saved!","\nÄnderungen werden gespeichert!" }, 485{ "\nChanges will be saved!","\nÄnderungen werden gespeichert!" },
486{ "Yes!","Ja!" }, 486{ "Yes!","Ja!" },
487{ "There was an error while attempting to save\n the address book. Please check that some \nother application is not using it. ","#There was an error while attempting to save\n the address book. Please check that some \nother application is not using it. " }, 487{ "There was an error while attempting to save\n the address book. Please check that some \nother application is not using it. ","#There was an error while attempting to save\n the address book. Please check that some \nother application is not using it. " },
488{ "Saving addressbook ... ","Speichere Adressbuch ... " }, 488{ "Saving addressbook ... ","Speichere Adressbuch ... " },
489{ "Addressbook saved!","Adressbuch gespeichert!" }, 489{ "Addressbook saved!","Adressbuch gespeichert!" },
490{ "Default Table View","Default Tabellenansicht" }, 490{ "Default Table View","Default Tabellenansicht" },
491{ "Merge and Remove","Zusammenfügen/entfernen" }, 491{ "Merge and Remove","Zusammenfügen/entfernen" },
492{ "Merge","Zusammenfügen" }, 492{ "Merge","Zusammenfügen" },
493{ "Merge Contacts Editor","Contact-Zusammenfüge-Editor" }, 493{ "Merge Contacts Editor","Contact-Zusammenfüge-Editor" },
494{ "New List...","Neue Liste..." }, 494{ "New List...","Neue Liste..." },
495{ "Rename List...","Ändere Namen..." }, 495{ "Rename List...","Ändere Namen..." },
496{ "Remove List","Lösche Liste" }, 496{ "Remove List","Lösche Liste" },
497{ "Add Contact","Kontakt hinzu" }, 497{ "Add Contact","Kontakt hinzu" },
498{ "Change Email...","Ändere Email..." }, 498{ "Change Email...","Ändere Email..." },
499{ "Remove Contact","Entferne Kontakt" }, 499{ "Remove Contact","Entferne Kontakt" },
500{ "Use Preferred","Nutze Preferred" }, 500{ "Use Preferred","Nutze Preferred" },
501{ "Distribution List Editor","Distribution List Editor" }, 501{ "Distribution List Editor","Distribution List Editor" },
502{ "Choose which contacts to export","Wähle Kontakte zum Exportieren" }, 502{ "Choose which contacts to export","Wähle Kontakte zum Exportieren" },
503{ "Which contacts do you want to export?","Welche Kontakte sollen exportiert werden?" }, 503{ "Which contacts do you want to export?","Welche Kontakte sollen exportiert werden?" },
504{ "Contact Selection","Kontaktauswahl" }, 504{ "Contact Selection","Kontaktauswahl" },
505{ "&All","&Alle" }, 505{ "&All","&Alle" },
506{ "Export the entire address book","Exportiere das komplette Addressbuch" }, 506{ "Export the entire address book","Exportiere das komplette Addressbuch" },
507{ "&Selected","Au&sgewählte" }, 507{ "&Selected","Au&sgewählte" },
508{ "Only export contacts selected in KAddressBook.\nThis option is disabled if no contacts are selected.","###Only export contacts selected in KAddressBook.\nThis option is disabled if no contacts are selected." }, 508{ "Only export contacts selected in KAddressBook.\nThis option is disabled if no contacts are selected.","###Only export contacts selected in KAddressBook.\nThis option is disabled if no contacts are selected." },
509{ "By matching &filter","Zutreffender &Filter" }, 509{ "By matching &filter","Zutreffender &Filter" },
510{ "Only export contacts matching the selected filter.\nThis option is disabled if you haven't defined any filters","###Only export contacts matching the selected filter.\nThis option is disabled if you haven't defined any filters" }, 510{ "Only export contacts matching the selected filter.\nThis option is disabled if you haven't defined any filters","###Only export contacts matching the selected filter.\nThis option is disabled if you haven't defined any filters" },
511{ "By Cate&gories","Kategorien" }, 511{ "By Cate&gories","Kategorien" },
512{ "Only export contacts who are members of a category that is checked on the list to the left.\nThis option is disabled if you have no categories.","###Only export contacts who are members of a category that is checked on the list to the left.\nThis option is disabled if you have no categories." }, 512{ "Only export contacts who are members of a category that is checked on the list to the left.\nThis option is disabled if you have no categories.","###Only export contacts who are members of a category that is checked on the list to the left.\nThis option is disabled if you have no categories." },
513{ "Select a filter to decide which contacts to export.","Wähle Filter zum Export aus." }, 513{ "Select a filter to decide which contacts to export.","Wähle Filter zum Export aus." },
514{ "Check the categories whose members you want to export.","Wähle die Kategorien zum Export aus." }, 514{ "Check the categories whose members you want to export.","Wähle die Kategorien zum Export aus." },
515{ "Sorting","Sortieren" }, 515{ "Sorting","Sortieren" },
516{ "Criterion:","Merkmal:" }, 516{ "Criterion:","Merkmal:" },
517{ "Order:","Reihenfolge:" }, 517{ "Order:","Reihenfolge:" },
518{ "Ascending","Aufsteigend" }, 518{ "Ascending","Aufsteigend" },
519{ "Descending","Absteigend" }, 519{ "Descending","Absteigend" },
520{ "Save file","Datei speichern" }, 520{ "Save file","Datei speichern" },
521{ "Error","Fehler" }, 521{ "Error","Fehler" },
522{ "Unable to export contacts.","Exportieren der Kontakte geht nicht." }, 522{ "Unable to export contacts.","Exportieren der Kontakte geht nicht." },
523{ "\nNo unsaved changes detected!\nNothing will be saved!","\nKeine ungespeicherten\nÄnderungen erkannt!\nNichts wird gespeichert!" }, 523{ "\nNo unsaved changes detected!\nNothing will be saved!","\nKeine ungespeicherten\nÄnderungen erkannt!\nNichts wird gespeichert!" },
524{ "Manage new categories...","Verwalte neue Kategorien..." }, 524{ "Manage new categories...","Verwalte neue Kategorien..." },
525{ "&File","Datei" },
526{ "&Edit","Bearbeite" },
527{ "&View","Ansichten" },
528{ "&Settings","Konfiguration" },
529{ "&Change selected","Ändere Selekt." },
530{ "&Help","Hilfe" },
525{ "","" }, 531{ "","" },
526{ "","" }, 532{ "","" },
527{ "","" }, 533{ "","" },
528{ "","" }, 534{ "","" },
529{ "","" }, 535{ "","" },
530{ "","" }, 536{ "","" },
531{ "","" }, 537{ "","" },
532{ "","" }, 538{ "","" },
533{ "","" }, \ No newline at end of file 539{ "","" }, \ No newline at end of file
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 9505a23..4445310 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1800,411 +1800,411 @@ void KABCore::initActions()
1800 mActionBeam = 0; 1800 mActionBeam = 0;
1801 1801
1802#ifndef DESKTOP_VERSION 1802#ifndef DESKTOP_VERSION
1803 if ( Ir::supported() ) { 1803 if ( Ir::supported() ) {
1804 mActionBeamVCard = new KAction( i18n( "Beam selected v&Card(s)" ), "beam", 0, this, 1804 mActionBeamVCard = new KAction( i18n( "Beam selected v&Card(s)" ), "beam", 0, this,
1805 SLOT( beamVCard() ), actionCollection(), 1805 SLOT( beamVCard() ), actionCollection(),
1806 "kaddressbook_beam_vcard" ); 1806 "kaddressbook_beam_vcard" );
1807 1807
1808 mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this, 1808 mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this,
1809 SLOT( beamMySelf() ), actionCollection(), 1809 SLOT( beamMySelf() ), actionCollection(),
1810 "kaddressbook_beam_myself" ); 1810 "kaddressbook_beam_myself" );
1811 } 1811 }
1812#endif 1812#endif
1813 1813
1814 mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0, 1814 mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0,
1815 this, SLOT( editContact2() ), 1815 this, SLOT( editContact2() ),
1816 actionCollection(), "file_properties" ); 1816 actionCollection(), "file_properties" );
1817 1817
1818#ifdef KAB_EMBEDDED 1818#ifdef KAB_EMBEDDED
1819 // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() ); 1819 // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() );
1820 mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0, 1820 mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0,
1821 mMainWindow, SLOT( exit() ), 1821 mMainWindow, SLOT( exit() ),
1822 actionCollection(), "quit" ); 1822 actionCollection(), "quit" );
1823#endif //KAB_EMBEDDED 1823#endif //KAB_EMBEDDED
1824 1824
1825 // edit menu 1825 // edit menu
1826 if ( mIsPart ) { 1826 if ( mIsPart ) {
1827 mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this, 1827 mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this,
1828 SLOT( copyContacts() ), actionCollection(), 1828 SLOT( copyContacts() ), actionCollection(),
1829 "kaddressbook_copy" ); 1829 "kaddressbook_copy" );
1830 mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this, 1830 mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this,
1831 SLOT( cutContacts() ), actionCollection(), 1831 SLOT( cutContacts() ), actionCollection(),
1832 "kaddressbook_cut" ); 1832 "kaddressbook_cut" );
1833 mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this, 1833 mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this,
1834 SLOT( pasteContacts() ), actionCollection(), 1834 SLOT( pasteContacts() ), actionCollection(),
1835 "kaddressbook_paste" ); 1835 "kaddressbook_paste" );
1836 mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this, 1836 mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this,
1837 SLOT( selectAllContacts() ), actionCollection(), 1837 SLOT( selectAllContacts() ), actionCollection(),
1838 "kaddressbook_select_all" ); 1838 "kaddressbook_select_all" );
1839 mActionUndo = new KAction( i18n( "&Undo" ), "undo", CTRL + Key_Z, this, 1839 mActionUndo = new KAction( i18n( "&Undo" ), "undo", CTRL + Key_Z, this,
1840 SLOT( undo() ), actionCollection(), 1840 SLOT( undo() ), actionCollection(),
1841 "kaddressbook_undo" ); 1841 "kaddressbook_undo" );
1842 mActionRedo = new KAction( i18n( "Re&do" ), "redo", CTRL + SHIFT + Key_Z, 1842 mActionRedo = new KAction( i18n( "Re&do" ), "redo", CTRL + SHIFT + Key_Z,
1843 this, SLOT( redo() ), actionCollection(), 1843 this, SLOT( redo() ), actionCollection(),
1844 "kaddressbook_redo" ); 1844 "kaddressbook_redo" );
1845 } else { 1845 } else {
1846 mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() ); 1846 mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() );
1847 mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() ); 1847 mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() );
1848 mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() ); 1848 mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() );
1849 mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() ); 1849 mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() );
1850 mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() ); 1850 mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() );
1851 mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() ); 1851 mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() );
1852 } 1852 }
1853 1853
1854 mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete", 1854 mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete",
1855 Key_Delete, this, SLOT( deleteContacts() ), 1855 Key_Delete, this, SLOT( deleteContacts() ),
1856 actionCollection(), "edit_delete" ); 1856 actionCollection(), "edit_delete" );
1857 1857
1858 mActionUndo->setEnabled( false ); 1858 mActionUndo->setEnabled( false );
1859 mActionRedo->setEnabled( false ); 1859 mActionRedo->setEnabled( false );
1860 1860
1861 // settings menu 1861 // settings menu
1862#ifdef KAB_EMBEDDED 1862#ifdef KAB_EMBEDDED
1863//US special menuentry to configure the addressbook resources. On KDE 1863//US special menuentry to configure the addressbook resources. On KDE
1864// you do that through the control center !!! 1864// you do that through the control center !!!
1865 mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this, 1865 mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this,
1866 SLOT( configureResources() ), actionCollection(), 1866 SLOT( configureResources() ), actionCollection(),
1867 "kaddressbook_configure_resources" ); 1867 "kaddressbook_configure_resources" );
1868#endif //KAB_EMBEDDED 1868#endif //KAB_EMBEDDED
1869 1869
1870 if ( mIsPart ) { 1870 if ( mIsPart ) {
1871 mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this, 1871 mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this,
1872 SLOT( openConfigDialog() ), actionCollection(), 1872 SLOT( openConfigDialog() ), actionCollection(),
1873 "kaddressbook_configure" ); 1873 "kaddressbook_configure" );
1874 1874
1875 //US not implemented yet 1875 //US not implemented yet
1876 //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0, 1876 //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0,
1877 // this, SLOT( configureKeyBindings() ), actionCollection(), 1877 // this, SLOT( configureKeyBindings() ), actionCollection(),
1878 // "kaddressbook_configure_shortcuts" ); 1878 // "kaddressbook_configure_shortcuts" );
1879#ifdef KAB_EMBEDDED 1879#ifdef KAB_EMBEDDED
1880 mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() ); 1880 mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() );
1881 mActionConfigureToolbars->setEnabled( false ); 1881 mActionConfigureToolbars->setEnabled( false );
1882#endif //KAB_EMBEDDED 1882#endif //KAB_EMBEDDED
1883 1883
1884 } else { 1884 } else {
1885 mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() ); 1885 mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() );
1886 1886
1887 //US not implemented yet 1887 //US not implemented yet
1888 //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() ); 1888 //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() );
1889 } 1889 }
1890 1890
1891 mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0, 1891 mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0,
1892 actionCollection(), "options_show_jump_bar" ); 1892 actionCollection(), "options_show_jump_bar" );
1893 connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) ); 1893 connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) );
1894 1894
1895 mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0, 1895 mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0,
1896 actionCollection(), "options_show_details" ); 1896 actionCollection(), "options_show_details" );
1897 connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) ); 1897 connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) );
1898 1898
1899 1899
1900 mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this, 1900 mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this,
1901 SLOT( toggleBeamReceive() ), actionCollection(), 1901 SLOT( toggleBeamReceive() ), actionCollection(),
1902 "kaddressbook_beam_rec" ); 1902 "kaddressbook_beam_rec" );
1903 1903
1904 1904
1905 // misc 1905 // misc
1906 // only enable LDAP lookup if we can handle the protocol 1906 // only enable LDAP lookup if we can handle the protocol
1907#ifndef KAB_EMBEDDED 1907#ifndef KAB_EMBEDDED
1908 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { 1908 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) {
1909 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, 1909 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0,
1910 this, SLOT( openLDAPDialog() ), actionCollection(), 1910 this, SLOT( openLDAPDialog() ), actionCollection(),
1911 "ldap_lookup" ); 1911 "ldap_lookup" );
1912 } 1912 }
1913#else //KAB_EMBEDDED 1913#else //KAB_EMBEDDED
1914 //qDebug("KABCore::initActions() LDAP has to be implemented"); 1914 //qDebug("KABCore::initActions() LDAP has to be implemented");
1915#endif //KAB_EMBEDDED 1915#endif //KAB_EMBEDDED
1916 1916
1917 1917
1918 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this, 1918 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
1919 SLOT( setWhoAmI() ), actionCollection(), 1919 SLOT( setWhoAmI() ), actionCollection(),
1920 "set_personal" ); 1920 "set_personal" );
1921 1921
1922 1922
1923 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this, 1923 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this,
1924 SLOT( setCategories() ), actionCollection(), 1924 SLOT( setCategories() ), actionCollection(),
1925 "edit_set_categories" ); 1925 "edit_set_categories" );
1926 mActionEditCategories = new KAction( i18n( "Edit Categories" ), 0, this, 1926 mActionEditCategories = new KAction( i18n( "Edit Categories" ), 0, this,
1927 SLOT( editCategories() ), actionCollection(), 1927 SLOT( editCategories() ), actionCollection(),
1928 "edit__categories" ); 1928 "edit__categories" );
1929 1929
1930 mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this, 1930 mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this,
1931 SLOT( removeVoice() ), actionCollection(), 1931 SLOT( removeVoice() ), actionCollection(),
1932 "remove_voice" ); 1932 "remove_voice" );
1933 1933
1934 mActionManageCategories= new KAction( i18n( "Manage new categories..." ), 0, this, 1934 mActionManageCategories= new KAction( i18n( "Manage new categories..." ), 0, this,
1935 SLOT( manageCategories() ), actionCollection(), 1935 SLOT( manageCategories() ), actionCollection(),
1936 "remove_voice" ); 1936 "remove_voice" );
1937 1937
1938 1938
1939 mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this, 1939 mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this,
1940 SLOT( importFromOL() ), actionCollection(), 1940 SLOT( importFromOL() ), actionCollection(),
1941 "import_OL" ); 1941 "import_OL" );
1942#ifdef KAB_EMBEDDED 1942#ifdef KAB_EMBEDDED
1943 mActionLicence = new KAction( i18n( "Licence" ), 0, 1943 mActionLicence = new KAction( i18n( "Licence" ), 0,
1944 this, SLOT( showLicence() ), actionCollection(), 1944 this, SLOT( showLicence() ), actionCollection(),
1945 "licence_about_data" ); 1945 "licence_about_data" );
1946 mActionFaq = new KAction( i18n( "Faq" ), 0, 1946 mActionFaq = new KAction( i18n( "Faq" ), 0,
1947 this, SLOT( faq() ), actionCollection(), 1947 this, SLOT( faq() ), actionCollection(),
1948 "faq_about_data" ); 1948 "faq_about_data" );
1949 mActionWN = new KAction( i18n( "What's New?" ), 0, 1949 mActionWN = new KAction( i18n( "What's New?" ), 0,
1950 this, SLOT( whatsnew() ), actionCollection(), 1950 this, SLOT( whatsnew() ), actionCollection(),
1951 "wn" ); 1951 "wn" );
1952 mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0, 1952 mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0,
1953 this, SLOT( synchowto() ), actionCollection(), 1953 this, SLOT( synchowto() ), actionCollection(),
1954 "sync" ); 1954 "sync" );
1955 mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0, 1955 mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0,
1956 this, SLOT( kdesynchowto() ), actionCollection(), 1956 this, SLOT( kdesynchowto() ), actionCollection(),
1957 "kdesync" ); 1957 "kdesync" );
1958 mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0, 1958 mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0,
1959 this, SLOT( multisynchowto() ), actionCollection(), 1959 this, SLOT( multisynchowto() ), actionCollection(),
1960 "multisync" ); 1960 "multisync" );
1961 1961
1962 mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, 1962 mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
1963 this, SLOT( createAboutData() ), actionCollection(), 1963 this, SLOT( createAboutData() ), actionCollection(),
1964 "kaddressbook_about_data" ); 1964 "kaddressbook_about_data" );
1965#endif //KAB_EMBEDDED 1965#endif //KAB_EMBEDDED
1966 1966
1967 clipboardDataChanged(); 1967 clipboardDataChanged();
1968 connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); 1968 connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
1969 connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); 1969 connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
1970} 1970}
1971 1971
1972//US we need this function, to plug all actions into the correct menues. 1972//US we need this function, to plug all actions into the correct menues.
1973// KDE uses a XML format to plug the actions, but we work her without this overhead. 1973// KDE uses a XML format to plug the actions, but we work her without this overhead.
1974void KABCore::addActionsManually() 1974void KABCore::addActionsManually()
1975{ 1975{
1976//US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); 1976//US qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
1977 1977
1978#ifdef KAB_EMBEDDED 1978#ifdef KAB_EMBEDDED
1979 QPopupMenu *fileMenu = new QPopupMenu( this ); 1979 QPopupMenu *fileMenu = new QPopupMenu( this );
1980 QPopupMenu *editMenu = new QPopupMenu( this ); 1980 QPopupMenu *editMenu = new QPopupMenu( this );
1981 QPopupMenu *helpMenu = new QPopupMenu( this ); 1981 QPopupMenu *helpMenu = new QPopupMenu( this );
1982 1982
1983 KToolBar* tb = mMainWindow->toolBar(); 1983 KToolBar* tb = mMainWindow->toolBar();
1984 1984
1985#ifndef DESKTOP_VERSION 1985#ifndef DESKTOP_VERSION
1986 if ( KABPrefs::instance()->mFullMenuBarVisible ) { 1986 if ( KABPrefs::instance()->mFullMenuBarVisible ) {
1987#endif 1987#endif
1988 QMenuBar* mb = mMainWindow->menuBar(); 1988 QMenuBar* mb = mMainWindow->menuBar();
1989 1989
1990 //US setup menubar. 1990 //US setup menubar.
1991 //Disable the following block if you do not want to have a menubar. 1991 //Disable the following block if you do not want to have a menubar.
1992 mb->insertItem( "&File", fileMenu ); 1992 mb->insertItem( i18n("&File"), fileMenu );
1993 mb->insertItem( "&Edit", editMenu ); 1993 mb->insertItem( i18n("&Edit"), editMenu );
1994 mb->insertItem( "&View", viewMenu ); 1994 mb->insertItem( i18n("&View"), viewMenu );
1995 mb->insertItem( "&Settings", settingsMenu ); 1995 mb->insertItem( i18n("&Settings"), settingsMenu );
1996 mb->insertItem( i18n("Synchronize"), syncMenu ); 1996 mb->insertItem( i18n("Synchronize"), syncMenu );
1997 mb->insertItem( "&Change selected", changeMenu ); 1997 mb->insertItem( i18n("&Change selected"), changeMenu );
1998 mb->insertItem( "&Help", helpMenu ); 1998 mb->insertItem( i18n("&Help"), helpMenu );
1999 mIncSearchWidget = new IncSearchWidget( tb ); 1999 mIncSearchWidget = new IncSearchWidget( tb );
2000 // tb->insertWidget(-1, 0, mIncSearchWidget); 2000 // tb->insertWidget(-1, 0, mIncSearchWidget);
2001#ifndef DESKTOP_VERSION 2001#ifndef DESKTOP_VERSION
2002 } else { 2002 } else {
2003 //US setup toolbar 2003 //US setup toolbar
2004 QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); 2004 QPEMenuBar *menuBarTB = new QPEMenuBar( tb );
2005 QPopupMenu *popupBarTB = new QPopupMenu( this ); 2005 QPopupMenu *popupBarTB = new QPopupMenu( this );
2006 menuBarTB->insertItem( "ME", popupBarTB); 2006 menuBarTB->insertItem( "ME", popupBarTB);
2007 tb->insertWidget(-1, 0, menuBarTB); 2007 tb->insertWidget(-1, 0, menuBarTB);
2008 mIncSearchWidget = new IncSearchWidget( tb ); 2008 mIncSearchWidget = new IncSearchWidget( tb );
2009 2009
2010 tb->enableMoving(false); 2010 tb->enableMoving(false);
2011 popupBarTB->insertItem( "&File", fileMenu ); 2011 popupBarTB->insertItem( i18n("&File"), fileMenu );
2012 popupBarTB->insertItem( "&Edit", editMenu ); 2012 popupBarTB->insertItem( i18n("&Edit"), editMenu );
2013 popupBarTB->insertItem( "&View", viewMenu ); 2013 popupBarTB->insertItem( i18n("&View"), viewMenu );
2014 popupBarTB->insertItem( "&Settings", settingsMenu ); 2014 popupBarTB->insertItem( i18n("&Settings"), settingsMenu );
2015 popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); 2015 popupBarTB->insertItem( i18n("Synchronize"), syncMenu );
2016 mViewManager->getFilterAction()->plug ( popupBarTB); 2016 mViewManager->getFilterAction()->plug ( popupBarTB);
2017 popupBarTB->insertItem( "&Change selected", changeMenu ); 2017 popupBarTB->insertItem( i18n("&Change selected"), changeMenu );
2018 popupBarTB->insertItem( "&Help", helpMenu ); 2018 popupBarTB->insertItem( i18n("&Help"), helpMenu );
2019 if (QApplication::desktop()->width() > 320 ) { 2019 if (QApplication::desktop()->width() > 320 ) {
2020 // mViewManager->getFilterAction()->plug ( tb); 2020 // mViewManager->getFilterAction()->plug ( tb);
2021 } 2021 }
2022 } 2022 }
2023#endif 2023#endif
2024 // mActionQuit->plug ( mMainWindow->toolBar()); 2024 // mActionQuit->plug ( mMainWindow->toolBar());
2025 2025
2026 2026
2027 2027
2028 //US Now connect the actions with the menue entries. 2028 //US Now connect the actions with the menue entries.
2029 mActionPrint->plug( fileMenu ); 2029 mActionPrint->plug( fileMenu );
2030 mActionMail->plug( fileMenu ); 2030 mActionMail->plug( fileMenu );
2031 fileMenu->insertSeparator(); 2031 fileMenu->insertSeparator();
2032 2032
2033 mActionNewContact->plug( fileMenu ); 2033 mActionNewContact->plug( fileMenu );
2034 mActionNewContact->plug( tb ); 2034 mActionNewContact->plug( tb );
2035 2035
2036 mActionEditAddressee->plug( fileMenu ); 2036 mActionEditAddressee->plug( fileMenu );
2037 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || 2037 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
2038 // (!KABPrefs::instance()->mMultipleViewsAtOnce )) 2038 // (!KABPrefs::instance()->mMultipleViewsAtOnce ))
2039 mActionEditAddressee->plug( tb ); 2039 mActionEditAddressee->plug( tb );
2040 2040
2041 fileMenu->insertSeparator(); 2041 fileMenu->insertSeparator();
2042 mActionSave->plug( fileMenu ); 2042 mActionSave->plug( fileMenu );
2043 fileMenu->insertItem( "&Import", ImportMenu ); 2043 fileMenu->insertItem( "&Import", ImportMenu );
2044 fileMenu->insertItem( "&Export", ExportMenu ); 2044 fileMenu->insertItem( "&Export", ExportMenu );
2045 fileMenu->insertSeparator(); 2045 fileMenu->insertSeparator();
2046 mActionMailVCard->plug( fileMenu ); 2046 mActionMailVCard->plug( fileMenu );
2047#ifndef DESKTOP_VERSION 2047#ifndef DESKTOP_VERSION
2048 if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu ); 2048 if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu );
2049 if ( Ir::supported() ) mActionBeam->plug(fileMenu ); 2049 if ( Ir::supported() ) mActionBeam->plug(fileMenu );
2050#endif 2050#endif
2051 fileMenu->insertSeparator(); 2051 fileMenu->insertSeparator();
2052 mActionQuit->plug( fileMenu ); 2052 mActionQuit->plug( fileMenu );
2053#ifdef _WIN32_ 2053#ifdef _WIN32_
2054 mActionImportOL->plug( ImportMenu ); 2054 mActionImportOL->plug( ImportMenu );
2055#endif 2055#endif
2056 // edit menu 2056 // edit menu
2057 mActionUndo->plug( editMenu ); 2057 mActionUndo->plug( editMenu );
2058 mActionRedo->plug( editMenu ); 2058 mActionRedo->plug( editMenu );
2059 editMenu->insertSeparator(); 2059 editMenu->insertSeparator();
2060 mActionCut->plug( editMenu ); 2060 mActionCut->plug( editMenu );
2061 mActionCopy->plug( editMenu ); 2061 mActionCopy->plug( editMenu );
2062 mActionPaste->plug( editMenu ); 2062 mActionPaste->plug( editMenu );
2063 mActionDelete->plug( editMenu ); 2063 mActionDelete->plug( editMenu );
2064 editMenu->insertSeparator(); 2064 editMenu->insertSeparator();
2065 mActionSelectAll->plug( editMenu ); 2065 mActionSelectAll->plug( editMenu );
2066 2066
2067 mActionRemoveVoice->plug( changeMenu ); 2067 mActionRemoveVoice->plug( changeMenu );
2068 // settings menu 2068 // settings menu
2069//US special menuentry to configure the addressbook resources. On KDE 2069//US special menuentry to configure the addressbook resources. On KDE
2070// you do that through the control center !!! 2070// you do that through the control center !!!
2071 mActionConfigResources->plug( settingsMenu ); 2071 mActionConfigResources->plug( settingsMenu );
2072 settingsMenu->insertSeparator(); 2072 settingsMenu->insertSeparator();
2073 2073
2074 mActionConfigKAddressbook->plug( settingsMenu ); 2074 mActionConfigKAddressbook->plug( settingsMenu );
2075 2075
2076 if ( mIsPart ) { 2076 if ( mIsPart ) {
2077 //US not implemented yet 2077 //US not implemented yet
2078 //mActionConfigShortcuts->plug( settingsMenu ); 2078 //mActionConfigShortcuts->plug( settingsMenu );
2079 //mActionConfigureToolbars->plug( settingsMenu ); 2079 //mActionConfigureToolbars->plug( settingsMenu );
2080 2080
2081 } else { 2081 } else {
2082 //US not implemented yet 2082 //US not implemented yet
2083 //mActionKeyBindings->plug( settingsMenu ); 2083 //mActionKeyBindings->plug( settingsMenu );
2084 } 2084 }
2085 2085
2086 settingsMenu->insertSeparator(); 2086 settingsMenu->insertSeparator();
2087 2087
2088 mActionJumpBar->plug( settingsMenu ); 2088 mActionJumpBar->plug( settingsMenu );
2089 mActionDetails->plug( settingsMenu ); 2089 mActionDetails->plug( settingsMenu );
2090 //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) 2090 //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop )
2091 mActionDetails->plug( tb ); 2091 mActionDetails->plug( tb );
2092 settingsMenu->insertSeparator(); 2092 settingsMenu->insertSeparator();
2093 mActionBR->plug(settingsMenu ); 2093 mActionBR->plug(settingsMenu );
2094 settingsMenu->insertSeparator(); 2094 settingsMenu->insertSeparator();
2095 2095
2096 mActionWhoAmI->plug( settingsMenu ); 2096 mActionWhoAmI->plug( settingsMenu );
2097 mActionEditCategories->plug( settingsMenu ); 2097 mActionEditCategories->plug( settingsMenu );
2098 mActionCategories->plug( settingsMenu ); 2098 mActionCategories->plug( settingsMenu );
2099 mActionManageCategories->plug( settingsMenu ); 2099 mActionManageCategories->plug( settingsMenu );
2100 2100
2101 2101
2102 mActionWN->plug( helpMenu ); 2102 mActionWN->plug( helpMenu );
2103 mActionSyncHowto->plug( helpMenu ); 2103 mActionSyncHowto->plug( helpMenu );
2104 mActionKdeSyncHowto->plug( helpMenu ); 2104 mActionKdeSyncHowto->plug( helpMenu );
2105 mActionMultiSyncHowto->plug( helpMenu ); 2105 mActionMultiSyncHowto->plug( helpMenu );
2106 mActionFaq->plug( helpMenu ); 2106 mActionFaq->plug( helpMenu );
2107 mActionLicence->plug( helpMenu ); 2107 mActionLicence->plug( helpMenu );
2108 mActionAboutKAddressbook->plug( helpMenu ); 2108 mActionAboutKAddressbook->plug( helpMenu );
2109 2109
2110 if (KGlobal::getDesktopSize() > KGlobal::Small ) { 2110 if (KGlobal::getDesktopSize() > KGlobal::Small ) {
2111 2111
2112 mActionSave->plug( tb ); 2112 mActionSave->plug( tb );
2113 mViewManager->getFilterAction()->plug ( tb); 2113 mViewManager->getFilterAction()->plug ( tb);
2114 if (KGlobal::getDesktopSize() == KGlobal::Desktop ) { 2114 if (KGlobal::getDesktopSize() == KGlobal::Desktop ) {
2115 mActionUndo->plug( tb ); 2115 mActionUndo->plug( tb );
2116 mActionDelete->plug( tb ); 2116 mActionDelete->plug( tb );
2117 mActionRedo->plug( tb ); 2117 mActionRedo->plug( tb );
2118 } 2118 }
2119 } else { 2119 } else {
2120 mActionSave->plug( tb ); 2120 mActionSave->plug( tb );
2121 tb->enableMoving(false); 2121 tb->enableMoving(false);
2122 } 2122 }
2123 //mActionQuit->plug ( tb ); 2123 //mActionQuit->plug ( tb );
2124 // tb->insertWidget(-1, 0, mIncSearchWidget, 6); 2124 // tb->insertWidget(-1, 0, mIncSearchWidget, 6);
2125 2125
2126 //US link the searchwidget first to this. 2126 //US link the searchwidget first to this.
2127 // The real linkage to the toolbar happens later. 2127 // The real linkage to the toolbar happens later.
2128//US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE); 2128//US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE);
2129//US tb->insertItem( mIncSearchWidget ); 2129//US tb->insertItem( mIncSearchWidget );
2130/*US 2130/*US
2131 mIncSearchWidget = new IncSearchWidget( tb ); 2131 mIncSearchWidget = new IncSearchWidget( tb );
2132 connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), 2132 connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
2133 SLOT( incrementalSearch( const QString& ) ) ); 2133 SLOT( incrementalSearch( const QString& ) ) );
2134 2134
2135 mJumpButtonBar = new JumpButtonBar( this, this ); 2135 mJumpButtonBar = new JumpButtonBar( this, this );
2136 2136
2137//US topLayout->addWidget( mJumpButtonBar ); 2137//US topLayout->addWidget( mJumpButtonBar );
2138 this->layout()->add( mJumpButtonBar ); 2138 this->layout()->add( mJumpButtonBar );
2139*/ 2139*/
2140 2140
2141#endif //KAB_EMBEDDED 2141#endif //KAB_EMBEDDED
2142 2142
2143 mActionExport2phone->plug( ExportMenu ); 2143 mActionExport2phone->plug( ExportMenu );
2144 connect ( syncMenu, SIGNAL( activated ( int ) ), syncManager, SLOT (slotSyncMenu( int ) ) ); 2144 connect ( syncMenu, SIGNAL( activated ( int ) ), syncManager, SLOT (slotSyncMenu( int ) ) );
2145 syncManager->fillSyncMenu(); 2145 syncManager->fillSyncMenu();
2146 2146
2147} 2147}
2148void KABCore::showLicence() 2148void KABCore::showLicence()
2149{ 2149{
2150 KApplication::showLicence(); 2150 KApplication::showLicence();
2151} 2151}
2152 2152
2153void KABCore::manageCategories( ) 2153void KABCore::manageCategories( )
2154{ 2154{
2155 KABCatPrefs* cp = new KABCatPrefs(); 2155 KABCatPrefs* cp = new KABCatPrefs();
2156 cp->show(); 2156 cp->show();
2157 int w =cp->sizeHint().width() ; 2157 int w =cp->sizeHint().width() ;
2158 int h = cp->sizeHint().height() ; 2158 int h = cp->sizeHint().height() ;
2159 int dw = QApplication::desktop()->width(); 2159 int dw = QApplication::desktop()->width();
2160 int dh = QApplication::desktop()->height(); 2160 int dh = QApplication::desktop()->height();
2161 cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); 2161 cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
2162 if ( !cp->exec() ) { 2162 if ( !cp->exec() ) {
2163 delete cp; 2163 delete cp;
2164 return; 2164 return;
2165 } 2165 }
2166 int count = 0; 2166 int count = 0;
2167 message( i18n("Please wait, processing categories...")); 2167 message( i18n("Please wait, processing categories..."));
2168 if ( cp->addCat() ) { 2168 if ( cp->addCat() ) {
2169 KABC::AddressBook::Iterator it; 2169 KABC::AddressBook::Iterator it;
2170 QStringList catList = KABPrefs::instance()->mCustomCategories; 2170 QStringList catList = KABPrefs::instance()->mCustomCategories;
2171 for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 2171 for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
2172 QStringList catIncList = (*it).categories(); 2172 QStringList catIncList = (*it).categories();
2173 int i; 2173 int i;
2174 for( i = 0; i< catIncList.count(); ++i ) { 2174 for( i = 0; i< catIncList.count(); ++i ) {
2175 if ( !catList.contains (catIncList[i])) { 2175 if ( !catList.contains (catIncList[i])) {
2176 catList.append( catIncList[i] ); 2176 catList.append( catIncList[i] );
2177 //qDebug("add cat %s ", catIncList[i].latin1()); 2177 //qDebug("add cat %s ", catIncList[i].latin1());
2178 ++count; 2178 ++count;
2179 } 2179 }
2180 } 2180 }
2181 } 2181 }
2182 catList.sort(); 2182 catList.sort();
2183 KABPrefs::instance()->mCustomCategories = catList; 2183 KABPrefs::instance()->mCustomCategories = catList;
2184 KABPrefs::instance()->writeConfig(); 2184 KABPrefs::instance()->writeConfig();
2185 message(QString::number( count )+ i18n(" categories added to list! ")); 2185 message(QString::number( count )+ i18n(" categories added to list! "));
2186 } else { 2186 } else {
2187 QStringList catList = KABPrefs::instance()->mCustomCategories; 2187 QStringList catList = KABPrefs::instance()->mCustomCategories;
2188 QStringList catIncList; 2188 QStringList catIncList;
2189 QStringList newCatList; 2189 QStringList newCatList;
2190 KABC::AddressBook::Iterator it; 2190 KABC::AddressBook::Iterator it;
2191 for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 2191 for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
2192 QStringList catIncList = (*it).categories(); 2192 QStringList catIncList = (*it).categories();
2193 int i; 2193 int i;
2194 if ( catIncList.count() ) { 2194 if ( catIncList.count() ) {
2195 newCatList.clear(); 2195 newCatList.clear();
2196 for( i = 0; i< catIncList.count(); ++i ) { 2196 for( i = 0; i< catIncList.count(); ++i ) {
2197 if ( catList.contains (catIncList[i])) { 2197 if ( catList.contains (catIncList[i])) {
2198 newCatList.append( catIncList[i] ); 2198 newCatList.append( catIncList[i] );
2199 } 2199 }
2200 } 2200 }
2201 newCatList.sort(); 2201 newCatList.sort();
2202 (*it).setCategories( newCatList ); 2202 (*it).setCategories( newCatList );
2203 mAddressBook->insertAddressee( (*it) ); 2203 mAddressBook->insertAddressee( (*it) );
2204 } 2204 }
2205 } 2205 }
2206 setModified( true ); 2206 setModified( true );
2207 mViewManager->refreshView(); 2207 mViewManager->refreshView();
2208 mDetails->refreshView(); 2208 mDetails->refreshView();
2209 message( i18n("Removing categories done!")); 2209 message( i18n("Removing categories done!"));
2210 } 2210 }