author | zautrix <zautrix> | 2005-06-10 11:53:12 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-10 11:53:12 (UTC) |
commit | d2f00fc2034450bc9a3cd1d2c3510bef1758d3bc (patch) (unidiff) | |
tree | 0764371abfdb5d663ffebf408d47d49f0ca919f3 | |
parent | e5ca8e0d8d6d08b597253f43de401aa1a99a6abe (diff) | |
download | kdepimpi-d2f00fc2034450bc9a3cd1d2c3510bef1758d3bc.zip kdepimpi-d2f00fc2034450bc9a3cd1d2c3510bef1758d3bc.tar.gz kdepimpi-d2f00fc2034450bc9a3cd1d2c3510bef1758d3bc.tar.bz2 |
config dialog changes
-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/kopiemail/germantranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/pwmanager/germantranslation.txt | 2 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 6 | ||||
-rw-r--r-- | kmicromail/koprefsdialog.cpp | 7 | ||||
-rw-r--r-- | kmicromail/koprefsdialog.h | 1 | ||||
-rw-r--r-- | kmicromail/mainwindow.cpp | 15 | ||||
-rw-r--r-- | kmicromail/mainwindow.h | 1 | ||||
-rw-r--r-- | kmicromail/opiemail.cpp | 5 | ||||
-rw-r--r-- | kmicromail/opiemail.h | 1 | ||||
-rw-r--r-- | microkde/kdialogbase.cpp | 5 | ||||
-rw-r--r-- | microkde/kdialogbase.h | 4 | ||||
-rw-r--r-- | pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.h | 1 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwm.cpp | 45 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwm.h | 1 |
15 files changed, 76 insertions, 22 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index e076e1e..d6bf118 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -727,53 +727,55 @@ | |||
727 | { "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." }, | 727 | { "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." }, |
728 | { "Remote from: ","Fern von: " }, | 728 | { "Remote from: ","Fern von: " }, |
729 | { "Local from: ","Lokal von: " }, | 729 | { "Local from: ","Lokal von: " }, |
730 | { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" }, | 730 | { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" }, |
731 | { "Local calendar changed!\n","Lokaler Kalender geändert!\n" }, | 731 | { "Local calendar changed!\n","Lokaler Kalender geändert!\n" }, |
732 | { "Write back","Schreibe zurück" }, | 732 | { "Write back","Schreibe zurück" }, |
733 | { "Pi-Sync succesful!","Pi-Sync erfolgreich!" }, | 733 | { "Pi-Sync succesful!","Pi-Sync erfolgreich!" }, |
734 | { "Received sync request","Sync Anfrage erhalten" }, | 734 | { "Received sync request","Sync Anfrage erhalten" }, |
735 | { "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." }, | 735 | { "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." }, |
736 | { "Saving Data to temp file ...","Speichere Daten in temp Datei..." }, | 736 | { "Saving Data to temp file ...","Speichere Daten in temp Datei..." }, |
737 | { "Data saved to temp file!","Daten in temp Datei gespeichert!" }, | 737 | { "Data saved to temp file!","Daten in temp Datei gespeichert!" }, |
738 | { "Sending file...","Sende Datei..." }, | 738 | { "Sending file...","Sende Datei..." }, |
739 | { "Waiting for synced file...","Warte auf gesyncte Daten..." }, | 739 | { "Waiting for synced file...","Warte auf gesyncte Daten..." }, |
740 | { "Receiving synced file...","Gesyncte Daten erhalten..." }, | 740 | { "Receiving synced file...","Gesyncte Daten erhalten..." }, |
741 | { "Received %1 bytes","%1 Bytes erhalten" }, | 741 | { "Received %1 bytes","%1 Bytes erhalten" }, |
742 | { "Writing file to disk...","Speichere Datei..." }, | 742 | { "Writing file to disk...","Speichere Datei..." }, |
743 | { "Pi-Sync successful!","Pi-Sync erfolgreich!" }, | 743 | { "Pi-Sync successful!","Pi-Sync erfolgreich!" }, |
744 | { "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" }, | 744 | { "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" }, |
745 | { "Synchronize!","Synchronisiere!" }, | 745 | { "Synchronize!","Synchronisiere!" }, |
746 | { "High clock skew!","Großer Uhrzeitunterschied!" }, | 746 | { "High clock skew!","Großer Uhrzeitunterschied!" }, |
747 | { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" }, | 747 | { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" }, |
748 | { "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" }, | 748 | { "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" }, |
749 | { "Change search field enable jump bar","Ändere Suchfeld um Jumpbar anzuzeigen" }, | 749 | { "Change search field enable jump bar","Ändere Suchfeld um Jumpbar anzuzeigen" }, |
750 | { "Search with '*' prefix (wildcard)","Suche mit '*' Prefix (Wildcard)" }, | 750 | { "Search with '*' prefix (wildcard)","Suche mit '*' Prefix (Wildcard)" }, |
751 | { "Shrink searchfield in portrait view","Verkleinere Suchfeld im Portraitmodus" }, | 751 | { "Shrink searchfield in portrait view","Verkleinere Suchfeld im Portraitmodus" }, |
752 | { "Edit new contact","Bearbeite neuen Kontakt" }, | 752 | { "Edit new contact","Bearbeite neuen Kontakt" }, |
753 | { "Edit ","Bearbeite " }, | 753 | { "Edit ","Bearbeite " }, |
754 | { "No contact changed!","Kein Kontakt verändert" }, | 754 | { "No contact changed!","Kein Kontakt verändert" }, |
755 | { "%1 contacts changed!","%1 Kontakte geändert!" }, | 755 | { "%1 contacts changed!","%1 Kontakte geändert!" }, |
756 | { "Mobile (home)","Handy (Arbeit)" }, | 756 | { "Mobile (home)","Handy (Arbeit)" }, |
757 | { "Mobile (work)","Handy (Privat)" }, | 757 | { "Mobile (work)","Handy (Privat)" }, |
758 | { "Def.Formatted Name","Def. Format. Name" }, | 758 | { "Def.Formatted Name","Def. Format. Name" }, |
759 | { "Colors","Farben" }, | 759 | { "Colors","Farben" }, |
760 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, | 760 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, |
761 | { "Backup enabled","Backup angeschaltet" }, | 761 | { "Backup enabled","Backup angeschaltet" }, |
762 | { "Use standard backup dir","Standard Backupverzeichnis" }, | 762 | { "Use standard backup dir","Standard Backupverzeichnis" }, |
763 | { "Number of Backups:","Anzahl der Backups" }, | 763 | { "Number of Backups:","Anzahl der Backups" }, |
764 | { "Make backup every ","Mache ein Backup alle " }, | 764 | { "Make backup every ","Mache ein Backup alle " }, |
765 | { " days"," Tage" }, | 765 | { " days"," Tage" }, |
766 | { "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." }, | 766 | { "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." }, |
767 | { "Backup Failed!","Backup Problem!" }, | 767 | { "Backup Failed!","Backup Problem!" }, |
768 | { "Try again now","Versuche jetzt nochmal" }, | 768 | { "Try again now","Versuche jetzt nochmal" }, |
769 | { "Try again later","Versuche später nochmal" }, | 769 | { "Try again later","Versuche später nochmal" }, |
770 | { "Try again tomorrow","Versuche morgen nochmal" }, | 770 | { "Try again tomorrow","Versuche morgen nochmal" }, |
771 | { "Disable backup","Schalte Backup ab" }, | 771 | { "Disable backup","Schalte Backup ab" }, |
772 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, | 772 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, |
773 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, | 773 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, |
774 | { "Choose action","Wähle Aktion" }, | 774 | { "Choose action","Wähle Aktion" }, |
775 | { "&Configure KA/Pi...","Konfiguriere KA/Pi..." }, | ||
776 | { "Global Settings...","Globale Einstellungen..." }, | ||
775 | { "","" }, | 777 | { "","" }, |
776 | { "","" }, | 778 | { "","" }, |
777 | { "","" }, | 779 | { "","" }, |
778 | { "","" }, | 780 | { "","" }, |
779 | { "","" }, \ No newline at end of file | 781 | { "","" }, \ No newline at end of file |
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt index 75fdd11..14e5c0b 100644 --- a/bin/kdepim/kopiemail/germantranslation.txt +++ b/bin/kdepim/kopiemail/germantranslation.txt | |||
@@ -230,51 +230,53 @@ | |||
230 | { "SMTP","SMTP (senden)" }, | 230 | { "SMTP","SMTP (senden)" }, |
231 | { "<p>Do you really want to delete the selected Account?</p>","<p>Möchten Sie wirklich den ausgewählten Account löschen?</p>" }, | 231 | { "<p>Do you really want to delete the selected Account?</p>","<p>Möchten Sie wirklich den ausgewählten Account löschen?</p>" }, |
232 | { "Question","Eine Frage..." }, | 232 | { "Question","Eine Frage..." }, |
233 | { "Send this message?","Nachricht wirklich senden?" }, | 233 | { "Send this message?","Nachricht wirklich senden?" }, |
234 | { "Stop editing message","Stop editing message" }, | 234 | { "Stop editing message","Stop editing message" }, |
235 | { "Sending mail %1 of %2","Sende Mail %1 von %2" }, | 235 | { "Sending mail %1 of %2","Sende Mail %1 von %2" }, |
236 | { "%1 of %2 bytes send","%1 von %2 Bytes gesendet" }, | 236 | { "%1 of %2 bytes send","%1 von %2 Bytes gesendet" }, |
237 | { "Refresh header list","Aktualisiere Titel Liste" }, | 237 | { "Refresh header list","Aktualisiere Titel Liste" }, |
238 | { "Define a smtp\n account first!\n","Bitte zuerst einen\nSMTP Account anlegen!\n" }, | 238 | { "Define a smtp\n account first!\n","Bitte zuerst einen\nSMTP Account anlegen!\n" }, |
239 | { "Mail queue flushed","Gespeicherte Mails gesendet!" }, | 239 | { "Mail queue flushed","Gespeicherte Mails gesendet!" }, |
240 | { "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n","Bitte legen Sie einen\nSMTP Account an.\nDer SMTP Account wird\nfür das Versenden von\nMails benötigt!" }, | 240 | { "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n","Bitte legen Sie einen\nSMTP Account an.\nDer SMTP Account wird\nfür das Versenden von\nMails benötigt!" }, |
241 | { "Show next mail","Zeige nächste Mail" }, | 241 | { "Show next mail","Zeige nächste Mail" }, |
242 | { "End of List","Ende der Liste" }, | 242 | { "End of List","Ende der Liste" }, |
243 | { "Language","Sprache" }, | 243 | { "Language","Sprache" }, |
244 | { "Time Format","Zeit Format" }, | 244 | { "Time Format","Zeit Format" }, |
245 | { "%1 groups subscribed","%1 Guppen abboniert" }, | 245 | { "%1 groups subscribed","%1 Guppen abboniert" }, |
246 | { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" }, | 246 | { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" }, |
247 | { "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" }, | 247 | { "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" }, |
248 | { "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" }, | 248 | { "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" }, |
249 | { "Save settings","Speichere Einstellungen" }, | 249 | { "Save settings","Speichere Einstellungen" }, |
250 | { "Save standard","Speichere Standard" }, | 250 | { "Save standard","Speichere Standard" }, |
251 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, | 251 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, |
252 | { "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" }, | 252 | { "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" }, |
253 | { "Data storage path","Daten Speicherpfad" }, | 253 | { "Data storage path","Daten Speicherpfad" }, |
254 | { "userdefined","benutzerdefiniert" }, | 254 | { "userdefined","benutzerdefiniert" }, |
255 | { "Reply to this mail","Beantworte diese Mail" }, | 255 | { "Reply to this mail","Beantworte diese Mail" }, |
256 | { "Su:","Be:" }, | 256 | { "Su:","Be:" }, |
257 | { "Fr:","Vo:" }, | 257 | { "Fr:","Vo:" }, |
258 | { "To:","An:" }, | 258 | { "To:","An:" }, |
259 | { "Download Mail","Mail runterladen" }, | 259 | { "Download Mail","Mail runterladen" }, |
260 | { "View Source","Zeige Source" }, | 260 | { "View Source","Zeige Source" }, |
261 | { "Show "To" field in list view","Zeige "An" Feld in Listenansicht" }, | 261 | { "Show "To" field in list view","Zeige "An" Feld in Listenansicht" }, |
262 | { "Show info fields at startup","Zeige Info Felder beim Start" }, | 262 | { "Show info fields at startup","Zeige Info Felder beim Start" }, |
263 | { "Show "Subject" info field","Zeige "Betreff" Info Feld" }, | 263 | { "Show "Subject" info field","Zeige "Betreff" Info Feld" }, |
264 | { "Show "From" info field","Zeige "Von" Info Feld" }, | 264 | { "Show "From" info field","Zeige "Von" Info Feld" }, |
265 | { "Show "To" info field","Zeige "An" Info Feld" }, | 265 | { "Show "To" info field","Zeige "An" Info Feld" }, |
266 | { "Mail saved as draft!","Mail als Entwurf gespeichert!" }, | 266 | { "Mail saved as draft!","Mail als Entwurf gespeichert!" }, |
267 | { "Save signature","Speichere Signatur" }, | 267 | { "Save signature","Speichere Signatur" }, |
268 | { "No paths allowed in\nlocal folder settings.\nPlease specify a folder\nname or leave empty\nto create local folder\nwith account name\nautomatically.","Beim lokalen Verzeichnis\nsind keine Pfade erlaubt.\nBitte Verzeichnisnamen\nangeben oder leer lassen\num automatisch ein lokales\nVerzeichnis mit dem\nZugangsnamen anzulegen." }, | 268 | { "No paths allowed in\nlocal folder settings.\nPlease specify a folder\nname or leave empty\nto create local folder\nwith account name\nautomatically.","Beim lokalen Verzeichnis\nsind keine Pfade erlaubt.\nBitte Verzeichnisnamen\nangeben oder leer lassen\num automatisch ein lokales\nVerzeichnis mit dem\nZugangsnamen anzulegen." }, |
269 | { "Do you really want to\nsend all queued mails?","Möchten sie wirklich\nalle Mails im\nOutgoing-Ordner\nsenden?" }, | 269 | { "Do you really want to\nsend all queued mails?","Möchten sie wirklich\nalle Mails im\nOutgoing-Ordner\nsenden?" }, |
270 | { "Sending all mails","Senden aller Mails" }, | 270 | { "Sending all mails","Senden aller Mails" }, |
271 | { "SMTP Account:","SMTP Zugang:" }, | 271 | { "SMTP Account:","SMTP Zugang:" }, |
272 | { "Select SMTP Account","Wähle SMTP Zugang" }, | 272 | { "Select SMTP Account","Wähle SMTP Zugang" }, |
273 | { "Error sending mail:\n%1","Fehler beim Mailversand:\n%1\nHaben Sie vergessen\ndie Post ausreichend\nzu frankieren? ;-)" }, | 273 | { "Error sending mail:\n%1","Fehler beim Mailversand:\n%1\nHaben Sie vergessen\ndie Post ausreichend\nzu frankieren? ;-)" }, |
274 | { "Error sending mail","Fehler beim Mailversand" }, | 274 | { "Error sending mail","Fehler beim Mailversand" }, |
275 | { "Error sending queued mail.\nBreaking.","Fehler beim Mailversand.\nAbbruch." }, | 275 | { "Error sending queued mail.\nBreaking.","Fehler beim Mailversand.\nAbbruch." }, |
276 | { "Colors","Farben" }, | 276 | { "Colors","Farben" }, |
277 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, | 277 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, |
278 | { "Configure OM/Pi...","Konfiguriere OM/Pi..." }, | ||
279 | { "Global Settings...","Globale Einstellungen..." }, | ||
278 | { "","" }, | 280 | { "","" }, |
279 | { "","" }, | 281 | { "","" }, |
280 | { "","" }, \ No newline at end of file | 282 | { "","" }, \ No newline at end of file |
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt index 06fa727..255f2eb 100644 --- a/bin/kdepim/pwmanager/germantranslation.txt +++ b/bin/kdepim/pwmanager/germantranslation.txt | |||
@@ -322,55 +322,57 @@ | |||
322 | { "Character set:","Buchstaben Set:" }, | 322 | { "Character set:","Buchstaben Set:" }, |
323 | { "Lowercase (abc)","Klein (abc)" }, | 323 | { "Lowercase (abc)","Klein (abc)" }, |
324 | { "Uppercase (ABC)","Groß (ABC)" }, | 324 | { "Uppercase (ABC)","Groß (ABC)" }, |
325 | { "Numbers (123)","Nummmern (123)" }, | 325 | { "Numbers (123)","Nummmern (123)" }, |
326 | { "Special characters:","Spezielle Buchstaben:" }, | 326 | { "Special characters:","Spezielle Buchstaben:" }, |
327 | { "Spaces (blank characters)","Leerzeichen" }, | 327 | { "Spaces (blank characters)","Leerzeichen" }, |
328 | { "User defined:","Benutzer definiert:" }, | 328 | { "User defined:","Benutzer definiert:" }, |
329 | { "Password Length:","Passwort Länge:" }, | 329 | { "Password Length:","Passwort Länge:" }, |
330 | { "Enable Filtering to get better passwords","Enable Filtering to get better passwords" }, | 330 | { "Enable Filtering to get better passwords","Enable Filtering to get better passwords" }, |
331 | { "no password","Kein Passwort" }, | 331 | { "no password","Kein Passwort" }, |
332 | { "Sorry, you haven't set a password.","Sorry, Sie haben kein Passwort angegeben." }, | 332 | { "Sorry, you haven't set a password.","Sorry, Sie haben kein Passwort angegeben." }, |
333 | { "not saved, yet","not saved, yet" }, | 333 | { "not saved, yet","not saved, yet" }, |
334 | { "Can't deep-lock, because the document\nhasn't been saved, yet. Please save\nto a file and try again.","Kann nicht tiefsperren, weil das\nDokument noch nicht gespeichert wurde.\nBitte speichern und noch einmal versuchen." }, | 334 | { "Can't deep-lock, because the document\nhasn't been saved, yet. Please save\nto a file and try again.","Kann nicht tiefsperren, weil das\nDokument noch nicht gespeichert wurde.\nBitte speichern und noch einmal versuchen." }, |
335 | { "Find","Finde" }, | 335 | { "Find","Finde" }, |
336 | { "&Exact match","Genaue Übereinstimmung" }, | 336 | { "&Exact match","Genaue Übereinstimmung" }, |
337 | { "&Case sensitive","Großschrift abhängig" }, | 337 | { "&Case sensitive","Großschrift abhängig" }, |
338 | { "Search in Column","Suche in Spalten" }, | 338 | { "Search in Column","Suche in Spalten" }, |
339 | { "&Description","Beschreibung" }, | 339 | { "&Description","Beschreibung" }, |
340 | { "C&omment","Kommentar" }, | 340 | { "C&omment","Kommentar" }, |
341 | { "&Username","Benutzername" }, | 341 | { "&Username","Benutzername" }, |
342 | { "U&RL","URL" }, | 342 | { "U&RL","URL" }, |
343 | { "delete?","Löschen?" }, | 343 | { "delete?","Löschen?" }, |
344 | { "Do you really want to delete\nthe selected entry","Wollen Sie wirklich\nden Eintrag löschen:" }, | 344 | { "Do you really want to delete\nthe selected entry","Wollen Sie wirklich\nden Eintrag löschen:" }, |
345 | { "Save?","Speichern?" }, | 345 | { "Save?","Speichern?" }, |
346 | { ""\nhas been modified.\nDo you want to save it?",""\nwurde geändert.\nMöchten Sie speichern?" }, | 346 | { ""\nhas been modified.\nDo you want to save it?",""\nwurde geändert.\nMöchten Sie speichern?" }, |
347 | { "The list\n "","Die Liste\n "" }, | 347 | { "The list\n "","Die Liste\n "" }, |
348 | { "nothing to do","Nichts zu tun" }, | 348 | { "nothing to do","Nichts zu tun" }, |
349 | { "Sorry, there's nothing to save.\nPlease first add some passwords.","Sorry, es gibt nichts zu speichern.\nBitte erst Passwörter hinzufügen." }, | 349 | { "Sorry, there's nothing to save.\nPlease first add some passwords.","Sorry, es gibt nichts zu speichern.\nBitte erst Passwörter hinzufügen." }, |
350 | { "Add new password","Passwort hinzufügen" }, | 350 | { "Add new password","Passwort hinzufügen" }, |
351 | { "Successfully saved data.","Datei gespeichert." }, | 351 | { "Successfully saved data.","Datei gespeichert." }, |
352 | { "Category:","Kategorie:" }, | 352 | { "Category:","Kategorie:" }, |
353 | { "LOCKED","GESPERRT" }, | 353 | { "LOCKED","GESPERRT" }, |
354 | { "Colors","Farben" }, | 354 | { "Colors","Farben" }, |
355 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, | 355 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, |
356 | { "Backup enabled","Backup angeschaltet" }, | 356 | { "Backup enabled","Backup angeschaltet" }, |
357 | { "Use standard backup dir","Standard Backupverzeichnis" }, | 357 | { "Use standard backup dir","Standard Backupverzeichnis" }, |
358 | { "Number of Backups:","Anzahl der Backups" }, | 358 | { "Number of Backups:","Anzahl der Backups" }, |
359 | { "Make backup every ","Mache ein Backup alle " }, | 359 | { "Make backup every ","Mache ein Backup alle " }, |
360 | { " days"," Tage" }, | 360 | { " days"," Tage" }, |
361 | { "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." }, | 361 | { "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." }, |
362 | { "Backup Failed!","Backup Problem!" }, | 362 | { "Backup Failed!","Backup Problem!" }, |
363 | { "Try again now","Versuche jetzt nochmal" }, | 363 | { "Try again now","Versuche jetzt nochmal" }, |
364 | { "Try again later","Versuche später nochmal" }, | 364 | { "Try again later","Versuche später nochmal" }, |
365 | { "Try again tomorrow","Versuche morgen nochmal" }, | 365 | { "Try again tomorrow","Versuche morgen nochmal" }, |
366 | { "Disable backup","Schalte Backup ab" }, | 366 | { "Disable backup","Schalte Backup ab" }, |
367 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, | 367 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, |
368 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, | 368 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, |
369 | { "Choose action","Wähle Aktion" }, | 369 | { "Choose action","Wähle Aktion" }, |
370 | { "&Configure PwM/Pi...","Konfiguriere PwM/Pi..." }, | ||
371 | { "Global Settings...","Globale Einstellungen..." }, | ||
370 | { "","" }, | 372 | { "","" }, |
371 | { "","" }, | 373 | { "","" }, |
372 | { "","" }, | 374 | { "","" }, |
373 | { "","" }, | 375 | { "","" }, |
374 | { "","" }, | 376 | { "","" }, |
375 | { "","" }, | 377 | { "","" }, |
376 | 378 | ||
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index cd833cf..b107e2d 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1582,99 +1582,99 @@ void KABCore::extensionModified( const KABC::Addressee::List &list ) | |||
1582 | 1582 | ||
1583 | } | 1583 | } |
1584 | 1584 | ||
1585 | QString KABCore::getNameByPhone( const QString &phone ) | 1585 | QString KABCore::getNameByPhone( const QString &phone ) |
1586 | { | 1586 | { |
1587 | #ifndef KAB_EMBEDDED | 1587 | #ifndef KAB_EMBEDDED |
1588 | QRegExp r( "[/*/-/ ]" ); | 1588 | QRegExp r( "[/*/-/ ]" ); |
1589 | QString localPhone( phone ); | 1589 | QString localPhone( phone ); |
1590 | 1590 | ||
1591 | bool found = false; | 1591 | bool found = false; |
1592 | QString ownerName = ""; | 1592 | QString ownerName = ""; |
1593 | KABC::AddressBook::Iterator iter; | 1593 | KABC::AddressBook::Iterator iter; |
1594 | KABC::PhoneNumber::List::Iterator phoneIter; | 1594 | KABC::PhoneNumber::List::Iterator phoneIter; |
1595 | KABC::PhoneNumber::List phoneList; | 1595 | KABC::PhoneNumber::List phoneList; |
1596 | for ( iter = mAddressBook->begin(); !found && ( iter != mAddressBook->end() ); ++iter ) { | 1596 | for ( iter = mAddressBook->begin(); !found && ( iter != mAddressBook->end() ); ++iter ) { |
1597 | phoneList = (*iter).phoneNumbers(); | 1597 | phoneList = (*iter).phoneNumbers(); |
1598 | for ( phoneIter = phoneList.begin(); !found && ( phoneIter != phoneList.end() ); | 1598 | for ( phoneIter = phoneList.begin(); !found && ( phoneIter != phoneList.end() ); |
1599 | ++phoneIter) { | 1599 | ++phoneIter) { |
1600 | // Get rid of separator chars so just the numbers are compared. | 1600 | // Get rid of separator chars so just the numbers are compared. |
1601 | if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) { | 1601 | if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) { |
1602 | ownerName = (*iter).formattedName(); | 1602 | ownerName = (*iter).formattedName(); |
1603 | found = true; | 1603 | found = true; |
1604 | } | 1604 | } |
1605 | } | 1605 | } |
1606 | } | 1606 | } |
1607 | 1607 | ||
1608 | return ownerName; | 1608 | return ownerName; |
1609 | #else //KAB_EMBEDDED | 1609 | #else //KAB_EMBEDDED |
1610 | qDebug("KABCore::getNameByPhone finsih method"); | 1610 | qDebug("KABCore::getNameByPhone finsih method"); |
1611 | return ""; | 1611 | return ""; |
1612 | #endif //KAB_EMBEDDED | 1612 | #endif //KAB_EMBEDDED |
1613 | 1613 | ||
1614 | } | 1614 | } |
1615 | void KABCore::openConfigGlobalDialog() | 1615 | void KABCore::openConfigGlobalDialog() |
1616 | { | 1616 | { |
1617 | KPimPrefsGlobalDialog gc ( this ); | 1617 | KPimPrefsGlobalDialog gc ( this ); |
1618 | gc.exec(); | 1618 | gc.exec(); |
1619 | } | 1619 | } |
1620 | void KABCore::openConfigDialog() | 1620 | void KABCore::openConfigDialog() |
1621 | { | 1621 | { |
1622 | KDialogBase * ConfigureDialog = new KDialogBase ( KDialogBase::Plain , i18n("Configure KA/Pi"), KDialogBase::Default |KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Ok, KDialogBase::Ok,0, "name", true, true); | 1622 | KDialogBase * ConfigureDialog = new KDialogBase ( KDialogBase::Plain , i18n("Configure KA/Pi"), KDialogBase::Default |KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Ok, KDialogBase::Ok,0, "name", true, true); |
1623 | 1623 | ||
1624 | KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog , "KCMKabConfig" ); | 1624 | KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog , "KCMKabConfig" ); |
1625 | ConfigureDialog->setMainWidget( kabcfg ); | 1625 | ConfigureDialog->setMainWidget( kabcfg ); |
1626 | connect( ConfigureDialog, SIGNAL( applyClicked() ), | 1626 | connect( ConfigureDialog, SIGNAL( applyClicked() ), |
1627 | this, SLOT( configurationChanged() ) ); | 1627 | this, SLOT( configurationChanged() ) ); |
1628 | connect( ConfigureDialog, SIGNAL( applyClicked() ), | 1628 | connect( ConfigureDialog, SIGNAL( applyClicked() ), |
1629 | kabcfg, SLOT( save() ) ); | 1629 | kabcfg, SLOT( save() ) ); |
1630 | connect( ConfigureDialog, SIGNAL( okClicked() ), | 1630 | connect( ConfigureDialog, SIGNAL( acceptClicked() ), |
1631 | this, SLOT( configurationChanged() ) ); | 1631 | this, SLOT( configurationChanged() ) ); |
1632 | connect( ConfigureDialog, SIGNAL( okClicked() ), | 1632 | connect( ConfigureDialog, SIGNAL( acceptClicked() ), |
1633 | kabcfg, SLOT( save() ) ); | 1633 | kabcfg, SLOT( save() ) ); |
1634 | connect( ConfigureDialog, SIGNAL( defaultClicked() ), | 1634 | connect( ConfigureDialog, SIGNAL( defaultClicked() ), |
1635 | kabcfg, SLOT( defaults() ) ); | 1635 | kabcfg, SLOT( defaults() ) ); |
1636 | saveSettings(); | 1636 | saveSettings(); |
1637 | kabcfg->load(); | 1637 | kabcfg->load(); |
1638 | #ifndef DESKTOP_VERSION | 1638 | #ifndef DESKTOP_VERSION |
1639 | if ( QApplication::desktop()->height() <= 480 ) | 1639 | if ( QApplication::desktop()->height() <= 480 ) |
1640 | ConfigureDialog->hideButtons(); | 1640 | ConfigureDialog->hideButtons(); |
1641 | ConfigureDialog->showMaximized(); | 1641 | ConfigureDialog->showMaximized(); |
1642 | #endif | 1642 | #endif |
1643 | if ( ConfigureDialog->exec() ) | 1643 | if ( ConfigureDialog->exec() ) |
1644 | KMessageBox::information( this, i18n("Some changes are only\neffective after a restart!\n") ); | 1644 | KMessageBox::information( this, i18n("Some changes are only\neffective after a restart!\n") ); |
1645 | delete ConfigureDialog; | 1645 | delete ConfigureDialog; |
1646 | } | 1646 | } |
1647 | 1647 | ||
1648 | void KABCore::openLDAPDialog() | 1648 | void KABCore::openLDAPDialog() |
1649 | { | 1649 | { |
1650 | #ifndef KAB_EMBEDDED | 1650 | #ifndef KAB_EMBEDDED |
1651 | if ( !mLdapSearchDialog ) { | 1651 | if ( !mLdapSearchDialog ) { |
1652 | mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this ); | 1652 | mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this ); |
1653 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager, | 1653 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager, |
1654 | SLOT( refreshView() ) ); | 1654 | SLOT( refreshView() ) ); |
1655 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this, | 1655 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this, |
1656 | SLOT( setModified() ) ); | 1656 | SLOT( setModified() ) ); |
1657 | } else | 1657 | } else |
1658 | mLdapSearchDialog->restoreSettings(); | 1658 | mLdapSearchDialog->restoreSettings(); |
1659 | 1659 | ||
1660 | if ( mLdapSearchDialog->isOK() ) | 1660 | if ( mLdapSearchDialog->isOK() ) |
1661 | mLdapSearchDialog->exec(); | 1661 | mLdapSearchDialog->exec(); |
1662 | #else //KAB_EMBEDDED | 1662 | #else //KAB_EMBEDDED |
1663 | qDebug("KABCore::openLDAPDialog() finsih method"); | 1663 | qDebug("KABCore::openLDAPDialog() finsih method"); |
1664 | #endif //KAB_EMBEDDED | 1664 | #endif //KAB_EMBEDDED |
1665 | } | 1665 | } |
1666 | 1666 | ||
1667 | void KABCore::print() | 1667 | void KABCore::print() |
1668 | { | 1668 | { |
1669 | #ifndef KAB_EMBEDDED | 1669 | #ifndef KAB_EMBEDDED |
1670 | KPrinter printer; | 1670 | KPrinter printer; |
1671 | if ( !printer.setup( this ) ) | 1671 | if ( !printer.setup( this ) ) |
1672 | return; | 1672 | return; |
1673 | 1673 | ||
1674 | KABPrinting::PrintingWizard wizard( &printer, mAddressBook, | 1674 | KABPrinting::PrintingWizard wizard( &printer, mAddressBook, |
1675 | mViewManager->selectedUids(), this ); | 1675 | mViewManager->selectedUids(), this ); |
1676 | 1676 | ||
1677 | wizard.exec(); | 1677 | wizard.exec(); |
1678 | #else //KAB_EMBEDDED | 1678 | #else //KAB_EMBEDDED |
1679 | qDebug("KABCore::print() finsih method"); | 1679 | qDebug("KABCore::print() finsih method"); |
1680 | #endif //KAB_EMBEDDED | 1680 | #endif //KAB_EMBEDDED |
@@ -3385,50 +3385,50 @@ bool KABCore::syncPhone() | |||
3385 | syncManager->hideProgressBar(); | 3385 | syncManager->hideProgressBar(); |
3386 | if ( syncOK ) { | 3386 | if ( syncOK ) { |
3387 | if ( syncManager->mWriteBackFile ) { | 3387 | if ( syncManager->mWriteBackFile ) { |
3388 | abLocal.removeSyncAddressees( true ); | 3388 | abLocal.removeSyncAddressees( true ); |
3389 | abLocal.saveABphone( fileName ); | 3389 | abLocal.saveABphone( fileName ); |
3390 | abLocal.findNewExtIds( fileName, mCurrentSyncDevice ); | 3390 | abLocal.findNewExtIds( fileName, mCurrentSyncDevice ); |
3391 | //abLocal.preparePhoneSync( mCurrentSyncDevice, false ); | 3391 | //abLocal.preparePhoneSync( mCurrentSyncDevice, false ); |
3392 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true ); | 3392 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true ); |
3393 | } | 3393 | } |
3394 | } | 3394 | } |
3395 | setModified(); | 3395 | setModified(); |
3396 | } | 3396 | } |
3397 | abLocal.removeResources(); | 3397 | abLocal.removeResources(); |
3398 | if ( syncOK ) | 3398 | if ( syncOK ) |
3399 | mViewManager->refreshView(); | 3399 | mViewManager->refreshView(); |
3400 | return syncOK; | 3400 | return syncOK; |
3401 | } | 3401 | } |
3402 | void KABCore::getFile( bool success ) | 3402 | void KABCore::getFile( bool success ) |
3403 | { | 3403 | { |
3404 | if ( ! success ) { | 3404 | if ( ! success ) { |
3405 | message( i18n("Error receiving file. Nothing changed!") ); | 3405 | message( i18n("Error receiving file. Nothing changed!") ); |
3406 | return; | 3406 | return; |
3407 | } | 3407 | } |
3408 | int count = mAddressBook->importFromFile( sentSyncFile() , false, true ); | 3408 | int count = mAddressBook->importFromFile( sentSyncFile() , false, true ); |
3409 | if ( count ) | 3409 | if ( count ) |
3410 | setModified( true ); | 3410 | setModified( true ); |
3411 | message( i18n("Pi-Sync successful!") ); | 3411 | message( i18n("Pi-Sync successful!") ); |
3412 | mViewManager->refreshView(); | 3412 | mViewManager->refreshView(); |
3413 | } | 3413 | } |
3414 | void KABCore::syncFileRequest() | 3414 | void KABCore::syncFileRequest() |
3415 | { | 3415 | { |
3416 | if ( KABPrefs::instance()->mPassiveSyncWithDesktop ) { | 3416 | if ( KABPrefs::instance()->mPassiveSyncWithDesktop ) { |
3417 | syncManager->slotSyncMenu( 999 ); | 3417 | syncManager->slotSyncMenu( 999 ); |
3418 | } | 3418 | } |
3419 | mAddressBook->export2File( sentSyncFile() ); | 3419 | mAddressBook->export2File( sentSyncFile() ); |
3420 | } | 3420 | } |
3421 | QString KABCore::sentSyncFile() | 3421 | QString KABCore::sentSyncFile() |
3422 | { | 3422 | { |
3423 | #ifdef DESKTOP_VERSION | 3423 | #ifdef DESKTOP_VERSION |
3424 | return locateLocal( "tmp", "copysyncab.vcf" ); | 3424 | return locateLocal( "tmp", "copysyncab.vcf" ); |
3425 | #else | 3425 | #else |
3426 | return QString( "/tmp/copysyncab.vcf" ); | 3426 | return QString( "/tmp/copysyncab.vcf" ); |
3427 | #endif | 3427 | #endif |
3428 | } | 3428 | } |
3429 | 3429 | ||
3430 | void KABCore::setCaptionBack() | 3430 | void KABCore::setCaptionBack() |
3431 | { | 3431 | { |
3432 | mMessageTimer->stop(); | 3432 | mMessageTimer->stop(); |
3433 | topLevelWidget()->setCaption( i18n("KAddressbook/Pi") ); | 3433 | topLevelWidget()->setCaption( i18n("KA/Pi") ); |
3434 | } | 3434 | } |
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp index 7de7064..017f1f7 100644 --- a/kmicromail/koprefsdialog.cpp +++ b/kmicromail/koprefsdialog.cpp | |||
@@ -60,100 +60,97 @@ | |||
60 | 60 | ||
61 | #include "koprefs.h" | 61 | #include "koprefs.h" |
62 | 62 | ||
63 | #include "koprefsdialog.h" | 63 | #include "koprefsdialog.h" |
64 | //#include <kprefswidget.h> | 64 | //#include <kprefswidget.h> |
65 | 65 | ||
66 | 66 | ||
67 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | 67 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : |
68 | KPrefsDialog(KOPrefs::instance(),parent,name,true) | 68 | KPrefsDialog(KOPrefs::instance(),parent,name,true) |
69 | { | 69 | { |
70 | 70 | ||
71 | setFont( KGlobalSettings::generalMaxFont() ); | 71 | setFont( KGlobalSettings::generalMaxFont() ); |
72 | setCaption( i18n("Settings - some need a restart (nr)")); | 72 | setCaption( i18n("Settings - some need a restart (nr)")); |
73 | setupGlobalTab(); | 73 | setupGlobalTab(); |
74 | setupMainTab(); | 74 | setupMainTab(); |
75 | setupMailTab();; | 75 | setupMailTab();; |
76 | setupFontsTab(); | 76 | setupFontsTab(); |
77 | readConfig(); | 77 | readConfig(); |
78 | #ifndef DESKTOP_VERSION | 78 | #ifndef DESKTOP_VERSION |
79 | if ( QApplication::desktop()->height() == 480 ) | 79 | if ( QApplication::desktop()->height() == 480 ) |
80 | hideButtons(); | 80 | hideButtons(); |
81 | #endif | 81 | #endif |
82 | 82 | ||
83 | #if 0 | 83 | #if 0 |
84 | 84 | ||
85 | setupMainTab(); | 85 | setupMainTab(); |
86 | setupLocaleTab(); | 86 | setupLocaleTab(); |
87 | setupTimeZoneTab(); | 87 | setupTimeZoneTab(); |
88 | setupTimeTab(); | 88 | setupTimeTab(); |
89 | setupLocaleDateTab(); | 89 | setupLocaleDateTab(); |
90 | setupFontsTab(); | 90 | setupFontsTab(); |
91 | setupColorsTab(); | 91 | setupColorsTab(); |
92 | setupViewsTab(); | 92 | setupViewsTab(); |
93 | //setupSyncTab(); | 93 | //setupSyncTab(); |
94 | //setupSyncAlgTab(); | 94 | //setupSyncAlgTab(); |
95 | //setupPrinterTab(); | 95 | //setupPrinterTab(); |
96 | //setupGroupSchedulingTab(); | 96 | //setupGroupSchedulingTab(); |
97 | //setupGroupAutomationTab(); | 97 | //setupGroupAutomationTab(); |
98 | #endif | 98 | #endif |
99 | } | 99 | } |
100 | 100 | ||
101 | #include "kpimglobalprefs.h" | 101 | #include "kpimglobalprefs.h" |
102 | 102 | ||
103 | KOPrefsDialog::~KOPrefsDialog() | 103 | KOPrefsDialog::~KOPrefsDialog() |
104 | { | 104 | { |
105 | } | 105 | } |
106 | void KOPrefsDialog::setupGlobalTab() | 106 | void KOPrefsDialog::setupGlobalTab() |
107 | { | 107 | { |
108 | QFrame *topFrame = addPage(i18n("Global"),0,0); | 108 | |
109 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); | ||
110 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); | ||
111 | topLayout->addWidget( kdelibcfg ); | ||
112 | 109 | ||
113 | 110 | ||
114 | } | 111 | } |
115 | void KOPrefsDialog::setupMainTab() | 112 | void KOPrefsDialog::setupMainTab() |
116 | { | 113 | { |
117 | QFrame *topFrame = addPage(i18n("General"),0,0); | 114 | QFrame *topFrame = addPage(i18n("General"),0,0); |
118 | 115 | ||
119 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); | 116 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); |
120 | topLayout->setSpacing(spacingHint()); | 117 | topLayout->setSpacing(spacingHint()); |
121 | topLayout->setMargin(marginHint()); | 118 | topLayout->setMargin(marginHint()); |
122 | 119 | ||
123 | 120 | ||
124 | mNameEdit = new QLineEdit(topFrame); | 121 | mNameEdit = new QLineEdit(topFrame); |
125 | mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); | 122 | mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); |
126 | topLayout->addWidget(mNameLabel,0,0); | 123 | topLayout->addWidget(mNameLabel,0,0); |
127 | topLayout->addWidget(mNameEdit,0,1); | 124 | topLayout->addWidget(mNameEdit,0,1); |
128 | 125 | ||
129 | mEmailEdit = new QLineEdit(topFrame); | 126 | mEmailEdit = new QLineEdit(topFrame); |
130 | mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); | 127 | mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); |
131 | topLayout->addWidget(mEmailLabel,1,0); | 128 | topLayout->addWidget(mEmailLabel,1,0); |
132 | topLayout->addWidget(mEmailEdit,1,1); | 129 | topLayout->addWidget(mEmailEdit,1,1); |
133 | QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame); | 130 | QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame); |
134 | topLayout->addMultiCellWidget(lab,2,2,0,1); | 131 | topLayout->addMultiCellWidget(lab,2,2,0,1); |
135 | KPrefsDialogWidBool* ttt = addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"), | 132 | KPrefsDialogWidBool* ttt = addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"), |
136 | &(KOPrefs::instance()->mUseKapi),topFrame); | 133 | &(KOPrefs::instance()->mUseKapi),topFrame); |
137 | topLayout->addMultiCellWidget(ttt->checkBox(),3,3,0,1); | 134 | topLayout->addMultiCellWidget(ttt->checkBox(),3,3,0,1); |
138 | } | 135 | } |
139 | 136 | ||
140 | void KOPrefsDialog::setupMailTab() | 137 | void KOPrefsDialog::setupMailTab() |
141 | { | 138 | { |
142 | QFrame *topFrame = addPage(i18n("Mail"),0,0); | 139 | QFrame *topFrame = addPage(i18n("Mail"),0,0); |
143 | 140 | ||
144 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); | 141 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); |
145 | topLayout->setSpacing(spacingHint()); | 142 | topLayout->setSpacing(spacingHint()); |
146 | topLayout->setMargin(marginHint()); | 143 | topLayout->setMargin(marginHint()); |
147 | 144 | ||
148 | KPrefsDialogWidBool* ttt = addWidBool(i18n("View mail as html"), | 145 | KPrefsDialogWidBool* ttt = addWidBool(i18n("View mail as html"), |
149 | &(KOPrefs::instance()->mViewAsHtml),topFrame); | 146 | &(KOPrefs::instance()->mViewAsHtml),topFrame); |
150 | topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1); | 147 | topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1); |
151 | 148 | ||
152 | 149 | ||
153 | ttt = addWidBool(i18n("Send mails later"), | 150 | ttt = addWidBool(i18n("Send mails later"), |
154 | &(KOPrefs::instance()->mSendLater),topFrame); | 151 | &(KOPrefs::instance()->mSendLater),topFrame); |
155 | topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1); | 152 | topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1); |
156 | ttt = addWidBool(i18n("Show \"To\" field in list view"), | 153 | ttt = addWidBool(i18n("Show \"To\" field in list view"), |
157 | &(KOPrefs::instance()->mShowToField),topFrame); | 154 | &(KOPrefs::instance()->mShowToField),topFrame); |
158 | topLayout->addMultiCellWidget(ttt->checkBox(),2,2,0,1); | 155 | topLayout->addMultiCellWidget(ttt->checkBox(),2,2,0,1); |
159 | 156 | ||
@@ -183,104 +180,102 @@ void KOPrefsDialog::setupMailTab() | |||
183 | */ | 180 | */ |
184 | } | 181 | } |
185 | void KOPrefsDialog::setupFontsTab() | 182 | void KOPrefsDialog::setupFontsTab() |
186 | { | 183 | { |
187 | 184 | ||
188 | QFrame *topFrame = addPage(i18n("Fonts"),0,0); | 185 | QFrame *topFrame = addPage(i18n("Fonts"),0,0); |
189 | // DesktopIcon("fonts",KIcon::SizeMedium)); | 186 | // DesktopIcon("fonts",KIcon::SizeMedium)); |
190 | 187 | ||
191 | QGridLayout *topLayout = new QGridLayout(topFrame,7,3); | 188 | QGridLayout *topLayout = new QGridLayout(topFrame,7,3); |
192 | topLayout->setSpacing(1); | 189 | topLayout->setSpacing(1); |
193 | topLayout->setMargin(3); | 190 | topLayout->setMargin(3); |
194 | KPrefsDialogWidFont * tVFont; | 191 | KPrefsDialogWidFont * tVFont; |
195 | int i = 0; | 192 | int i = 0; |
196 | KPrefsDialogWidFont *timeLabelsFont = | 193 | KPrefsDialogWidFont *timeLabelsFont = |
197 | addWidFont(i18n("OK"),i18n("Application(nr)"), | 194 | addWidFont(i18n("OK"),i18n("Application(nr)"), |
198 | &(KOPrefs::instance()->mAppFont),topFrame); | 195 | &(KOPrefs::instance()->mAppFont),topFrame); |
199 | topLayout->addWidget(timeLabelsFont->label(),i,0); | 196 | topLayout->addWidget(timeLabelsFont->label(),i,0); |
200 | topLayout->addWidget(timeLabelsFont->preview(),i,1); | 197 | topLayout->addWidget(timeLabelsFont->preview(),i,1); |
201 | topLayout->addWidget(timeLabelsFont->button(),i,2); | 198 | topLayout->addWidget(timeLabelsFont->button(),i,2); |
202 | ++i; | 199 | ++i; |
203 | 200 | ||
204 | 201 | ||
205 | timeLabelsFont = | 202 | timeLabelsFont = |
206 | addWidFont(i18n("Dear Mr."),i18n("Compose mail:"), | 203 | addWidFont(i18n("Dear Mr."),i18n("Compose mail:"), |
207 | &(KOPrefs::instance()->mComposeFont),topFrame); | 204 | &(KOPrefs::instance()->mComposeFont),topFrame); |
208 | topLayout->addWidget(timeLabelsFont->label(),i,0); | 205 | topLayout->addWidget(timeLabelsFont->label(),i,0); |
209 | topLayout->addWidget(timeLabelsFont->preview(),i,1); | 206 | topLayout->addWidget(timeLabelsFont->preview(),i,1); |
210 | topLayout->addWidget(timeLabelsFont->button(),i,2); | 207 | topLayout->addWidget(timeLabelsFont->button(),i,2); |
211 | ++i; | 208 | ++i; |
212 | 209 | ||
213 | KPrefsDialogWidFont *timeBarFont = | 210 | KPrefsDialogWidFont *timeBarFont = |
214 | addWidFont(i18n("Hello"),i18n("Read mail:"), | 211 | addWidFont(i18n("Hello"),i18n("Read mail:"), |
215 | &(KOPrefs::instance()->mReadFont),topFrame); | 212 | &(KOPrefs::instance()->mReadFont),topFrame); |
216 | topLayout->addWidget(timeBarFont->label(),i,0); | 213 | topLayout->addWidget(timeBarFont->label(),i,0); |
217 | topLayout->addWidget(timeBarFont->preview(),i,1); | 214 | topLayout->addWidget(timeBarFont->preview(),i,1); |
218 | topLayout->addWidget(timeBarFont->button(),i,2); | 215 | topLayout->addWidget(timeBarFont->button(),i,2); |
219 | ++i; | 216 | ++i; |
220 | 217 | ||
221 | topLayout->setColStretch(1,1); | 218 | topLayout->setColStretch(1,1); |
222 | topLayout->setRowStretch(4,1); | 219 | topLayout->setRowStretch(4,1); |
223 | 220 | ||
224 | } | 221 | } |
225 | void KOPrefsDialog::usrReadConfig() | 222 | void KOPrefsDialog::usrReadConfig() |
226 | { | 223 | { |
227 | 224 | ||
228 | mNameEdit->setText(KOPrefs::instance()->mName); | 225 | mNameEdit->setText(KOPrefs::instance()->mName); |
229 | mEmailEdit->setText(KOPrefs::instance()->mEmail); | 226 | mEmailEdit->setText(KOPrefs::instance()->mEmail); |
230 | //mCodecEdit->setText(KOPrefs::instance()->mSendCodec); | 227 | //mCodecEdit->setText(KOPrefs::instance()->mSendCodec); |
231 | kdelibcfg->readConfig(); | ||
232 | } | 228 | } |
233 | void KOPrefsDialog::usrWriteConfig() | 229 | void KOPrefsDialog::usrWriteConfig() |
234 | { | 230 | { |
235 | KOPrefs::instance()->mName = mNameEdit->text(); | 231 | KOPrefs::instance()->mName = mNameEdit->text(); |
236 | KOPrefs::instance()->mEmail = mEmailEdit->text(); | 232 | KOPrefs::instance()->mEmail = mEmailEdit->text(); |
237 | //KOPrefs::instance()->mSendCodec = mCodecEdit->text(); | 233 | //KOPrefs::instance()->mSendCodec = mCodecEdit->text(); |
238 | kdelibcfg->writeConfig(); | ||
239 | 234 | ||
240 | 235 | ||
241 | } | 236 | } |
242 | 237 | ||
243 | #if 0 | 238 | #if 0 |
244 | void KOPrefsDialog::setupLocaleDateTab() | 239 | void KOPrefsDialog::setupLocaleDateTab() |
245 | { | 240 | { |
246 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); | 241 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); |
247 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); | 242 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); |
248 | topLayout->setSpacing(spacingHint()); | 243 | topLayout->setSpacing(spacingHint()); |
249 | topLayout->setMargin(marginHint()); | 244 | topLayout->setMargin(marginHint()); |
250 | int iii = 0; | 245 | int iii = 0; |
251 | 246 | ||
252 | 247 | ||
253 | KPrefsWidRadios *syncPrefsGroup = | 248 | KPrefsWidRadios *syncPrefsGroup = |
254 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); | 249 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); |
255 | QString format; | 250 | QString format; |
256 | if ( QApplication::desktop()->width() < 480 ) | 251 | if ( QApplication::desktop()->width() < 480 ) |
257 | format = "(%d.%m.%Y)"; | 252 | format = "(%d.%m.%Y)"; |
258 | else | 253 | else |
259 | format = "(%d.%m.%Y|%A %d %B %Y)"; | 254 | format = "(%d.%m.%Y|%A %d %B %Y)"; |
260 | syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); | 255 | syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); |
261 | if ( QApplication::desktop()->width() < 480 ) | 256 | if ( QApplication::desktop()->width() < 480 ) |
262 | format = "(%m.%d.%Y)"; | 257 | format = "(%m.%d.%Y)"; |
263 | else | 258 | else |
264 | format = "(%m.%d.%Y|%A %B %d %Y)"; | 259 | format = "(%m.%d.%Y|%A %B %d %Y)"; |
265 | syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); | 260 | syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); |
266 | if ( QApplication::desktop()->width() < 480 ) | 261 | if ( QApplication::desktop()->width() < 480 ) |
267 | format = "(%Y-%m-%d)"; | 262 | format = "(%Y-%m-%d)"; |
268 | else | 263 | else |
269 | format = "(%Y-%m-%d|%A %Y %B %d)"; | 264 | format = "(%Y-%m-%d|%A %Y %B %d)"; |
270 | syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); | 265 | syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); |
271 | syncPrefsGroup->addRadio(i18n("User defined")); | 266 | syncPrefsGroup->addRadio(i18n("User defined")); |
272 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); | 267 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); |
273 | ++iii; | 268 | ++iii; |
274 | ++iii; | 269 | ++iii; |
275 | QLabel * lab; | 270 | QLabel * lab; |
276 | mUserDateFormatLong = new QLineEdit(topFrame); | 271 | mUserDateFormatLong = new QLineEdit(topFrame); |
277 | lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); | 272 | lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); |
278 | topLayout->addWidget(lab ,iii,0); | 273 | topLayout->addWidget(lab ,iii,0); |
279 | topLayout->addWidget(mUserDateFormatLong,iii,1); | 274 | topLayout->addWidget(mUserDateFormatLong,iii,1); |
280 | ++iii; | 275 | ++iii; |
281 | mUserDateFormatShort = new QLineEdit(topFrame); | 276 | mUserDateFormatShort = new QLineEdit(topFrame); |
282 | lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame); | 277 | lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame); |
283 | topLayout->addWidget(lab ,iii,0); | 278 | topLayout->addWidget(lab ,iii,0); |
284 | topLayout->addWidget(mUserDateFormatShort,iii,1); | 279 | topLayout->addWidget(mUserDateFormatShort,iii,1); |
285 | ++iii; | 280 | ++iii; |
286 | lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); | 281 | lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); |
diff --git a/kmicromail/koprefsdialog.h b/kmicromail/koprefsdialog.h index a0416ae..7fa9261 100644 --- a/kmicromail/koprefsdialog.h +++ b/kmicromail/koprefsdialog.h | |||
@@ -16,97 +16,96 @@ | |||
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | #ifndef _KOPREFSDIALOG_H | 23 | #ifndef _KOPREFSDIALOG_H |
24 | #define _KOPREFSDIALOG_H | 24 | #define _KOPREFSDIALOG_H |
25 | 25 | ||
26 | #include <qframe.h> | 26 | #include <qframe.h> |
27 | #include <qdict.h> | 27 | #include <qdict.h> |
28 | #include <qcolor.h> | 28 | #include <qcolor.h> |
29 | #include <qlistview.h> | 29 | #include <qlistview.h> |
30 | 30 | ||
31 | #include <kdialogbase.h> | 31 | #include <kdialogbase.h> |
32 | 32 | ||
33 | #include <libkdepim/kprefsdialog.h> | 33 | #include <libkdepim/kprefsdialog.h> |
34 | #include <libkdepim/kdateedit.h> | 34 | #include <libkdepim/kdateedit.h> |
35 | #include <kcmconfigs/kdepimconfigwidget.h> | 35 | #include <kcmconfigs/kdepimconfigwidget.h> |
36 | 36 | ||
37 | class KColorButton; | 37 | class KColorButton; |
38 | class QSpinBox; | 38 | class QSpinBox; |
39 | class QSlider; | 39 | class QSlider; |
40 | class KURLRequester; | 40 | class KURLRequester; |
41 | class QComboBox; | 41 | class QComboBox; |
42 | class QLineEdit; | 42 | class QLineEdit; |
43 | class QStringList; | 43 | class QStringList; |
44 | 44 | ||
45 | /** Dialog to change the korganizer configuration. | 45 | /** Dialog to change the korganizer configuration. |
46 | */ | 46 | */ |
47 | class KOPrefsDialog : public KPrefsDialog | 47 | class KOPrefsDialog : public KPrefsDialog |
48 | { | 48 | { |
49 | Q_OBJECT | 49 | Q_OBJECT |
50 | public: | 50 | public: |
51 | /** Initialize dialog and pages */ | 51 | /** Initialize dialog and pages */ |
52 | KOPrefsDialog(QWidget *parent=0,char *name=0,bool modal=false); | 52 | KOPrefsDialog(QWidget *parent=0,char *name=0,bool modal=false); |
53 | ~KOPrefsDialog(); | 53 | ~KOPrefsDialog(); |
54 | 54 | ||
55 | protected: | 55 | protected: |
56 | void usrReadConfig(); | 56 | void usrReadConfig(); |
57 | void usrWriteConfig(); | 57 | void usrWriteConfig(); |
58 | 58 | ||
59 | void setupMainTab(); | 59 | void setupMainTab(); |
60 | void setupGlobalTab(); | 60 | void setupGlobalTab(); |
61 | void setupMailTab(); | 61 | void setupMailTab(); |
62 | void setupFontsTab(); | 62 | void setupFontsTab(); |
63 | private: | 63 | private: |
64 | KDEPIMConfigWidget* kdelibcfg; | ||
65 | QLineEdit *mNameEdit; | 64 | QLineEdit *mNameEdit; |
66 | QLineEdit *mCodecEdit; | 65 | QLineEdit *mCodecEdit; |
67 | QLineEdit *mEmailEdit; | 66 | QLineEdit *mEmailEdit; |
68 | QLabel *mNameLabel; | 67 | QLabel *mNameLabel; |
69 | QLabel *mEmailLabel; | 68 | QLabel *mEmailLabel; |
70 | #if 0 | 69 | #if 0 |
71 | /* | 70 | /* |
72 | public slots: | 71 | public slots: |
73 | void showPrinterTab(); | 72 | void showPrinterTab(); |
74 | 73 | ||
75 | 74 | ||
76 | void updateCategories(); | 75 | void updateCategories(); |
77 | void showSyncPage(); | 76 | void showSyncPage(); |
78 | protected slots: | 77 | protected slots: |
79 | void selectSoundFile(); | 78 | void selectSoundFile(); |
80 | void setCategoryColor(); | 79 | void setCategoryColor(); |
81 | void updateCategoryColor(); | 80 | void updateCategoryColor(); |
82 | void updateTimezoneOffset( int ); | 81 | void updateTimezoneOffset( int ); |
83 | 82 | ||
84 | 83 | ||
85 | void warningExperimental(bool on); | 84 | void warningExperimental(bool on); |
86 | void warningGroupScheduling(); | 85 | void warningGroupScheduling(); |
87 | void warningProjectView(); | 86 | void warningProjectView(); |
88 | 87 | ||
89 | void toggleEmailSettings(bool); | 88 | void toggleEmailSettings(bool); |
90 | 89 | ||
91 | //additional emails | 90 | //additional emails |
92 | void addItem(); | 91 | void addItem(); |
93 | void removeItem(); | 92 | void removeItem(); |
94 | void updateItem(); | 93 | void updateItem(); |
95 | void updateInput(); | 94 | void updateInput(); |
96 | */ | 95 | */ |
97 | protected: | 96 | protected: |
98 | void usrReadConfig(); | 97 | void usrReadConfig(); |
99 | void usrWriteConfig(); | 98 | void usrWriteConfig(); |
100 | 99 | ||
101 | void setupMainTab(); | 100 | void setupMainTab(); |
102 | void setupTimeTab(); | 101 | void setupTimeTab(); |
103 | void setupTimeZoneTab(); | 102 | void setupTimeZoneTab(); |
104 | void setupLocaleTab(); | 103 | void setupLocaleTab(); |
105 | void setupLocaleDateTab(); | 104 | void setupLocaleDateTab(); |
106 | void setupFontsTab(); | 105 | void setupFontsTab(); |
107 | void setupColorsTab(); | 106 | void setupColorsTab(); |
108 | void setupViewsTab(); | 107 | void setupViewsTab(); |
109 | void setupDisplayTab(); | 108 | void setupDisplayTab(); |
110 | void setupPrinterTab(); | 109 | void setupPrinterTab(); |
111 | void setupGroupSchedulingTab(); | 110 | void setupGroupSchedulingTab(); |
112 | void setupGroupAutomationTab(); | 111 | void setupGroupAutomationTab(); |
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 9a52d1b..e3c5ec3 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp | |||
@@ -50,101 +50,111 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
50 | SLOT( slotGetAllMail() ) ); | 50 | SLOT( slotGetAllMail() ) ); |
51 | getMail->addTo( mailMenu ); | 51 | getMail->addTo( mailMenu ); |
52 | 52 | ||
53 | getMail = new QAction( i18n( "Get new messages" ), SmallIcon("add"), | 53 | getMail = new QAction( i18n( "Get new messages" ), SmallIcon("add"), |
54 | 0, 0, this ); | 54 | 0, 0, this ); |
55 | getMail->addTo( toolBar ); | 55 | getMail->addTo( toolBar ); |
56 | getMail->addTo( mailMenu ); | 56 | getMail->addTo( mailMenu ); |
57 | connect(getMail, SIGNAL( activated() ), | 57 | connect(getMail, SIGNAL( activated() ), |
58 | SLOT( slotGetMail() ) ); | 58 | SLOT( slotGetMail() ) ); |
59 | 59 | ||
60 | composeMail = new QAction( i18n( "Compose new mail" ), SmallIcon("composemail"), | 60 | composeMail = new QAction( i18n( "Compose new mail" ), SmallIcon("composemail"), |
61 | 0, 0, this ); | 61 | 0, 0, this ); |
62 | composeMail->addTo( toolBar ); | 62 | composeMail->addTo( toolBar ); |
63 | composeMail->addTo( mailMenu ); | 63 | composeMail->addTo( mailMenu ); |
64 | 64 | ||
65 | sendQueued = new QAction( i18n( "Send queued mails" ), SmallIcon("sendqueued") , | 65 | sendQueued = new QAction( i18n( "Send queued mails" ), SmallIcon("sendqueued") , |
66 | 0, 0, this ); | 66 | 0, 0, this ); |
67 | sendQueued->addTo( toolBar ); | 67 | sendQueued->addTo( toolBar ); |
68 | sendQueued->addTo( mailMenu ); | 68 | sendQueued->addTo( mailMenu ); |
69 | 69 | ||
70 | /* | 70 | /* |
71 | syncFolders = new QAction( i18n( "Sync mailfolders" ), ICON_SYNC, | 71 | syncFolders = new QAction( i18n( "Sync mailfolders" ), ICON_SYNC, |
72 | 0, 0, this ); | 72 | 0, 0, this ); |
73 | syncFolders->addTo( toolBar ); | 73 | syncFolders->addTo( toolBar ); |
74 | syncFolders->addTo( mailMenu ); | 74 | syncFolders->addTo( mailMenu ); |
75 | */ | 75 | */ |
76 | 76 | ||
77 | showFolders = new QAction( i18n( "Show/Hide folders" ), SmallIcon("showfolders") , | 77 | showFolders = new QAction( i18n( "Show/Hide folders" ), SmallIcon("showfolders") , |
78 | 0, 0, this, 0, true ); | 78 | 0, 0, this, 0, true ); |
79 | showFolders->addTo( toolBar ); | 79 | showFolders->addTo( toolBar ); |
80 | showFolders->addTo( mailMenu ); | 80 | showFolders->addTo( mailMenu ); |
81 | showFolders->setOn( true ); | 81 | showFolders->setOn( true ); |
82 | connect(showFolders, SIGNAL( toggled(bool) ), | 82 | connect(showFolders, SIGNAL( toggled(bool) ), |
83 | SLOT( slotShowFolders(bool) ) ); | 83 | SLOT( slotShowFolders(bool) ) ); |
84 | 84 | ||
85 | /* | 85 | /* |
86 | searchMails = new QAction( i18n( "Search mails" ), SmallIcon("find") ), | 86 | searchMails = new QAction( i18n( "Search mails" ), SmallIcon("find") ), |
87 | 0, 0, this ); | 87 | 0, 0, this ); |
88 | searchMails->kopddTo( toolBar ); | 88 | searchMails->kopddTo( toolBar ); |
89 | searchMails->addTo( mailMenu ); | 89 | searchMails->addTo( mailMenu ); |
90 | */ | 90 | */ |
91 | 91 | ||
92 | deleteMails = new QAction(i18n("Delete Mail"), SmallIcon("trash"), 0, 0, this); | 92 | deleteMails = new QAction(i18n("Delete Mail"), SmallIcon("trash"), 0, 0, this); |
93 | deleteMails->addTo( toolBar ); | 93 | deleteMails->addTo( toolBar ); |
94 | deleteMails->addTo( mailMenu ); | 94 | deleteMails->addTo( mailMenu ); |
95 | connect( deleteMails, SIGNAL( activated() ), | 95 | connect( deleteMails, SIGNAL( activated() ), |
96 | SLOT( slotDeleteAllMail() ) ); | 96 | SLOT( slotDeleteAllMail() ) ); |
97 | 97 | ||
98 | editSettings = new QAction( i18n( "Edit settings" ), SmallIcon("SettingsIcon") , | 98 | editSettings = new QAction( i18n( "Configure OM/Pi..." ), SmallIcon("SettingsIcon") , |
99 | 0, 0, this ); | 99 | 0, 0, this ); |
100 | editSettings->addTo( settingsMenu ); | 100 | editSettings->addTo( settingsMenu ); |
101 | connect( editSettings, SIGNAL( activated() ), | 101 | connect( editSettings, SIGNAL( activated() ), |
102 | SLOT( slotEditSettings() ) ); | 102 | SLOT( slotEditSettings() ) ); |
103 | |||
104 | |||
105 | QAction * editSettings2 = new QAction( i18n( "Global Settings..." ), SmallIcon("SettingsIcon") , | ||
106 | 0, 0, this ); | ||
107 | editSettings2->addTo( settingsMenu ); | ||
108 | connect( editSettings2, SIGNAL( activated() ), | ||
109 | SLOT( slotEditGlobalSettings() ) ); | ||
110 | |||
111 | |||
112 | |||
103 | editAccounts = new QAction( i18n( "Configure accounts" ), SmallIcon("editaccounts") , | 113 | editAccounts = new QAction( i18n( "Configure accounts" ), SmallIcon("editaccounts") , |
104 | 0, 0, this ); | 114 | 0, 0, this ); |
105 | editAccounts->addTo( settingsMenu ); | 115 | editAccounts->addTo( settingsMenu ); |
106 | codecMenu = new QPopupMenu( menuBar ); | 116 | codecMenu = new QPopupMenu( menuBar ); |
107 | codecMenu->insertItem( "Western (iso-8859-1)",0,0); | 117 | codecMenu->insertItem( "Western (iso-8859-1)",0,0); |
108 | codecMenu->insertItem( "Cyrillic (iso-8859-5)",1,1); | 118 | codecMenu->insertItem( "Cyrillic (iso-8859-5)",1,1); |
109 | codecMenu->insertItem( "Western (iso-8859-15)",2,2); | 119 | codecMenu->insertItem( "Western (iso-8859-15)",2,2); |
110 | codecMenu->insertItem( "Chinese (big-5)",3,3); | 120 | codecMenu->insertItem( "Chinese (big-5)",3,3); |
111 | codecMenu->insertItem( "Unicode (utf-8)",4,4); | 121 | codecMenu->insertItem( "Unicode (utf-8)",4,4); |
112 | codecMenu->insertItem( "Userdefined ("+KOPrefs::instance()->mSendCodec+")",5,5); | 122 | codecMenu->insertItem( "Userdefined ("+KOPrefs::instance()->mSendCodec+")",5,5); |
113 | //disabled | 123 | //disabled |
114 | //settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu); | 124 | //settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu); |
115 | //setCentralWidget( view ); | 125 | //setCentralWidget( view ); |
116 | 126 | ||
117 | QVBox* wrapperBox = new QVBox( this ); | 127 | QVBox* wrapperBox = new QVBox( this ); |
118 | setCentralWidget( wrapperBox ); | 128 | setCentralWidget( wrapperBox ); |
119 | 129 | ||
120 | // QWidget *view = new QWidget( wrapperBox ); | 130 | // QWidget *view = new QWidget( wrapperBox ); |
121 | KDGanttMinimizeSplitter* splithor = new KDGanttMinimizeSplitter( Qt::Vertical, wrapperBox); | 131 | KDGanttMinimizeSplitter* splithor = new KDGanttMinimizeSplitter( Qt::Vertical, wrapperBox); |
122 | splithor->setMinimizeDirection( KDGanttMinimizeSplitter::Down); | 132 | splithor->setMinimizeDirection( KDGanttMinimizeSplitter::Down); |
123 | KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, splithor); | 133 | KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, splithor); |
124 | split->setMinimizeDirection( KDGanttMinimizeSplitter::Left); | 134 | split->setMinimizeDirection( KDGanttMinimizeSplitter::Left); |
125 | //layout = new QBoxLayout ( split, QBoxLayout::LeftToRight ); | 135 | //layout = new QBoxLayout ( split, QBoxLayout::LeftToRight ); |
126 | subLE = 0; | 136 | subLE = 0; |
127 | fromLE = 0; | 137 | fromLE = 0; |
128 | toLE = 0; | 138 | toLE = 0; |
129 | if ( KOPrefs::instance()->mShowInfoSub || KOPrefs::instance()->mShowInfoFrom || KOPrefs::instance()->mShowInfoTo ) { | 139 | if ( KOPrefs::instance()->mShowInfoSub || KOPrefs::instance()->mShowInfoFrom || KOPrefs::instance()->mShowInfoTo ) { |
130 | QWidget* infoBox = new QWidget( splithor ); | 140 | QWidget* infoBox = new QWidget( splithor ); |
131 | QGridLayout *griLay = new QGridLayout( infoBox, 2,2); | 141 | QGridLayout *griLay = new QGridLayout( infoBox, 2,2); |
132 | if ( KOPrefs::instance()->mShowInfoSub ) { | 142 | if ( KOPrefs::instance()->mShowInfoSub ) { |
133 | griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 ); | 143 | griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 ); |
134 | griLay->addWidget( subLE = new QLineEdit( infoBox ),0,1) ; | 144 | griLay->addWidget( subLE = new QLineEdit( infoBox ),0,1) ; |
135 | } | 145 | } |
136 | if ( KOPrefs::instance()->mShowInfoFrom ) { | 146 | if ( KOPrefs::instance()->mShowInfoFrom ) { |
137 | griLay->addWidget( new QLabel ( i18n("Fr:"), infoBox ),1,0 ); | 147 | griLay->addWidget( new QLabel ( i18n("Fr:"), infoBox ),1,0 ); |
138 | griLay->addWidget( fromLE = new QLineEdit( infoBox ),1,1) ; | 148 | griLay->addWidget( fromLE = new QLineEdit( infoBox ),1,1) ; |
139 | } | 149 | } |
140 | if ( KOPrefs::instance()->mShowInfoTo ) { | 150 | if ( KOPrefs::instance()->mShowInfoTo ) { |
141 | griLay->addWidget( new QLabel ( i18n("To:"), infoBox ),2,0 ); | 151 | griLay->addWidget( new QLabel ( i18n("To:"), infoBox ),2,0 ); |
142 | griLay->addWidget( toLE = new QLineEdit( infoBox ),2,1) ; | 152 | griLay->addWidget( toLE = new QLineEdit( infoBox ),2,1) ; |
143 | } | 153 | } |
144 | infoBox->setMaximumHeight( infoBox->sizeHint().height() ); | 154 | infoBox->setMaximumHeight( infoBox->sizeHint().height() ); |
145 | if ( !KOPrefs::instance()->mShowInfoStart ) { | 155 | if ( !KOPrefs::instance()->mShowInfoStart ) { |
146 | QTimer::singleShot( 1,splithor, SLOT ( toggle() ) ); | 156 | QTimer::singleShot( 1,splithor, SLOT ( toggle() ) ); |
147 | } | 157 | } |
148 | } | 158 | } |
149 | 159 | ||
150 | 160 | ||
@@ -324,93 +334,96 @@ void MainWindow::showAbout() | |||
324 | "KOpieMail/Pi uses LibEtPan - a mail stuff library\n" | 334 | "KOpieMail/Pi uses LibEtPan - a mail stuff library\n" |
325 | "Copyright (C) 2001, 2002 - DINH Viet Hoa\n" | 335 | "Copyright (C) 2001, 2002 - DINH Viet Hoa\n" |
326 | "libEtPan has its own licence - see LibEtPan licence\n"; | 336 | "libEtPan has its own licence - see LibEtPan licence\n"; |
327 | 337 | ||
328 | KApplication::showText( cap, text ); | 338 | KApplication::showText( cap, text ); |
329 | } | 339 | } |
330 | void MainWindow::showEtpanLicence() | 340 | void MainWindow::showEtpanLicence() |
331 | { | 341 | { |
332 | KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" ); | 342 | KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" ); |
333 | 343 | ||
334 | } | 344 | } |
335 | void MainWindow::appMessage(const QCString &, const QByteArray &) | 345 | void MainWindow::appMessage(const QCString &, const QByteArray &) |
336 | { | 346 | { |
337 | qDebug("appMessage implemented by subclass"); | 347 | qDebug("appMessage implemented by subclass"); |
338 | } | 348 | } |
339 | 349 | ||
340 | void MainWindow::slotAdjustLayout() { | 350 | void MainWindow::slotAdjustLayout() { |
341 | 351 | ||
342 | /* | 352 | /* |
343 | QWidget *d = QApplication::desktop(); | 353 | QWidget *d = QApplication::desktop(); |
344 | 354 | ||
345 | if ( d->width() < d->height() ) { | 355 | if ( d->width() < d->height() ) { |
346 | layout->setDirection( QBoxLayout::TopToBottom ); | 356 | layout->setDirection( QBoxLayout::TopToBottom ); |
347 | } else { | 357 | } else { |
348 | layout->setDirection( QBoxLayout::LeftToRight ); | 358 | layout->setDirection( QBoxLayout::LeftToRight ); |
349 | } | 359 | } |
350 | */ | 360 | */ |
351 | } | 361 | } |
352 | 362 | ||
353 | void MainWindow::slotAdjustColumns() | 363 | void MainWindow::slotAdjustColumns() |
354 | { | 364 | { |
355 | bool hidden = folderView->isHidden(); | 365 | bool hidden = folderView->isHidden(); |
356 | if ( hidden ) folderView->show(); | 366 | if ( hidden ) folderView->show(); |
357 | folderView->setColumnWidth( 0, folderView->visibleWidth() ); | 367 | folderView->setColumnWidth( 0, folderView->visibleWidth() ); |
358 | if ( hidden ) folderView->hide(); | 368 | if ( hidden ) folderView->hide(); |
359 | 369 | ||
360 | mailView->setColumnWidth( 0, 10 ); | 370 | mailView->setColumnWidth( 0, 10 ); |
361 | mailView->setColumnWidth( 1, 100 ); | 371 | mailView->setColumnWidth( 1, 100 ); |
362 | mailView->setColumnWidth( 2, 100 ); | 372 | mailView->setColumnWidth( 2, 100 ); |
363 | mailView->setColumnWidth( 3, 50 ); | 373 | mailView->setColumnWidth( 3, 50 ); |
364 | mailView->setColumnWidth( 4, 120 ); | 374 | mailView->setColumnWidth( 4, 120 ); |
365 | if ( KOPrefs::instance()->mShowToField ) | 375 | if ( KOPrefs::instance()->mShowToField ) |
366 | mailView->setColumnWidth( 5, 100 ); | 376 | mailView->setColumnWidth( 5, 100 ); |
367 | } | 377 | } |
368 | 378 | ||
369 | void MainWindow::slotEditSettings() | 379 | void MainWindow::slotEditSettings() |
370 | { | 380 | { |
371 | } | 381 | } |
382 | void MainWindow::slotEditGlobalSettings() | ||
383 | { | ||
384 | } | ||
372 | 385 | ||
373 | void MainWindow::slotShowFolders( bool ) | 386 | void MainWindow::slotShowFolders( bool ) |
374 | { | 387 | { |
375 | qDebug("not implemented: "); | 388 | qDebug("not implemented: "); |
376 | } | 389 | } |
377 | 390 | ||
378 | void MainWindow::refreshMailView(const QValueList<RecMailP>&) | 391 | void MainWindow::refreshMailView(const QValueList<RecMailP>&) |
379 | { | 392 | { |
380 | qDebug("not implemented: "); | 393 | qDebug("not implemented: "); |
381 | } | 394 | } |
382 | 395 | ||
383 | void MainWindow::mailLeftClicked(QListViewItem * ) | 396 | void MainWindow::mailLeftClicked(QListViewItem * ) |
384 | { | 397 | { |
385 | qDebug("not implemented: "); | 398 | qDebug("not implemented: "); |
386 | } | 399 | } |
387 | 400 | ||
388 | void MainWindow::displayMail() | 401 | void MainWindow::displayMail() |
389 | { | 402 | { |
390 | qDebug("not implemented: "); | 403 | qDebug("not implemented: "); |
391 | } | 404 | } |
392 | 405 | ||
393 | void MainWindow::slotDeleteMail() | 406 | void MainWindow::slotDeleteMail() |
394 | { | 407 | { |
395 | qDebug("not implemented: "); | 408 | qDebug("not implemented: "); |
396 | } | 409 | } |
397 | 410 | ||
398 | void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int ) | 411 | void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int ) |
399 | { | 412 | { |
400 | qDebug("not implemented: "); | 413 | qDebug("not implemented: "); |
401 | } | 414 | } |
402 | 415 | ||
403 | void MainWindow::slotSendQueued() | 416 | void MainWindow::slotSendQueued() |
404 | { | 417 | { |
405 | qDebug("not implemented: "); | 418 | qDebug("not implemented: "); |
406 | } | 419 | } |
407 | 420 | ||
408 | void MainWindow::slotEditAccounts() | 421 | void MainWindow::slotEditAccounts() |
409 | { | 422 | { |
410 | qDebug("not implemented: "); | 423 | qDebug("not implemented: "); |
411 | } | 424 | } |
412 | 425 | ||
413 | void MainWindow::slotComposeMail() | 426 | void MainWindow::slotComposeMail() |
414 | { | 427 | { |
415 | qDebug("not implemented: "); | 428 | qDebug("not implemented: "); |
416 | } | 429 | } |
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h index ddb3fca..6894039 100644 --- a/kmicromail/mainwindow.h +++ b/kmicromail/mainwindow.h | |||
@@ -7,67 +7,68 @@ | |||
7 | #include <qlistview.h> | 7 | #include <qlistview.h> |
8 | #include <qaction.h> | 8 | #include <qaction.h> |
9 | #include <qlineedit.h> | 9 | #include <qlineedit.h> |
10 | 10 | ||
11 | #include <qtoolbar.h> | 11 | #include <qtoolbar.h> |
12 | #ifdef DESKTOP_VERSION | 12 | #ifdef DESKTOP_VERSION |
13 | #include <qmenubar.h> | 13 | #include <qmenubar.h> |
14 | #define QPEMenuBar QMenuBar | 14 | #define QPEMenuBar QMenuBar |
15 | #else | 15 | #else |
16 | #include <qpe/qpemenubar.h> | 16 | #include <qpe/qpemenubar.h> |
17 | #endif | 17 | #endif |
18 | 18 | ||
19 | #include "accountview.h" | 19 | #include "accountview.h" |
20 | #include "statuswidget.h" | 20 | #include "statuswidget.h" |
21 | 21 | ||
22 | #include <libmailwrapper/mailtypes.h> | 22 | #include <libmailwrapper/mailtypes.h> |
23 | #include <opie2/osmartpointer.h> | 23 | #include <opie2/osmartpointer.h> |
24 | 24 | ||
25 | class RecMail; | 25 | class RecMail; |
26 | 26 | ||
27 | class MainWindow : public QMainWindow | 27 | class MainWindow : public QMainWindow |
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | 30 | ||
31 | public: | 31 | public: |
32 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); | 32 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); |
33 | virtual ~MainWindow(); | 33 | virtual ~MainWindow(); |
34 | 34 | ||
35 | public slots: | 35 | public slots: |
36 | virtual void slotAdjustColumns(); | 36 | virtual void slotAdjustColumns(); |
37 | virtual void appMessage(const QCString &msg, const QByteArray &data); | 37 | virtual void appMessage(const QCString &msg, const QByteArray &data); |
38 | virtual void slotComposeMail(); | 38 | virtual void slotComposeMail(); |
39 | 39 | ||
40 | protected slots: | 40 | protected slots: |
41 | virtual void setInfoFields(QListViewItem* ); | 41 | virtual void setInfoFields(QListViewItem* ); |
42 | virtual void slotSendQueued(); | 42 | virtual void slotSendQueued(); |
43 | virtual void slotEditAccounts(); | 43 | virtual void slotEditAccounts(); |
44 | virtual void slotShowFolders( bool show ); | 44 | virtual void slotShowFolders( bool show ); |
45 | virtual void refreshMailView(const QValueList<RecMailP>&); | 45 | virtual void refreshMailView(const QValueList<RecMailP>&); |
46 | virtual void displayMail(); | 46 | virtual void displayMail(); |
47 | virtual void slotGetMail() = 0; | 47 | virtual void slotGetMail() = 0; |
48 | virtual void slotGetAllMail() = 0; | 48 | virtual void slotGetAllMail() = 0; |
49 | virtual void slotDeleteMail(); | 49 | virtual void slotDeleteMail(); |
50 | virtual void slotDeleteAllMail() = 0; | 50 | virtual void slotDeleteAllMail() = 0; |
51 | virtual void slotSetCodec(int); | 51 | virtual void slotSetCodec(int); |
52 | virtual void mailHold(int, QListViewItem *,const QPoint&,int); | 52 | virtual void mailHold(int, QListViewItem *,const QPoint&,int); |
53 | virtual void slotAdjustLayout(); | 53 | virtual void slotAdjustLayout(); |
54 | virtual void slotEditSettings(); | 54 | virtual void slotEditSettings(); |
55 | virtual void slotEditGlobalSettings(); | ||
55 | virtual void mailLeftClicked( QListViewItem * ); | 56 | virtual void mailLeftClicked( QListViewItem * ); |
56 | void showLicence(); | 57 | void showLicence(); |
57 | void showAbout(); | 58 | void showAbout(); |
58 | void showEtpanLicence(); | 59 | void showEtpanLicence(); |
59 | 60 | ||
60 | protected: | 61 | protected: |
61 | QToolBar *toolBar; | 62 | QToolBar *toolBar; |
62 | StatusWidget *statusWidget; | 63 | StatusWidget *statusWidget; |
63 | QPEMenuBar *menuBar; | 64 | QPEMenuBar *menuBar; |
64 | QPopupMenu *mailMenu, *settingsMenu, *codecMenu; | 65 | QPopupMenu *mailMenu, *settingsMenu, *codecMenu; |
65 | QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, | 66 | QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, |
66 | *editSettings, *editAccounts, *syncFolders; | 67 | *editSettings, *editAccounts, *syncFolders; |
67 | AccountView *folderView; | 68 | AccountView *folderView; |
68 | QListView *mailView; | 69 | QListView *mailView; |
69 | QLineEdit* toLE,*fromLE,*subLE; | 70 | QLineEdit* toLE,*fromLE,*subLE; |
70 | //QBoxLayout *layout; | 71 | //QBoxLayout *layout; |
71 | }; | 72 | }; |
72 | 73 | ||
73 | #endif | 74 | #endif |
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 4436ad6..8ac3451 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -199,96 +199,101 @@ void OpieMail::slotSendQueued() | |||
199 | for ( it = list.first(); it; it = list.next() ) | 199 | for ( it = list.first(); it; it = list.next() ) |
200 | { | 200 | { |
201 | if ( it->getType() == MAILLIB::A_SMTP ) | 201 | if ( it->getType() == MAILLIB::A_SMTP ) |
202 | { | 202 | { |
203 | smtp = static_cast<SMTPaccount *>(it); | 203 | smtp = static_cast<SMTPaccount *>(it); |
204 | smtpList.append(smtp); | 204 | smtpList.append(smtp); |
205 | } | 205 | } |
206 | } | 206 | } |
207 | if (smtpList.count()==0) | 207 | if (smtpList.count()==0) |
208 | { | 208 | { |
209 | QMessageBox::information(0,i18n("Info"),i18n("Define a smtp\n account first!\n")); | 209 | QMessageBox::information(0,i18n("Info"),i18n("Define a smtp\n account first!\n")); |
210 | return; | 210 | return; |
211 | } | 211 | } |
212 | if ( QMessageBox::warning(this, i18n("Sending all mails"), i18n("Do you really want to\nsend all queued mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No ) | 212 | if ( QMessageBox::warning(this, i18n("Sending all mails"), i18n("Do you really want to\nsend all queued mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No ) |
213 | return; | 213 | return; |
214 | if (smtpList.count()==1) | 214 | if (smtpList.count()==1) |
215 | { | 215 | { |
216 | smtp = smtpList.at(0); | 216 | smtp = smtpList.at(0); |
217 | } | 217 | } |
218 | else | 218 | else |
219 | { | 219 | { |
220 | smtp = 0; | 220 | smtp = 0; |
221 | selectsmtp selsmtp; | 221 | selectsmtp selsmtp; |
222 | selsmtp.setSelectionlist(&smtpList); | 222 | selsmtp.setSelectionlist(&smtpList); |
223 | selsmtp.resize( selsmtp.sizeHint() ); | 223 | selsmtp.resize( selsmtp.sizeHint() ); |
224 | if ( selsmtp.exec() == QDialog::Accepted ) | 224 | if ( selsmtp.exec() == QDialog::Accepted ) |
225 | { | 225 | { |
226 | smtp = selsmtp.selected_smtp(); | 226 | smtp = selsmtp.selected_smtp(); |
227 | } | 227 | } |
228 | } | 228 | } |
229 | if (smtp) | 229 | if (smtp) |
230 | { | 230 | { |
231 | 231 | ||
232 | Global::statusMessage("Sending mails...!"); | 232 | Global::statusMessage("Sending mails...!"); |
233 | SMTPwrapper * wrap = new SMTPwrapper(smtp); | 233 | SMTPwrapper * wrap = new SMTPwrapper(smtp); |
234 | if ( wrap->flushOutbox() ) | 234 | if ( wrap->flushOutbox() ) |
235 | { | 235 | { |
236 | Global::statusMessage("Mails sent!"); | 236 | Global::statusMessage("Mails sent!"); |
237 | } | 237 | } |
238 | delete wrap; | 238 | delete wrap; |
239 | } | 239 | } |
240 | folderView->refreshOutgoing(); | 240 | folderView->refreshOutgoing(); |
241 | } | 241 | } |
242 | 242 | ||
243 | void OpieMail::slotSearchMails() | 243 | void OpieMail::slotSearchMails() |
244 | { | 244 | { |
245 | qDebug("OpieMail::slotSearchMails():not implemented "); | 245 | qDebug("OpieMail::slotSearchMails():not implemented "); |
246 | } | 246 | } |
247 | void OpieMail::slotEditGlobalSettings() | ||
248 | { | ||
249 | KPimPrefsGlobalDialog gc ( this ); | ||
250 | gc.exec(); | ||
251 | } | ||
247 | 252 | ||
248 | void OpieMail::slotEditSettings() | 253 | void OpieMail::slotEditSettings() |
249 | { | 254 | { |
250 | 255 | ||
251 | KOPrefsDialog settingsDialog( this, "koprefs", true ); | 256 | KOPrefsDialog settingsDialog( this, "koprefs", true ); |
252 | #ifndef DESKTOP_VERSION | 257 | #ifndef DESKTOP_VERSION |
253 | settingsDialog.showMaximized(); | 258 | settingsDialog.showMaximized(); |
254 | #endif | 259 | #endif |
255 | settingsDialog.exec(); | 260 | settingsDialog.exec(); |
256 | 261 | ||
257 | slotSetCodec( KOPrefs::instance()->mCurrentCodec ); | 262 | slotSetCodec( KOPrefs::instance()->mCurrentCodec ); |
258 | // KApplication::execDialog(settingsDialog); | 263 | // KApplication::execDialog(settingsDialog); |
259 | } | 264 | } |
260 | 265 | ||
261 | void OpieMail::slotEditAccounts() | 266 | void OpieMail::slotEditAccounts() |
262 | { | 267 | { |
263 | EditAccounts eaDialog( settings, this, 0, true ); | 268 | EditAccounts eaDialog( settings, this, 0, true ); |
264 | eaDialog.slotAdjustColumns(); | 269 | eaDialog.slotAdjustColumns(); |
265 | #ifndef DESKTOP_VERSION | 270 | #ifndef DESKTOP_VERSION |
266 | eaDialog.showMaximized(); | 271 | eaDialog.showMaximized(); |
267 | #endif | 272 | #endif |
268 | eaDialog.exec(); | 273 | eaDialog.exec(); |
269 | if ( settings ) delete settings; | 274 | if ( settings ) delete settings; |
270 | settings = new Settings(); | 275 | settings = new Settings(); |
271 | 276 | ||
272 | folderView->populate( settings->getAccounts() ); | 277 | folderView->populate( settings->getAccounts() ); |
273 | } | 278 | } |
274 | void OpieMail::replyMail() | 279 | void OpieMail::replyMail() |
275 | { | 280 | { |
276 | 281 | ||
277 | QListViewItem*item = mailView->currentItem(); | 282 | QListViewItem*item = mailView->currentItem(); |
278 | if (!item) return; | 283 | if (!item) return; |
279 | RecMailP mail = ((MailListViewItem*)item)->data(); | 284 | RecMailP mail = ((MailListViewItem*)item)->data(); |
280 | RecBodyP body = folderView->fetchBody(mail); | 285 | RecBodyP body = folderView->fetchBody(mail); |
281 | 286 | ||
282 | QString rtext; | 287 | QString rtext; |
283 | rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose | 288 | rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose |
284 | .arg( mail->getFrom()) | 289 | .arg( mail->getFrom()) |
285 | .arg( mail->getDate()); | 290 | .arg( mail->getDate()); |
286 | 291 | ||
287 | QString text = body->Bodytext(); | 292 | QString text = body->Bodytext(); |
288 | QStringList lines = QStringList::split(QRegExp("\\n"), text); | 293 | QStringList lines = QStringList::split(QRegExp("\\n"), text); |
289 | QStringList::Iterator it; | 294 | QStringList::Iterator it; |
290 | for (it = lines.begin(); it != lines.end(); it++) | 295 | for (it = lines.begin(); it != lines.end(); it++) |
291 | { | 296 | { |
292 | rtext += "> " + *it + "\n"; | 297 | rtext += "> " + *it + "\n"; |
293 | } | 298 | } |
294 | rtext += "\n"; | 299 | rtext += "\n"; |
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h index 4f75b3f..48c5dda 100644 --- a/kmicromail/opiemail.h +++ b/kmicromail/opiemail.h | |||
@@ -1,66 +1,67 @@ | |||
1 | // CHANGED 2004-09-31 Lutz Rogowski | 1 | // CHANGED 2004-09-31 Lutz Rogowski |
2 | #ifndef OPIEMAIL_H | 2 | #ifndef OPIEMAIL_H |
3 | #define OPIEMAIL_H | 3 | #define OPIEMAIL_H |
4 | 4 | ||
5 | #include "mainwindow.h" | 5 | #include "mainwindow.h" |
6 | #include <libmailwrapper/settings.h> | 6 | #include <libmailwrapper/settings.h> |
7 | 7 | ||
8 | #include <opie2/osmartpointer.h> | 8 | #include <opie2/osmartpointer.h> |
9 | #include <libmailwrapper/mailtypes.h> | 9 | #include <libmailwrapper/mailtypes.h> |
10 | #include <viewmail.h> | 10 | #include <viewmail.h> |
11 | #include <qstringlist.h> | 11 | #include <qstringlist.h> |
12 | 12 | ||
13 | class ComposeMail; | 13 | class ComposeMail; |
14 | 14 | ||
15 | class OpieMail : public MainWindow | 15 | class OpieMail : public MainWindow |
16 | { | 16 | { |
17 | Q_OBJECT | 17 | Q_OBJECT |
18 | 18 | ||
19 | public: | 19 | public: |
20 | OpieMail( QWidget *parent = 0, const char *name = 0 ); | 20 | OpieMail( QWidget *parent = 0, const char *name = 0 ); |
21 | virtual ~OpieMail(); | 21 | virtual ~OpieMail(); |
22 | static QString appName() { return QString::fromLatin1("kopiemail"); } | 22 | static QString appName() { return QString::fromLatin1("kopiemail"); } |
23 | 23 | ||
24 | public slots: | 24 | public slots: |
25 | virtual void slotwriteMail(const QString&name,const QString&email); | 25 | virtual void slotwriteMail(const QString&name,const QString&email); |
26 | virtual void slotwriteMail2(const QString&nameemail); | 26 | virtual void slotwriteMail2(const QString&nameemail); |
27 | virtual void slotComposeMail(); | 27 | virtual void slotComposeMail(); |
28 | virtual void slotExtAppHandler(); | 28 | virtual void slotExtAppHandler(); |
29 | virtual void appMessage(const QCString &msg, const QByteArray &data); | 29 | virtual void appMessage(const QCString &msg, const QByteArray &data); |
30 | virtual void message(const QCString &msg, const QByteArray &data); | 30 | virtual void message(const QCString &msg, const QByteArray &data); |
31 | void insertAttendees(const QString&, const QStringList& namelist, const QStringList& emaillist, const QStringList& uidlist); | 31 | void insertAttendees(const QString&, const QStringList& namelist, const QStringList& emaillist, const QStringList& uidlist); |
32 | protected slots: | 32 | protected slots: |
33 | virtual void deleteAndDisplayNextMail(ViewMail * vm); | 33 | virtual void deleteAndDisplayNextMail(ViewMail * vm); |
34 | virtual void displayNextMail(ViewMail * vm); | 34 | virtual void displayNextMail(ViewMail * vm); |
35 | virtual void slotSendQueued(); | 35 | virtual void slotSendQueued(); |
36 | virtual void slotSearchMails(); | 36 | virtual void slotSearchMails(); |
37 | virtual void slotEditSettings(); | 37 | virtual void slotEditSettings(); |
38 | virtual void slotEditGlobalSettings(); | ||
38 | virtual void slotEditAccounts(); | 39 | virtual void slotEditAccounts(); |
39 | virtual void displayMail(); | 40 | virtual void displayMail(); |
40 | virtual void replyMail(); | 41 | virtual void replyMail(); |
41 | virtual void slotDeleteMail(); | 42 | virtual void slotDeleteMail(); |
42 | virtual void slotGetMail(); | 43 | virtual void slotGetMail(); |
43 | virtual void slotGetAllMail(); | 44 | virtual void slotGetAllMail(); |
44 | virtual void slotDeleteAllMail(); | 45 | virtual void slotDeleteAllMail(); |
45 | virtual void mailHold(int, QListViewItem *,const QPoint&,int); | 46 | virtual void mailHold(int, QListViewItem *,const QPoint&,int); |
46 | virtual void slotShowFolders( bool show ); | 47 | virtual void slotShowFolders( bool show ); |
47 | virtual void refreshMailView(const QValueList<RecMailP>&); | 48 | virtual void refreshMailView(const QValueList<RecMailP>&); |
48 | virtual void mailLeftClicked( QListViewItem * ); | 49 | virtual void mailLeftClicked( QListViewItem * ); |
49 | virtual void slotMoveCopyMail(); | 50 | virtual void slotMoveCopyMail(); |
50 | virtual void slotMoveCopyAllMail(); | 51 | virtual void slotMoveCopyAllMail(); |
51 | virtual void reEditMail(); | 52 | virtual void reEditMail(); |
52 | void clearSelection(); | 53 | void clearSelection(); |
53 | void slotDownloadMail(); | 54 | void slotDownloadMail(); |
54 | private: | 55 | private: |
55 | ComposeMail* mCurrentComposer; | 56 | ComposeMail* mCurrentComposer; |
56 | void closeViewMail(ViewMail * vm); | 57 | void closeViewMail(ViewMail * vm); |
57 | QString mPendingEmail; | 58 | QString mPendingEmail; |
58 | QString mPendingName; | 59 | QString mPendingName; |
59 | QByteArray mPendingData; | 60 | QByteArray mPendingData; |
60 | QCString mPendingMessage; | 61 | QCString mPendingMessage; |
61 | Settings *settings; | 62 | Settings *settings; |
62 | QTextBrowser * tb; | 63 | QTextBrowser * tb; |
63 | 64 | ||
64 | }; | 65 | }; |
65 | 66 | ||
66 | #endif | 67 | #endif |
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp index 11635e1..d5c7e61 100644 --- a/microkde/kdialogbase.cpp +++ b/microkde/kdialogbase.cpp | |||
@@ -241,56 +241,61 @@ void KDialogBase::showButton( ButtonCode id, bool show ) | |||
241 | if ( show ) button->show(); | 241 | if ( show ) button->show(); |
242 | else button->hide(); | 242 | else button->hide(); |
243 | } | 243 | } |
244 | } | 244 | } |
245 | 245 | ||
246 | int KDialogBase::pageIndex( QWidget *widget ) const | 246 | int KDialogBase::pageIndex( QWidget *widget ) const |
247 | { | 247 | { |
248 | return 0; | 248 | return 0; |
249 | } | 249 | } |
250 | 250 | ||
251 | 251 | ||
252 | bool KDialogBase::showPage( int index ) | 252 | bool KDialogBase::showPage( int index ) |
253 | { | 253 | { |
254 | tabWidget()->setCurrentPage( index );return false; | 254 | tabWidget()->setCurrentPage( index );return false; |
255 | } | 255 | } |
256 | 256 | ||
257 | QFrame *KDialogBase::plainPage() | 257 | QFrame *KDialogBase::plainPage() |
258 | { | 258 | { |
259 | if ( !mPlainPage ) { | 259 | if ( !mPlainPage ) { |
260 | mPlainPage = new QFrame( this ); | 260 | mPlainPage = new QFrame( this ); |
261 | setMainWidget( mPlainPage ); | 261 | setMainWidget( mPlainPage ); |
262 | } | 262 | } |
263 | return mPlainPage; | 263 | return mPlainPage; |
264 | } | 264 | } |
265 | 265 | ||
266 | void KDialogBase::slotOk() | 266 | void KDialogBase::slotOk() |
267 | { | 267 | { |
268 | emit okClicked(); | 268 | emit okClicked(); |
269 | accept(); | 269 | accept(); |
270 | } | 270 | } |
271 | 271 | ||
272 | void KDialogBase::slotApply() | 272 | void KDialogBase::slotApply() |
273 | { | 273 | { |
274 | emit applyClicked(); | 274 | emit applyClicked(); |
275 | } | 275 | } |
276 | 276 | ||
277 | void KDialogBase::slotCancel() | 277 | void KDialogBase::slotCancel() |
278 | { | 278 | { |
279 | emit cancelClicked(); | 279 | emit cancelClicked(); |
280 | reject(); | 280 | reject(); |
281 | } | 281 | } |
282 | 282 | ||
283 | void KDialogBase::slotClose() | 283 | void KDialogBase::slotClose() |
284 | { | 284 | { |
285 | emit closeClicked(); | 285 | emit closeClicked(); |
286 | reject(); | 286 | reject(); |
287 | } | 287 | } |
288 | 288 | ||
289 | void KDialogBase::accept () | ||
290 | { | ||
291 | emit acceptClicked(); | ||
292 | KDialog::accept(); | ||
293 | } | ||
289 | void KDialogBase::slotUser1() | 294 | void KDialogBase::slotUser1() |
290 | { | 295 | { |
291 | emit user1Clicked(); | 296 | emit user1Clicked(); |
292 | } | 297 | } |
293 | void KDialogBase::slotUser2() | 298 | void KDialogBase::slotUser2() |
294 | { | 299 | { |
295 | emit user2Clicked(); | 300 | emit user2Clicked(); |
296 | } | 301 | } |
diff --git a/microkde/kdialogbase.h b/microkde/kdialogbase.h index a2fc2dc..17c186b 100644 --- a/microkde/kdialogbase.h +++ b/microkde/kdialogbase.h | |||
@@ -62,80 +62,82 @@ class KDialogBase : public KDialog | |||
62 | QFrame *addPage( const QString & ); | 62 | QFrame *addPage( const QString & ); |
63 | QFrame *addPage( const QString &, int, const QPixmap & ); | 63 | QFrame *addPage( const QString &, int, const QPixmap & ); |
64 | 64 | ||
65 | void setMainWidget( QWidget *widget ); | 65 | void setMainWidget( QWidget *widget ); |
66 | 66 | ||
67 | void setButtonText( ButtonCode id, const QString &text ); | 67 | void setButtonText( ButtonCode id, const QString &text ); |
68 | 68 | ||
69 | void enableButton( ButtonCode id, bool state ); | 69 | void enableButton( ButtonCode id, bool state ); |
70 | void enableButtonOK( bool state ); | 70 | void enableButtonOK( bool state ); |
71 | void enableButtonApply( bool state ); | 71 | void enableButtonApply( bool state ); |
72 | 72 | ||
73 | void showButton( ButtonCode, bool show ); | 73 | void showButton( ButtonCode, bool show ); |
74 | 74 | ||
75 | int pageIndex( QWidget *widget ) const; | 75 | int pageIndex( QWidget *widget ) const; |
76 | 76 | ||
77 | bool showPage( int index ); | 77 | bool showPage( int index ); |
78 | void hideButtons(); | 78 | void hideButtons(); |
79 | 79 | ||
80 | QFrame *plainPage(); | 80 | QFrame *plainPage(); |
81 | 81 | ||
82 | signals: | 82 | signals: |
83 | void user1Clicked(); | 83 | void user1Clicked(); |
84 | void user2Clicked(); | 84 | void user2Clicked(); |
85 | /** | 85 | /** |
86 | * The Apply button was pressed. This signal is only emitted if | 86 | * The Apply button was pressed. This signal is only emitted if |
87 | * @ref slotApply() is not replaced. | 87 | * @ref slotApply() is not replaced. |
88 | */ | 88 | */ |
89 | void applyClicked(); | 89 | void applyClicked(); |
90 | 90 | ||
91 | /** | 91 | /** |
92 | * The OK button was pressed. This signal is only emitted if | 92 | * The OK button was pressed. This signal is only emitted if |
93 | * @ref slotOk() is not replaced. | 93 | * @ref slotOk() is not replaced. |
94 | */ | 94 | */ |
95 | void okClicked(); | 95 | void okClicked(); |
96 | 96 | ||
97 | /** | 97 | /** |
98 | * The Cancel button was pressed. This signal is only emitted if | 98 | * The Cancel button was pressed. This signal is only emitted if |
99 | * @ref slotCancel() is not replaced. | 99 | * @ref slotCancel() is not replaced. |
100 | */ | 100 | */ |
101 | void cancelClicked(); | 101 | void cancelClicked(); |
102 | 102 | ||
103 | /** | 103 | /** |
104 | * The Close button was pressed. This signal is only emitted if | 104 | * The Close button was pressed. This signal is only emitted if |
105 | * @ref slotClose() is not replaced. | 105 | * @ref slotClose() is not replaced. |
106 | */ | 106 | */ |
107 | void closeClicked(); | 107 | void closeClicked(); |
108 | void defaultClicked(); | 108 | void defaultClicked(); |
109 | 109 | ||
110 | void acceptClicked(); | ||
111 | |||
110 | protected slots: | 112 | protected slots: |
111 | virtual void slotOk(); | 113 | virtual void slotOk(); |
112 | virtual void slotApply(); | 114 | virtual void slotApply(); |
113 | virtual void slotCancel(); | 115 | virtual void slotCancel(); |
114 | virtual void slotClose(); | 116 | virtual void slotClose(); |
115 | virtual void slotUser1(); | 117 | virtual void slotUser1(); |
116 | virtual void slotUser2(); | 118 | virtual void slotUser2(); |
117 | 119 | virtual void accept (); | |
118 | protected: | 120 | protected: |
119 | QPushButton *findButton( ButtonCode ); | 121 | QPushButton *findButton( ButtonCode ); |
120 | QTabWidget *tabWidget(); | 122 | QTabWidget *tabWidget(); |
121 | 123 | ||
122 | private: | 124 | private: |
123 | void init( const QString &caption, int buttonMask, | 125 | void init( const QString &caption, int buttonMask, |
124 | const QString &user1=QString::null, const QString &user2=QString::null ); | 126 | const QString &user1=QString::null, const QString &user2=QString::null ); |
125 | void initLayout(); | 127 | void initLayout(); |
126 | 128 | ||
127 | QWidget *mMainWidget; | 129 | QWidget *mMainWidget; |
128 | QTabWidget *mTabWidget; | 130 | QTabWidget *mTabWidget; |
129 | QFrame *mPlainPage; | 131 | QFrame *mPlainPage; |
130 | QBoxLayout *mTopLayout; | 132 | QBoxLayout *mTopLayout; |
131 | 133 | ||
132 | QPushButton *mUser1Button; | 134 | QPushButton *mUser1Button; |
133 | QPushButton *mUser2Button; | 135 | QPushButton *mUser2Button; |
134 | QPushButton *mCloseButton; | 136 | QPushButton *mCloseButton; |
135 | QPushButton *mOkButton; | 137 | QPushButton *mOkButton; |
136 | QPushButton *mApplyButton; | 138 | QPushButton *mApplyButton; |
137 | QPushButton *mCancelButton; | 139 | QPushButton *mCancelButton; |
138 | QPushButton *mDefaultButton; | 140 | QPushButton *mDefaultButton; |
139 | }; | 141 | }; |
140 | 142 | ||
141 | #endif | 143 | #endif |
diff --git a/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.h b/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.h index b9ea6b8..2d19680 100644 --- a/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.h +++ b/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.h | |||
@@ -1,47 +1,48 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of PwManager/Pi. | 2 | This file is part of PwManager/Pi. |
3 | Copyright (c) 2004 Ulf Schenk | 3 | Copyright (c) 2004 Ulf Schenk |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifndef KCMPWMCONFIG_H | 24 | #ifndef KCMPWMCONFIG_H |
25 | #define KCMPWMCONFIG_H | 25 | #define KCMPWMCONFIG_H |
26 | 26 | ||
27 | #include <kcmodule.h> | 27 | #include <kcmodule.h> |
28 | 28 | ||
29 | class PWMConfigWidget; | 29 | class PWMConfigWidget; |
30 | class PWMPrefs; | 30 | class PWMPrefs; |
31 | 31 | ||
32 | class KCMPwmConfig : public KCModule | 32 | class KCMPwmConfig : public KCModule |
33 | { | 33 | { |
34 | Q_OBJECT | 34 | Q_OBJECT |
35 | 35 | ||
36 | public: | 36 | public: |
37 | KCMPwmConfig(QWidget *parent = 0, const char *name = 0 ); | 37 | KCMPwmConfig(QWidget *parent = 0, const char *name = 0 ); |
38 | 38 | ||
39 | public slots: | ||
39 | virtual void load(); | 40 | virtual void load(); |
40 | virtual void save(); | 41 | virtual void save(); |
41 | virtual void defaults(); | 42 | virtual void defaults(); |
42 | 43 | ||
43 | private: | 44 | private: |
44 | PWMConfigWidget *mConfigWidget; | 45 | PWMConfigWidget *mConfigWidget; |
45 | }; | 46 | }; |
46 | 47 | ||
47 | #endif | 48 | #endif |
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp index 9c8d12d..e12dc49 100644 --- a/pwmanager/pwmanager/pwm.cpp +++ b/pwmanager/pwmanager/pwm.cpp | |||
@@ -1,168 +1,169 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * * | 2 | * * |
3 | * copyright (C) 2003, 2004 by Michael Buesch * | 3 | * copyright (C) 2003, 2004 by Michael Buesch * |
4 | * email: mbuesch@freenet.de * | 4 | * email: mbuesch@freenet.de * |
5 | * * | 5 | * * |
6 | * This program is free software; you can redistribute it and/or modify * | 6 | * This program is free software; you can redistribute it and/or modify * |
7 | * it under the terms of the GNU General Public License version 2 * | 7 | * it under the terms of the GNU General Public License version 2 * |
8 | * as published by the Free Software Foundation. * | 8 | * as published by the Free Software Foundation. * |
9 | * * | 9 | * * |
10 | ***************************************************************************/ | 10 | ***************************************************************************/ |
11 | 11 | ||
12 | /*************************************************************************** | 12 | /*************************************************************************** |
13 | * copyright (C) 2004 by Ulf Schenk | 13 | * copyright (C) 2004 by Ulf Schenk |
14 | * This file is originaly based on version 1.0.1 of pwmanager | 14 | * This file is originaly based on version 1.0.1 of pwmanager |
15 | * and was modified to run on embedded devices that run microkde | 15 | * and was modified to run on embedded devices that run microkde |
16 | * | 16 | * |
17 | * $Id$ | 17 | * $Id$ |
18 | **************************************************************************/ | 18 | **************************************************************************/ |
19 | 19 | ||
20 | #include <klocale.h> | 20 | #include <klocale.h> |
21 | #include <klistview.h> | 21 | #include <klistview.h> |
22 | #include <ktoolbar.h> | 22 | #include <ktoolbar.h> |
23 | #include <kfiledialog.h> | 23 | #include <kfiledialog.h> |
24 | #include <kiconloader.h> | 24 | #include <kiconloader.h> |
25 | #include <kmessagebox.h> | 25 | #include <kmessagebox.h> |
26 | 26 | ||
27 | #include <qstatusbar.h> | 27 | #include <qstatusbar.h> |
28 | 28 | ||
29 | #ifndef PWM_EMBEDDED | 29 | #ifndef PWM_EMBEDDED |
30 | #include <kmenubar.h> | 30 | #include <kmenubar.h> |
31 | #include <kstatusbar.h> | 31 | #include <kstatusbar.h> |
32 | #include <dcopclient.h> | 32 | #include <dcopclient.h> |
33 | #include "configwndimpl.h" | 33 | #include "configwndimpl.h" |
34 | #include "configuration.h" | 34 | #include "configuration.h" |
35 | #else | 35 | #else |
36 | #include <qmenubar.h> | 36 | #include <qmenubar.h> |
37 | #include <qmessagebox.h> | 37 | #include <qmessagebox.h> |
38 | #include <pwmprefs.h> | 38 | #include <pwmprefs.h> |
39 | #include <kpimglobalprefs.h> | 39 | #include <kpimglobalprefs.h> |
40 | #include <kprefsdialog.h> | ||
40 | #include <kcmconfigs/kcmpwmconfig.h> | 41 | #include <kcmconfigs/kcmpwmconfig.h> |
41 | #include <kcmconfigs/kcmkdepimconfig.h> | 42 | #include <kcmconfigs/kcmkdepimconfig.h> |
42 | #include <kcmultidialog.h> | 43 | #include <kcmultidialog.h> |
43 | #include "editcategory.h" | 44 | #include "editcategory.h" |
44 | #endif | 45 | #endif |
45 | 46 | ||
46 | 47 | ||
47 | #ifndef DESKTOP_VERSION | 48 | #ifndef DESKTOP_VERSION |
48 | #include <qpe/global.h> | 49 | #include <qpe/global.h> |
49 | #endif | 50 | #endif |
50 | 51 | ||
51 | #include <qpixmap.h> | 52 | #include <qpixmap.h> |
52 | #include <qcheckbox.h> | 53 | #include <qcheckbox.h> |
53 | #include <qspinbox.h> | 54 | #include <qspinbox.h> |
54 | #include <qlineedit.h> | 55 | #include <qlineedit.h> |
55 | #include <qfileinfo.h> | 56 | #include <qfileinfo.h> |
56 | #include <qclipboard.h> | 57 | #include <qclipboard.h> |
57 | 58 | ||
58 | 59 | ||
59 | #include <stdio.h> | 60 | #include <stdio.h> |
60 | 61 | ||
61 | #include "pwm.h" | 62 | #include "pwm.h" |
62 | #include "pwminit.h" | 63 | #include "pwminit.h" |
63 | #include "pwmprint.h" | 64 | #include "pwmprint.h" |
64 | #include "addentrywndimpl.h" | 65 | #include "addentrywndimpl.h" |
65 | #include "globalstuff.h" | 66 | #include "globalstuff.h" |
66 | #include "findwndimpl.h" | 67 | #include "findwndimpl.h" |
67 | #include "csv.h" | 68 | #include "csv.h" |
68 | 69 | ||
69 | #ifdef CONFIG_KWALLETIF | 70 | #ifdef CONFIG_KWALLETIF |
70 | # include "kwalletif.h" | 71 | # include "kwalletif.h" |
71 | # include "kwalletemu.h" | 72 | # include "kwalletemu.h" |
72 | #endif | 73 | #endif |
73 | #ifdef CONFIG_KEYCARD | 74 | #ifdef CONFIG_KEYCARD |
74 | # include "pwmkeycard.h" | 75 | # include "pwmkeycard.h" |
75 | #endif | 76 | #endif |
76 | 77 | ||
77 | |||
78 | #define DEFAULT_SIZE (QSize(700, 400)) | 78 | #define DEFAULT_SIZE (QSize(700, 400)) |
79 | 79 | ||
80 | // Button IDs for "file" popup menu | 80 | // Button IDs for "file" popup menu |
81 | enum { | 81 | enum { |
82 | BUTTON_POPUP_FILE_NEW = 0, | 82 | BUTTON_POPUP_FILE_NEW = 0, |
83 | BUTTON_POPUP_FILE_OPEN, | 83 | BUTTON_POPUP_FILE_OPEN, |
84 | BUTTON_POPUP_FILE_CLOSE, | 84 | BUTTON_POPUP_FILE_CLOSE, |
85 | BUTTON_POPUP_FILE_SAVE, | 85 | BUTTON_POPUP_FILE_SAVE, |
86 | BUTTON_POPUP_FILE_SAVEAS, | 86 | BUTTON_POPUP_FILE_SAVEAS, |
87 | BUTTON_POPUP_FILE_EXPORT, | 87 | BUTTON_POPUP_FILE_EXPORT, |
88 | BUTTON_POPUP_FILE_IMPORT, | 88 | BUTTON_POPUP_FILE_IMPORT, |
89 | BUTTON_POPUP_FILE_PRINT, | 89 | BUTTON_POPUP_FILE_PRINT, |
90 | BUTTON_POPUP_FILE_QUIT | 90 | BUTTON_POPUP_FILE_QUIT |
91 | }; | 91 | }; |
92 | // Button IDs for "manage" popup menu | 92 | // Button IDs for "manage" popup menu |
93 | enum { | 93 | enum { |
94 | BUTTON_POPUP_MANAGE_ADD = 0, | 94 | BUTTON_POPUP_MANAGE_ADD = 0, |
95 | BUTTON_POPUP_MANAGE_EDIT, | 95 | BUTTON_POPUP_MANAGE_EDIT, |
96 | BUTTON_POPUP_MANAGE_DEL, | 96 | BUTTON_POPUP_MANAGE_DEL, |
97 | BUTTON_POPUP_MANAGE_CHANGEMP | 97 | BUTTON_POPUP_MANAGE_CHANGEMP |
98 | }; | 98 | }; |
99 | // Button IDs for chipcard popup menu | 99 | // Button IDs for chipcard popup menu |
100 | enum { | 100 | enum { |
101 | #ifdef CONFIG_KEYCARD | 101 | #ifdef CONFIG_KEYCARD |
102 | BUTTON_POPUP_CHIPCARD_GENNEW = 0, | 102 | BUTTON_POPUP_CHIPCARD_GENNEW = 0, |
103 | BUTTON_POPUP_CHIPCARD_DEL, | 103 | BUTTON_POPUP_CHIPCARD_DEL, |
104 | BUTTON_POPUP_CHIPCARD_READID, | 104 | BUTTON_POPUP_CHIPCARD_READID, |
105 | BUTTON_POPUP_CHIPCARD_SAVEBACKUP, | 105 | BUTTON_POPUP_CHIPCARD_SAVEBACKUP, |
106 | BUTTON_POPUP_CHIPCARD_REPLAYBACKUP | 106 | BUTTON_POPUP_CHIPCARD_REPLAYBACKUP |
107 | #else // CONFIG_KEYCARD | 107 | #else // CONFIG_KEYCARD |
108 | BUTTON_POPUP_CHIPCARD_NO = 0 | 108 | BUTTON_POPUP_CHIPCARD_NO = 0 |
109 | #endif // CONFIG_KEYCARD | 109 | #endif // CONFIG_KEYCARD |
110 | }; | 110 | }; |
111 | // Button IDs for "view" popup menu | 111 | // Button IDs for "view" popup menu |
112 | enum { | 112 | enum { |
113 | BUTTON_POPUP_VIEW_FIND = 0, | 113 | BUTTON_POPUP_VIEW_FIND = 0, |
114 | BUTTON_POPUP_VIEW_LOCK, | 114 | BUTTON_POPUP_VIEW_LOCK, |
115 | BUTTON_POPUP_VIEW_DEEPLOCK, | 115 | BUTTON_POPUP_VIEW_DEEPLOCK, |
116 | BUTTON_POPUP_VIEW_UNLOCK | 116 | BUTTON_POPUP_VIEW_UNLOCK |
117 | }; | 117 | }; |
118 | // Button IDs for "options" popup menu | 118 | // Button IDs for "options" popup menu |
119 | enum { | 119 | enum { |
120 | BUTTON_POPUP_OPTIONS_CONFIG = 0 | 120 | BUTTON_POPUP_OPTIONS_CONFIG = 0, |
121 | BUTTON_POPUP_OPTIONS_GLOBAL_CONFIG | ||
121 | #ifdef PWM_EMBEDDED | 122 | #ifdef PWM_EMBEDDED |
122 | ,BUTTON_POPUP_OPTIONS_CATEGORY | 123 | ,BUTTON_POPUP_OPTIONS_CATEGORY |
123 | #endif | 124 | #endif |
124 | }; | 125 | }; |
125 | // Button IDs for "export" popup menu (in "file" popup menu) | 126 | // Button IDs for "export" popup menu (in "file" popup menu) |
126 | enum { | 127 | enum { |
127 | BUTTON_POPUP_EXPORT_TEXT = 0, | 128 | BUTTON_POPUP_EXPORT_TEXT = 0, |
128 | BUTTON_POPUP_EXPORT_GPASMAN, | 129 | BUTTON_POPUP_EXPORT_GPASMAN, |
129 | BUTTON_POPUP_EXPORT_CSV | 130 | BUTTON_POPUP_EXPORT_CSV |
130 | #ifdef CONFIG_KWALLETIF | 131 | #ifdef CONFIG_KWALLETIF |
131 | ,BUTTON_POPUP_EXPORT_KWALLET | 132 | ,BUTTON_POPUP_EXPORT_KWALLET |
132 | #endif | 133 | #endif |
133 | }; | 134 | }; |
134 | // Button IDs for "import" popup menu (in "file" popup menu) | 135 | // Button IDs for "import" popup menu (in "file" popup menu) |
135 | enum { | 136 | enum { |
136 | BUTTON_POPUP_IMPORT_TEXT = 0, | 137 | BUTTON_POPUP_IMPORT_TEXT = 0, |
137 | BUTTON_POPUP_IMPORT_GPASMAN, | 138 | BUTTON_POPUP_IMPORT_GPASMAN, |
138 | BUTTON_POPUP_IMPORT_CSV | 139 | BUTTON_POPUP_IMPORT_CSV |
139 | #ifdef CONFIG_KWALLETIF | 140 | #ifdef CONFIG_KWALLETIF |
140 | ,BUTTON_POPUP_IMPORT_KWALLET | 141 | ,BUTTON_POPUP_IMPORT_KWALLET |
141 | #endif | 142 | #endif |
142 | }; | 143 | }; |
143 | 144 | ||
144 | #ifdef PWM_EMBEDDED | 145 | #ifdef PWM_EMBEDDED |
145 | // Button IDs for "help" popup menu | 146 | // Button IDs for "help" popup menu |
146 | enum { | 147 | enum { |
147 | BUTTON_POPUP_HELP_LICENSE = 0, | 148 | BUTTON_POPUP_HELP_LICENSE = 0, |
148 | BUTTON_POPUP_HELP_FAQ, | 149 | BUTTON_POPUP_HELP_FAQ, |
149 | BUTTON_POPUP_HELP_ABOUT, | 150 | BUTTON_POPUP_HELP_ABOUT, |
150 | BUTTON_POPUP_HELP_SYNC, | 151 | BUTTON_POPUP_HELP_SYNC, |
151 | BUTTON_POPUP_HELP_WHATSNEW | 152 | BUTTON_POPUP_HELP_WHATSNEW |
152 | }; | 153 | }; |
153 | #endif | 154 | #endif |
154 | 155 | ||
155 | // Button IDs for toolbar | 156 | // Button IDs for toolbar |
156 | enum { | 157 | enum { |
157 | BUTTON_TOOL_NEW = 0, | 158 | BUTTON_TOOL_NEW = 0, |
158 | BUTTON_TOOL_OPEN, | 159 | BUTTON_TOOL_OPEN, |
159 | BUTTON_TOOL_SAVE, | 160 | BUTTON_TOOL_SAVE, |
160 | BUTTON_TOOL_SAVEAS, | 161 | BUTTON_TOOL_SAVEAS, |
161 | BUTTON_TOOL_PRINT, | 162 | BUTTON_TOOL_PRINT, |
162 | BUTTON_TOOL_ADD, | 163 | BUTTON_TOOL_ADD, |
163 | BUTTON_TOOL_EDIT, | 164 | BUTTON_TOOL_EDIT, |
164 | BUTTON_TOOL_DEL, | 165 | BUTTON_TOOL_DEL, |
165 | BUTTON_TOOL_FIND, | 166 | BUTTON_TOOL_FIND, |
166 | BUTTON_TOOL_LOCK, | 167 | BUTTON_TOOL_LOCK, |
167 | BUTTON_TOOL_DEEPLOCK, | 168 | BUTTON_TOOL_DEEPLOCK, |
168 | BUTTON_TOOL_UNLOCK | 169 | BUTTON_TOOL_UNLOCK |
@@ -314,99 +315,103 @@ void PwM::initMenubar() | |||
314 | SLOT(changeMasterPwd_slot()), 0, | 315 | SLOT(changeMasterPwd_slot()), 0, |
315 | BUTTON_POPUP_MANAGE_CHANGEMP); | 316 | BUTTON_POPUP_MANAGE_CHANGEMP); |
316 | menuBar()->insertItem(i18n("&Manage"), managePopup); | 317 | menuBar()->insertItem(i18n("&Manage"), managePopup); |
317 | // "chipcard" popup menu | 318 | // "chipcard" popup menu |
318 | #ifdef CONFIG_KEYCARD | 319 | #ifdef CONFIG_KEYCARD |
319 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)), | 320 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)), |
320 | i18n("&Generate new key-card"), this, | 321 | i18n("&Generate new key-card"), this, |
321 | SLOT(genNewCard_slot()), 0, | 322 | SLOT(genNewCard_slot()), 0, |
322 | BUTTON_POPUP_CHIPCARD_GENNEW); | 323 | BUTTON_POPUP_CHIPCARD_GENNEW); |
323 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("editdelete", KIcon::Small)), | 324 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("editdelete", KIcon::Small)), |
324 | i18n("&Erase key-card"), this, | 325 | i18n("&Erase key-card"), this, |
325 | SLOT(eraseCard_slot()), 0, | 326 | SLOT(eraseCard_slot()), 0, |
326 | BUTTON_POPUP_CHIPCARD_DEL); | 327 | BUTTON_POPUP_CHIPCARD_DEL); |
327 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("", KIcon::Small)), | 328 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("", KIcon::Small)), |
328 | i18n("Read card-&ID"), this, | 329 | i18n("Read card-&ID"), this, |
329 | SLOT(readCardId_slot()), 0, | 330 | SLOT(readCardId_slot()), 0, |
330 | BUTTON_POPUP_CHIPCARD_READID); | 331 | BUTTON_POPUP_CHIPCARD_READID); |
331 | chipcardPopup->insertSeparator(); | 332 | chipcardPopup->insertSeparator(); |
332 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("2rightarrow", KIcon::Small)), | 333 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("2rightarrow", KIcon::Small)), |
333 | i18n("&Make card backup-image"), this, | 334 | i18n("&Make card backup-image"), this, |
334 | SLOT(makeCardBackup_slot()), 0, | 335 | SLOT(makeCardBackup_slot()), 0, |
335 | BUTTON_POPUP_CHIPCARD_SAVEBACKUP); | 336 | BUTTON_POPUP_CHIPCARD_SAVEBACKUP); |
336 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("2leftarrow", KIcon::Small)), | 337 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("2leftarrow", KIcon::Small)), |
337 | i18n("&Replay card backup-image"), this, | 338 | i18n("&Replay card backup-image"), this, |
338 | SLOT(replayCardBackup_slot()), 0, | 339 | SLOT(replayCardBackup_slot()), 0, |
339 | BUTTON_POPUP_CHIPCARD_REPLAYBACKUP); | 340 | BUTTON_POPUP_CHIPCARD_REPLAYBACKUP); |
340 | menuBar()->insertItem(i18n("&Chipcard manager"), chipcardPopup); | 341 | menuBar()->insertItem(i18n("&Chipcard manager"), chipcardPopup); |
341 | #endif // CONFIG_KEYCARD | 342 | #endif // CONFIG_KEYCARD |
342 | // "view" popup menu | 343 | // "view" popup menu |
343 | viewPopup->insertItem(QIconSet(picons->loadIcon("find", KIcon::Small)), | 344 | viewPopup->insertItem(QIconSet(picons->loadIcon("find", KIcon::Small)), |
344 | i18n("&Find"), this, | 345 | i18n("&Find"), this, |
345 | SLOT(find_slot()), 0, BUTTON_POPUP_VIEW_FIND); | 346 | SLOT(find_slot()), 0, BUTTON_POPUP_VIEW_FIND); |
346 | viewPopup->insertSeparator(); | 347 | viewPopup->insertSeparator(); |
347 | viewPopup->insertItem(QIconSet(picons->loadIcon("halfencrypted", KIcon::Small)), | 348 | viewPopup->insertItem(QIconSet(picons->loadIcon("halfencrypted", KIcon::Small)), |
348 | i18n("&Lock all entries"), this, | 349 | i18n("&Lock all entries"), this, |
349 | SLOT(lockWnd_slot()), 0, | 350 | SLOT(lockWnd_slot()), 0, |
350 | BUTTON_POPUP_VIEW_LOCK); | 351 | BUTTON_POPUP_VIEW_LOCK); |
351 | viewPopup->insertItem(QIconSet(picons->loadIcon("encrypted", KIcon::Small)), | 352 | viewPopup->insertItem(QIconSet(picons->loadIcon("encrypted", KIcon::Small)), |
352 | i18n("&Deep-lock all entries"), this, | 353 | i18n("&Deep-lock all entries"), this, |
353 | SLOT(deepLockWnd_slot()), 0, | 354 | SLOT(deepLockWnd_slot()), 0, |
354 | BUTTON_POPUP_VIEW_DEEPLOCK); | 355 | BUTTON_POPUP_VIEW_DEEPLOCK); |
355 | viewPopup->insertItem(QIconSet(picons->loadIcon("decrypted", KIcon::Small)), | 356 | viewPopup->insertItem(QIconSet(picons->loadIcon("decrypted", KIcon::Small)), |
356 | i18n("&Unlock all entries"), this, | 357 | i18n("&Unlock all entries"), this, |
357 | SLOT(unlockWnd_slot()), 0, | 358 | SLOT(unlockWnd_slot()), 0, |
358 | BUTTON_POPUP_VIEW_UNLOCK); | 359 | BUTTON_POPUP_VIEW_UNLOCK); |
359 | menuBar()->insertItem(i18n("&View"), viewPopup); | 360 | menuBar()->insertItem(i18n("&View"), viewPopup); |
360 | // "options" popup menu | 361 | // "options" popup menu |
361 | optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)), | 362 | optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)), |
362 | i18n("&Configure..."), this, | 363 | i18n("&Configure PwM/Pi..."), this, |
363 | SLOT(config_slot()),0, | 364 | SLOT(config_slot()),0, |
364 | BUTTON_POPUP_OPTIONS_CONFIG); | 365 | BUTTON_POPUP_OPTIONS_CONFIG); |
366 | optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)), | ||
367 | i18n("Global Settings..."), this, | ||
368 | SLOT(config_global_slot()),0, | ||
369 | BUTTON_POPUP_OPTIONS_GLOBAL_CONFIG); | ||
365 | if ( QApplication::desktop()->width() <= 240 ) { | 370 | if ( QApplication::desktop()->width() <= 240 ) { |
366 | managePopup->insertSeparator(); | 371 | managePopup->insertSeparator(); |
367 | managePopup->insertItem(i18n("&Options"), optionsPopup); | 372 | managePopup->insertItem(i18n("&Options"), optionsPopup); |
368 | } else | 373 | } else |
369 | menuBar()->insertItem(i18n("&Options"), optionsPopup); | 374 | menuBar()->insertItem(i18n("&Options"), optionsPopup); |
370 | // "help" popup menu | 375 | // "help" popup menu |
371 | #ifndef PWM_EMBEDDED | 376 | #ifndef PWM_EMBEDDED |
372 | helpPopup = helpMenu(QString::null, false); | 377 | helpPopup = helpMenu(QString::null, false); |
373 | #else | 378 | #else |
374 | optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)), | 379 | optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)), |
375 | i18n("C&ategories..."), this, | 380 | i18n("C&ategories..."), this, |
376 | SLOT(category_slot()),0, | 381 | SLOT(category_slot()),0, |
377 | BUTTON_POPUP_OPTIONS_CATEGORY); | 382 | BUTTON_POPUP_OPTIONS_CATEGORY); |
378 | 383 | ||
379 | 384 | ||
380 | menuBar()->insertItem(i18n("&Sync"), syncPopup); | 385 | menuBar()->insertItem(i18n("&Sync"), syncPopup); |
381 | 386 | ||
382 | 387 | ||
383 | 388 | ||
384 | 389 | ||
385 | 390 | ||
386 | helpPopup = new KPopupMenu(this); | 391 | helpPopup = new KPopupMenu(this); |
387 | 392 | ||
388 | 393 | ||
389 | helpPopup->insertItem(i18n("&License"), this, | 394 | helpPopup->insertItem(i18n("&License"), this, |
390 | SLOT(showLicense_slot()), 0, | 395 | SLOT(showLicense_slot()), 0, |
391 | BUTTON_POPUP_HELP_LICENSE); | 396 | BUTTON_POPUP_HELP_LICENSE); |
392 | 397 | ||
393 | helpPopup->insertItem(i18n("&Faq"), this, | 398 | helpPopup->insertItem(i18n("&Faq"), this, |
394 | SLOT(faq_slot()), 0, | 399 | SLOT(faq_slot()), 0, |
395 | BUTTON_POPUP_HELP_FAQ); | 400 | BUTTON_POPUP_HELP_FAQ); |
396 | 401 | ||
397 | helpPopup->insertItem(i18n("&About PwManager"), this, | 402 | helpPopup->insertItem(i18n("&About PwManager"), this, |
398 | SLOT(createAboutData_slot()), 0, | 403 | SLOT(createAboutData_slot()), 0, |
399 | BUTTON_POPUP_HELP_ABOUT); | 404 | BUTTON_POPUP_HELP_ABOUT); |
400 | 405 | ||
401 | helpPopup->insertItem(i18n("&Sync HowTo"), this, | 406 | helpPopup->insertItem(i18n("&Sync HowTo"), this, |
402 | SLOT(syncHowTo_slot()), 0, | 407 | SLOT(syncHowTo_slot()), 0, |
403 | BUTTON_POPUP_HELP_SYNC); | 408 | BUTTON_POPUP_HELP_SYNC); |
404 | 409 | ||
405 | helpPopup->insertItem(i18n("&What's New"), this, | 410 | helpPopup->insertItem(i18n("&What's New"), this, |
406 | SLOT(whatsnew_slot()), 0, | 411 | SLOT(whatsnew_slot()), 0, |
407 | BUTTON_POPUP_HELP_WHATSNEW); | 412 | BUTTON_POPUP_HELP_WHATSNEW); |
408 | 413 | ||
409 | #endif | 414 | #endif |
410 | menuBar()->insertItem(i18n("&Help"), helpPopup); | 415 | menuBar()->insertItem(i18n("&Help"), helpPopup); |
411 | 416 | ||
412 | } | 417 | } |
@@ -806,121 +811,141 @@ void PwM::deletePwd_slot() | |||
806 | printDebug("couldn't get index"); | 811 | printDebug("couldn't get index"); |
807 | curDoc()->timer()->putLock(DocTimer::id_autoLockTimer); | 812 | curDoc()->timer()->putLock(DocTimer::id_autoLockTimer); |
808 | return; | 813 | return; |
809 | } | 814 | } |
810 | 815 | ||
811 | PwMDataItem currItem; | 816 | PwMDataItem currItem; |
812 | QString curCategory = view->getCurrentCategory(); | 817 | QString curCategory = view->getCurrentCategory(); |
813 | if (!curDoc()->getEntry(curCategory, curEntryIndex, &currItem)) { | 818 | if (!curDoc()->getEntry(curCategory, curEntryIndex, &currItem)) { |
814 | printDebug("couldn't get entry"); | 819 | printDebug("couldn't get entry"); |
815 | curDoc()->timer()->putLock(DocTimer::id_autoLockTimer); | 820 | curDoc()->timer()->putLock(DocTimer::id_autoLockTimer); |
816 | return; | 821 | return; |
817 | } | 822 | } |
818 | if (KMessageBox:: | 823 | if (KMessageBox:: |
819 | questionYesNo(this, | 824 | questionYesNo(this, |
820 | i18n | 825 | i18n |
821 | ("Do you really want to delete\nthe selected entry") + | 826 | ("Do you really want to delete\nthe selected entry") + |
822 | " \n\"" + QString(currItem.desc.c_str()) | 827 | " \n\"" + QString(currItem.desc.c_str()) |
823 | + "\" ?", i18n("delete?")) | 828 | + "\" ?", i18n("delete?")) |
824 | == KMessageBox::Yes) { | 829 | == KMessageBox::Yes) { |
825 | 830 | ||
826 | curDoc()->delEntry(curCategory, curEntryIndex); | 831 | curDoc()->delEntry(curCategory, curEntryIndex); |
827 | } | 832 | } |
828 | curDoc()->timer()->putLock(DocTimer::id_autoLockTimer); | 833 | curDoc()->timer()->putLock(DocTimer::id_autoLockTimer); |
829 | } | 834 | } |
830 | 835 | ||
831 | void PwM::changeMasterPwd_slot() | 836 | void PwM::changeMasterPwd_slot() |
832 | { | 837 | { |
833 | PWM_ASSERT(curDoc()); | 838 | PWM_ASSERT(curDoc()); |
834 | curDoc()->changeCurrentPw(); | 839 | curDoc()->changeCurrentPw(); |
835 | } | 840 | } |
836 | 841 | ||
837 | void PwM::lockWnd_slot() | 842 | void PwM::lockWnd_slot() |
838 | { | 843 | { |
839 | PWM_ASSERT(curDoc()); | 844 | PWM_ASSERT(curDoc()); |
840 | curDoc()->lockAll(true); | 845 | curDoc()->lockAll(true); |
841 | } | 846 | } |
842 | 847 | ||
843 | void PwM::deepLockWnd_slot() | 848 | void PwM::deepLockWnd_slot() |
844 | { | 849 | { |
845 | PWM_ASSERT(curDoc()); | 850 | PWM_ASSERT(curDoc()); |
846 | curDoc()->deepLock(); | 851 | curDoc()->deepLock(); |
847 | } | 852 | } |
848 | 853 | ||
849 | void PwM::unlockWnd_slot() | 854 | void PwM::unlockWnd_slot() |
850 | { | 855 | { |
851 | PWM_ASSERT(curDoc()); | 856 | PWM_ASSERT(curDoc()); |
852 | curDoc()->lockAll(false); | 857 | curDoc()->lockAll(false); |
853 | } | 858 | } |
854 | 859 | void PwM::config_global_slot() | |
860 | { | ||
861 | KPimPrefsGlobalDialog gc ( this ); | ||
862 | gc.exec(); | ||
863 | } | ||
855 | void PwM::config_slot() | 864 | void PwM::config_slot() |
856 | { | 865 | { |
857 | int oldStyle = conf()->confWndMainViewStyle(); | 866 | int oldStyle = conf()->confWndMainViewStyle(); |
858 | #ifdef PWM_EMBEDDED | 867 | |
868 | #if 0 | ||
859 | KCMultiDialog* ConfigureDialog = new KCMultiDialog( "PIM", this ,"pwmconfigdialog", true ); | 869 | KCMultiDialog* ConfigureDialog = new KCMultiDialog( "PIM", this ,"pwmconfigdialog", true ); |
860 | 870 | ||
861 | KCMPwmConfig* pwmcfg = new KCMPwmConfig( ConfigureDialog->getNewVBoxPage(i18n( "PwManager")) , "KCMPwmConfig" ); | 871 | KCMPwmConfig* pwmcfg = new KCMPwmConfig( ConfigureDialog->getNewVBoxPage(i18n( "PwManager")) , "KCMPwmConfig" ); |
862 | ConfigureDialog->addModule(pwmcfg ); | 872 | ConfigureDialog->addModule(pwmcfg ); |
863 | 873 | ||
864 | KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" ); | 874 | KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" ); |
865 | ConfigureDialog->addModule(kdelibcfg ); | 875 | ConfigureDialog->addModule(kdelibcfg ); |
876 | #endif | ||
866 | 877 | ||
878 | |||
879 | |||
880 | KDialogBase * ConfigureDialog = new KDialogBase ( KDialogBase::Plain , i18n("Configure KA/Pi"), KDialogBase::Default |KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Ok, KDialogBase::Ok,0, "name", true, true); | ||
881 | |||
882 | KCMPwmConfig* kabcfg = new KCMPwmConfig( ConfigureDialog , "KCMpwmConfig" ); | ||
883 | ConfigureDialog->setMainWidget( kabcfg ); | ||
884 | connect( ConfigureDialog, SIGNAL( applyClicked() ), | ||
885 | kabcfg, SLOT( save() ) ); | ||
886 | connect( ConfigureDialog, SIGNAL( acceptClicked() ), | ||
887 | kabcfg, SLOT( save() ) ); | ||
888 | connect( ConfigureDialog, SIGNAL( defaultClicked() ), | ||
889 | kabcfg, SLOT( defaults() ) ); | ||
890 | //saveSettings(); | ||
891 | kabcfg->load(); | ||
867 | #ifndef DESKTOP_VERSION | 892 | #ifndef DESKTOP_VERSION |
893 | if ( QApplication::desktop()->height() <= 480 ) | ||
894 | ;// ConfigureDialog->hideButtons(); | ||
868 | ConfigureDialog->showMaximized(); | 895 | ConfigureDialog->showMaximized(); |
869 | #endif | 896 | #endif |
897 | |||
898 | |||
870 | if ( ConfigureDialog->exec() ) | 899 | if ( ConfigureDialog->exec() ) |
871 | KMessageBox::information( this, i18n("Some changes are only\neffective after a restart!\n") ); | 900 | KMessageBox::information( this, i18n("Some changes are only\neffective after a restart!\n") ); |
872 | delete ConfigureDialog; | 901 | delete ConfigureDialog; |
873 | 902 | ||
874 | #else //PWM_EMBEDDED | 903 | |
875 | // display the configuration window (modal mode) | ||
876 | if (!conf()->showConfWnd(this)) | ||
877 | return; | ||
878 | #endif | ||
879 | 904 | ||
880 | int newStyle = conf()->confWndMainViewStyle(); | 905 | int newStyle = conf()->confWndMainViewStyle(); |
881 | // reinitialize tray | 906 | // reinitialize tray |
882 | init->initTray(); | 907 | init->initTray(); |
883 | // reinitialize KWallet emulation | 908 | // reinitialize KWallet emulation |
884 | init->initKWalletEmu(); | 909 | init->initKWalletEmu(); |
885 | 910 | ||
886 | PwMDocList *_dl = PwMDoc::getOpenDocList(); | 911 | PwMDocList *_dl = PwMDoc::getOpenDocList(); |
887 | const vector<PwMDocList::listItem> *dl = _dl->getList(); | 912 | const vector<PwMDocList::listItem> *dl = _dl->getList(); |
888 | vector<PwMDocList::listItem>::const_iterator i = dl->begin(), | 913 | vector<PwMDocList::listItem>::const_iterator i = dl->begin(), |
889 | end = dl->end(); | 914 | end = dl->end(); |
890 | PwMDoc *doc; | 915 | PwMDoc *doc; |
891 | while (i != end) { | 916 | while (i != end) { |
892 | doc = (*i).doc; | 917 | doc = (*i).doc; |
893 | // unlock-without-mpw timeout | 918 | // unlock-without-mpw timeout |
894 | doc->timer()->start(DocTimer::id_mpwTimer); | 919 | doc->timer()->start(DocTimer::id_mpwTimer); |
895 | // auto-lock timeout | 920 | // auto-lock timeout |
896 | doc->timer()->start(DocTimer::id_autoLockTimer); | 921 | doc->timer()->start(DocTimer::id_autoLockTimer); |
897 | ++i; | 922 | ++i; |
898 | } | 923 | } |
899 | 924 | ||
900 | const QValueList<PwM *> *ml = init->mainWndList(); | 925 | const QValueList<PwM *> *ml = init->mainWndList(); |
901 | #ifndef PWM_EMBEDDED | 926 | #ifndef PWM_EMBEDDED |
902 | QValueList<PwM *>::const_iterator i2 = ml->begin(), | 927 | QValueList<PwM *>::const_iterator i2 = ml->begin(), |
903 | end2 = ml->end(); | 928 | end2 = ml->end(); |
904 | #else | 929 | #else |
905 | QValueList<PwM *>::ConstIterator i2 = ml->begin(), | 930 | QValueList<PwM *>::ConstIterator i2 = ml->begin(), |
906 | end2 = ml->end(); | 931 | end2 = ml->end(); |
907 | #endif | 932 | #endif |
908 | PwM *pwm; | 933 | PwM *pwm; |
909 | while (i2 != end2) { | 934 | while (i2 != end2) { |
910 | pwm = *i2; | 935 | pwm = *i2; |
911 | // reinitialize the window style. | 936 | // reinitialize the window style. |
912 | if (oldStyle != newStyle) | 937 | if (oldStyle != newStyle) |
913 | pwm->curView()->initStyle(newStyle); | 938 | pwm->curView()->initStyle(newStyle); |
914 | // set the new font | 939 | // set the new font |
915 | pwm->curView()->setFont(conf()->confGlobEntryFont()); | 940 | pwm->curView()->setFont(conf()->confGlobEntryFont()); |
916 | ++i2; | 941 | ++i2; |
917 | } | 942 | } |
918 | } | 943 | } |
919 | 944 | ||
920 | void PwM::activateMpButton(bool activate) | 945 | void PwM::activateMpButton(bool activate) |
921 | { | 946 | { |
922 | managePopup->setItemEnabled(BUTTON_POPUP_MANAGE_CHANGEMP, activate); | 947 | managePopup->setItemEnabled(BUTTON_POPUP_MANAGE_CHANGEMP, activate); |
923 | } | 948 | } |
924 | 949 | ||
925 | void PwM::closeEvent(QCloseEvent *e) | 950 | void PwM::closeEvent(QCloseEvent *e) |
926 | { | 951 | { |
diff --git a/pwmanager/pwmanager/pwm.h b/pwmanager/pwmanager/pwm.h index 9fa9edc..2d1b854 100644 --- a/pwmanager/pwmanager/pwm.h +++ b/pwmanager/pwmanager/pwm.h | |||
@@ -120,96 +120,97 @@ public slots: | |||
120 | void saveAs_slot(); | 120 | void saveAs_slot(); |
121 | /** file/export/text triggered */ | 121 | /** file/export/text triggered */ |
122 | void exportToText(); | 122 | void exportToText(); |
123 | /** file/export/gpasman triggered */ | 123 | /** file/export/gpasman triggered */ |
124 | void exportToGpasman(); | 124 | void exportToGpasman(); |
125 | /** file/export/kwallet triggered */ | 125 | /** file/export/kwallet triggered */ |
126 | void exportToKWallet(); | 126 | void exportToKWallet(); |
127 | /** file/export/csv triggered */ | 127 | /** file/export/csv triggered */ |
128 | void exportToCsv(); | 128 | void exportToCsv(); |
129 | /** file/import/text triggered */ | 129 | /** file/import/text triggered */ |
130 | bool importFromText(); | 130 | bool importFromText(); |
131 | /** file/import/gpasman triggered */ | 131 | /** file/import/gpasman triggered */ |
132 | bool importFromGpasman(); | 132 | bool importFromGpasman(); |
133 | /** file/import/kwallet triggered */ | 133 | /** file/import/kwallet triggered */ |
134 | bool importKWallet(); | 134 | bool importKWallet(); |
135 | /** file/import/csv triggered */ | 135 | /** file/import/csv triggered */ |
136 | bool importCsv(); | 136 | bool importCsv(); |
137 | /** file/print triggered */ | 137 | /** file/print triggered */ |
138 | void print_slot(); | 138 | void print_slot(); |
139 | /** manage/add triggered */ | 139 | /** manage/add triggered */ |
140 | //US ENH : changed code to run with older MOC | 140 | //US ENH : changed code to run with older MOC |
141 | 141 | ||
142 | void addPwd_slot(); | 142 | void addPwd_slot(); |
143 | void addPwd_slot1(QString *pw, PwMDoc *_doc); | 143 | void addPwd_slot1(QString *pw, PwMDoc *_doc); |
144 | /** manage/edit triggered */ | 144 | /** manage/edit triggered */ |
145 | //US ENH : changed code to run with older MOC | 145 | //US ENH : changed code to run with older MOC |
146 | void editPwd_slot(); | 146 | void editPwd_slot(); |
147 | void editPwd_slot1(const QString *category); | 147 | void editPwd_slot1(const QString *category); |
148 | void editPwd_slot3(const QString *category, const int *index ,PwMDoc *_doc ); | 148 | void editPwd_slot3(const QString *category, const int *index ,PwMDoc *_doc ); |
149 | 149 | ||
150 | /** manage/delete triggered */ | 150 | /** manage/delete triggered */ |
151 | void deletePwd_slot(); | 151 | void deletePwd_slot(); |
152 | /** execute the "Launcher" entry */ | 152 | /** execute the "Launcher" entry */ |
153 | void execLauncher_slot(); | 153 | void execLauncher_slot(); |
154 | /** open browser with URL entry */ | 154 | /** open browser with URL entry */ |
155 | void goToURL_slot(); | 155 | void goToURL_slot(); |
156 | /** manage/changeMasterPwd triggered */ | 156 | /** manage/changeMasterPwd triggered */ |
157 | void changeMasterPwd_slot(); | 157 | void changeMasterPwd_slot(); |
158 | /** lock current document */ | 158 | /** lock current document */ |
159 | void lockWnd_slot(); | 159 | void lockWnd_slot(); |
160 | /** deeplock current document */ | 160 | /** deeplock current document */ |
161 | void deepLockWnd_slot(); | 161 | void deepLockWnd_slot(); |
162 | /** window/unlock triggered */ | 162 | /** window/unlock triggered */ |
163 | void unlockWnd_slot(); | 163 | void unlockWnd_slot(); |
164 | /** find item */ | 164 | /** find item */ |
165 | void find_slot(); | 165 | void find_slot(); |
166 | /** configure clicked */ | 166 | /** configure clicked */ |
167 | void config_slot(); | 167 | void config_slot(); |
168 | void config_global_slot(); | ||
168 | /** (de)activate the "change master pw" button in the menu-bar */ | 169 | /** (de)activate the "change master pw" button in the menu-bar */ |
169 | void activateMpButton(bool activate = true); | 170 | void activateMpButton(bool activate = true); |
170 | /** generate a new chipcard */ | 171 | /** generate a new chipcard */ |
171 | void genNewCard_slot(); | 172 | void genNewCard_slot(); |
172 | /** completely erase the current card */ | 173 | /** completely erase the current card */ |
173 | void eraseCard_slot(); | 174 | void eraseCard_slot(); |
174 | /** returns the ID number of the current card */ | 175 | /** returns the ID number of the current card */ |
175 | void readCardId_slot(); | 176 | void readCardId_slot(); |
176 | /** make backup image of the current card */ | 177 | /** make backup image of the current card */ |
177 | void makeCardBackup_slot(); | 178 | void makeCardBackup_slot(); |
178 | /** write backup image to current card */ | 179 | /** write backup image to current card */ |
179 | void replayCardBackup_slot(); | 180 | void replayCardBackup_slot(); |
180 | 181 | ||
181 | #ifdef PWM_EMBEDDED | 182 | #ifdef PWM_EMBEDDED |
182 | void category_slot(); | 183 | void category_slot(); |
183 | void whatsnew_slot(); | 184 | void whatsnew_slot(); |
184 | void showLicense_slot(); | 185 | void showLicense_slot(); |
185 | void faq_slot(); | 186 | void faq_slot(); |
186 | void createAboutData_slot(); | 187 | void createAboutData_slot(); |
187 | void syncHowTo_slot(); | 188 | void syncHowTo_slot(); |
188 | #endif | 189 | #endif |
189 | 190 | ||
190 | protected: | 191 | protected: |
191 | /** is this window virgin? */ | 192 | /** is this window virgin? */ |
192 | bool isVirgin() | 193 | bool isVirgin() |
193 | { return virgin; } | 194 | { return virgin; } |
194 | /** add/remove virginity */ | 195 | /** add/remove virginity */ |
195 | void setVirgin(bool v); | 196 | void setVirgin(bool v); |
196 | /** initialize the menubar */ | 197 | /** initialize the menubar */ |
197 | void initMenubar(); | 198 | void initMenubar(); |
198 | /** initialize the toolbar */ | 199 | /** initialize the toolbar */ |
199 | void initToolbar(); | 200 | void initToolbar(); |
200 | /** initialize the window-metrics */ | 201 | /** initialize the window-metrics */ |
201 | void initMetrics(); | 202 | void initMetrics(); |
202 | /** close-event */ | 203 | /** close-event */ |
203 | void closeEvent(QCloseEvent *e); | 204 | void closeEvent(QCloseEvent *e); |
204 | /** creates a new PwM-ListView and returns it */ | 205 | /** creates a new PwM-ListView and returns it */ |
205 | PwMView * makeNewListView(PwMDoc *doc); | 206 | PwMView * makeNewListView(PwMDoc *doc); |
206 | /** Window hide-event */ | 207 | /** Window hide-event */ |
207 | void hideEvent(QHideEvent *); | 208 | void hideEvent(QHideEvent *); |
208 | /** is this window minimized? */ | 209 | /** is this window minimized? */ |
209 | bool isMinimized() | 210 | bool isMinimized() |
210 | { | 211 | { |
211 | #ifndef PWM_EMBEDDED | 212 | #ifndef PWM_EMBEDDED |
212 | #if KDE_VERSION >= KDE_MAKE_VERSION(3, 2, 0) | 213 | #if KDE_VERSION >= KDE_MAKE_VERSION(3, 2, 0) |
213 | return KWin::windowInfo(winId()).isMinimized(); | 214 | return KWin::windowInfo(winId()).isMinimized(); |
214 | #else // KDE_VERSION | 215 | #else // KDE_VERSION |
215 | return KWin::info(winId()).isIconified(); | 216 | return KWin::info(winId()).isIconified(); |