-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 20 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 22 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 97 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 6 |
5 files changed, 125 insertions, 22 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index f64bfda..4a5122f 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -741,53 +741,73 @@ | |||
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..." }, | 775 | { "&Configure KA/Pi...","Konfiguriere KA/Pi..." }, |
776 | { "Global Settings...","Globale Einstellungen..." }, | 776 | { "Global Settings...","Globale Einstellungen..." }, |
777 | { "Spouse","Ehegatte" }, | 777 | { "Spouse","Ehegatte" }, |
778 | { "Notes","Notizen" }, | 778 | { "Notes","Notizen" }, |
779 | { "Messanger","Messanger" }, | 779 | { "Messanger","Messanger" }, |
780 | { "Assistant","Assistent" }, | 780 | { "Assistant","Assistent" }, |
781 | { "Manager","Manager" }, | 781 | { "Manager","Manager" }, |
782 | { "Secrecy","Sichtbar" }, | 782 | { "Secrecy","Sichtbar" }, |
783 | { "male","männlich" }, | 783 | { "male","männlich" }, |
784 | { "female","weiblich" }, | 784 | { "female","weiblich" }, |
785 | { "Hide!","Verbergen!" }, | 785 | { "Hide!","Verbergen!" }, |
786 | { "Show!","Anzeigen!" }, | 786 | { "Show!","Anzeigen!" }, |
787 | { "Details","Details" }, | 787 | { "Details","Details" }, |
788 | { "Search:","Suche:" }, | 788 | { "Search:","Suche:" }, |
789 | { "Automatically sync with KDE-Desktop\nwhen receiving sync request","Synce automatisch mit KDE-Desktop\nwenn eine Sync-Anforderung kommt" }, | ||
790 | { "Pi-Sync Port Error","Pi-Sync Port Fehler" }, | ||
791 | { "<b>Enabling Pi-Sync failed!</b> Failed to bind or listen to the port %1! Is another instance already listening to that port?","<b>Anschalten von Pi-Sync fehlgeschlagen!</b> Fehler beim Ansprechen des Ports %1! Ist bereits eine andere Anwendung dabei diesen Port zu nutzen?" }, | ||
792 | { "No valid port number:\n%1","Keine gültige Port Nummer:\n%1" }, | ||
793 | { "Port number (Default: %1)\nValid range from 1 to 65535","Port Nummer (Standard: %1)\nGültiger Bereich von 1 bis 65535" }, | ||
794 | { "Pi-Sync Error","Pi-Sync Fehler" }, | ||
795 | { "Got send file request\nwith invalid password","Erhielt "sende Datei" Anfrage\nmit ungültigem Passwort" }, | ||
796 | { "Got receive file request\nwith invalid password","Erhielt "empfange Datei" Anfrage\nmit ungültigem Passwort" }, | ||
797 | { "Wrong password: Receiving remote file failed.","Falsches Passwort: Empfangen von entfernter Datei fehlgeschlagen." }, | ||
798 | { "Please close error dialog on remote.","Bitte schließe Fehler-Dialog am entfernten Rechner" }, | ||
799 | { "Unknown error on remote.","Unbekannter Fehler am entfernten Rechner" }, | ||
800 | { "Pi-Sync: Connected!","Pi-Sync: Verbunden!" }, | ||
801 | { "Receiving file from remote...","Empfange entfernte Datei..." }, | ||
802 | { "Sending back synced file...","Sende synchronisierte Datei zurück..." }, | ||
803 | { "Do you want to\nclear all sync info\nof all profiles?","Möchten Sie wirklich\ndie Sync-Info\nfür alle Profile\nlöschen?" }, | ||
804 | { "Do you want to\nclear the sync\ninfo of profile\n%1?\n","Möchten Sie wirklich\ndie Sync-Info für Profil\n%1?\nlöschen" }, | ||
805 | { "Sorry, no valid port.Syncing cancelled.","Sorry, kein gültiger Port. Syncing abgebrochen." }, | ||
806 | { "Remote port number:\n(May be: 1 - 65535)","Ferne Port Nummer:\n(Darf sein: 1 - 65535)" }, | ||
807 | { "Writing back file ...","Schreibe Datei zurück..." }, | ||
808 | { "Sending back file ...","Sende Datei zurück..." }, | ||
789 | { "","" }, | 809 | { "","" }, |
790 | { "","" }, | 810 | { "","" }, |
791 | { "","" }, | 811 | { "","" }, |
792 | { "","" }, | 812 | { "","" }, |
793 | { "","" }, \ No newline at end of file | 813 | { "","" }, \ No newline at end of file |
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 34e9b7f..ff5e095 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -912,97 +912,96 @@ | |||
912 | { "1 hour","1 Std." }, | 912 | { "1 hour","1 Std." }, |
913 | { "15 minutes","15 Min." }, | 913 | { "15 minutes","15 Min." }, |
914 | { "5 minutes","5 Min." }, | 914 | { "5 minutes","5 Min." }, |
915 | { "1 minute","1 Min." }, | 915 | { "1 minute","1 Min." }, |
916 | { "23","23" }, | 916 | { "23","23" }, |
917 | { "Mon 15","Mon 15" }, | 917 | { "Mon 15","Mon 15" }, |
918 | { "Configure KO","Konfiguriere KO" }, | 918 | { "Configure KO","Konfiguriere KO" }, |
919 | { "Event text","Termin Text" }, | 919 | { "Event text","Termin Text" }, |
920 | { "ToDo","Todo" }, | 920 | { "ToDo","Todo" }, |
921 | { "Today","Heute" }, | 921 | { "Today","Heute" }, |
922 | { "What's Next View","What's Next Ansicht" }, | 922 | { "What's Next View","What's Next Ansicht" }, |
923 | { "Allday Agenda view shows todos","Ganztag Agenda zeigt Todos" }, | 923 | { "Allday Agenda view shows todos","Ganztag Agenda zeigt Todos" }, |
924 | { "Alarm","Alarm" }, | 924 | { "Alarm","Alarm" }, |
925 | { "Used %1 Client","Benutzter %1 Client" }, | 925 | { "Used %1 Client","Benutzter %1 Client" }, |
926 | { "No email client installed","Kein Email Klient installiert" }, | 926 | { "No email client installed","Kein Email Klient installiert" }, |
927 | { "Userdefined email client","Benutzerdef. Email Klient" }, | 927 | { "Userdefined email client","Benutzerdef. Email Klient" }, |
928 | { "OM/Pi email client","OM/Pi Email Klient" }, | 928 | { "OM/Pi email client","OM/Pi Email Klient" }, |
929 | { "Include in multiple ","Beziehe in multiple " }, | 929 | { "Include in multiple ","Beziehe in multiple " }, |
930 | { "calendar ","Kalender " }, | 930 | { "calendar ","Kalender " }, |
931 | { "addressbook ","Adressbuch " }, | 931 | { "addressbook ","Adressbuch " }, |
932 | { "pwmanager","PWmanager" }, | 932 | { "pwmanager","PWmanager" }, |
933 | { " sync"," Sync ein" }, | 933 | { " sync"," Sync ein" }, |
934 | { "Write back synced data","Schreibe gesyncte Daten zurück" }, | 934 | { "Write back synced data","Schreibe gesyncte Daten zurück" }, |
935 | { "-- Write back (on remote) existing entries only","-- Schreibe nur existierende (entfernte) Einträge zurück" }, | 935 | { "-- Write back (on remote) existing entries only","-- Schreibe nur existierende (entfernte) Einträge zurück" }, |
936 | { "-- Write back (calendar) entries in future only","-- Schreibe nur zukünftige Kalender-Einträge zurück" }, | 936 | { "-- Write back (calendar) entries in future only","-- Schreibe nur zukünftige Kalender-Einträge zurück" }, |
937 | { "---- Max. weeks in future: ","---- Max. wochen in der Zukunft: " }, | 937 | { "---- Max. weeks in future: ","---- Max. wochen in der Zukunft: " }, |
938 | { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direktes Kx/Pi zu Kx/Pi sync )" }, | 938 | { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direktes Kx/Pi zu Kx/Pi sync )" }, |
939 | { "Mobile device (cell phone)","Mobiles Gerät (Handy)" }, | 939 | { "Mobile device (cell phone)","Mobiles Gerät (Handy)" }, |
940 | { "Help...","Hilfe..." }, | 940 | { "Help...","Hilfe..." }, |
941 | { "Local file Cal:","Lokale Datei Kal:" }, | 941 | { "Local file Cal:","Lokale Datei Kal:" }, |
942 | { "Local file ABook:","Lokale Datei ABuch:" }, | 942 | { "Local file ABook:","Lokale Datei ABuch:" }, |
943 | { "Local file PWMgr:","Lokale Datei PWMgr:" }, | 943 | { "Local file PWMgr:","Lokale Datei PWMgr:" }, |
944 | { "Addressbook file (*.vcf) is used by KA/Pi","Adressbuch Datei (*.vcf) wird von KA/Pi genutzt" }, | 944 | { "Addressbook file (*.vcf) is used by KA/Pi","Adressbuch Datei (*.vcf) wird von KA/Pi genutzt" }, |
945 | { "Calendar:","Kalender:" }, | 945 | { "Calendar:","Kalender:" }, |
946 | { "AddressBook:","AdressBuch:" }, | 946 | { "AddressBook:","AdressBuch:" }, |
947 | { "PWManager:","PWManager:" }, | 947 | { "PWManager:","PWManager:" }, |
948 | { "Addressbook file is used by KA/Pi","Adressbuch Datei wird von KA/Pi genutzt" }, | 948 | { "Addressbook file is used by KA/Pi","Adressbuch Datei wird von KA/Pi genutzt" }, |
949 | { "ssh/scp","ssh/scp" }, | 949 | { "ssh/scp","ssh/scp" }, |
950 | { "ftp","ftp" }, | 950 | { "ftp","ftp" }, |
951 | { "Password for remote access: (could be the same for each)","Passwort für entfernten Zugriff: (kann dasselbe sein für alle)" }, | 951 | { "Password for remote access: (could be the same for each)","Passwort für entfernten Zugriff: (kann dasselbe sein für alle)" }, |
952 | { "Remote IP address: (could be the same for each)","Entfernte IP Adresse: (kann dasselbe sein für alle)" }, | 952 | { "Remote IP address: (could be the same for each)","Entfernte IP Adresse: (kann dasselbe sein für alle)" }, |
953 | { "Remote port number: (should be different for each)","Entfernte Port Nummer: (Sollte für alle unterschiedlich sein)" }, | 953 | { "Remote port number: (should be different for each)","Entfernte Port Nummer: (Sollte für alle unterschiedlich sein)" }, |
954 | { "command for downloading remote file to local device","Kommando zum Download der entfernten Datei zum lokalen Gerät" }, | 954 | { "command for downloading remote file to local device","Kommando zum Download der entfernten Datei zum lokalen Gerät" }, |
955 | { "command for uploading local temp file to remote device","Kommando zum Upload der lokalen temp. Datei zum entfernten Gerät" }, | 955 | { "command for uploading local temp file to remote device","Kommando zum Upload der lokalen temp. Datei zum entfernten Gerät" }, |
956 | { "Insert device where\nphone is connected. E.g.:\n","Füge Device ein, an dem\ndas Handy angeschlossen ist. Z.B.:\n" }, | 956 | { "Insert device where\nphone is connected. E.g.:\n","Füge Device ein, an dem\ndas Handy angeschlossen ist. Z.B.:\n" }, |
957 | { "KDE-Pim sync config","KDE-Pim sync Konfig" }, | 957 | { "KDE-Pim sync config","KDE-Pim sync Konfig" }, |
958 | { "Insert kind of connection,e.g.:\n","Füge Art der Verbindung ein,z.B.:\n" }, | 958 | { "Insert kind of connection,e.g.:\n","Füge Art der Verbindung ein,z.B.:\n" }, |
959 | { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Empfohlen: Leer lassen!\n(So dass das Model\nautomatisch erkannt\nwerden kann)\nOder füge Model Name ein:\n" }, | 959 | { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Empfohlen: Leer lassen!\n(So dass das Model\nautomatisch erkannt\nwerden kann)\nOder füge Model Name ein:\n" }, |
960 | { "Port number (Default: %1)","Port Nummer (Default: %1)" }, | ||
961 | { "Password to enable\naccess from remote:","Passwort um entfernten\nZugriff zuzulassen:" }, | 960 | { "Password to enable\naccess from remote:","Passwort um entfernten\nZugriff zuzulassen:" }, |
962 | { "Automatically start\nat application startup","Starte automatisch\nbeim Programmstart" }, | 961 | { "Automatically start\nat application startup","Starte automatisch\nbeim Programmstart" }, |
963 | { "Automatically sync\nwith KDE-Desktop","Automatischer Sync\nmit dem KDE-Desktop" }, | 962 | { "Automatically sync\nwith KDE-Desktop","Automatischer Sync\nmit dem KDE-Desktop" }, |
964 | { "Enter port for Pi-Sync","Port Nummer für Pi-Sync" }, | 963 | { "Enter port for Pi-Sync","Port Nummer für Pi-Sync" }, |
965 | { "Disable Pi-Sync","Schalte Pi-Sync aus" }, | 964 | { "Disable Pi-Sync","Schalte Pi-Sync aus" }, |
966 | { "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen "Multi-Syncen"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" }, | 965 | { "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen "Multi-Syncen"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" }, |
967 | { "KDE-Pim Sync","KDE-Pim Sync" }, | 966 | { "KDE-Pim Sync","KDE-Pim Sync" }, |
968 | { "Multiple profiles","Multi-Sync Profile" }, | 967 | { "Multiple profiles","Multi-Sync Profile" }, |
969 | { "Device: ","Gerät: " }, | 968 | { "Device: ","Gerät: " }, |
970 | { "Multiple sync started.","Multi-Sync gestartet." }, | 969 | { "Multiple sync started.","Multi-Sync gestartet." }, |
971 | { "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile\nselektiert für Multi-Sync" }, | 970 | { "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile\nselektiert für Multi-Sync" }, |
972 | { "Turn filter on","Schalte Filter an" }, | 971 | { "Turn filter on","Schalte Filter an" }, |
973 | { "Turn filter off","Schalte Filter aus" }, | 972 | { "Turn filter off","Schalte Filter aus" }, |
974 | { "Key bindings KOrganizer/Pi","Tastatur Belegung KOrganizer/Pi" }, | 973 | { "Key bindings KOrganizer/Pi","Tastatur Belegung KOrganizer/Pi" }, |
975 | { "<p><b>White</b>: Item readonly</p>\n","<p><b>Weiss</b>: Eintrag schreibgeschützt</p>\n" }, | 974 | { "<p><b>White</b>: Item readonly</p>\n","<p><b>Weiss</b>: Eintrag schreibgeschützt</p>\n" }, |
976 | { "<p><b>Dark yellow</b>: Event/todo with attendees.</p>\n","<p><b>Dunkelgelb</b>: Termin/Todo mit Teilnehmern.</p>\n" }, | 975 | { "<p><b>Dark yellow</b>: Event/todo with attendees.</p>\n","<p><b>Dunkelgelb</b>: Termin/Todo mit Teilnehmern.</p>\n" }, |
977 | { "<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n","<p><b>Schwarz</b>: Termin/Todo mit Teilnehmern. Sie sind der Organisator!</p>\n" }, | 976 | { "<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n","<p><b>Schwarz</b>: Termin/Todo mit Teilnehmern. Sie sind der Organisator!</p>\n" }, |
978 | { "<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n","<p><b>Dunkelgrün</b>: Information(Beschreibung) verfügbar.([i] in WN Ansicht)</p>\n" }, | 977 | { "<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n","<p><b>Dunkelgrün</b>: Information(Beschreibung) verfügbar.([i] in WN Ansicht)</p>\n" }, |
979 | { "<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n","<p><b>Blau</b>: Wiederholender Termin.([r] in Whats'Next Ansicht)</p>\n" }, | 978 | { "<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n","<p><b>Blau</b>: Wiederholender Termin.([r] in Whats'Next Ansicht)</p>\n" }, |
980 | { "<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n","<p><b>Rot</b>: Alarm gesetzt.([a] in Whats'Next Ansicht)</p>\n" }, | 979 | { "<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n","<p><b>Rot</b>: Alarm gesetzt.([a] in Whats'Next Ansicht)</p>\n" }, |
981 | { "<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n","<p><b>Kreuz</b>: Eintrag gecancelt.([c] in Whats'Next Ansicht)</p>\n" }, | 980 | { "<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n","<p><b>Kreuz</b>: Eintrag gecancelt.([c] in Whats'Next Ansicht)</p>\n" }, |
982 | { "<p><b>(for square icons in agenda and month view)</b></p>\n","<p><b>(für quadratische Icons in Agenda und Monats Ansicht)</b></p>\n" }, | 981 | { "<p><b>(for square icons in agenda and month view)</b></p>\n","<p><b>(für quadratische Icons in Agenda und Monats Ansicht)</b></p>\n" }, |
983 | { "<p><h2>KO/Pi icon colors:</h2></p>\n","<p><h2>KO/Pi Icon Farben:</h2></p>\n" }, | 982 | { "<p><h2>KO/Pi icon colors:</h2></p>\n","<p><h2>KO/Pi Icon Farben:</h2></p>\n" }, |
984 | { "<p><b>E</b>: Edit item</p>\n","<p><b>E</b>: Editiere Eintrag</p>\n" }, | 983 | { "<p><b>E</b>: Edit item</p>\n","<p><b>E</b>: Editiere Eintrag</p>\n" }, |
985 | { "<p><b>A</b>: Show agenda view.</p>\n","<p><b>A</b>: Zeige Agenda Ansicht.</p>\n" }, | 984 | { "<p><b>A</b>: Show agenda view.</p>\n","<p><b>A</b>: Zeige Agenda Ansicht.</p>\n" }, |
986 | { "<p><b>I,C</b>: Close dialog.</p>\n","<p><b>I,C</b>: Schließe Dialog.</p>\n" }, | 985 | { "<p><b>I,C</b>: Close dialog.</p>\n","<p><b>I,C</b>: Schließe Dialog.</p>\n" }, |
987 | { "<p><h3>In event/todo viewer:</h3></p>\n","<p><h3>In Termin/Todo Detail-Anzeige:</h3></p>\n" }, | 986 | { "<p><h3>In event/todo viewer:</h3></p>\n","<p><h3>In Termin/Todo Detail-Anzeige:</h3></p>\n" }, |
988 | { "<p><b>shift+up/down</b>: Goto first/last item</p>\n","<p><b>shift+up/down</b>: Gehe zum ersten/letzten Eintrag</p>\n" }, | 987 | { "<p><b>shift+up/down</b>: Goto first/last item</p>\n","<p><b>shift+up/down</b>: Gehe zum ersten/letzten Eintrag</p>\n" }, |
989 | { "<p><b>ctrl+up/down</b>: Goto up/down by 20% of items</p>\n","<p><b>ctrl+up/down</b>: Gehe hoch/runter 20% aller Einträge</p>\n" }, | 988 | { "<p><b>ctrl+up/down</b>: Goto up/down by 20% of items</p>\n","<p><b>ctrl+up/down</b>: Gehe hoch/runter 20% aller Einträge</p>\n" }, |
990 | { "<p><b>up/down</b>: Next/prev item</p>\n","<p><b>up/down</b>: Nächster/vorheriger Eintrag</p>\n" }, | 989 | { "<p><b>up/down</b>: Next/prev item</p>\n","<p><b>up/down</b>: Nächster/vorheriger Eintrag</p>\n" }, |
991 | { "<p><b>return+shift</b>: Deselect item+one step down</p>\n","<p><b>return+shift</b>: Deselektiere Item+Cursor einen Eintrag runter</p>\n" }, | 990 | { "<p><b>return+shift</b>: Deselect item+one step down</p>\n","<p><b>return+shift</b>: Deselektiere Item+Cursor einen Eintrag runter</p>\n" }, |
992 | { "<p><b>return</b>: Select item+one step down</p>\n","<p><b>return</b>: Selektiere Item+Cursor einen Eintrag runter</p>\n" }, | 991 | { "<p><b>return</b>: Select item+one step down</p>\n","<p><b>return</b>: Selektiere Item+Cursor einen Eintrag runter</p>\n" }, |
993 | { "<p><b>I</b>: Show info of current item+one step down.</p>\n","<p><b>I</b>: Zeige Detail-Ansicht vom sel.Eintrag+Cursor einen Eintrag runter.</p>\n" }, | 992 | { "<p><b>I</b>: Show info of current item+one step down.</p>\n","<p><b>I</b>: Zeige Detail-Ansicht vom sel.Eintrag+Cursor einen Eintrag runter.</p>\n" }, |
994 | { "<p><h3>In list view:</h3></p>\n","<p><h3>In Listen Ansicht:</h3></p>\n" }, | 993 | { "<p><h3>In list view:</h3></p>\n","<p><h3>In Listen Ansicht:</h3></p>\n" }, |
995 | { "<p><b>return+shift</b>: Mark item as not completed+one step down</p>\n","<p><b>return+shift</b>: Markiere Todo als nicht erledigt+Cursor einen Eintrag runter</p>\n" }, | 994 | { "<p><b>return+shift</b>: Mark item as not completed+one step down</p>\n","<p><b>return+shift</b>: Markiere Todo als nicht erledigt+Cursor einen Eintrag runter</p>\n" }, |
996 | { "<p><b>return</b>: Mark item as completed+one step down.</p>\n","<p><b>return</b>: Markiere Todo als erledigt+Cursor einen Eintrag runter.</p>\n" }, | 995 | { "<p><b>return</b>: Mark item as completed+one step down.</p>\n","<p><b>return</b>: Markiere Todo als erledigt+Cursor einen Eintrag runter.</p>\n" }, |
997 | { "<p><b>Q</b>: Toggle quick todo line edit.</p>\n","<p><b>Q</b>: Zeige/verstecke Quick Todo Eingabe Zeile.</p>\n" }, | 996 | { "<p><b>Q</b>: Toggle quick todo line edit.</p>\n","<p><b>Q</b>: Zeige/verstecke Quick Todo Eingabe Zeile.</p>\n" }, |
998 | { "<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n","<p><b>shift+P</b>: Mache Todo zum neuen <b>P</b>arent Todo für das Todo, welches mit shift+Sselektiert wurde.</p>\n" }, | 997 | { "<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n","<p><b>shift+P</b>: Mache Todo zum neuen <b>P</b>arent Todo für das Todo, welches mit shift+Sselektiert wurde.</p>\n" }, |
999 | { "<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n","<p><b>shift+S</b>: Mache Todo zum <b>S</b>ubtodo</p>\n" }, | 998 | { "<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n","<p><b>shift+S</b>: Mache Todo zum <b>S</b>ubtodo</p>\n" }, |
1000 | { "<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n","<p><b>shift+U</b>: <b>U</b>nparent Todo (Mache Sub-Todo zum Toplevel Todo)</p>\n" }, | 999 | { "<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n","<p><b>shift+U</b>: <b>U</b>nparent Todo (Mache Sub-Todo zum Toplevel Todo)</p>\n" }, |
1001 | { "<p><h3>In todo view:</h3></p>\n","<p><h3>In Todo Anzige:</h3></p>\n" }, | 1000 | { "<p><h3>In todo view:</h3></p>\n","<p><h3>In Todo Anzige:</h3></p>\n" }, |
1002 | { "<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n","<p><b>ctrl+up/down</b>: Scrolle kleine Todo Ansicht</p>\n" }, | 1001 | { "<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n","<p><b>ctrl+up/down</b>: Scrolle kleine Todo Ansicht</p>\n" }, |
1003 | { "<p><b>up/down</b>: Scroll agenda view</p>\n","<p><b>up/down</b>: Scrolle Agenda Ansicht</p>\n" }, | 1002 | { "<p><b>up/down</b>: Scroll agenda view</p>\n","<p><b>up/down</b>: Scrolle Agenda Ansicht</p>\n" }, |
1004 | { "<p><h3>In agenda view:</h3></p>\n","<p><h3>In Agenda Ansicht:</h3></p>\n" }, | 1003 | { "<p><h3>In agenda view:</h3></p>\n","<p><h3>In Agenda Ansicht:</h3></p>\n" }, |
1005 | { "<p><b>del,backspace</b>: Delete selected item</p>\n","<p><b>del,backspace</b>: Lösche selektiertes Item</p>\n" }, | 1004 | { "<p><b>del,backspace</b>: Delete selected item</p>\n","<p><b>del,backspace</b>: Lösche selektiertes Item</p>\n" }, |
1006 | { "<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n","<p><b>left</b>: Vorh. Woche | <b>left+ctrl</b>: Vorh. Monat</p>\n" }, | 1005 | { "<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n","<p><b>left</b>: Vorh. Woche | <b>left+ctrl</b>: Vorh. Monat</p>\n" }, |
1007 | { "<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n","<p><b>right</b>: Nächste Woche | <b>right+ctrl</b>: Nächste Woche</p>\n" }, | 1006 | { "<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n","<p><b>right</b>: Nächste Woche | <b>right+ctrl</b>: Nächste Woche</p>\n" }, |
1008 | { "<p><b>B</b>: Edit description (details) of selected item</p>\n","<p><b>B</b>: Editiere Beschreibung (Details) des selektierten Items</p>\n" }, | 1007 | { "<p><b>B</b>: Edit description (details) of selected item</p>\n","<p><b>B</b>: Editiere Beschreibung (Details) des selektierten Items</p>\n" }, |
@@ -1461,57 +1460,76 @@ | |||
1461 | { "Journal from: ","Journal vom: " }, | 1460 | { "Journal from: ","Journal vom: " }, |
1462 | { "Journal: %1 from ","Journal: %1 vom " }, | 1461 | { "Journal: %1 from ","Journal: %1 vom " }, |
1463 | { "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" }, | 1462 | { "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" }, |
1464 | { "Selected Item","Ausgewähltes Item" }, | 1463 | { "Selected Item","Ausgewähltes Item" }, |
1465 | { "Select Date...","Wähle Datum..." }, | 1464 | { "Select Date...","Wähle Datum..." }, |
1466 | { "After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:","Nach dem Importieren/Laden/Syncen kann es neue Kategorien in den Terminen oder Todos geben, die nicht automatisch der Kategorieliste hinzugefügt werden. Bitte wählen Sie, was <b>jetzt</b> passieren soll:" }, | 1465 | { "After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:","Nach dem Importieren/Laden/Syncen kann es neue Kategorien in den Terminen oder Todos geben, die nicht automatisch der Kategorieliste hinzugefügt werden. Bitte wählen Sie, was <b>jetzt</b> passieren soll:" }, |
1467 | { "Change category list now!","Ändere Kategorieliste jetzt!" }, | 1466 | { "Change category list now!","Ändere Kategorieliste jetzt!" }, |
1468 | { "Edit category list...","Ändere Kategorieliste..." }, | 1467 | { "Edit category list...","Ändere Kategorieliste..." }, |
1469 | { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" }, | 1468 | { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" }, |
1470 | { "Filepath: ","Dateipfad: " }, | 1469 | { "Filepath: ","Dateipfad: " }, |
1471 | { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" }, | 1470 | { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" }, |
1472 | { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" }, | 1471 | { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" }, |
1473 | { "Pending Suspend Alarm","Laufender Suspend Alarm" }, | 1472 | { "Pending Suspend Alarm","Laufender Suspend Alarm" }, |
1474 | { "Error loading calendar %1","Fehler beim Laden von Kalender %1" }, | 1473 | { "Error loading calendar %1","Fehler beim Laden von Kalender %1" }, |
1475 | { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" }, | 1474 | { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" }, |
1476 | { "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" }, | 1475 | { "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" }, |
1477 | { "Alarm Options","Alarm Einstellungen" }, | 1476 | { "Alarm Options","Alarm Einstellungen" }, |
1478 | { "Delete selected...","Lösche Ausgewählte..." }, | 1477 | { "Delete selected...","Lösche Ausgewählte..." }, |
1479 | { "None","Nichts" }, | 1478 | { "None","Nichts" }, |
1480 | { "Selection","Auswahl" }, | 1479 | { "Selection","Auswahl" }, |
1481 | { "Set categories","Setze Kategorien" }, | 1480 | { "Set categories","Setze Kategorien" }, |
1482 | { "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" }, | 1481 | { "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" }, |
1483 | { "Reset","Neu setzen" }, | 1482 | { "Reset","Neu setzen" }, |
1484 | { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, | 1483 | { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, |
1485 | { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, | 1484 | { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, |
1486 | { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, | 1485 | { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, |
1487 | { "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" }, | 1486 | { "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" }, |
1488 | { "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" }, | 1487 | { "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" }, |
1489 | { "Edit","Edit" }, | 1488 | { "Edit","Edit" }, |
1490 | { "Last Modified","Zuletzt geändert" }, | 1489 | { "Last Modified","Zuletzt geändert" }, |
1491 | { "Journal viewer","Journal Anzeige" }, | 1490 | { "Journal viewer","Journal Anzeige" }, |
1492 | { "Configure Calendar Files...","Konfiguriere Kalenderdateien..." }, | 1491 | { "Configure Calendar Files...","Konfiguriere Kalenderdateien..." }, |
1493 | { "You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." }, | 1492 | { "You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." }, |
1494 | { "Hide Completed","Verstecke erledigte Todos" }, | 1493 | { "Hide Completed","Verstecke erledigte Todos" }, |
1495 | { "Show not Running","Zeige nicht Laufende" }, | 1494 | { "Show not Running","Zeige nicht Laufende" }, |
1496 | { "Click to add new Todo","Klick für neues Todo!" }, | 1495 | { "Click to add new Todo","Klick für neues Todo!" }, |
1497 | { "Show next conflict for","Zeige nächsten Konflikt für" }, | 1496 | { "Show next conflict for","Zeige nächsten Konflikt für" }, |
1498 | { "All events","Alle Termine" }, | 1497 | { "All events","Alle Termine" }, |
1499 | { "Allday events","Ganztagestermine" }, | 1498 | { "Allday events","Ganztagestermine" }, |
1500 | { "Events with time","Termine mit Zeit" }, | 1499 | { "Events with time","Termine mit Zeit" }, |
1501 | { "No conflict found","Kein Konflikt gefunden" }, | 1500 | { "No conflict found","Kein Konflikt gefunden" }, |
1502 | { "Conflict %1 <-> %2","Konflikt %1 <-> %2" }, | 1501 | { "Conflict %1 <-> %2","Konflikt %1 <-> %2" }, |
1503 | { "<p><b>Q</b>: Show next date with conflicting events\n ","<p><b>Q</b>: Zeige nächstes Datum mit Terminen im Konflikt\n " }, | 1502 | { "<p><b>Q</b>: Show next date with conflicting events\n ","<p><b>Q</b>: Zeige nächstes Datum mit Terminen im Konflikt\n " }, |
1504 | { "Week view mode uses row layout","Wochenansicht Modus nutzt Reihenlayout" }, | 1503 | { "Week view mode uses row layout","Wochenansicht Modus nutzt Reihenlayout" }, |
1505 | { "The event\n%1\nconflicts with event\n%2\nat date\n%3.\n","Der Termin\n%1\nist im Konflikt mit Termin\n%2\nam Datum\n%3.\n" }, | 1504 | { "The event\n%1\nconflicts with event\n%2\nat date\n%3.\n","Der Termin\n%1\nist im Konflikt mit Termin\n%2\nam Datum\n%3.\n" }, |
1506 | { "KO/Pi Conflict delected","KO/Pi Konflikt erkannt" }, | 1505 | { "KO/Pi Conflict delected","KO/Pi Konflikt erkannt" }, |
1507 | { "Show date","Zeige Datum" }, | 1506 | { "Show date","Zeige Datum" }, |
1508 | { "No problem!","Null Problemo!" }, | 1507 | { "No problem!","Null Problemo!" }, |
1509 | { "","" }, | 1508 | { "Automatically sync with KDE-Desktop\nwhen receiving sync request","Synce automatisch mit KDE-Desktop\nwenn eine Sync-Anforderung kommt" }, |
1509 | { "Pi-Sync Port Error","Pi-Sync Port Fehler" }, | ||
1510 | { "<b>Enabling Pi-Sync failed!</b> Failed to bind or listen to the port %1! Is another instance already listening to that port?","<b>Anschalten von Pi-Sync fehlgeschlagen!</b> Fehler beim Ansprechen des Ports %1! Ist bereits eine andere Anwendung dabei diesen Port zu nutzen?" }, | ||
1511 | { "No valid port number:\n%1","Keine gültige Port Nummer:\n%1" }, | ||
1512 | { "Port number (Default: %1)\nValid range from 1 to 65535","Port Nummer (Standard: %1)\nGültiger Bereich von 1 bis 65535" }, | ||
1513 | { "Pi-Sync Error","Pi-Sync Fehler" }, | ||
1514 | { "Got send file request\nwith invalid password","Erhielt "sende Datei" Anfrage\nmit ungültigem Passwort" }, | ||
1515 | { "Got receive file request\nwith invalid password","Erhielt "empfange Datei" Anfrage\nmit ungültigem Passwort" }, | ||
1516 | { "Wrong password: Receiving remote file failed.","Falsches Passwort: Empfangen von entfernter Datei fehlgeschlagen." }, | ||
1517 | { "Please close error dialog on remote.","Bitte schließe Fehler-Dialog am entfernten Rechner" }, | ||
1518 | { "Unknown error on remote.","Unbekannter Fehler am entfernten Rechner" }, | ||
1519 | { "Pi-Sync: Connected!","Pi-Sync: Verbunden!" }, | ||
1520 | { "Receiving file from remote...","Empfange entfernte Datei..." }, | ||
1521 | { "Sending back synced file...","Sende synchronisierte Datei zurück..." }, | ||
1522 | { "Do you want to\nclear all sync info\nof all profiles?","Möchten Sie wirklich\ndie Sync-Info\nfür alle Profile\nlöschen?" }, | ||
1523 | { "Do you want to\nclear the sync\ninfo of profile\n%1?\n","Möchten Sie wirklich\ndie Sync-Info für Profil\n%1?\nlöschen" }, | ||
1524 | { "Sorry, no valid port.Syncing cancelled.","Sorry, kein gültiger Port. Syncing abgebrochen." }, | ||
1525 | { "Remote port number:\n(May be: 1 - 65535)","Ferne Port Nummer:\n(Darf sein: 1 - 65535)" }, | ||
1526 | { "Writing back file ...","Schreibe Datei zurück..." }, | ||
1527 | { "Sending back file ...","Sende Datei zurück..." }, | ||
1510 | { "","" }, | 1528 | { "","" }, |
1511 | { "","" }, | 1529 | { "","" }, |
1512 | { "","" }, | 1530 | { "","" }, |
1513 | { "","" }, | 1531 | { "","" }, |
1514 | { "","" }, | 1532 | { "","" }, |
1515 | { "","" }, | 1533 | { "","" }, |
1516 | { "","" }, | 1534 | { "","" }, |
1517 | { "","" }, | 1535 | { "","" }, |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 68d1bc6..940ea91 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -403,97 +403,97 @@ void CalendarView::init() | |||
403 | 403 | ||
404 | mLeftSplitter->setResizeMode(mDateNavigator,QSplitter::KeepSize); | 404 | mLeftSplitter->setResizeMode(mDateNavigator,QSplitter::KeepSize); |
405 | mTodoList = new KOTodoView(mCalendar, mLeftSplitter, "todolist_small2"); | 405 | mTodoList = new KOTodoView(mCalendar, mLeftSplitter, "todolist_small2"); |
406 | mTodoList->setNavigator( mNavigator ); | 406 | mTodoList->setNavigator( mNavigator ); |
407 | mFilterView = new KOFilterView(&mFilters,mLeftSplitter,"CalendarView::FilterView"); | 407 | mFilterView = new KOFilterView(&mFilters,mLeftSplitter,"CalendarView::FilterView"); |
408 | 408 | ||
409 | #ifdef KORG_NORESOURCEVIEW | 409 | #ifdef KORG_NORESOURCEVIEW |
410 | mResourceView = 0; | 410 | mResourceView = 0; |
411 | #else | 411 | #else |
412 | if ( mResourceManager ) { | 412 | if ( mResourceManager ) { |
413 | mResourceView = new ResourceView( mResourceManager, mLeftSplitter ); | 413 | mResourceView = new ResourceView( mResourceManager, mLeftSplitter ); |
414 | mResourceView->updateView(); | 414 | mResourceView->updateView(); |
415 | connect( mResourceView, SIGNAL( resourcesChanged() ), | 415 | connect( mResourceView, SIGNAL( resourcesChanged() ), |
416 | SLOT( updateView() ) ); | 416 | SLOT( updateView() ) ); |
417 | } else { | 417 | } else { |
418 | mResourceView = 0; | 418 | mResourceView = 0; |
419 | } | 419 | } |
420 | #endif | 420 | #endif |
421 | QWidget *rightBox = new QWidget( mPanner ); | 421 | QWidget *rightBox = new QWidget( mPanner ); |
422 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 422 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); |
423 | 423 | ||
424 | mRightFrame = new QWidgetStack( rightBox ); | 424 | mRightFrame = new QWidgetStack( rightBox ); |
425 | rightLayout->addWidget( mRightFrame, 1 ); | 425 | rightLayout->addWidget( mRightFrame, 1 ); |
426 | 426 | ||
427 | mLeftFrame = mLeftSplitter; | 427 | mLeftFrame = mLeftSplitter; |
428 | #else | 428 | #else |
429 | //QWidget *mainBox = new QWidget( this ); | 429 | //QWidget *mainBox = new QWidget( this ); |
430 | //QWidget *leftFrame = new QWidget( mainBox ); | 430 | //QWidget *leftFrame = new QWidget( mainBox ); |
431 | //QBoxLayout * mainBoxLayout; | 431 | //QBoxLayout * mainBoxLayout; |
432 | if ( KOPrefs::instance()->mVerticalScreen ) { | 432 | if ( KOPrefs::instance()->mVerticalScreen ) { |
433 | //mainBoxLayout = new QVBoxLayout(mainBox); | 433 | //mainBoxLayout = new QVBoxLayout(mainBox); |
434 | //leftFrameLayout = new QHBoxLayout(leftFrame ); | 434 | //leftFrameLayout = new QHBoxLayout(leftFrame ); |
435 | mMainFrame = new KDGanttMinimizeSplitter( Qt::Vertical, this ); | 435 | mMainFrame = new KDGanttMinimizeSplitter( Qt::Vertical, this ); |
436 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); | 436 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); |
437 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, mMainFrame);; | 437 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, mMainFrame);; |
438 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 438 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
439 | } else { | 439 | } else { |
440 | //mainBoxLayout = new QHBoxLayout(mainBox); | 440 | //mainBoxLayout = new QHBoxLayout(mainBox); |
441 | //leftFrameLayout = new QVBoxLayout(leftFrame ); | 441 | //leftFrameLayout = new QVBoxLayout(leftFrame ); |
442 | mMainFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, this); | 442 | mMainFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, this); |
443 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left); | 443 | mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left); |
444 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame); | 444 | mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame); |
445 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); | 445 | mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); |
446 | } | 446 | } |
447 | mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); | 447 | mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); |
448 | //QBoxLayout * leftFrameLayout; | 448 | //QBoxLayout * leftFrameLayout; |
449 | topLayout->addWidget( mMainFrame ); | 449 | topLayout->addWidget( mMainFrame ); |
450 | #ifdef DESKTOP_VERSION | 450 | #ifdef DESKTOP_VERSION |
451 | mDateScrollBar = new QScrollBar ( 0, 364, 1,30, 200,QScrollBar::Horizontal, this ); | 451 | mDateScrollBar = new QScrollBar ( 1, 365, 1,30, 200,QScrollBar::Horizontal, this ); |
452 | topLayout->addWidget( mDateScrollBar ); | 452 | topLayout->addWidget( mDateScrollBar ); |
453 | connect( mDateScrollBar, SIGNAL( valueChanged ( int ) ),this, SLOT( scrollBarValue( int )) ); | 453 | connect( mDateScrollBar, SIGNAL( valueChanged ( int ) ),this, SLOT( scrollBarValue( int )) ); |
454 | if ( QApplication::desktop()->width() < 800 ) | 454 | if ( QApplication::desktop()->width() < 800 ) |
455 | mDateScrollBar->hide(); | 455 | mDateScrollBar->hide(); |
456 | #endif | 456 | #endif |
457 | //mainBoxLayout->addWidget (mLeftFrame); | 457 | //mainBoxLayout->addWidget (mLeftFrame); |
458 | mDateNavigator = new DateNavigatorContainer( mLeftFrame, | 458 | mDateNavigator = new DateNavigatorContainer( mLeftFrame, |
459 | "CalendarView::DateNavigator" ); | 459 | "CalendarView::DateNavigator" ); |
460 | #if 0 | 460 | #if 0 |
461 | // FIXME | 461 | // FIXME |
462 | mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE, | 462 | mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE, |
463 | "CalendarView::DateNavigator", QDate::currentDate()); | 463 | "CalendarView::DateNavigator", QDate::currentDate()); |
464 | #endif | 464 | #endif |
465 | // mDateNavigator->blockSignals( true ); | 465 | // mDateNavigator->blockSignals( true ); |
466 | //leftFrameLayout->addWidget( mDateNavigator ); | 466 | //leftFrameLayout->addWidget( mDateNavigator ); |
467 | mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall"); | 467 | mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall"); |
468 | mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); | 468 | mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); |
469 | mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView"); | 469 | mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView"); |
470 | connect( mCalEditView, SIGNAL( calendarEnabled (int,bool) ),mCalendar, SLOT( setCalendarEnabled(int,bool)) ); | 470 | connect( mCalEditView, SIGNAL( calendarEnabled (int,bool) ),mCalendar, SLOT( setCalendarEnabled(int,bool)) ); |
471 | connect( mCalEditView, SIGNAL( alarmEnabled(int,bool) ),mCalendar, SLOT( setAlarmEnabled(int,bool)) ); | 471 | connect( mCalEditView, SIGNAL( alarmEnabled(int,bool) ),mCalendar, SLOT( setAlarmEnabled(int,bool)) ); |
472 | connect( mCalEditView, SIGNAL( calendarReadonly(int,bool) ),this, SLOT( setCalReadOnly(int,bool)) ); | 472 | connect( mCalEditView, SIGNAL( calendarReadonly(int,bool) ),this, SLOT( setCalReadOnly(int,bool)) ); |
473 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) ); | 473 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) ); |
474 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mViewManager, SLOT( setDefaultCalendar(int)) ); | 474 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mViewManager, SLOT( setDefaultCalendar(int)) ); |
475 | connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) ); | 475 | connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) ); |
476 | connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) ); | 476 | connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) ); |
477 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) ); | 477 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) ); |
478 | connect( mCalEditView, SIGNAL( checkCalendar() ),this, SLOT( checkFiles() )); | 478 | connect( mCalEditView, SIGNAL( checkCalendar() ),this, SLOT( checkFiles() )); |
479 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) ); | 479 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) ); |
480 | 480 | ||
481 | mTodoList->setNavigator( mNavigator ); | 481 | mTodoList->setNavigator( mNavigator ); |
482 | #if 0 | 482 | #if 0 |
483 | if ( QApplication::desktop()->width() < 480 ) { | 483 | if ( QApplication::desktop()->width() < 480 ) { |
484 | leftFrameLayout->addWidget(mFilterView); | 484 | leftFrameLayout->addWidget(mFilterView); |
485 | leftFrameLayout->addWidget(mTodoList, 2 ); | 485 | leftFrameLayout->addWidget(mTodoList, 2 ); |
486 | 486 | ||
487 | } else { | 487 | } else { |
488 | leftFrameLayout->addWidget(mTodoList,2 ); | 488 | leftFrameLayout->addWidget(mTodoList,2 ); |
489 | leftFrameLayout->addWidget(mFilterView ); | 489 | leftFrameLayout->addWidget(mFilterView ); |
490 | } | 490 | } |
491 | #endif | 491 | #endif |
492 | mFilterView->hide(); | 492 | mFilterView->hide(); |
493 | mCalEditView->hide(); | 493 | mCalEditView->hide(); |
494 | QWidget *rightBox = new QWidget( mMainFrame ); | 494 | QWidget *rightBox = new QWidget( mMainFrame ); |
495 | //mainBoxLayout->addWidget ( rightBox, 10 ); | 495 | //mainBoxLayout->addWidget ( rightBox, 10 ); |
496 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 496 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); |
497 | mRightFrame = new QWidgetStack( rightBox ); | 497 | mRightFrame = new QWidgetStack( rightBox ); |
498 | rightLayout->addWidget( mRightFrame, 10 ); | 498 | rightLayout->addWidget( mRightFrame, 10 ); |
499 | 499 | ||
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index fc0ac6b..f2ee0ab 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -308,180 +308,185 @@ void KSyncManager::slotSyncMenu( int action ) | |||
308 | 308 | ||
309 | } | 309 | } |
310 | } else { | 310 | } else { |
311 | if ( temp->getIsPhoneSync() ) { | 311 | if ( temp->getIsPhoneSync() ) { |
312 | mPhoneDevice = temp->getPhoneDevice( ) ; | 312 | mPhoneDevice = temp->getPhoneDevice( ) ; |
313 | mPhoneConnection = temp->getPhoneConnection( ); | 313 | mPhoneConnection = temp->getPhoneConnection( ); |
314 | mPhoneModel = temp->getPhoneModel( ); | 314 | mPhoneModel = temp->getPhoneModel( ); |
315 | syncPhone(); | 315 | syncPhone(); |
316 | } else if ( temp->getIsPiSync() ) { | 316 | } else if ( temp->getIsPiSync() ) { |
317 | if ( mTargetApp == KAPI ) { | 317 | if ( mTargetApp == KAPI ) { |
318 | mPassWordPiSync = temp->getRemotePwAB(); | 318 | mPassWordPiSync = temp->getRemotePwAB(); |
319 | mActiveSyncPort = temp->getRemotePortAB(); | 319 | mActiveSyncPort = temp->getRemotePortAB(); |
320 | mActiveSyncIP = temp->getRemoteIPAB(); | 320 | mActiveSyncIP = temp->getRemoteIPAB(); |
321 | } else if ( mTargetApp == KOPI ) { | 321 | } else if ( mTargetApp == KOPI ) { |
322 | mPassWordPiSync = temp->getRemotePw(); | 322 | mPassWordPiSync = temp->getRemotePw(); |
323 | mActiveSyncPort = temp->getRemotePort(); | 323 | mActiveSyncPort = temp->getRemotePort(); |
324 | mActiveSyncIP = temp->getRemoteIP(); | 324 | mActiveSyncIP = temp->getRemoteIP(); |
325 | } else { | 325 | } else { |
326 | mPassWordPiSync = temp->getRemotePwPWM(); | 326 | mPassWordPiSync = temp->getRemotePwPWM(); |
327 | mActiveSyncPort = temp->getRemotePortPWM(); | 327 | mActiveSyncPort = temp->getRemotePortPWM(); |
328 | mActiveSyncIP = temp->getRemoteIPPWM(); | 328 | mActiveSyncIP = temp->getRemoteIPPWM(); |
329 | } | 329 | } |
330 | syncPi(); | 330 | syncPi(); |
331 | while ( !mPisyncFinished ) { | 331 | while ( !mPisyncFinished ) { |
332 | //qDebug("waiting "); | 332 | //qDebug("waiting "); |
333 | qApp->processEvents(); | 333 | qApp->processEvents(); |
334 | } | 334 | } |
335 | } else | 335 | } else |
336 | syncRemote( temp ); | 336 | syncRemote( temp ); |
337 | 337 | ||
338 | } | 338 | } |
339 | } | 339 | } |
340 | delete temp; | 340 | delete temp; |
341 | setBlockSave(false); | 341 | setBlockSave(false); |
342 | } | 342 | } |
343 | 343 | ||
344 | void KSyncManager::enableQuick( bool ask ) | 344 | void KSyncManager::enableQuick( bool ask ) |
345 | { | 345 | { |
346 | bool autoStart; | 346 | bool autoStart; |
347 | bool changed = false; | 347 | bool changed = false; |
348 | if ( ask ) { | 348 | if ( ask ) { |
349 | QDialog dia ( 0, "input-dialog", true ); | 349 | QDialog dia ( 0, "input-dialog", true ); |
350 | QLineEdit lab ( &dia ); | 350 | QLineEdit lab ( &dia ); |
351 | QVBoxLayout lay( &dia ); | 351 | QVBoxLayout lay( &dia ); |
352 | lab.setText( mPrefs->mPassiveSyncPort ); | 352 | lab.setText( mPrefs->mPassiveSyncPort ); |
353 | lay.setMargin(7); | 353 | lay.setMargin(7); |
354 | lay.setSpacing(7); | 354 | lay.setSpacing(7); |
355 | int po = 9197+mTargetApp; | 355 | int po = 9197+mTargetApp; |
356 | QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia ); | 356 | QLabel label ( i18n("Port number (Default: %1)\nValid range from 1 to 65535").arg(po), &dia ); |
357 | lay.addWidget( &label); | 357 | lay.addWidget( &label); |
358 | lay.addWidget( &lab); | 358 | lay.addWidget( &lab); |
359 | 359 | ||
360 | QLineEdit lepw ( &dia ); | 360 | QLineEdit lepw ( &dia ); |
361 | lepw.setText( mPrefs->mPassiveSyncPw ); | 361 | lepw.setText( mPrefs->mPassiveSyncPw ); |
362 | QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia ); | 362 | QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia ); |
363 | lay.addWidget( &label2); | 363 | lay.addWidget( &label2); |
364 | lay.addWidget( &lepw); | 364 | lay.addWidget( &lepw); |
365 | QCheckBox autostart(i18n("Automatically start\nat application startup"), &dia ); | 365 | QCheckBox autostart(i18n("Automatically start\nat application startup"), &dia ); |
366 | lay.addWidget( &autostart); | 366 | lay.addWidget( &autostart); |
367 | autostart.setChecked( mPrefs->mPassiveSyncAutoStart ); | 367 | autostart.setChecked( mPrefs->mPassiveSyncAutoStart ); |
368 | #ifdef DESKTOP_VERSION | 368 | #ifdef DESKTOP_VERSION |
369 | #ifdef _WIN32_ | 369 | #ifdef _WIN32_ |
370 | QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia ); | 370 | QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia ); |
371 | syncdesktop.hide();// not implemented! | 371 | syncdesktop.hide();// not implemented! |
372 | #else | 372 | #else |
373 | QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia ); | 373 | QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia ); |
374 | #endif | 374 | #endif |
375 | lay.addWidget( &syncdesktop); | 375 | lay.addWidget( &syncdesktop); |
376 | #else | 376 | #else |
377 | mPrefs->mPassiveSyncWithDesktop = false; | 377 | mPrefs->mPassiveSyncWithDesktop = false; |
378 | QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia ); | 378 | QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia ); |
379 | syncdesktop.hide(); | 379 | syncdesktop.hide(); |
380 | #endif | 380 | #endif |
381 | syncdesktop.setChecked( mPrefs->mPassiveSyncWithDesktop ); | 381 | syncdesktop.setChecked( mPrefs->mPassiveSyncWithDesktop ); |
382 | 382 | ||
383 | QPushButton pb ( "OK", &dia); | 383 | QPushButton pb ( "OK", &dia); |
384 | lay.addWidget( &pb ); | 384 | lay.addWidget( &pb ); |
385 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 385 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
386 | dia.resize( 230,120 ); | 386 | dia.resize( 230,120 ); |
387 | dia.setCaption( i18n("Enter port for Pi-Sync") ); | 387 | dia.setCaption( i18n("Enter port for Pi-Sync") ); |
388 | dia.show(); | 388 | dia.show(); |
389 | #ifndef DESKTOP_VERSION | 389 | #ifndef DESKTOP_VERSION |
390 | int dw = QApplication::desktop()->width(); | 390 | int dw = QApplication::desktop()->width(); |
391 | int dh = QApplication::desktop()->height(); | 391 | int dh = QApplication::desktop()->height(); |
392 | dia.move( (dw-dia.width())/2, (dh - dia.height() )/2 ); | 392 | dia.move( (dw-dia.width())/2, (dh - dia.height() )/2 ); |
393 | #endif | 393 | #endif |
394 | if ( ! dia.exec() ) | 394 | if ( ! dia.exec() ) |
395 | return; | 395 | return; |
396 | dia.hide(); | 396 | dia.hide(); |
397 | qApp->processEvents(); | 397 | qApp->processEvents(); |
398 | if ( mPrefs->mPassiveSyncPw != lepw.text() ) { | 398 | if ( mPrefs->mPassiveSyncPw != lepw.text() ) { |
399 | changed = true; | 399 | changed = true; |
400 | mPrefs->mPassiveSyncPw = lepw.text(); | 400 | mPrefs->mPassiveSyncPw = lepw.text(); |
401 | } | 401 | } |
402 | if ( mPrefs->mPassiveSyncPort != lab.text() ) { | 402 | if ( mPrefs->mPassiveSyncPort != lab.text() ) { |
403 | mPrefs->mPassiveSyncPort = lab.text(); | 403 | mPrefs->mPassiveSyncPort = lab.text(); |
404 | changed = true; | 404 | changed = true; |
405 | } | 405 | } |
406 | autoStart = autostart.isChecked(); | 406 | autoStart = autostart.isChecked(); |
407 | if (mPrefs->mPassiveSyncWithDesktop != syncdesktop.isChecked() ) { | 407 | if (mPrefs->mPassiveSyncWithDesktop != syncdesktop.isChecked() ) { |
408 | changed = true; | 408 | changed = true; |
409 | mPrefs->mPassiveSyncWithDesktop = syncdesktop.isChecked(); | 409 | mPrefs->mPassiveSyncWithDesktop = syncdesktop.isChecked(); |
410 | } | 410 | } |
411 | } | 411 | } |
412 | else | 412 | else |
413 | autoStart = mPrefs->mPassiveSyncAutoStart; | 413 | autoStart = mPrefs->mPassiveSyncAutoStart; |
414 | if ( autoStart != mPrefs->mPassiveSyncAutoStart ) | 414 | if ( autoStart != mPrefs->mPassiveSyncAutoStart ) |
415 | changed = true; | 415 | changed = true; |
416 | bool ok; | 416 | bool ok; |
417 | mPrefs->mPassiveSyncAutoStart = false; | 417 | mPrefs->mPassiveSyncAutoStart = false; |
418 | Q_UINT16 port = mPrefs->mPassiveSyncPort.toUInt(&ok); | 418 | Q_UINT32 port_t = mPrefs->mPassiveSyncPort.toUInt(&ok); |
419 | if ( ! ok ) { | 419 | qDebug("%d ", port_t); |
420 | KMessageBox::information( 0, i18n("No valid port")); | 420 | if ( ! ok || port_t > 65535 ) { |
421 | KMessageBox::information( 0, i18n("No valid port number:\n%1").arg ( mPrefs->mPassiveSyncPort ), i18n("Pi-Sync Port Error")); | ||
421 | return; | 422 | return; |
422 | } | 423 | } |
424 | Q_UINT16 port = port_t; | ||
423 | //qDebug("port %d ", port); | 425 | //qDebug("port %d ", port); |
424 | mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 ); | 426 | mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 ); |
425 | mServerSocket->setFileName( defaultFileName() );//bbb | 427 | mServerSocket->setFileName( defaultFileName() );//bbb |
426 | if ( !mServerSocket->ok() ) { | 428 | if ( !mServerSocket->ok() ) { |
427 | KMessageBox::information( 0, i18n("Failed to bind or\nlisten to the port!")); | 429 | QTimer::singleShot( 2000, this, SLOT ( displayErrorPort() ) ); |
428 | delete mServerSocket; | 430 | delete mServerSocket; |
429 | mServerSocket = 0; | 431 | mServerSocket = 0; |
430 | return; | 432 | return; |
431 | } | 433 | } |
432 | mPrefs->mPassiveSyncAutoStart = autoStart; | 434 | mPrefs->mPassiveSyncAutoStart = autoStart; |
433 | if ( changed ) { | 435 | if ( changed ) { |
434 | mPrefs->writeConfig(); | 436 | mPrefs->writeConfig(); |
435 | } | 437 | } |
436 | connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL ( request_file() ) ); | 438 | connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL ( request_file() ) ); |
437 | connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SIGNAL ( getFile( bool ) ) ); | 439 | connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SIGNAL ( getFile( bool ) ) ); |
438 | } | 440 | } |
439 | 441 | void KSyncManager::displayErrorPort() | |
442 | { | ||
443 | KMessageBox::information( 0, i18n("<b>Enabling Pi-Sync failed!</b> Failed to bind or listen to the port %1! Is another instance already listening to that port?").arg( mPrefs->mPassiveSyncPort) , i18n("Pi-Sync Port Error")); | ||
444 | } | ||
440 | void KSyncManager::syncLocalFile() | 445 | void KSyncManager::syncLocalFile() |
441 | { | 446 | { |
442 | 447 | ||
443 | QString fn =mPrefs->mLastSyncedLocalFile; | 448 | QString fn =mPrefs->mLastSyncedLocalFile; |
444 | QString ext; | 449 | QString ext; |
445 | 450 | ||
446 | switch(mTargetApp) | 451 | switch(mTargetApp) |
447 | { | 452 | { |
448 | case (KAPI): | 453 | case (KAPI): |
449 | ext = "(*.vcf)"; | 454 | ext = "(*.vcf)"; |
450 | break; | 455 | break; |
451 | case (KOPI): | 456 | case (KOPI): |
452 | ext = "(*.ics/*.vcs)"; | 457 | ext = "(*.ics/*.vcs)"; |
453 | break; | 458 | break; |
454 | case (PWMPI): | 459 | case (PWMPI): |
455 | ext = "(*.pwm)"; | 460 | ext = "(*.pwm)"; |
456 | break; | 461 | break; |
457 | default: | 462 | default: |
458 | qDebug("KSM::syncLocalFile: invalid apptype selected"); | 463 | qDebug("KSM::syncLocalFile: invalid apptype selected"); |
459 | break; | 464 | break; |
460 | 465 | ||
461 | } | 466 | } |
462 | 467 | ||
463 | fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent ); | 468 | fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent ); |
464 | if ( fn == "" ) | 469 | if ( fn == "" ) |
465 | return; | 470 | return; |
466 | if ( syncWithFile( fn, false ) ) { | 471 | if ( syncWithFile( fn, false ) ) { |
467 | qDebug("KSM::syncLocalFile() successful "); | 472 | qDebug("KSM::syncLocalFile() successful "); |
468 | } | 473 | } |
469 | 474 | ||
470 | } | 475 | } |
471 | 476 | ||
472 | bool KSyncManager::syncWithFile( QString fn , bool quick ) | 477 | bool KSyncManager::syncWithFile( QString fn , bool quick ) |
473 | { | 478 | { |
474 | bool ret = false; | 479 | bool ret = false; |
475 | QFileInfo info; | 480 | QFileInfo info; |
476 | info.setFile( fn ); | 481 | info.setFile( fn ); |
477 | QString mess; | 482 | QString mess; |
478 | if ( !info. exists() ) { | 483 | if ( !info. exists() ) { |
479 | mess = i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) ); | 484 | mess = i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) ); |
480 | QMessageBox::warning( mParent, i18n("Warning!"), | 485 | QMessageBox::warning( mParent, i18n("Warning!"), |
481 | mess ); | 486 | mess ); |
482 | return ret; | 487 | return ret; |
483 | } | 488 | } |
484 | int result = 0; | 489 | int result = 0; |
485 | if ( !quick ) { | 490 | if ( !quick ) { |
486 | mess = i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); | 491 | mess = i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); |
487 | result = QMessageBox::warning( mParent, i18n("Warning!"), | 492 | result = QMessageBox::warning( mParent, i18n("Warning!"), |
@@ -751,97 +756,97 @@ void KSyncManager::syncRemote( KSyncProfile* prof, bool ask) | |||
751 | } | 756 | } |
752 | question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (preCommand) ; | 757 | question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (preCommand) ; |
753 | QMessageBox::information( mParent, i18n("Sync - ERROR"), | 758 | QMessageBox::information( mParent, i18n("Sync - ERROR"), |
754 | question, | 759 | question, |
755 | i18n("Okay!")) ; | 760 | i18n("Okay!")) ; |
756 | mParent->topLevelWidget()->setCaption ("KDE-Pim"); | 761 | mParent->topLevelWidget()->setCaption ("KDE-Pim"); |
757 | return; | 762 | return; |
758 | } | 763 | } |
759 | mParent->topLevelWidget()->setCaption ( i18n( "Copying succeed." ) ); | 764 | mParent->topLevelWidget()->setCaption ( i18n( "Copying succeed." ) ); |
760 | //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() ); | 765 | //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() ); |
761 | 766 | ||
762 | if ( syncWithFile( localTempFile, true ) ) { | 767 | if ( syncWithFile( localTempFile, true ) ) { |
763 | 768 | ||
764 | if ( mWriteBackFile ) { | 769 | if ( mWriteBackFile ) { |
765 | int fi; | 770 | int fi; |
766 | if ( (fi = postCommand.find("$PWD$")) > 0 ) { | 771 | if ( (fi = postCommand.find("$PWD$")) > 0 ) { |
767 | QString pwd = getPassword(); | 772 | QString pwd = getPassword(); |
768 | postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 ); | 773 | postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 ); |
769 | 774 | ||
770 | } | 775 | } |
771 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) ); | 776 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) ); |
772 | result = system ( postCommand ); | 777 | result = system ( postCommand ); |
773 | qDebug("KSM::Sync:Writing back file result: %d ", result); | 778 | qDebug("KSM::Sync:Writing back file result: %d ", result); |
774 | if ( result != 0 ) { | 779 | if ( result != 0 ) { |
775 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); | 780 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); |
776 | return; | 781 | return; |
777 | } else { | 782 | } else { |
778 | mParent->topLevelWidget()->setCaption ( i18n( "Syncronization sucessfully completed" ) ); | 783 | mParent->topLevelWidget()->setCaption ( i18n( "Syncronization sucessfully completed" ) ); |
779 | } | 784 | } |
780 | } | 785 | } |
781 | } | 786 | } |
782 | return; | 787 | return; |
783 | } | 788 | } |
784 | bool KSyncManager::edit_pisync_options() | 789 | bool KSyncManager::edit_pisync_options() |
785 | { | 790 | { |
786 | QDialog dia( mParent, "dia", true ); | 791 | QDialog dia( mParent, "dia", true ); |
787 | dia.setCaption( i18n("Pi-Sync options for device: " ) +mCurrentSyncDevice ); | 792 | dia.setCaption( i18n("Pi-Sync options for device: " ) +mCurrentSyncDevice ); |
788 | QVBoxLayout lay ( &dia ); | 793 | QVBoxLayout lay ( &dia ); |
789 | lay.setSpacing( 5 ); | 794 | lay.setSpacing( 5 ); |
790 | lay.setMargin( 3 ); | 795 | lay.setMargin( 3 ); |
791 | QLabel lab1 ( i18n("Password for remote access:"), &dia); | 796 | QLabel lab1 ( i18n("Password for remote access:"), &dia); |
792 | lay.addWidget( &lab1 ); | 797 | lay.addWidget( &lab1 ); |
793 | QLineEdit le1 (&dia ); | 798 | QLineEdit le1 (&dia ); |
794 | lay.addWidget( &le1 ); | 799 | lay.addWidget( &le1 ); |
795 | QLabel lab2 ( i18n("Remote IP address:"), &dia); | 800 | QLabel lab2 ( i18n("Remote IP address:"), &dia); |
796 | lay.addWidget( &lab2 ); | 801 | lay.addWidget( &lab2 ); |
797 | QLineEdit le2 (&dia ); | 802 | QLineEdit le2 (&dia ); |
798 | lay.addWidget( &le2 ); | 803 | lay.addWidget( &le2 ); |
799 | QLabel lab3 ( i18n("Remote port number:"), &dia); | 804 | QLabel lab3 ( i18n("Remote port number:\n(May be: 1 - 65535)"), &dia); |
800 | lay.addWidget( &lab3 ); | 805 | lay.addWidget( &lab3 ); |
801 | QLineEdit le3 (&dia ); | 806 | QLineEdit le3 (&dia ); |
802 | lay.addWidget( &le3 ); | 807 | lay.addWidget( &le3 ); |
803 | QPushButton pb ( "OK", &dia); | 808 | QPushButton pb ( "OK", &dia); |
804 | lay.addWidget( &pb ); | 809 | lay.addWidget( &pb ); |
805 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 810 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
806 | le1.setText( mPassWordPiSync ); | 811 | le1.setText( mPassWordPiSync ); |
807 | le2.setText( mActiveSyncIP ); | 812 | le2.setText( mActiveSyncIP ); |
808 | le3.setText( mActiveSyncPort ); | 813 | le3.setText( mActiveSyncPort ); |
809 | if ( dia.exec() ) { | 814 | if ( dia.exec() ) { |
810 | mPassWordPiSync = le1.text(); | 815 | mPassWordPiSync = le1.text(); |
811 | mActiveSyncPort = le3.text(); | 816 | mActiveSyncPort = le3.text(); |
812 | mActiveSyncIP = le2.text(); | 817 | mActiveSyncIP = le2.text(); |
813 | return true; | 818 | return true; |
814 | } | 819 | } |
815 | return false; | 820 | return false; |
816 | } | 821 | } |
817 | bool KSyncManager::edit_sync_options() | 822 | bool KSyncManager::edit_sync_options() |
818 | { | 823 | { |
819 | 824 | ||
820 | QDialog dia( mParent, "dia", true ); | 825 | QDialog dia( mParent, "dia", true ); |
821 | dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice ); | 826 | dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice ); |
822 | QButtonGroup gr ( 1, Qt::Horizontal, i18n("Sync preferences"), &dia); | 827 | QButtonGroup gr ( 1, Qt::Horizontal, i18n("Sync preferences"), &dia); |
823 | QVBoxLayout lay ( &dia ); | 828 | QVBoxLayout lay ( &dia ); |
824 | lay.setSpacing( 2 ); | 829 | lay.setSpacing( 2 ); |
825 | lay.setMargin( 3 ); | 830 | lay.setMargin( 3 ); |
826 | lay.addWidget(&gr); | 831 | lay.addWidget(&gr); |
827 | QRadioButton loc ( i18n("Take local entry on conflict"), &gr ); | 832 | QRadioButton loc ( i18n("Take local entry on conflict"), &gr ); |
828 | QRadioButton rem ( i18n("Take remote entry on conflict"), &gr ); | 833 | QRadioButton rem ( i18n("Take remote entry on conflict"), &gr ); |
829 | QRadioButton newest( i18n("Take newest entry on conflict"), &gr ); | 834 | QRadioButton newest( i18n("Take newest entry on conflict"), &gr ); |
830 | QRadioButton ask( i18n("Ask for every entry on conflict"), &gr ); | 835 | QRadioButton ask( i18n("Ask for every entry on conflict"), &gr ); |
831 | QRadioButton f_loc( i18n("Force: Take local entry always"), &gr ); | 836 | QRadioButton f_loc( i18n("Force: Take local entry always"), &gr ); |
832 | QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr ); | 837 | QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr ); |
833 | //QRadioButton both( i18n("Take both on conflict"), &gr ); | 838 | //QRadioButton both( i18n("Take both on conflict"), &gr ); |
834 | QPushButton pb ( "OK", &dia); | 839 | QPushButton pb ( "OK", &dia); |
835 | lay.addWidget( &pb ); | 840 | lay.addWidget( &pb ); |
836 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 841 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
837 | switch ( mSyncAlgoPrefs ) { | 842 | switch ( mSyncAlgoPrefs ) { |
838 | case 0: | 843 | case 0: |
839 | loc.setChecked( true); | 844 | loc.setChecked( true); |
840 | break; | 845 | break; |
841 | case 1: | 846 | case 1: |
842 | rem.setChecked( true ); | 847 | rem.setChecked( true ); |
843 | break; | 848 | break; |
844 | case 2: | 849 | case 2: |
845 | newest.setChecked( true); | 850 | newest.setChecked( true); |
846 | break; | 851 | break; |
847 | case 3: | 852 | case 3: |
@@ -1143,98 +1148,100 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | |||
1143 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") ); | 1148 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") ); |
1144 | else if ( state == KCommandSocket::errorFI ) | 1149 | else if ( state == KCommandSocket::errorFI ) |
1145 | mParent->topLevelWidget()->setCaption( i18n("File error on remote.") ); | 1150 | mParent->topLevelWidget()->setCaption( i18n("File error on remote.") ); |
1146 | else if ( state == KCommandSocket::errorED ) | 1151 | else if ( state == KCommandSocket::errorED ) |
1147 | mParent->topLevelWidget()->setCaption( i18n("Please close error dialog on remote.") ); | 1152 | mParent->topLevelWidget()->setCaption( i18n("Please close error dialog on remote.") ); |
1148 | else if ( state == KCommandSocket::errorUN ) | 1153 | else if ( state == KCommandSocket::errorUN ) |
1149 | mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") ); | 1154 | mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") ); |
1150 | delete s; | 1155 | delete s; |
1151 | if ( state == KCommandSocket::errorR ) { | 1156 | if ( state == KCommandSocket::errorR ) { |
1152 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); | 1157 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); |
1153 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1158 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1154 | commandSocket->sendStop(); | 1159 | commandSocket->sendStop(); |
1155 | } | 1160 | } |
1156 | mPisyncFinished = true; | 1161 | mPisyncFinished = true; |
1157 | return; | 1162 | return; |
1158 | 1163 | ||
1159 | } else if ( state == KCommandSocket::errorW ) { | 1164 | } else if ( state == KCommandSocket::errorW ) { |
1160 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); | 1165 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); |
1161 | mPisyncFinished = true; | 1166 | mPisyncFinished = true; |
1162 | 1167 | ||
1163 | } else if ( state == KCommandSocket::successR ) { | 1168 | } else if ( state == KCommandSocket::successR ) { |
1164 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); | 1169 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); |
1165 | 1170 | ||
1166 | } else if ( state == KCommandSocket::successW ) { | 1171 | } else if ( state == KCommandSocket::successW ) { |
1167 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); | 1172 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); |
1168 | mPisyncFinished = true; | 1173 | mPisyncFinished = true; |
1169 | } else if ( state == KCommandSocket::quiet ){ | 1174 | } else if ( state == KCommandSocket::quiet ){ |
1170 | qDebug("KSS: quiet "); | 1175 | qDebug("KSS: quiet "); |
1171 | mPisyncFinished = true; | 1176 | mPisyncFinished = true; |
1172 | } else { | 1177 | } else { |
1173 | qDebug("KSS: Error: unknown state: %d ", state); | 1178 | qDebug("KSS: Error: unknown state: %d ", state); |
1174 | mPisyncFinished = true; | 1179 | mPisyncFinished = true; |
1175 | } | 1180 | } |
1176 | 1181 | ||
1177 | delete s; | 1182 | delete s; |
1178 | } | 1183 | } |
1179 | 1184 | ||
1180 | void KSyncManager::readFileFromSocket() | 1185 | void KSyncManager::readFileFromSocket() |
1181 | { | 1186 | { |
1182 | QString fileName = syncFileName(); | 1187 | QString fileName = syncFileName(); |
1183 | bool syncOK = true; | 1188 | bool syncOK = true; |
1184 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); | 1189 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); |
1185 | if ( ! syncWithFile( fileName , true ) ) { | 1190 | if ( ! syncWithFile( fileName , true ) ) { |
1186 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); | 1191 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); |
1187 | syncOK = false; | 1192 | syncOK = false; |
1188 | } | 1193 | } |
1189 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); | 1194 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); |
1190 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1195 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1191 | if ( mWriteBackFile && syncOK ) | 1196 | if ( mWriteBackFile && syncOK ) { |
1197 | mParent->topLevelWidget()->setCaption( i18n("Sending back file ...") ); | ||
1192 | commandSocket->writeFile( fileName ); | 1198 | commandSocket->writeFile( fileName ); |
1199 | } | ||
1193 | else { | 1200 | else { |
1194 | commandSocket->sendStop(); | 1201 | commandSocket->sendStop(); |
1195 | if ( syncOK ) | 1202 | if ( syncOK ) |
1196 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 1203 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); |
1197 | mPisyncFinished = true; | 1204 | mPisyncFinished = true; |
1198 | } | 1205 | } |
1199 | } | 1206 | } |
1200 | 1207 | ||
1201 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) | 1208 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) |
1202 | { | 1209 | { |
1203 | mPassWord = pw; | 1210 | mPassWord = pw; |
1204 | mSocket = 0; | 1211 | mSocket = 0; |
1205 | mSyncActionDialog = 0; | 1212 | mSyncActionDialog = 0; |
1206 | blockRC = false; | 1213 | blockRC = false; |
1207 | mErrorMessage = 0; | 1214 | mErrorMessage = 0; |
1208 | } | 1215 | } |
1209 | 1216 | ||
1210 | void KServerSocket::newConnection ( int socket ) | 1217 | void KServerSocket::newConnection ( int socket ) |
1211 | { | 1218 | { |
1212 | // qDebug("KServerSocket:New connection %d ", socket); | 1219 | // qDebug("KServerSocket:New connection %d ", socket); |
1213 | if ( mSocket ) { | 1220 | if ( mSocket ) { |
1214 | qDebug("KSS::newConnection Socket deleted! "); | 1221 | qDebug("KSS::newConnection Socket deleted! "); |
1215 | delete mSocket; | 1222 | delete mSocket; |
1216 | mSocket = 0; | 1223 | mSocket = 0; |
1217 | } | 1224 | } |
1218 | mSocket = new QSocket( this ); | 1225 | mSocket = new QSocket( this ); |
1219 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); | 1226 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); |
1220 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); | 1227 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); |
1221 | mSocket->setSocket( socket ); | 1228 | mSocket->setSocket( socket ); |
1222 | } | 1229 | } |
1223 | 1230 | ||
1224 | void KServerSocket::discardClient() | 1231 | void KServerSocket::discardClient() |
1225 | { | 1232 | { |
1226 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1233 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1227 | } | 1234 | } |
1228 | void KServerSocket::deleteSocket() | 1235 | void KServerSocket::deleteSocket() |
1229 | { | 1236 | { |
1230 | qDebug("KSS::deleteSocket"); | 1237 | qDebug("KSS::deleteSocket"); |
1231 | if ( mSocket ) { | 1238 | if ( mSocket ) { |
1232 | delete mSocket; | 1239 | delete mSocket; |
1233 | mSocket = 0; | 1240 | mSocket = 0; |
1234 | } | 1241 | } |
1235 | if ( mErrorMessage ) | 1242 | if ( mErrorMessage ) |
1236 | QTimer::singleShot( 10, this , SLOT ( displayErrorMessage())); | 1243 | QTimer::singleShot( 10, this , SLOT ( displayErrorMessage())); |
1237 | } | 1244 | } |
1238 | void KServerSocket::readClient() | 1245 | void KServerSocket::readClient() |
1239 | { | 1246 | { |
1240 | if ( blockRC ) | 1247 | if ( blockRC ) |
@@ -1247,101 +1254,101 @@ void KServerSocket::readClient() | |||
1247 | mErrorMessage = 999; | 1254 | mErrorMessage = 999; |
1248 | error_connect("ERROR_ED\r\n\r\n"); | 1255 | error_connect("ERROR_ED\r\n\r\n"); |
1249 | return; | 1256 | return; |
1250 | } | 1257 | } |
1251 | mErrorMessage = 0; | 1258 | mErrorMessage = 0; |
1252 | //qDebug("KServerSocket::readClient()"); | 1259 | //qDebug("KServerSocket::readClient()"); |
1253 | if ( mSocket->canReadLine() ) { | 1260 | if ( mSocket->canReadLine() ) { |
1254 | QString line = mSocket->readLine(); | 1261 | QString line = mSocket->readLine(); |
1255 | //qDebug("KServerSocket readline: %s ", line.latin1()); | 1262 | //qDebug("KServerSocket readline: %s ", line.latin1()); |
1256 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); | 1263 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); |
1257 | if ( tokens[0] == "GET" ) { | 1264 | if ( tokens[0] == "GET" ) { |
1258 | if ( tokens[1] == mPassWord ) { | 1265 | if ( tokens[1] == mPassWord ) { |
1259 | //emit sendFile( mSocket ); | 1266 | //emit sendFile( mSocket ); |
1260 | bool ok = false; | 1267 | bool ok = false; |
1261 | QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok); | 1268 | QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok); |
1262 | if ( ok ) { | 1269 | if ( ok ) { |
1263 | KSyncManager::mRequestedSyncEvent = dt; | 1270 | KSyncManager::mRequestedSyncEvent = dt; |
1264 | } | 1271 | } |
1265 | else | 1272 | else |
1266 | KSyncManager::mRequestedSyncEvent = QDateTime(); | 1273 | KSyncManager::mRequestedSyncEvent = QDateTime(); |
1267 | send_file(); | 1274 | send_file(); |
1268 | } | 1275 | } |
1269 | else { | 1276 | else { |
1270 | mErrorMessage = 1; | 1277 | mErrorMessage = 1; |
1271 | error_connect("ERROR_PW\r\n\r\n"); | 1278 | error_connect("ERROR_PW\r\n\r\n"); |
1272 | } | 1279 | } |
1273 | } | 1280 | } |
1274 | if ( tokens[0] == "PUT" ) { | 1281 | if ( tokens[0] == "PUT" ) { |
1275 | if ( tokens[1] == mPassWord ) { | 1282 | if ( tokens[1] == mPassWord ) { |
1276 | //emit getFile( mSocket ); | 1283 | //emit getFile( mSocket ); |
1277 | blockRC = true; | 1284 | blockRC = true; |
1278 | get_file(); | 1285 | get_file(); |
1279 | } | 1286 | } |
1280 | else { | 1287 | else { |
1281 | mErrorMessage = 2; | 1288 | mErrorMessage = 2; |
1282 | error_connect("ERROR_PW\r\n\r\n"); | 1289 | error_connect("ERROR_PW\r\n\r\n"); |
1283 | end_connect(); | 1290 | end_connect(); |
1284 | } | 1291 | } |
1285 | } | 1292 | } |
1286 | if ( tokens[0] == "STOP" ) { | 1293 | if ( tokens[0] == "STOP" ) { |
1287 | //emit endConnect(); | 1294 | //emit endConnect(); |
1288 | end_connect(); | 1295 | end_connect(); |
1289 | } | 1296 | } |
1290 | } | 1297 | } |
1291 | } | 1298 | } |
1292 | void KServerSocket::displayErrorMessage() | 1299 | void KServerSocket::displayErrorMessage() |
1293 | { | 1300 | { |
1294 | if ( mErrorMessage == 1 ) { | 1301 | if ( mErrorMessage == 1 ) { |
1295 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); | 1302 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password"), i18n("Pi-Sync Error")); |
1296 | mErrorMessage = 0; | 1303 | mErrorMessage = 0; |
1297 | } | 1304 | } |
1298 | else if ( mErrorMessage == 2 ) { | 1305 | else if ( mErrorMessage == 2 ) { |
1299 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); | 1306 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"), i18n("Pi-Sync Error")); |
1300 | mErrorMessage = 0; | 1307 | mErrorMessage = 0; |
1301 | } | 1308 | } |
1302 | } | 1309 | } |
1303 | void KServerSocket::error_connect( QString errmess ) | 1310 | void KServerSocket::error_connect( QString errmess ) |
1304 | { | 1311 | { |
1305 | QTextStream os( mSocket ); | 1312 | QTextStream os( mSocket ); |
1306 | os.setEncoding( QTextStream::Latin1 ); | 1313 | os.setEncoding( QTextStream::Latin1 ); |
1307 | os << errmess ; | 1314 | os << errmess ; |
1308 | mSocket->close(); | 1315 | mSocket->close(); |
1309 | if ( mSocket->state() == QSocket::Idle ) { | 1316 | if ( mSocket->state() == QSocket::Idle ) { |
1310 | QTimer::singleShot( 0, this , SLOT ( discardClient())); | 1317 | QTimer::singleShot( 0, this , SLOT ( discardClient())); |
1311 | } | 1318 | } |
1312 | } | 1319 | } |
1313 | void KServerSocket::end_connect() | 1320 | void KServerSocket::end_connect() |
1314 | { | 1321 | { |
1315 | delete mSyncActionDialog; | 1322 | delete mSyncActionDialog; |
1316 | mSyncActionDialog = 0; | 1323 | mSyncActionDialog = 0; |
1317 | } | 1324 | } |
1318 | void KServerSocket::send_file() | 1325 | void KServerSocket::send_file() |
1319 | { | 1326 | { |
1320 | //qDebug("MainWindow::sendFile(QSocket* s) "); | 1327 | //qDebug("MainWindow::sendFile(QSocket* s) "); |
1321 | if ( mSyncActionDialog ) | 1328 | if ( mSyncActionDialog ) |
1322 | delete mSyncActionDialog; | 1329 | delete mSyncActionDialog; |
1323 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); | 1330 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); |
1324 | mSyncActionDialog->setCaption(i18n("Received sync request")); | 1331 | mSyncActionDialog->setCaption(i18n("Received sync request")); |
1325 | QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); | 1332 | QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); |
1326 | label->setAlignment ( Qt::AlignHCenter ); | 1333 | label->setAlignment ( Qt::AlignHCenter ); |
1327 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); | 1334 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); |
1328 | lay->addWidget( label); | 1335 | lay->addWidget( label); |
1329 | lay->setMargin(7); | 1336 | lay->setMargin(7); |
1330 | lay->setSpacing(7); | 1337 | lay->setSpacing(7); |
1331 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { | 1338 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { |
1332 | int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent ); | 1339 | int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent ); |
1333 | //secs = 333; | 1340 | //secs = 333; |
1334 | if ( secs < 0 ) | 1341 | if ( secs < 0 ) |
1335 | secs = secs * (-1); | 1342 | secs = secs * (-1); |
1336 | if ( secs > 30 ) | 1343 | if ( secs > 30 ) |
1337 | //if ( true ) | 1344 | //if ( true ) |
1338 | { | 1345 | { |
1339 | QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs ); | 1346 | QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs ); |
1340 | QLabel* label = new QLabel( warning, mSyncActionDialog ); | 1347 | QLabel* label = new QLabel( warning, mSyncActionDialog ); |
1341 | label->setAlignment ( Qt::AlignHCenter ); | 1348 | label->setAlignment ( Qt::AlignHCenter ); |
1342 | lay->addWidget( label); | 1349 | lay->addWidget( label); |
1343 | if ( secs > 180 ) | 1350 | if ( secs > 180 ) |
1344 | { | 1351 | { |
1345 | if ( secs > 300 ) { | 1352 | if ( secs > 300 ) { |
1346 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("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!"), i18n("High clock skew!"),i18n("Synchronize!"))) { | 1353 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("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!"), i18n("High clock skew!"),i18n("Synchronize!"))) { |
1347 | qDebug("KSS::Sync cancelled ,cs"); | 1354 | qDebug("KSS::Sync cancelled ,cs"); |
@@ -1421,235 +1428,287 @@ void KServerSocket::readBackFileFromSocket() | |||
1421 | } | 1428 | } |
1422 | if ( piTime.elapsed () < 3000 ) { | 1429 | if ( piTime.elapsed () < 3000 ) { |
1423 | // wait for more | 1430 | // wait for more |
1424 | //qDebug("waitformore "); | 1431 | //qDebug("waitformore "); |
1425 | QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) )); | 1432 | QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) )); |
1426 | return; | 1433 | return; |
1427 | } | 1434 | } |
1428 | QString fileName = mFileName; | 1435 | QString fileName = mFileName; |
1429 | QFile file ( fileName ); | 1436 | QFile file ( fileName ); |
1430 | if (!file.open( IO_WriteOnly ) ) { | 1437 | if (!file.open( IO_WriteOnly ) ) { |
1431 | delete mSyncActionDialog; | 1438 | delete mSyncActionDialog; |
1432 | mSyncActionDialog = 0; | 1439 | mSyncActionDialog = 0; |
1433 | qDebug("KSS:Error open read back file "); | 1440 | qDebug("KSS:Error open read back file "); |
1434 | piFileString = ""; | 1441 | piFileString = ""; |
1435 | emit file_received( false ); | 1442 | emit file_received( false ); |
1436 | blockRC = false; | 1443 | blockRC = false; |
1437 | return ; | 1444 | return ; |
1438 | 1445 | ||
1439 | } | 1446 | } |
1440 | 1447 | ||
1441 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | 1448 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); |
1442 | QTextStream ts ( &file ); | 1449 | QTextStream ts ( &file ); |
1443 | ts.setEncoding( QTextStream::Latin1 ); | 1450 | ts.setEncoding( QTextStream::Latin1 ); |
1444 | mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); | 1451 | mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); |
1445 | ts << piFileString; | 1452 | ts << piFileString; |
1446 | mSocket->close(); | 1453 | mSocket->close(); |
1447 | if ( mSocket->state() == QSocket::Idle ) | 1454 | if ( mSocket->state() == QSocket::Idle ) |
1448 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | 1455 | QTimer::singleShot( 10, this , SLOT ( discardClient())); |
1449 | file.close(); | 1456 | file.close(); |
1450 | piFileString = ""; | 1457 | piFileString = ""; |
1451 | emit file_received( true ); | 1458 | emit file_received( true ); |
1452 | delete mSyncActionDialog; | 1459 | delete mSyncActionDialog; |
1453 | mSyncActionDialog = 0; | 1460 | mSyncActionDialog = 0; |
1454 | blockRC = false; | 1461 | blockRC = false; |
1455 | 1462 | ||
1456 | } | 1463 | } |
1457 | 1464 | ||
1458 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) | 1465 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) |
1459 | { | 1466 | { |
1460 | mPassWord = password; | 1467 | mPassWord = password; |
1461 | mSocket = 0; | 1468 | mSocket = 0; |
1462 | mFirst = false; | 1469 | mFirst = false; |
1463 | mFirstLine = true; | 1470 | mFirstLine = true; |
1464 | mPort = port; | 1471 | mPort = port; |
1465 | mHost = host; | 1472 | mHost = host; |
1466 | tlw = cap; | 1473 | tlw = cap; |
1467 | mRetVal = quiet; | 1474 | mRetVal = quiet; |
1468 | mTimerSocket = new QTimer ( this ); | 1475 | mTimerSocket = new QTimer ( this ); |
1469 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) ); | 1476 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( updateConnectDialog() ) ); |
1477 | mConnectProgress.setCaption( i18n("Pi-Sync") ); | ||
1478 | connect( &mConnectProgress, SIGNAL ( cancelled () ), this, SLOT ( deleteSocket() ) ); | ||
1479 | mConnectCount = -1; | ||
1470 | } | 1480 | } |
1471 | void KCommandSocket::sendFileRequest() | 1481 | void KCommandSocket::sendFileRequest() |
1472 | { | 1482 | { |
1473 | if ( tlw ) | 1483 | if ( tlw ) |
1474 | tlw->setCaption( i18n("Connected! Sending request for remote file ...") ); | 1484 | tlw->setCaption( i18n("Connected! Sending request for remote file ...") ); |
1475 | mTimerSocket->start( 300000 ); | 1485 | mConnectProgress.hide(); |
1486 | mConnectCount = 300;mConnectMax = 300; | ||
1487 | mConnectProgress.setCaption( i18n("Pi-Sync: Connected!") ); | ||
1488 | mTimerSocket->start( 100, true ); | ||
1476 | QTextStream os( mSocket ); | 1489 | QTextStream os( mSocket ); |
1477 | os.setEncoding( QTextStream::Latin1 ); | 1490 | os.setEncoding( QTextStream::Latin1 ); |
1478 | 1491 | ||
1479 | QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); | 1492 | QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); |
1480 | os << "GET " << mPassWord << curDt <<"\r\n\r\n"; | 1493 | os << "GET " << mPassWord << curDt <<"\r\n\r\n"; |
1481 | } | 1494 | } |
1482 | 1495 | ||
1483 | void KCommandSocket::readFile( QString fn ) | 1496 | void KCommandSocket::readFile( QString fn ) |
1484 | { | 1497 | { |
1485 | if ( !mSocket ) { | 1498 | if ( !mSocket ) { |
1486 | mSocket = new QSocket( this ); | 1499 | mSocket = new QSocket( this ); |
1487 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); | 1500 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); |
1488 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1501 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1489 | connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() )); | 1502 | connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() )); |
1490 | } | 1503 | } |
1491 | mFileString = ""; | 1504 | mFileString = ""; |
1492 | mFileName = fn; | 1505 | mFileName = fn; |
1493 | mFirst = true; | 1506 | mFirst = true; |
1494 | if ( tlw ) | 1507 | if ( tlw ) |
1495 | tlw->setCaption( i18n("Trying to connect to remote...") ); | 1508 | tlw->setCaption( i18n("Trying to connect to remote...") ); |
1496 | mTimerSocket->start( 20000 ); | 1509 | mConnectCount = 30;mConnectMax = 30; |
1510 | mTimerSocket->start( 1000, true ); | ||
1497 | mSocket->connectToHost( mHost, mPort ); | 1511 | mSocket->connectToHost( mHost, mPort ); |
1498 | qDebug("KSS: Waiting for connection"); | 1512 | qDebug("KSS: Waiting for connection"); |
1499 | } | 1513 | } |
1500 | 1514 | void KCommandSocket::updateConnectDialog() | |
1515 | { | ||
1516 | |||
1517 | if ( mConnectCount == mConnectMax ) { | ||
1518 | //qDebug("MAXX %d", mConnectMax); | ||
1519 | mConnectProgress.setTotalSteps ( 30 ); | ||
1520 | mConnectProgress.show(); | ||
1521 | mConnectProgress.setLabelText( i18n("Trying to connect to remote...") ); | ||
1522 | } | ||
1523 | //qDebug("updateConnectDialog() %d", mConnectCount); | ||
1524 | mConnectProgress.raise(); | ||
1525 | mConnectProgress.setProgress( (mConnectMax - mConnectCount)%30 ); | ||
1526 | --mConnectCount; | ||
1527 | if ( mConnectCount > 0 ) | ||
1528 | mTimerSocket->start( 1000, true ); | ||
1529 | else | ||
1530 | deleteSocket(); | ||
1531 | |||
1532 | } | ||
1501 | void KCommandSocket::writeFile( QString fileName ) | 1533 | void KCommandSocket::writeFile( QString fileName ) |
1502 | { | 1534 | { |
1503 | if ( !mSocket ) { | 1535 | if ( !mSocket ) { |
1504 | mSocket = new QSocket( this ); | 1536 | mSocket = new QSocket( this ); |
1505 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1537 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1506 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); | 1538 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); |
1507 | } | 1539 | } |
1508 | mFileName = fileName ; | 1540 | mFileName = fileName ; |
1509 | mTimerSocket->start( 20000 ); | 1541 | mConnectCount = 30;mConnectMax = 30; |
1542 | mTimerSocket->start( 1000, true ); | ||
1510 | mSocket->connectToHost( mHost, mPort ); | 1543 | mSocket->connectToHost( mHost, mPort ); |
1511 | } | 1544 | } |
1512 | void KCommandSocket::writeFileToSocket() | 1545 | void KCommandSocket::writeFileToSocket() |
1513 | { | 1546 | { |
1514 | mTimerSocket->stop(); | 1547 | mTimerSocket->stop(); |
1515 | QFile file2( mFileName ); | 1548 | QFile file2( mFileName ); |
1516 | if (!file2.open( IO_ReadOnly ) ) { | 1549 | if (!file2.open( IO_ReadOnly ) ) { |
1550 | mConnectProgress.hide(); | ||
1551 | mConnectCount = -1; | ||
1517 | mRetVal= errorW; | 1552 | mRetVal= errorW; |
1518 | mSocket->close(); | 1553 | mSocket->close(); |
1519 | if ( mSocket->state() == QSocket::Idle ) | 1554 | if ( mSocket->state() == QSocket::Idle ) |
1520 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1555 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1521 | return ; | 1556 | return ; |
1522 | } | 1557 | } |
1558 | mConnectProgress.setTotalSteps ( file2.size() ); | ||
1559 | mConnectProgress.show(); | ||
1560 | int count = 0; | ||
1561 | mConnectProgress.setLabelText( i18n("Sending back synced file...") ); | ||
1562 | mConnectProgress.setProgress( count ); | ||
1563 | mConnectProgress.blockSignals( true ); | ||
1523 | QTextStream ts2( &file2 ); | 1564 | QTextStream ts2( &file2 ); |
1524 | ts2.setEncoding( QTextStream::Latin1 ); | 1565 | ts2.setEncoding( QTextStream::Latin1 ); |
1525 | QTextStream os2( mSocket ); | 1566 | QTextStream os2( mSocket ); |
1526 | os2.setEncoding( QTextStream::Latin1 ); | 1567 | os2.setEncoding( QTextStream::Latin1 ); |
1527 | os2 << "PUT " << mPassWord << "\r\n\r\n";; | 1568 | os2 << "PUT " << mPassWord << "\r\n\r\n";; |
1528 | while ( ! ts2.atEnd() ) { | 1569 | while ( ! ts2.atEnd() ) { |
1529 | os2 << ts2.readLine() << "\r\n"; | 1570 | qApp->processEvents(); |
1571 | mConnectProgress.setProgress( count ); | ||
1572 | QString temp = ts2.readLine(); | ||
1573 | count += temp.length(); | ||
1574 | os2 << temp << "\r\n"; | ||
1530 | } | 1575 | } |
1576 | file2.close(); | ||
1577 | mConnectProgress.hide(); | ||
1578 | mConnectCount = -1; | ||
1531 | os2 << "\r\n"; | 1579 | os2 << "\r\n"; |
1532 | mRetVal= successW; | 1580 | mRetVal= successW; |
1533 | file2.close(); | ||
1534 | mSocket->close(); | 1581 | mSocket->close(); |
1535 | if ( mSocket->state() == QSocket::Idle ) | 1582 | if ( mSocket->state() == QSocket::Idle ) |
1536 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1583 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1584 | mConnectProgress.blockSignals( false ); | ||
1537 | } | 1585 | } |
1538 | void KCommandSocket::sendStop() | 1586 | void KCommandSocket::sendStop() |
1539 | { | 1587 | { |
1540 | if ( !mSocket ) { | 1588 | if ( !mSocket ) { |
1541 | mSocket = new QSocket( this ); | 1589 | mSocket = new QSocket( this ); |
1542 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1590 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1543 | } | 1591 | } |
1544 | mSocket->connectToHost( mHost, mPort ); | 1592 | mSocket->connectToHost( mHost, mPort ); |
1545 | QTextStream os2( mSocket ); | 1593 | QTextStream os2( mSocket ); |
1546 | os2.setEncoding( QTextStream::Latin1 ); | 1594 | os2.setEncoding( QTextStream::Latin1 ); |
1547 | os2 << "STOP\r\n\r\n"; | 1595 | os2 << "STOP\r\n\r\n"; |
1548 | mSocket->close(); | 1596 | mSocket->close(); |
1549 | if ( mSocket->state() == QSocket::Idle ) | 1597 | if ( mSocket->state() == QSocket::Idle ) |
1550 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1598 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1551 | } | 1599 | } |
1552 | 1600 | ||
1553 | void KCommandSocket::startReadFileFromSocket() | 1601 | void KCommandSocket::startReadFileFromSocket() |
1554 | { | 1602 | { |
1555 | if ( ! mFirst ) | 1603 | if ( ! mFirst ) |
1556 | return; | 1604 | return; |
1605 | mConnectProgress.setLabelText( i18n("Receiving file from remote...") ); | ||
1557 | mFirst = false; | 1606 | mFirst = false; |
1558 | mTimerSocket->stop(); | ||
1559 | mFileString = ""; | 1607 | mFileString = ""; |
1560 | mTime.start(); | 1608 | mTime.start(); |
1561 | mFirstLine = true; | 1609 | mFirstLine = true; |
1562 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); | 1610 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); |
1563 | 1611 | ||
1564 | } | 1612 | } |
1565 | void KCommandSocket::readFileFromSocket() | 1613 | void KCommandSocket::readFileFromSocket() |
1566 | { | 1614 | { |
1567 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); | 1615 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); |
1568 | while ( mSocket->canReadLine () ) { | 1616 | while ( mSocket->canReadLine () ) { |
1569 | mTime.restart(); | 1617 | mTime.restart(); |
1570 | QString line = mSocket->readLine (); | 1618 | QString line = mSocket->readLine (); |
1571 | if ( mFirstLine ) { | 1619 | if ( mFirstLine ) { |
1572 | mFirstLine = false; | 1620 | mFirstLine = false; |
1573 | if ( line.left( 6 ) == "ERROR_" ) { | 1621 | if ( line.left( 6 ) == "ERROR_" ) { |
1622 | mTimerSocket->stop(); | ||
1623 | mConnectCount = -1; | ||
1574 | if ( line.left( 8 ) == "ERROR_PW" ) { | 1624 | if ( line.left( 8 ) == "ERROR_PW" ) { |
1575 | mRetVal = errorPW; | 1625 | mRetVal = errorPW; |
1576 | deleteSocket(); | 1626 | deleteSocket(); |
1577 | return ; | 1627 | return ; |
1578 | } | 1628 | } |
1579 | if ( line.left( 8 ) == "ERROR_CA" ) { | 1629 | if ( line.left( 8 ) == "ERROR_CA" ) { |
1580 | mRetVal = errorCA; | 1630 | mRetVal = errorCA; |
1581 | deleteSocket(); | 1631 | deleteSocket(); |
1582 | return ; | 1632 | return ; |
1583 | } | 1633 | } |
1584 | if ( line.left( 8 ) == "ERROR_FI" ) { | 1634 | if ( line.left( 8 ) == "ERROR_FI" ) { |
1585 | mRetVal = errorFI; | 1635 | mRetVal = errorFI; |
1586 | deleteSocket(); | 1636 | deleteSocket(); |
1587 | return ; | 1637 | return ; |
1588 | } | 1638 | } |
1589 | if ( line.left( 8 ) == "ERROR_ED" ) { | 1639 | if ( line.left( 8 ) == "ERROR_ED" ) { |
1590 | mRetVal = errorED; | 1640 | mRetVal = errorED; |
1591 | deleteSocket(); | 1641 | deleteSocket(); |
1592 | return ; | 1642 | return ; |
1593 | } | 1643 | } |
1594 | mRetVal = errorUN; | 1644 | mRetVal = errorUN; |
1595 | deleteSocket(); | 1645 | deleteSocket(); |
1596 | return ; | 1646 | return ; |
1597 | } | 1647 | } |
1598 | } | 1648 | } |
1599 | mFileString += line; | 1649 | mFileString += line; |
1600 | //qDebug("readline: %s ", line.latin1()); | 1650 | //qDebug("readline: %s ", line.latin1()); |
1601 | } | 1651 | } |
1602 | if ( mTime.elapsed () < 3000 ) { | 1652 | if ( mTime.elapsed () < 3000 ) { |
1603 | // wait for more | 1653 | // wait for more |
1604 | //qDebug("waitformore "); | 1654 | //qDebug("waitformore "); |
1605 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); | 1655 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); |
1606 | return; | 1656 | return; |
1607 | } | 1657 | } |
1658 | mTimerSocket->stop(); | ||
1659 | mConnectCount = -1; | ||
1660 | mConnectProgress.hide(); | ||
1608 | QString fileName = mFileName; | 1661 | QString fileName = mFileName; |
1609 | QFile file ( fileName ); | 1662 | QFile file ( fileName ); |
1610 | if (!file.open( IO_WriteOnly ) ) { | 1663 | if (!file.open( IO_WriteOnly ) ) { |
1611 | mFileString = ""; | 1664 | mFileString = ""; |
1612 | mRetVal = errorR; | 1665 | mRetVal = errorR; |
1613 | qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() ); | 1666 | qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() ); |
1614 | deleteSocket(); | 1667 | deleteSocket(); |
1615 | return ; | 1668 | return ; |
1616 | 1669 | ||
1617 | } | 1670 | } |
1618 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | 1671 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); |
1619 | QTextStream ts ( &file ); | 1672 | QTextStream ts ( &file ); |
1620 | ts.setEncoding( QTextStream::Latin1 ); | 1673 | ts.setEncoding( QTextStream::Latin1 ); |
1621 | ts << mFileString; | 1674 | ts << mFileString; |
1622 | file.close(); | 1675 | file.close(); |
1623 | mFileString = ""; | 1676 | mFileString = ""; |
1624 | mRetVal = successR; | 1677 | mRetVal = successR; |
1625 | mSocket->close(); | 1678 | mSocket->close(); |
1626 | // if state is not idle, deleteSocket(); is called via | 1679 | // if state is not idle, deleteSocket(); is called via |
1627 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1680 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1628 | if ( mSocket->state() == QSocket::Idle ) | 1681 | if ( mSocket->state() == QSocket::Idle ) |
1629 | deleteSocket(); | 1682 | deleteSocket(); |
1630 | } | 1683 | } |
1631 | 1684 | ||
1632 | void KCommandSocket::deleteSocket() | 1685 | void KCommandSocket::deleteSocket() |
1633 | { | 1686 | { |
1634 | //qDebug("KCommandSocket::deleteSocket() "); | 1687 | //qDebug("KCommandSocket::deleteSocket() "); |
1635 | if ( mTimerSocket->isActive () ) { | 1688 | mConnectProgress.hide(); |
1689 | |||
1690 | if ( mConnectCount >= 0 ) { | ||
1636 | mTimerSocket->stop(); | 1691 | mTimerSocket->stop(); |
1637 | mRetVal = errorTO; | 1692 | mRetVal = errorTO; |
1638 | qDebug("KCS::Connection to remote host timed out"); | 1693 | qDebug("KCS::Connection to remote host timed out"); |
1639 | if ( mSocket ) { | 1694 | if ( mSocket ) { |
1640 | mSocket->close(); | 1695 | mSocket->close(); |
1641 | //if ( mSocket->state() == QSocket::Idle ) | 1696 | //if ( mSocket->state() == QSocket::Idle ) |
1642 | // deleteSocket(); | 1697 | // deleteSocket(); |
1643 | delete mSocket; | 1698 | delete mSocket; |
1644 | mSocket = 0; | 1699 | mSocket = 0; |
1645 | } | 1700 | } |
1701 | if ( mConnectCount == 0 ) | ||
1646 | KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?")); | 1702 | KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?")); |
1703 | else if ( tlw ) | ||
1704 | tlw->setCaption( i18n("Connection to remote host cancelled!") ); | ||
1647 | emit commandFinished( this, mRetVal ); | 1705 | emit commandFinished( this, mRetVal ); |
1648 | return; | 1706 | return; |
1649 | } | 1707 | } |
1650 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); | 1708 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); |
1651 | if ( mSocket) | 1709 | if ( mSocket) |
1652 | delete mSocket; | 1710 | delete mSocket; |
1653 | mSocket = 0; | 1711 | mSocket = 0; |
1712 | qDebug("commandFinished "); | ||
1654 | emit commandFinished( this, mRetVal ); | 1713 | emit commandFinished( this, mRetVal ); |
1655 | } | 1714 | } |
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 30ec1e6..e6738b6 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -1,145 +1,150 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KDE-Pim/Pi. | 2 | This file is part of KDE-Pim/Pi. |
3 | Copyright (c) 2004 Ulf Schenk | 3 | Copyright (c) 2004 Ulf Schenk |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library 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 GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | $Id$ | 20 | $Id$ |
21 | */ | 21 | */ |
22 | #ifndef _KSYNCMANAGER_H | 22 | #ifndef _KSYNCMANAGER_H |
23 | #define _KSYNCMANAGER_H | 23 | #define _KSYNCMANAGER_H |
24 | 24 | ||
25 | #include <qobject.h> | 25 | #include <qobject.h> |
26 | #include <qstring.h> | 26 | #include <qstring.h> |
27 | #include <qsocket.h> | 27 | #include <qsocket.h> |
28 | #include <qdatetime.h> | 28 | #include <qdatetime.h> |
29 | #include <qserversocket.h> | 29 | #include <qserversocket.h> |
30 | #include <qtextstream.h> | 30 | #include <qtextstream.h> |
31 | #include <qregexp.h> | 31 | #include <qregexp.h> |
32 | #include <qprogressdialog.h> | ||
32 | 33 | ||
33 | class QPopupMenu; | 34 | class QPopupMenu; |
34 | class KSyncProfile; | 35 | class KSyncProfile; |
35 | class KPimPrefs; | 36 | class KPimPrefs; |
36 | class QWidget; | 37 | class QWidget; |
37 | class KSyncManager; | 38 | class KSyncManager; |
38 | class KSyncInterface; | 39 | class KSyncInterface; |
39 | class QProgressBar; | 40 | class QProgressBar; |
40 | 41 | ||
41 | 42 | ||
42 | class KServerSocket : public QServerSocket | 43 | class KServerSocket : public QServerSocket |
43 | { | 44 | { |
44 | Q_OBJECT | 45 | Q_OBJECT |
45 | 46 | ||
46 | public: | 47 | public: |
47 | KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 ); | 48 | KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 ); |
48 | 49 | ||
49 | void newConnection ( int socket ) ; | 50 | void newConnection ( int socket ) ; |
50 | void setFileName( QString fn ) {mFileName = fn;}; | 51 | void setFileName( QString fn ) {mFileName = fn;}; |
51 | signals: | 52 | signals: |
52 | void file_received( bool ); | 53 | void file_received( bool ); |
53 | void request_file(); | 54 | void request_file(); |
54 | void saveFile(); | 55 | void saveFile(); |
55 | void endConnect(); | 56 | void endConnect(); |
56 | private slots: | 57 | private slots: |
57 | void discardClient(); | 58 | void discardClient(); |
58 | void deleteSocket(); | 59 | void deleteSocket(); |
59 | void readClient(); | 60 | void readClient(); |
60 | void displayErrorMessage(); | 61 | void displayErrorMessage(); |
61 | void readBackFileFromSocket(); | 62 | void readBackFileFromSocket(); |
62 | private : | 63 | private : |
63 | int mErrorMessage; | 64 | int mErrorMessage; |
64 | bool blockRC; | 65 | bool blockRC; |
65 | void send_file(); | 66 | void send_file(); |
66 | void get_file(); | 67 | void get_file(); |
67 | void end_connect(); | 68 | void end_connect(); |
68 | void error_connect( QString ); | 69 | void error_connect( QString ); |
69 | QDialog* mSyncActionDialog; | 70 | QDialog* mSyncActionDialog; |
70 | QSocket* mSocket; | 71 | QSocket* mSocket; |
71 | QString mPassWord; | 72 | QString mPassWord; |
72 | QString mFileName; | 73 | QString mFileName; |
73 | QTime piTime; | 74 | QTime piTime; |
74 | QString piFileString; | 75 | QString piFileString; |
75 | }; | 76 | }; |
76 | 77 | ||
77 | class KCommandSocket : public QObject | 78 | class KCommandSocket : public QObject |
78 | { | 79 | { |
79 | Q_OBJECT | 80 | Q_OBJECT |
80 | public: | 81 | public: |
81 | enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN, errorED,quiet }; | 82 | enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN, errorED,quiet }; |
82 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); | 83 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); |
83 | void readFile( QString ); | 84 | void readFile( QString ); |
84 | void writeFile( QString ); | 85 | void writeFile( QString ); |
85 | void sendStop(); | 86 | void sendStop(); |
86 | 87 | ||
87 | private slots : | 88 | private slots : |
88 | void sendFileRequest(); | 89 | void sendFileRequest(); |
90 | void updateConnectDialog(); | ||
89 | 91 | ||
90 | signals: | 92 | signals: |
91 | void commandFinished( KCommandSocket*, int ); | 93 | void commandFinished( KCommandSocket*, int ); |
92 | private slots: | 94 | private slots: |
93 | void startReadFileFromSocket(); | 95 | void startReadFileFromSocket(); |
94 | void readFileFromSocket(); | 96 | void readFileFromSocket(); |
95 | void deleteSocket(); | 97 | void deleteSocket(); |
96 | void writeFileToSocket(); | 98 | void writeFileToSocket(); |
97 | private : | 99 | private : |
100 | int mConnectCount; | ||
101 | int mConnectMax; | ||
102 | QProgressDialog mConnectProgress; | ||
98 | QWidget* tlw; | 103 | QWidget* tlw; |
99 | QSocket* mSocket; | 104 | QSocket* mSocket; |
100 | QString mPassWord; | 105 | QString mPassWord; |
101 | Q_UINT16 mPort; | 106 | Q_UINT16 mPort; |
102 | QString mHost; | 107 | QString mHost; |
103 | QString mFileName; | 108 | QString mFileName; |
104 | QTimer* mTimerSocket; | 109 | QTimer* mTimerSocket; |
105 | int mRetVal; | 110 | int mRetVal; |
106 | QTime mTime; | 111 | QTime mTime; |
107 | QString mFileString; | 112 | QString mFileString; |
108 | bool mFirst; | 113 | bool mFirst; |
109 | bool mFirstLine; | 114 | bool mFirstLine; |
110 | }; | 115 | }; |
111 | 116 | ||
112 | 117 | ||
113 | class KSyncManager : public QObject | 118 | class KSyncManager : public QObject |
114 | { | 119 | { |
115 | Q_OBJECT | 120 | Q_OBJECT |
116 | 121 | ||
117 | public: | 122 | public: |
118 | enum TargetApp { | 123 | enum TargetApp { |
119 | KOPI = 0, | 124 | KOPI = 0, |
120 | KAPI = 1, | 125 | KAPI = 1, |
121 | PWMPI = 2 }; | 126 | PWMPI = 2 }; |
122 | 127 | ||
123 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); | 128 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); |
124 | ~KSyncManager() ; | 129 | ~KSyncManager() ; |
125 | 130 | ||
126 | void multiSync( bool askforPrefs ); | 131 | void multiSync( bool askforPrefs ); |
127 | bool blockSave() { return mBlockSaveFlag; } | 132 | bool blockSave() { return mBlockSaveFlag; } |
128 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } | 133 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } |
129 | void setDefaultFileName( QString s) ; | 134 | void setDefaultFileName( QString s) ; |
130 | QString defaultFileName() { return mDefFileName ;} | 135 | QString defaultFileName() { return mDefFileName ;} |
131 | QString syncFileName(); | 136 | QString syncFileName(); |
132 | void enableQuick( bool ask = true); | 137 | void enableQuick( bool ask = true); |
133 | 138 | ||
134 | bool syncWithDesktop () { return mSyncWithDesktop;} | 139 | bool syncWithDesktop () { return mSyncWithDesktop;} |
135 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } | 140 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } |
136 | QString getCurrentSyncName() { return mCurrentSyncName; } | 141 | QString getCurrentSyncName() { return mCurrentSyncName; } |
137 | 142 | ||
138 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); | 143 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); |
139 | void hideProgressBar(); | 144 | void hideProgressBar(); |
140 | bool isProgressBarCanceled(); | 145 | bool isProgressBarCanceled(); |
141 | 146 | ||
142 | // sync stuff | 147 | // sync stuff |
143 | QString mLocalMachineName; | 148 | QString mLocalMachineName; |
144 | QStringList mExternSyncProfiles; | 149 | QStringList mExternSyncProfiles; |
145 | QStringList mSyncProfileNames; | 150 | QStringList mSyncProfileNames; |
@@ -160,71 +165,72 @@ class KSyncManager : public QObject | |||
160 | QString mFilterInCal; | 165 | QString mFilterInCal; |
161 | QString mFilterOutCal; | 166 | QString mFilterOutCal; |
162 | QString mFilterInAB; | 167 | QString mFilterInAB; |
163 | QString mFilterOutAB; | 168 | QString mFilterOutAB; |
164 | static QDateTime mRequestedSyncEvent; | 169 | static QDateTime mRequestedSyncEvent; |
165 | 170 | ||
166 | signals: | 171 | signals: |
167 | void save(); | 172 | void save(); |
168 | void request_file(); | 173 | void request_file(); |
169 | void getFile( bool ); | 174 | void getFile( bool ); |
170 | 175 | ||
171 | public slots: | 176 | public slots: |
172 | void slotSyncMenu( int ); | 177 | void slotSyncMenu( int ); |
173 | void slotClearMenu( int action ); | 178 | void slotClearMenu( int action ); |
174 | void deleteCommandSocket(KCommandSocket*s, int state); | 179 | void deleteCommandSocket(KCommandSocket*s, int state); |
175 | void readFileFromSocket(); | 180 | void readFileFromSocket(); |
176 | void fillSyncMenu(); | 181 | void fillSyncMenu(); |
177 | 182 | ||
178 | private: | 183 | private: |
179 | void syncPi(); | 184 | void syncPi(); |
180 | KServerSocket * mServerSocket; | 185 | KServerSocket * mServerSocket; |
181 | KPimPrefs* mPrefs; | 186 | KPimPrefs* mPrefs; |
182 | QString mDefFileName; | 187 | QString mDefFileName; |
183 | QString mCurrentSyncDevice; | 188 | QString mCurrentSyncDevice; |
184 | QString mCurrentSyncName; | 189 | QString mCurrentSyncName; |
185 | void quickSyncLocalFile(); | 190 | void quickSyncLocalFile(); |
186 | bool syncWithFile( QString fn , bool quick ); | 191 | bool syncWithFile( QString fn , bool quick ); |
187 | void syncLocalFile(); | 192 | void syncLocalFile(); |
188 | void syncPhone(); | 193 | void syncPhone(); |
189 | void syncSharp(); | 194 | void syncSharp(); |
190 | void syncKDE(); | 195 | void syncKDE(); |
191 | bool syncExternalApplication(QString); | 196 | bool syncExternalApplication(QString); |
192 | int mCurrentSyncProfile ; | 197 | int mCurrentSyncProfile ; |
193 | void syncRemote( KSyncProfile* prof, bool ask = true); | 198 | void syncRemote( KSyncProfile* prof, bool ask = true); |
194 | bool edit_sync_options(); | 199 | bool edit_sync_options(); |
195 | bool edit_pisync_options(); | 200 | bool edit_pisync_options(); |
196 | int ringSync(); | 201 | int ringSync(); |
197 | QString getPassword( ); | 202 | QString getPassword( ); |
198 | bool mPisyncFinished; | 203 | bool mPisyncFinished; |
199 | bool mBlockSaveFlag; | 204 | bool mBlockSaveFlag; |
200 | QWidget* mParent; | 205 | QWidget* mParent; |
201 | KSyncInterface* mImplementation; | 206 | KSyncInterface* mImplementation; |
202 | TargetApp mTargetApp; | 207 | TargetApp mTargetApp; |
203 | QPopupMenu* mSyncMenu; | 208 | QPopupMenu* mSyncMenu; |
204 | QProgressBar* bar; | 209 | QProgressBar* bar; |
205 | bool mSyncWithDesktop; | 210 | bool mSyncWithDesktop; |
206 | 211 | ||
207 | private slots: | 212 | private slots: |
213 | void displayErrorPort(); | ||
208 | void confSync(); | 214 | void confSync(); |
209 | 215 | ||
210 | 216 | ||
211 | }; | 217 | }; |
212 | 218 | ||
213 | 219 | ||
214 | class KSyncInterface | 220 | class KSyncInterface |
215 | { | 221 | { |
216 | public : | 222 | public : |
217 | virtual void removeSyncInfo( QString syncProfile) = 0; | 223 | virtual void removeSyncInfo( QString syncProfile) = 0; |
218 | virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; | 224 | virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; |
219 | virtual bool syncExternal(KSyncManager* manager, QString resource) | 225 | virtual bool syncExternal(KSyncManager* manager, QString resource) |
220 | { | 226 | { |
221 | // empty implementation, because some syncable applications do not | 227 | // empty implementation, because some syncable applications do not |
222 | // have an external(sharpdtm) syncmode, like pwmanager. | 228 | // have an external(sharpdtm) syncmode, like pwmanager. |
223 | return false; | 229 | return false; |
224 | } | 230 | } |
225 | 231 | ||
226 | 232 | ||
227 | }; | 233 | }; |
228 | 234 | ||
229 | 235 | ||
230 | #endif | 236 | #endif |