-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 2 | ||||
-rw-r--r-- | kabc/stdaddressbook.cpp | 5 | ||||
-rw-r--r-- | kabc/stdaddressbook.h | 2 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 28 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 4 | ||||
-rw-r--r-- | kaddressbook/kaddressbookmain.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/mainembedded.cpp | 5 |
7 files changed, 38 insertions, 12 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index 293aaea..ece26d2 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -767,54 +767,54 @@ | |||
767 | { "Try again now","Versuche jetzt nochmal" }, | 767 | { "Try again now","Versuche jetzt nochmal" }, |
768 | { "Try again later","Versuche später nochmal" }, | 768 | { "Try again later","Versuche später nochmal" }, |
769 | { "Try again tomorrow","Versuche morgen nochmal" }, | 769 | { "Try again tomorrow","Versuche morgen nochmal" }, |
770 | { "Disable backup","Schalte Backup ab" }, | 770 | { "Disable backup","Schalte Backup ab" }, |
771 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, | 771 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, |
772 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, | 772 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, |
773 | { "Choose action","Wähle Aktion" }, | 773 | { "Choose action","Wähle Aktion" }, |
774 | { "&Configure KA/Pi...","Konfiguriere KA/Pi..." }, | 774 | { "&Configure KA/Pi...","Konfiguriere KA/Pi..." }, |
775 | { "Global Settings...","Globale Einstellungen..." }, | 775 | { "Global Settings...","Globale Einstellungen..." }, |
776 | { "Spouse","Ehegatte" }, | 776 | { "Spouse","Ehegatte" }, |
777 | { "Notes","Notizen" }, | 777 | { "Notes","Notizen" }, |
778 | { "Messanger","Messanger" }, | 778 | { "Messanger","Messanger" }, |
779 | { "Assistant","Assistent" }, | 779 | { "Assistant","Assistent" }, |
780 | { "Manager","Manager" }, | 780 | { "Manager","Manager" }, |
781 | { "Secrecy","Sichtbar" }, | 781 | { "Secrecy","Sichtbar" }, |
782 | { "male","männlich" }, | 782 | { "male","männlich" }, |
783 | { "female","weiblich" }, | 783 | { "female","weiblich" }, |
784 | { "Hide!","Verbergen!" }, | 784 | { "Hide!","Verbergen!" }, |
785 | { "Show!","Anzeigen!" }, | 785 | { "Show!","Anzeigen!" }, |
786 | { "Details","Details" }, | 786 | { "Details","Details" }, |
787 | { "Search:","Suche:" }, | 787 | { "Search:","Suche:" }, |
788 | { "Automatically sync with KDE-Desktop\nwhen receiving sync request","Synce automatisch mit KDE-Desktop\nwenn eine Sync-Anforderung kommt" }, | 788 | { "Automatically sync with KDE-Desktop\nwhen receiving sync request","Synce automatisch mit KDE-Desktop\nwenn eine Sync-Anforderung kommt" }, |
789 | { "Pi-Sync Port Error","Pi-Sync Port Fehler" }, | 789 | { "Pi-Sync Port Error","Pi-Sync Port Fehler" }, |
790 | { "<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?" }, | 790 | { "<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?" }, |
791 | { "No valid port number:\n%1","Keine gültige Port Nummer:\n%1" }, | 791 | { "No valid port number:\n%1","Keine gültige Port Nummer:\n%1" }, |
792 | { "Port number (Default: %1)\nValid range from 1 to 65535","Port Nummer (Standard: %1)\nGültiger Bereich von 1 bis 65535" }, | 792 | { "Port number (Default: %1)\nValid range from 1 to 65535","Port Nummer (Standard: %1)\nGültiger Bereich von 1 bis 65535" }, |
793 | { "Pi-Sync Error","Pi-Sync Fehler" }, | 793 | { "Pi-Sync Error","Pi-Sync Fehler" }, |
794 | { "Got send file request\nwith invalid password","Erhielt "sende Datei" Anfrage\nmit ungültigem Passwort" }, | 794 | { "Got send file request\nwith invalid password","Erhielt "sende Datei" Anfrage\nmit ungültigem Passwort" }, |
795 | { "Got receive file request\nwith invalid password","Erhielt "empfange Datei" Anfrage\nmit ungültigem Passwort" }, | 795 | { "Got receive file request\nwith invalid password","Erhielt "empfange Datei" Anfrage\nmit ungültigem Passwort" }, |
796 | { "Wrong password: Receiving remote file failed.","Falsches Passwort: Empfangen von entfernter Datei fehlgeschlagen." }, | 796 | { "Wrong password: Receiving remote file failed.","Falsches Passwort: Empfangen von entfernter Datei fehlgeschlagen." }, |
797 | { "Please close error dialog on remote.","Bitte schließe Fehler-Dialog am entfernten Rechner" }, | 797 | { "Please close error dialog on remote.","Bitte schließe Fehler-Dialog am entfernten Rechner" }, |
798 | { "Unknown error on remote.","Unbekannter Fehler am entfernten Rechner" }, | 798 | { "Unknown error on remote.","Unbekannter Fehler am entfernten Rechner" }, |
799 | { "Pi-Sync: Connected!","Pi-Sync: Verbunden!" }, | 799 | { "Pi-Sync: Connected!","Pi-Sync: Verbunden!" }, |
800 | { "Receiving file from remote...","Empfange entfernte Datei..." }, | 800 | { "Receiving file from remote...","Empfange entfernte Datei..." }, |
801 | { "Sending back synced file...","Sende synchronisierte Datei zurück..." }, | 801 | { "Sending back synced file...","Sende synchronisierte Datei zurück..." }, |
802 | { "Do you want to\nclear all sync info\nof all profiles?","Möchten Sie wirklich\ndie Sync-Info\nfür alle Profile\nlöschen?" }, | 802 | { "Do you want to\nclear all sync info\nof all profiles?","Möchten Sie wirklich\ndie Sync-Info\nfür alle Profile\nlöschen?" }, |
803 | { "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" }, | 803 | { "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" }, |
804 | { "Sorry, no valid port.Syncing cancelled.","Sorry, kein gültiger Port. Syncing abgebrochen." }, | 804 | { "Sorry, no valid port.Syncing cancelled.","Sorry, kein gültiger Port. Syncing abgebrochen." }, |
805 | { "Remote port number:\n(May be: 1 - 65535)","Ferne Port Nummer:\n(Darf sein: 1 - 65535)" }, | 805 | { "Remote port number:\n(May be: 1 - 65535)","Ferne Port Nummer:\n(Darf sein: 1 - 65535)" }, |
806 | { "Writing back file ...","Schreibe Datei zurück..." }, | 806 | { "Writing back file ...","Schreibe Datei zurück..." }, |
807 | { "Sending back file ...","Sende Datei zurück..." }, | 807 | { "Sending back file ...","Sende Datei zurück..." }, |
808 | { "Eeek, there I am ticklish!","Huch, da bin ich kitzlig!" }, | 808 | { "Eeek, there I am ticklish!","Huch, da bin ich kitzlig!" }, |
809 | { "Save using LOCAL storage","Speichere nutze LOCAL Pfad" }, | 809 | { "Save using LOCAL storage","Speichere nutze LOCAL Pfad" }, |
810 | { "...and %1 more\ncontact(s) selected","...und noch %1 Kontakte\n mehr ausgewählt" }, | 810 | { "...and %1 more\ncontact(s) selected","...und noch %1 Kontakte\n mehr ausgewählt" }, |
811 | { "Do you really\nwant to delete the\nsetected contact(s)?\n\n","Möchten Sie wirklich\ndie ausgewählten\nKontakte löschen?\n\n" }, | 811 | { "Do you really\nwant to delete the\nsetected contact(s)?\n\n","Möchten Sie wirklich\ndie ausgewählten\nKontakte löschen?\n\n" }, |
812 | { "%1 contacts\nsuccessfully\nimported.","%1 Kontakte\nerfolgreich\nimportiert." }, | 812 | { "%1 contacts\nsuccessfully\nimported.","%1 Kontakte\nerfolgreich\nimportiert." }, |
813 | { "Import this contact?","Importiere diesen Kontakt?" }, | 813 | { "Import this contact?","Importiere diesen Kontakt?" }, |
814 | { "Import all!","Importiere alle!" }, | 814 | { "Import all!","Importiere alle!" }, |
815 | { "","" }, | 815 | { "Loading addressbook data ... please wait","Lade Adressbuchdaten ... bitte warten" }, |
816 | { "","" }, | 816 | { "","" }, |
817 | { "","" }, | 817 | { "","" }, |
818 | { "","" }, | 818 | { "","" }, |
819 | { "","" }, | 819 | { "","" }, |
820 | { "","" }, \ No newline at end of file | 820 | { "","" }, \ No newline at end of file |
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index f17f366..a14ae20 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp | |||
@@ -68,104 +68,105 @@ StdAddressBook *StdAddressBook::self() | |||
68 | mSelf = addressBookDeleter.setObject( new StdAddressBook ); | 68 | mSelf = addressBookDeleter.setObject( new StdAddressBook ); |
69 | #else //KAB_EMBEDDED | 69 | #else //KAB_EMBEDDED |
70 | addressBookDeleter.setObject( mSelf, new StdAddressBook ); | 70 | addressBookDeleter.setObject( mSelf, new StdAddressBook ); |
71 | #endif //KAB_EMBEDDED | 71 | #endif //KAB_EMBEDDED |
72 | KStandardDirs::setAppDir( appdir ); | 72 | KStandardDirs::setAppDir( appdir ); |
73 | } | 73 | } |
74 | 74 | ||
75 | return mSelf; | 75 | return mSelf; |
76 | } | 76 | } |
77 | 77 | ||
78 | QString StdAddressBook::setTempAppDir() | 78 | QString StdAddressBook::setTempAppDir() |
79 | { | 79 | { |
80 | QString appDIR = KStandardDirs::appDir(); | 80 | QString appDIR = KStandardDirs::appDir(); |
81 | #ifdef DESKTOP_VERSION | 81 | #ifdef DESKTOP_VERSION |
82 | QString appdir = QDir::homeDirPath(); | 82 | QString appdir = QDir::homeDirPath(); |
83 | if ( appdir.right(1) == "\\" || appdir.right(1) == "/" ) | 83 | if ( appdir.right(1) == "\\" || appdir.right(1) == "/" ) |
84 | appdir += "kaddressbook/"; | 84 | appdir += "kaddressbook/"; |
85 | else | 85 | else |
86 | appdir += "/kaddressbook/"; | 86 | appdir += "/kaddressbook/"; |
87 | KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); | 87 | KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); |
88 | #else | 88 | #else |
89 | QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; | 89 | QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; |
90 | 90 | ||
91 | KStandardDirs::setAppDir( appdir ); | 91 | KStandardDirs::setAppDir( appdir ); |
92 | #endif | 92 | #endif |
93 | 93 | ||
94 | return appDIR; | 94 | return appDIR; |
95 | } | 95 | } |
96 | StdAddressBook *StdAddressBook::self( bool onlyFastResources ) | 96 | StdAddressBook *StdAddressBook::self( bool onlyFastResources ) |
97 | { | 97 | { |
98 | 98 | ||
99 | if ( !mSelf ) | 99 | if ( !mSelf ) |
100 | { | 100 | { |
101 | QString appdir =StdAddressBook::setTempAppDir(); | 101 | QString appdir =StdAddressBook::setTempAppDir(); |
102 | #ifdef KAB_EMBEDDED | 102 | #ifdef KAB_EMBEDDED |
103 | mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) ); | 103 | mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) ); |
104 | #else //KAB_EMBEDDED | 104 | #else //KAB_EMBEDDED |
105 | addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) ); | 105 | addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) ); |
106 | #endif //KAB_EMBEDDED | 106 | #endif //KAB_EMBEDDED |
107 | KStandardDirs::setAppDir( appdir ); | 107 | KStandardDirs::setAppDir( appdir ); |
108 | } | 108 | } |
109 | return mSelf; | 109 | return mSelf; |
110 | } | 110 | } |
111 | 111 | ||
112 | StdAddressBook::StdAddressBook() | 112 | StdAddressBook::StdAddressBook() |
113 | : AddressBook( "kabcrc" ) | 113 | : AddressBook( "kabcrc" ) |
114 | { | 114 | { |
115 | 115 | ||
116 | init( false ); | 116 | //init( false ); |
117 | } | 117 | } |
118 | 118 | ||
119 | StdAddressBook::StdAddressBook( bool onlyFastResources ) | 119 | StdAddressBook::StdAddressBook( bool onlyFastResources ) |
120 | : AddressBook( "kabcrc" ) | 120 | : AddressBook( "kabcrc" ) |
121 | { | 121 | { |
122 | 122 | ||
123 | init( onlyFastResources ); | 123 | if ( onlyFastResources ) |
124 | init( onlyFastResources ); | ||
124 | } | 125 | } |
125 | 126 | ||
126 | StdAddressBook::~StdAddressBook() | 127 | StdAddressBook::~StdAddressBook() |
127 | { | 128 | { |
128 | if ( mAutomaticSave ) | 129 | if ( mAutomaticSave ) |
129 | save(); | 130 | save(); |
130 | } | 131 | } |
131 | 132 | ||
132 | void StdAddressBook::init( bool ) | 133 | void StdAddressBook::init( bool ) |
133 | { | 134 | { |
134 | KRES::Manager<Resource> *manager = resourceManager(); | 135 | KRES::Manager<Resource> *manager = resourceManager(); |
135 | KRES::Manager<Resource>::ActiveIterator it; | 136 | KRES::Manager<Resource>::ActiveIterator it; |
136 | 137 | ||
137 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { | 138 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { |
138 | (*it)->setAddressBook( this ); | 139 | (*it)->setAddressBook( this ); |
139 | if ( !(*it)->open() ) | 140 | if ( !(*it)->open() ) |
140 | error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) ); | 141 | error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) ); |
141 | } | 142 | } |
142 | 143 | ||
143 | Resource *res = standardResource(); | 144 | Resource *res = standardResource(); |
144 | if ( !res ) { | 145 | if ( !res ) { |
145 | res = manager->createResource( "file" ); | 146 | res = manager->createResource( "file" ); |
146 | if ( res ) | 147 | if ( res ) |
147 | { | 148 | { |
148 | addResource( res ); | 149 | addResource( res ); |
149 | } | 150 | } |
150 | else | 151 | else |
151 | qDebug(" No resource available!!!"); | 152 | qDebug(" No resource available!!!"); |
152 | } | 153 | } |
153 | 154 | ||
154 | setStandardResource( res ); | 155 | setStandardResource( res ); |
155 | manager->writeConfig(); | 156 | manager->writeConfig(); |
156 | 157 | ||
157 | load(); | 158 | load(); |
158 | } | 159 | } |
159 | 160 | ||
160 | bool StdAddressBook::save() | 161 | bool StdAddressBook::save() |
161 | { | 162 | { |
162 | kdDebug(5700) << "StdAddressBook::save()" << endl; | 163 | kdDebug(5700) << "StdAddressBook::save()" << endl; |
163 | 164 | ||
164 | bool ok = true; | 165 | bool ok = true; |
165 | AddressBook *ab = self(); | 166 | AddressBook *ab = self(); |
166 | 167 | ||
167 | ab->deleteRemovedAddressees(); | 168 | ab->deleteRemovedAddressees(); |
168 | Iterator ait; | 169 | Iterator ait; |
169 | for ( ait = ab->begin(); ait != ab->end(); ++ait ) { | 170 | for ( ait = ab->begin(); ait != ab->end(); ++ait ) { |
170 | if ( !(*ait).IDStr().isEmpty() ) { | 171 | if ( !(*ait).IDStr().isEmpty() ) { |
171 | (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() ); | 172 | (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() ); |
diff --git a/kabc/stdaddressbook.h b/kabc/stdaddressbook.h index 9ec53b0..cf130b3 100644 --- a/kabc/stdaddressbook.h +++ b/kabc/stdaddressbook.h | |||
@@ -89,63 +89,63 @@ class StdAddressBook : public AddressBook | |||
89 | Call this method in your crash handler to allow the library clean up | 89 | Call this method in your crash handler to allow the library clean up |
90 | possible locks. | 90 | possible locks. |
91 | */ | 91 | */ |
92 | static void handleCrash(); | 92 | static void handleCrash(); |
93 | 93 | ||
94 | /** | 94 | /** |
95 | Returns the default file name for vcard-based addressbook | 95 | Returns the default file name for vcard-based addressbook |
96 | */ | 96 | */ |
97 | static QString fileName(); | 97 | static QString fileName(); |
98 | 98 | ||
99 | /** | 99 | /** |
100 | Returns the default directory name for vcard-based addressbook | 100 | Returns the default directory name for vcard-based addressbook |
101 | */ | 101 | */ |
102 | static QString directoryName(); | 102 | static QString directoryName(); |
103 | 103 | ||
104 | /** | 104 | /** |
105 | Set the automatic save property of the address book. | 105 | Set the automatic save property of the address book. |
106 | If @p enable is TRUE (default) the address book is saved at | 106 | If @p enable is TRUE (default) the address book is saved at |
107 | destruction time otherwise you have to call @ref save() to | 107 | destruction time otherwise you have to call @ref save() to |
108 | explicitely save it. | 108 | explicitely save it. |
109 | */ | 109 | */ |
110 | static void setAutomaticSave( bool enable ); | 110 | static void setAutomaticSave( bool enable ); |
111 | 111 | ||
112 | /** | 112 | /** |
113 | Closes the address book. Depending on @ref automaticSave() it will | 113 | Closes the address book. Depending on @ref automaticSave() it will |
114 | save the address book first. | 114 | save the address book first. |
115 | */ | 115 | */ |
116 | static void close(); | 116 | static void close(); |
117 | 117 | ||
118 | /** | 118 | /** |
119 | Returns whether the address book is saved at destruction time. | 119 | Returns whether the address book is saved at destruction time. |
120 | See also @ref setAutomaticSave(). | 120 | See also @ref setAutomaticSave(). |
121 | */ | 121 | */ |
122 | static bool automaticSave(); | 122 | static bool automaticSave(); |
123 | 123 | ||
124 | /** | 124 | /** |
125 | Returns the contact, that is associated with the owner of the | 125 | Returns the contact, that is associated with the owner of the |
126 | address book. This contact should be used by other programs | 126 | address book. This contact should be used by other programs |
127 | to access user specific data. | 127 | to access user specific data. |
128 | */ | 128 | */ |
129 | Addressee whoAmI(); | 129 | Addressee whoAmI(); |
130 | 130 | ||
131 | /** | 131 | /** |
132 | Sets the users contact. See @ref whoAmI() for more information. | 132 | Sets the users contact. See @ref whoAmI() for more information. |
133 | 133 | ||
134 | @param uid The uid of the users contact. | 134 | @param uid The uid of the users contact. |
135 | */ | 135 | */ |
136 | void setWhoAmI( const Addressee &addr ); | 136 | void setWhoAmI( const Addressee &addr ); |
137 | void init( bool onlyFastResources ); | ||
137 | 138 | ||
138 | protected: | 139 | protected: |
139 | StdAddressBook(); | 140 | StdAddressBook(); |
140 | StdAddressBook( bool onlyFastResources ); | 141 | StdAddressBook( bool onlyFastResources ); |
141 | 142 | ||
142 | void init( bool onlyFastResources ); | ||
143 | 143 | ||
144 | private: | 144 | private: |
145 | static QString setTempAppDir(); | 145 | static QString setTempAppDir(); |
146 | static StdAddressBook *mSelf; | 146 | static StdAddressBook *mSelf; |
147 | static bool mAutomaticSave; | 147 | static bool mAutomaticSave; |
148 | }; | 148 | }; |
149 | 149 | ||
150 | } | 150 | } |
151 | #endif | 151 | #endif |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index b9830b1..c670b1f 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -358,99 +358,122 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
358 | 358 | ||
359 | connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); | 359 | connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); |
360 | connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) ); | 360 | connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) ); |
361 | 361 | ||
362 | connect( mXXPortManager, SIGNAL( modified() ), | 362 | connect( mXXPortManager, SIGNAL( modified() ), |
363 | SLOT( setModified() ) ); | 363 | SLOT( setModified() ) ); |
364 | 364 | ||
365 | connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), | 365 | connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), |
366 | SLOT( incrementalSearchJump( const QString& ) ) ); | 366 | SLOT( incrementalSearchJump( const QString& ) ) ); |
367 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), | 367 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), |
368 | mJumpButtonBar, SLOT( recreateButtons() ) ); | 368 | mJumpButtonBar, SLOT( recreateButtons() ) ); |
369 | 369 | ||
370 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), | 370 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), |
371 | SLOT( sendMail( const QString& ) ) ); | 371 | SLOT( sendMail( const QString& ) ) ); |
372 | 372 | ||
373 | 373 | ||
374 | connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); | 374 | connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); |
375 | connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&))); | 375 | connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&))); |
376 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); | 376 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); |
377 | connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); | 377 | connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); |
378 | connect( ExternalAppHandler::instance(), SIGNAL (doRingSync()),this, SLOT( doRingSync())); | 378 | connect( ExternalAppHandler::instance(), SIGNAL (doRingSync()),this, SLOT( doRingSync())); |
379 | connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog())); | 379 | connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog())); |
380 | 380 | ||
381 | 381 | ||
382 | #ifndef KAB_EMBEDDED | 382 | #ifndef KAB_EMBEDDED |
383 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), | 383 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), |
384 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); | 384 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); |
385 | 385 | ||
386 | connect( mDetails, SIGNAL( browse( const QString& ) ), | 386 | connect( mDetails, SIGNAL( browse( const QString& ) ), |
387 | SLOT( browse( const QString& ) ) ); | 387 | SLOT( browse( const QString& ) ) ); |
388 | 388 | ||
389 | 389 | ||
390 | mAddressBookService = new KAddressBookService( this ); | 390 | mAddressBookService = new KAddressBookService( this ); |
391 | 391 | ||
392 | #endif //KAB_EMBEDDED | 392 | #endif //KAB_EMBEDDED |
393 | 393 | ||
394 | mMessageTimer = new QTimer( this ); | 394 | mMessageTimer = new QTimer( this ); |
395 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); | 395 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); |
396 | mEditorDialog = 0; | 396 | mEditorDialog = 0; |
397 | createAddresseeEditorDialog( this ); | 397 | createAddresseeEditorDialog( this ); |
398 | setModified( false ); | 398 | setModified( false ); |
399 | mBRdisabled = false; | 399 | mBRdisabled = false; |
400 | #ifndef DESKTOP_VERSION | 400 | #ifndef DESKTOP_VERSION |
401 | infrared = 0; | 401 | infrared = 0; |
402 | #endif | 402 | #endif |
403 | //toggleBeamReceive( ); | 403 | //toggleBeamReceive( ); |
404 | mMainWindow->toolBar()->show(); | 404 | mMainWindow->toolBar()->show(); |
405 | // we have a toolbar repainting error on the Zaurus when starting KA/Pi | 405 | // we have a toolbar repainting error on the Zaurus when starting KA/Pi |
406 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); | 406 | //QTimer::singleShot( 10, this , SLOT ( updateToolBar())); |
407 | QTimer::singleShot( 100, this, SLOT ( loadDataAfterStart() )); | ||
408 | } | ||
409 | void KABCore::receiveStart( const QCString& cmsg, const QByteArray& data ) | ||
410 | { | ||
411 | qDebug("KO: QCOP start message received: %s ", cmsg.data() ); | ||
412 | mCStringMess = cmsg; | ||
413 | mByteData = data; | ||
407 | } | 414 | } |
408 | 415 | ||
416 | void KABCore::loadDataAfterStart() | ||
417 | { | ||
418 | qDebug("KABCore::loadDataAfterStart() "); | ||
419 | ((StdAddressBook*)mAddressBook)->init( true ); | ||
420 | mViewManager->refreshView(); | ||
421 | |||
422 | #ifndef DESKTOP_VERSION | ||
423 | disconnect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT (receiveStart ( const QCString &, const QByteArray & ))); | ||
424 | |||
425 | QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | ||
426 | if ( !mCStringMess.isEmpty() ) | ||
427 | ExternalAppHandler::instance()->appMessage( mCStringMess, mByteData ); | ||
428 | #endif | ||
429 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); | ||
430 | setCaptionBack(); | ||
431 | } | ||
409 | void KABCore::updateToolBar() | 432 | void KABCore::updateToolBar() |
410 | { | 433 | { |
411 | static int iii = 0; | 434 | static int iii = 0; |
412 | ++iii; | 435 | ++iii; |
413 | mMainWindow->toolBar()->repaintMe(); | 436 | mMainWindow->toolBar()->repaintMe(); |
414 | if ( iii < 4 ) | 437 | if ( iii < 4 ) |
415 | QTimer::singleShot( 100*iii, this , SLOT ( updateToolBar())); | 438 | QTimer::singleShot( 100*iii, this , SLOT ( updateToolBar())); |
416 | } | 439 | } |
417 | KABCore::~KABCore() | 440 | KABCore::~KABCore() |
418 | { | 441 | { |
419 | // save(); | 442 | // save(); |
420 | //saveSettings(); | 443 | //saveSettings(); |
421 | //KABPrefs::instance()->writeConfig(); | 444 | //KABPrefs::instance()->writeConfig(); |
422 | delete AddresseeConfig::instance(); | 445 | delete AddresseeConfig::instance(); |
423 | mAddressBook = 0; | 446 | mAddressBook = 0; |
424 | KABC::StdAddressBook::close(); | 447 | KABC::StdAddressBook::close(); |
425 | 448 | ||
426 | delete syncManager; | 449 | delete syncManager; |
427 | #ifndef DESKTOP_VERSION | 450 | #ifndef DESKTOP_VERSION |
428 | if ( infrared ) | 451 | if ( infrared ) |
429 | delete infrared; | 452 | delete infrared; |
430 | #endif | 453 | #endif |
431 | } | 454 | } |
432 | void KABCore::receive( const QCString& cmsg, const QByteArray& data ) | 455 | void KABCore::receive( const QCString& cmsg, const QByteArray& data ) |
433 | { | 456 | { |
434 | //qDebug("KA: QCOP message received: %s ", cmsg.data() ); | 457 | //qDebug("KA: QCOP message received: %s ", cmsg.data() ); |
435 | if ( cmsg == "setDocument(QString)" ) { | 458 | if ( cmsg == "setDocument(QString)" ) { |
436 | QDataStream stream( data, IO_ReadOnly ); | 459 | QDataStream stream( data, IO_ReadOnly ); |
437 | QString fileName; | 460 | QString fileName; |
438 | stream >> fileName; | 461 | stream >> fileName; |
439 | recieve( fileName ); | 462 | recieve( fileName ); |
440 | return; | 463 | return; |
441 | } | 464 | } |
442 | } | 465 | } |
443 | void KABCore::toggleBeamReceive( ) | 466 | void KABCore::toggleBeamReceive( ) |
444 | { | 467 | { |
445 | if ( mBRdisabled ) | 468 | if ( mBRdisabled ) |
446 | return; | 469 | return; |
447 | #ifndef DESKTOP_VERSION | 470 | #ifndef DESKTOP_VERSION |
448 | if ( infrared ) { | 471 | if ( infrared ) { |
449 | qDebug("KA: AB disable BeamReceive "); | 472 | qDebug("KA: AB disable BeamReceive "); |
450 | delete infrared; | 473 | delete infrared; |
451 | infrared = 0; | 474 | infrared = 0; |
452 | mActionBR->setChecked(false); | 475 | mActionBR->setChecked(false); |
453 | return; | 476 | return; |
454 | } | 477 | } |
455 | qDebug("KA: AB enable BeamReceive "); | 478 | qDebug("KA: AB enable BeamReceive "); |
456 | mActionBR->setChecked(true); | 479 | mActionBR->setChecked(true); |
@@ -2400,149 +2423,146 @@ void KABCore::manageCategories( ) | |||
2400 | KABPrefs::instance()->writeConfig(); | 2423 | KABPrefs::instance()->writeConfig(); |
2401 | message(QString::number( count )+ i18n(" categories added to list! ")); | 2424 | message(QString::number( count )+ i18n(" categories added to list! ")); |
2402 | } else { | 2425 | } else { |
2403 | QStringList catList = KABPrefs::instance()->mCustomCategories; | 2426 | QStringList catList = KABPrefs::instance()->mCustomCategories; |
2404 | QStringList catIncList; | 2427 | QStringList catIncList; |
2405 | QStringList newCatList; | 2428 | QStringList newCatList; |
2406 | KABC::AddressBook::Iterator it; | 2429 | KABC::AddressBook::Iterator it; |
2407 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 2430 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
2408 | ++cc; | 2431 | ++cc; |
2409 | if ( cc %10 == 0) | 2432 | if ( cc %10 == 0) |
2410 | message(i18n("Processing contact #%1").arg(cc)); | 2433 | message(i18n("Processing contact #%1").arg(cc)); |
2411 | QStringList catIncList = (*it).categories(); | 2434 | QStringList catIncList = (*it).categories(); |
2412 | int i; | 2435 | int i; |
2413 | if ( catIncList.count() ) { | 2436 | if ( catIncList.count() ) { |
2414 | newCatList.clear(); | 2437 | newCatList.clear(); |
2415 | for( i = 0; i< catIncList.count(); ++i ) { | 2438 | for( i = 0; i< catIncList.count(); ++i ) { |
2416 | if ( catList.contains (catIncList[i])) { | 2439 | if ( catList.contains (catIncList[i])) { |
2417 | newCatList.append( catIncList[i] ); | 2440 | newCatList.append( catIncList[i] ); |
2418 | } | 2441 | } |
2419 | } | 2442 | } |
2420 | newCatList.sort(); | 2443 | newCatList.sort(); |
2421 | (*it).setCategories( newCatList ); | 2444 | (*it).setCategories( newCatList ); |
2422 | mAddressBook->insertAddressee( (*it) ); | 2445 | mAddressBook->insertAddressee( (*it) ); |
2423 | } | 2446 | } |
2424 | } | 2447 | } |
2425 | setModified( true ); | 2448 | setModified( true ); |
2426 | mViewManager->refreshView(); | 2449 | mViewManager->refreshView(); |
2427 | message( i18n("Removing categories done!")); | 2450 | message( i18n("Removing categories done!")); |
2428 | } | 2451 | } |
2429 | delete cp; | 2452 | delete cp; |
2430 | } | 2453 | } |
2431 | void KABCore::removeVoice() | 2454 | void KABCore::removeVoice() |
2432 | { | 2455 | { |
2433 | if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No ) | 2456 | if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No ) |
2434 | return; | 2457 | return; |
2435 | XXPortSelectDialog dlg( this, false, this ); | 2458 | XXPortSelectDialog dlg( this, false, this ); |
2436 | if ( !dlg.exec() ) | 2459 | if ( !dlg.exec() ) |
2437 | return; | 2460 | return; |
2438 | mAddressBook->setUntagged(); | 2461 | mAddressBook->setUntagged(); |
2439 | dlg.tagSelected(); | 2462 | dlg.tagSelected(); |
2440 | message(i18n("Removing voice..."), false ); | 2463 | message(i18n("Removing voice..."), false ); |
2441 | KABC::AddressBook::Iterator it; | 2464 | KABC::AddressBook::Iterator it; |
2442 | for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 2465 | for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
2443 | if ( (*it).tagged() ) { | 2466 | if ( (*it).tagged() ) { |
2444 | (*it).removeVoice(); | 2467 | (*it).removeVoice(); |
2445 | } | 2468 | } |
2446 | } | 2469 | } |
2447 | message(i18n("Refreshing view...") ); | 2470 | message(i18n("Refreshing view...") ); |
2448 | qApp->processEvents(); | ||
2449 | mViewManager->refreshView( "" ); | 2471 | mViewManager->refreshView( "" ); |
2450 | Addressee add; | 2472 | Addressee add; |
2451 | mDetails->setAddressee( add ); | 2473 | mDetails->setAddressee( add ); |
2452 | message(i18n("Remove voice completed!") ); | 2474 | message(i18n("Remove voice completed!") ); |
2453 | 2475 | ||
2454 | 2476 | ||
2455 | 2477 | ||
2456 | } | 2478 | } |
2457 | 2479 | ||
2458 | void KABCore::setFormattedName() | 2480 | void KABCore::setFormattedName() |
2459 | { | 2481 | { |
2460 | KABFormatPrefs setpref; | 2482 | KABFormatPrefs setpref; |
2461 | if ( !setpref.exec() ) { | 2483 | if ( !setpref.exec() ) { |
2462 | return; | 2484 | return; |
2463 | } | 2485 | } |
2464 | XXPortSelectDialog dlg( this, false, this ); | 2486 | XXPortSelectDialog dlg( this, false, this ); |
2465 | if ( !dlg.exec() ) | 2487 | if ( !dlg.exec() ) |
2466 | return; | 2488 | return; |
2467 | mAddressBook->setUntagged(); | 2489 | mAddressBook->setUntagged(); |
2468 | dlg.tagSelected(); | 2490 | dlg.tagSelected(); |
2469 | int count = 0; | 2491 | int count = 0; |
2470 | KABC::AddressBook::Iterator it; | 2492 | KABC::AddressBook::Iterator it; |
2471 | bool modified = false; | 2493 | bool modified = false; |
2472 | for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 2494 | for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
2473 | if ( (*it).tagged() ) { | 2495 | if ( (*it).tagged() ) { |
2474 | if ( (*it).uid().left( 2 ) == "la" ) | 2496 | if ( (*it).uid().left( 2 ) == "la" ) |
2475 | if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) | 2497 | if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) |
2476 | continue; | 2498 | continue; |
2477 | ++count; | 2499 | ++count; |
2478 | if ( count %10 == 0 ) | 2500 | if ( count %10 == 0 ) |
2479 | message(i18n("Changing contact #%1").arg( count ) ); | 2501 | message(i18n("Changing contact #%1").arg( count ) ); |
2480 | qApp->processEvents(); | ||
2481 | QString fName; | 2502 | QString fName; |
2482 | if ( setpref.simple->isChecked() ) | 2503 | if ( setpref.simple->isChecked() ) |
2483 | fName = NameEditDialog::formattedName( (*it), NameEditDialog::SimpleName ); | 2504 | fName = NameEditDialog::formattedName( (*it), NameEditDialog::SimpleName ); |
2484 | else if ( setpref.full->isChecked() ) | 2505 | else if ( setpref.full->isChecked() ) |
2485 | fName = NameEditDialog::formattedName( (*it), NameEditDialog::FullName ); | 2506 | fName = NameEditDialog::formattedName( (*it), NameEditDialog::FullName ); |
2486 | else if ( setpref.reverse->isChecked() ) | 2507 | else if ( setpref.reverse->isChecked() ) |
2487 | fName = NameEditDialog::formattedName( (*it), NameEditDialog::ReverseName ); | 2508 | fName = NameEditDialog::formattedName( (*it), NameEditDialog::ReverseName ); |
2488 | else | 2509 | else |
2489 | fName = (*it).organization(); | 2510 | fName = (*it).organization(); |
2490 | if ( setpref.setCompany->isChecked() ) | 2511 | if ( setpref.setCompany->isChecked() ) |
2491 | if ( fName.isEmpty() || fName =="," ) | 2512 | if ( fName.isEmpty() || fName =="," ) |
2492 | fName = (*it).organization(); | 2513 | fName = (*it).organization(); |
2493 | (*it).setFormattedName( fName ); | 2514 | (*it).setFormattedName( fName ); |
2494 | (*it).setChanged( true ); | 2515 | (*it).setChanged( true ); |
2495 | modified = true; | 2516 | modified = true; |
2496 | (*it).setRevision( QDateTime::currentDateTime() ); | 2517 | (*it).setRevision( QDateTime::currentDateTime() ); |
2497 | } | 2518 | } |
2498 | } | 2519 | } |
2499 | message(i18n("Refreshing view...") ); | 2520 | message(i18n("Refreshing view...") ); |
2500 | qApp->processEvents(); | ||
2501 | if ( modified ) | 2521 | if ( modified ) |
2502 | setModified( true ); | 2522 | setModified( true ); |
2503 | Addressee add; | 2523 | Addressee add; |
2504 | mDetails->setAddressee( add ); | 2524 | mDetails->setAddressee( add ); |
2505 | if ( count == 0 ) | 2525 | if ( count == 0 ) |
2506 | message(i18n("No contact changed!") ); | 2526 | message(i18n("No contact changed!") ); |
2507 | else | 2527 | else |
2508 | message(i18n("%1 contacts changed!").arg( count ) ); | 2528 | message(i18n("%1 contacts changed!").arg( count ) ); |
2509 | } | 2529 | } |
2510 | 2530 | ||
2511 | void KABCore::clipboardDataChanged() | 2531 | void KABCore::clipboardDataChanged() |
2512 | { | 2532 | { |
2513 | 2533 | ||
2514 | if ( mReadWrite ) | 2534 | if ( mReadWrite ) |
2515 | mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() ); | 2535 | mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() ); |
2516 | 2536 | ||
2517 | } | 2537 | } |
2518 | 2538 | ||
2519 | void KABCore::updateActionMenu() | 2539 | void KABCore::updateActionMenu() |
2520 | { | 2540 | { |
2521 | UndoStack *undo = UndoStack::instance(); | 2541 | UndoStack *undo = UndoStack::instance(); |
2522 | RedoStack *redo = RedoStack::instance(); | 2542 | RedoStack *redo = RedoStack::instance(); |
2523 | 2543 | ||
2524 | if ( undo->isEmpty() ) | 2544 | if ( undo->isEmpty() ) |
2525 | mActionUndo->setText( i18n( "Undo" ) ); | 2545 | mActionUndo->setText( i18n( "Undo" ) ); |
2526 | else | 2546 | else |
2527 | mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) ); | 2547 | mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) ); |
2528 | 2548 | ||
2529 | mActionUndo->setEnabled( !undo->isEmpty() ); | 2549 | mActionUndo->setEnabled( !undo->isEmpty() ); |
2530 | 2550 | ||
2531 | if ( !redo->top() ) | 2551 | if ( !redo->top() ) |
2532 | mActionRedo->setText( i18n( "Redo" ) ); | 2552 | mActionRedo->setText( i18n( "Redo" ) ); |
2533 | else | 2553 | else |
2534 | mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) ); | 2554 | mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) ); |
2535 | 2555 | ||
2536 | mActionRedo->setEnabled( !redo->isEmpty() ); | 2556 | mActionRedo->setEnabled( !redo->isEmpty() ); |
2537 | } | 2557 | } |
2538 | 2558 | ||
2539 | void KABCore::configureKeyBindings() | 2559 | void KABCore::configureKeyBindings() |
2540 | { | 2560 | { |
2541 | #ifndef KAB_EMBEDDED | 2561 | #ifndef KAB_EMBEDDED |
2542 | KKeyDialog::configure( actionCollection(), true ); | 2562 | KKeyDialog::configure( actionCollection(), true ); |
2543 | #else //KAB_EMBEDDED | 2563 | #else //KAB_EMBEDDED |
2544 | qDebug("KABCore::configureKeyBindings() not implemented"); | 2564 | qDebug("KABCore::configureKeyBindings() not implemented"); |
2545 | #endif //KAB_EMBEDDED | 2565 | #endif //KAB_EMBEDDED |
2546 | } | 2566 | } |
2547 | 2567 | ||
2548 | #ifdef KAB_EMBEDDED | 2568 | #ifdef KAB_EMBEDDED |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index ceeeda7..42b7709 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -309,134 +309,138 @@ class KABCore : public QWidget, public KSyncInterface | |||
309 | */ | 309 | */ |
310 | void redo(); | 310 | void redo(); |
311 | 311 | ||
312 | /** | 312 | /** |
313 | Shows the edit dialog for the given uid. If the uid is QString::null, | 313 | Shows the edit dialog for the given uid. If the uid is QString::null, |
314 | the method will try to find a selected addressee in the view. | 314 | the method will try to find a selected addressee in the view. |
315 | */ | 315 | */ |
316 | void editContact( const QString &uid /*US = QString::null*/ ); | 316 | void editContact( const QString &uid /*US = QString::null*/ ); |
317 | //US added a second method without defaultparameter | 317 | //US added a second method without defaultparameter |
318 | void editContact2(); | 318 | void editContact2(); |
319 | 319 | ||
320 | /** | 320 | /** |
321 | Shows or edits the detail view for the given uid. If the uid is QString::null, | 321 | Shows or edits the detail view for the given uid. If the uid is QString::null, |
322 | the method will try to find a selected addressee in the view. | 322 | the method will try to find a selected addressee in the view. |
323 | */ | 323 | */ |
324 | void executeContact( const QString &uid /*US = QString::null*/ ); | 324 | void executeContact( const QString &uid /*US = QString::null*/ ); |
325 | 325 | ||
326 | /** | 326 | /** |
327 | Launches the configuration dialog. | 327 | Launches the configuration dialog. |
328 | */ | 328 | */ |
329 | void openConfigDialog(); | 329 | void openConfigDialog(); |
330 | void openConfigGlobalDialog(); | 330 | void openConfigGlobalDialog(); |
331 | 331 | ||
332 | /** | 332 | /** |
333 | Launches the ldap search dialog. | 333 | Launches the ldap search dialog. |
334 | */ | 334 | */ |
335 | void openLDAPDialog(); | 335 | void openLDAPDialog(); |
336 | 336 | ||
337 | /** | 337 | /** |
338 | Creates a KAddressBookPrinter, which will display the print | 338 | Creates a KAddressBookPrinter, which will display the print |
339 | dialog and do the printing. | 339 | dialog and do the printing. |
340 | */ | 340 | */ |
341 | void print(); | 341 | void print(); |
342 | 342 | ||
343 | /** | 343 | /** |
344 | Registers a new GUI client, so plugins can register its actions. | 344 | Registers a new GUI client, so plugins can register its actions. |
345 | */ | 345 | */ |
346 | void addGUIClient( KXMLGUIClient *client ); | 346 | void addGUIClient( KXMLGUIClient *client ); |
347 | 347 | ||
348 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid); | 348 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid); |
349 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); | 349 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); |
350 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); | 350 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); |
351 | 351 | ||
352 | 352 | ||
353 | signals: | 353 | signals: |
354 | void contactSelected( const QString &name ); | 354 | void contactSelected( const QString &name ); |
355 | void contactSelected( const QPixmap &pixmap ); | 355 | void contactSelected( const QPixmap &pixmap ); |
356 | public slots: | 356 | public slots: |
357 | void loadDataAfterStart(); | ||
357 | void recieve(QString cmsg ); | 358 | void recieve(QString cmsg ); |
358 | void getFile( bool success ); | 359 | void getFile( bool success ); |
359 | void syncFileRequest(); | 360 | void syncFileRequest(); |
360 | void setDetailsVisible( bool visible ); | 361 | void setDetailsVisible( bool visible ); |
361 | void setDetailsToState(); | 362 | void setDetailsToState(); |
362 | 363 | ||
363 | void saveSettings(); | 364 | void saveSettings(); |
364 | 365 | ||
365 | private slots: | 366 | private slots: |
366 | void updateToolBar(); | 367 | void updateToolBar(); |
367 | void updateMainWindow(); | 368 | void updateMainWindow(); |
368 | void receive( const QCString& cmsg, const QByteArray& data ); | 369 | void receive( const QCString& cmsg, const QByteArray& data ); |
370 | void receiveStart( const QCString& cmsg, const QByteArray& data ); | ||
369 | void toggleBeamReceive( ); | 371 | void toggleBeamReceive( ); |
370 | void disableBR(bool); | 372 | void disableBR(bool); |
371 | void setJumpButtonBarVisible( bool visible ); | 373 | void setJumpButtonBarVisible( bool visible ); |
372 | void setJumpButtonBar( bool visible ); | 374 | void setJumpButtonBar( bool visible ); |
373 | void setCaptionBack(); | 375 | void setCaptionBack(); |
374 | void resizeAndCallContactdialog(); | 376 | void resizeAndCallContactdialog(); |
375 | void callContactdialog(); | 377 | void callContactdialog(); |
376 | void doRingSync(); | 378 | void doRingSync(); |
377 | 379 | ||
378 | void importFromOL(); | 380 | void importFromOL(); |
379 | void extensionModified( const KABC::Addressee::List &list ); | 381 | void extensionModified( const KABC::Addressee::List &list ); |
380 | void extensionChanged( int id ); | 382 | void extensionChanged( int id ); |
381 | void clipboardDataChanged(); | 383 | void clipboardDataChanged(); |
382 | void updateActionMenu(); | 384 | void updateActionMenu(); |
383 | void configureKeyBindings(); | 385 | void configureKeyBindings(); |
384 | void removeVoice(); | 386 | void removeVoice(); |
385 | void setFormattedName(); | 387 | void setFormattedName(); |
386 | #ifdef KAB_EMBEDDED | 388 | #ifdef KAB_EMBEDDED |
387 | void configureResources(); | 389 | void configureResources(); |
388 | #endif //KAB_EMBEDDED | 390 | #endif //KAB_EMBEDDED |
389 | 391 | ||
390 | void slotEditorDestroyed( const QString &uid ); | 392 | void slotEditorDestroyed( const QString &uid ); |
391 | void configurationChanged(); | 393 | void configurationChanged(); |
392 | void addressBookChanged(); | 394 | void addressBookChanged(); |
393 | 395 | ||
394 | private: | 396 | private: |
397 | QCString mCStringMess; | ||
398 | QByteArray mByteData; | ||
395 | QString mEmailSourceChannel; | 399 | QString mEmailSourceChannel; |
396 | QString mEmailSourceUID; | 400 | QString mEmailSourceUID; |
397 | void resizeEvent(QResizeEvent* e ); | 401 | void resizeEvent(QResizeEvent* e ); |
398 | bool mBRdisabled; | 402 | bool mBRdisabled; |
399 | #ifndef DESKTOP_VERSION | 403 | #ifndef DESKTOP_VERSION |
400 | QCopChannel* infrared; | 404 | QCopChannel* infrared; |
401 | #endif | 405 | #endif |
402 | QTimer *mMessageTimer; | 406 | QTimer *mMessageTimer; |
403 | void initGUI(); | 407 | void initGUI(); |
404 | void initActions(); | 408 | void initActions(); |
405 | QString getPhoneFile(); | 409 | QString getPhoneFile(); |
406 | 410 | ||
407 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, | 411 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, |
408 | const char *name = 0 ); | 412 | const char *name = 0 ); |
409 | 413 | ||
410 | KXMLGUIClient *mGUIClient; | 414 | KXMLGUIClient *mGUIClient; |
411 | 415 | ||
412 | KABC::AddressBook *mAddressBook; | 416 | KABC::AddressBook *mAddressBook; |
413 | 417 | ||
414 | ViewManager *mViewManager; | 418 | ViewManager *mViewManager; |
415 | // QSplitter *mDetailsSplitter; | 419 | // QSplitter *mDetailsSplitter; |
416 | KDGanttMinimizeSplitter *mExtensionBarSplitter; | 420 | KDGanttMinimizeSplitter *mExtensionBarSplitter; |
417 | ViewContainer *mDetails; | 421 | ViewContainer *mDetails; |
418 | KDGanttMinimizeSplitter* mMiniSplitter; | 422 | KDGanttMinimizeSplitter* mMiniSplitter; |
419 | XXPortManager *mXXPortManager; | 423 | XXPortManager *mXXPortManager; |
420 | JumpButtonBar *mJumpButtonBar; | 424 | JumpButtonBar *mJumpButtonBar; |
421 | IncSearchWidget *mIncSearchWidget; | 425 | IncSearchWidget *mIncSearchWidget; |
422 | ExtensionManager *mExtensionManager; | 426 | ExtensionManager *mExtensionManager; |
423 | 427 | ||
424 | KCMultiDialog *mConfigureDialog; | 428 | KCMultiDialog *mConfigureDialog; |
425 | 429 | ||
426 | #ifndef KAB_EMBEDDED | 430 | #ifndef KAB_EMBEDDED |
427 | LDAPSearchDialog *mLdapSearchDialog; | 431 | LDAPSearchDialog *mLdapSearchDialog; |
428 | #endif //KAB_EMBEDDED | 432 | #endif //KAB_EMBEDDED |
429 | // QDict<AddresseeEditorDialog> mEditorDict; | 433 | // QDict<AddresseeEditorDialog> mEditorDict; |
430 | AddresseeEditorDialog *mEditorDialog; | 434 | AddresseeEditorDialog *mEditorDialog; |
431 | bool mReadWrite; | 435 | bool mReadWrite; |
432 | bool mModified; | 436 | bool mModified; |
433 | bool mIsPart; | 437 | bool mIsPart; |
434 | bool mMultipleViewsAtOnce; | 438 | bool mMultipleViewsAtOnce; |
435 | 439 | ||
436 | 440 | ||
437 | //US file menu | 441 | //US file menu |
438 | KAction *mActionMail; | 442 | KAction *mActionMail; |
439 | KAction *mActionBeam; | 443 | KAction *mActionBeam; |
440 | KToggleAction *mActionBR; | 444 | KToggleAction *mActionBR; |
441 | KAction *mActionExport2phone; | 445 | KAction *mActionExport2phone; |
442 | KAction* mActionPrint; | 446 | KAction* mActionPrint; |
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index 519dc92..8fe3ee0 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp | |||
@@ -38,98 +38,100 @@ | |||
38 | #include "kabcore.h" | 38 | #include "kabcore.h" |
39 | #include "kaddressbookmain.h" | 39 | #include "kaddressbookmain.h" |
40 | #include "kactioncollection.h" | 40 | #include "kactioncollection.h" |
41 | 41 | ||
42 | #ifdef KAB_EMBEDDED | 42 | #ifdef KAB_EMBEDDED |
43 | KAddressBookMain::KAddressBookMain() : KMainWindow( 0, "adrressbook" ) | 43 | KAddressBookMain::KAddressBookMain() : KMainWindow( 0, "adrressbook" ) |
44 | #else //KAB_EMBEDDED | 44 | #else //KAB_EMBEDDED |
45 | //MOC_SKIP_BEGIN | 45 | //MOC_SKIP_BEGIN |
46 | KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainWindow( 0 ) | 46 | KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainWindow( 0 ) |
47 | //MOC_SKIP_END | 47 | //MOC_SKIP_END |
48 | #endif //KAB_EMBEDDED | 48 | #endif //KAB_EMBEDDED |
49 | { | 49 | { |
50 | setIcon(SmallIcon( "ka24" ) ); | 50 | setIcon(SmallIcon( "ka24" ) ); |
51 | #if 0 | 51 | #if 0 |
52 | //US for embedded systems, create the toolbar before we initiate KABCore. | 52 | //US for embedded systems, create the toolbar before we initiate KABCore. |
53 | // KABCore will fill the toolbar with menues and icons | 53 | // KABCore will fill the toolbar with menues and icons |
54 | QMainWindow::ToolBarDock tbd; | 54 | QMainWindow::ToolBarDock tbd; |
55 | tbd = Top; | 55 | tbd = Top; |
56 | iconToolBar = new QToolBar( this ); | 56 | iconToolBar = new QToolBar( this ); |
57 | addToolBar (iconToolBar , tbd ); | 57 | addToolBar (iconToolBar , tbd ); |
58 | iconToolBar->setHorizontalStretchable(true); | 58 | iconToolBar->setHorizontalStretchable(true); |
59 | //US iconToolBar->setWidth(300); | 59 | //US iconToolBar->setWidth(300); |
60 | #endif // 0 | 60 | #endif // 0 |
61 | 61 | ||
62 | mCore = new KABCore( this, true, this ); | 62 | mCore = new KABCore( this, true, this ); |
63 | 63 | ||
64 | #ifdef KAB_EMBEDDED | 64 | #ifdef KAB_EMBEDDED |
65 | setCaption( i18n( "KAddressbook/Pi" ) ); | 65 | setCaption( i18n( "KAddressbook/Pi" ) ); |
66 | #else //KAB_EMBEDDED | 66 | #else //KAB_EMBEDDED |
67 | setCaption( i18n( "Address Book Browser" ) ); | 67 | setCaption( i18n( "Address Book Browser" ) ); |
68 | #endif //KAB_EMBEDDED | 68 | #endif //KAB_EMBEDDED |
69 | 69 | ||
70 | //mCore->restoreSettings(); | 70 | //mCore->restoreSettings(); |
71 | 71 | ||
72 | initActions(); | 72 | initActions(); |
73 | 73 | ||
74 | setCentralWidget( mCore ); | 74 | setCentralWidget( mCore ); |
75 | 75 | ||
76 | //US statusBar()->show(); | 76 | //US statusBar()->show(); |
77 | 77 | ||
78 | #ifndef KAB_EMBEDDED | 78 | #ifndef KAB_EMBEDDED |
79 | setStandardToolBarMenuEnabled(true); | 79 | setStandardToolBarMenuEnabled(true); |
80 | 80 | ||
81 | createGUI( "kaddressbookui.rc", false ); | 81 | createGUI( "kaddressbookui.rc", false ); |
82 | 82 | ||
83 | 83 | ||
84 | #endif //KAB_EMBEDDED | 84 | #endif //KAB_EMBEDDED |
85 | setAutoSaveSettings(); | 85 | setAutoSaveSettings(); |
86 | qApp->processEvents(); | ||
87 | mCore->restoreSettings(); | 86 | mCore->restoreSettings(); |
87 | #ifndef DESKTOP_VERSION | ||
88 | QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), mCore, SLOT (receiveStart ( const QCString &, const QByteArray & ))); | ||
89 | #endif | ||
88 | } | 90 | } |
89 | 91 | ||
90 | KAddressBookMain::~KAddressBookMain() | 92 | KAddressBookMain::~KAddressBookMain() |
91 | { | 93 | { |
92 | // mCore->saveSettings(); | 94 | // mCore->saveSettings(); |
93 | } | 95 | } |
94 | 96 | ||
95 | void KAddressBookMain::showMinimized () | 97 | void KAddressBookMain::showMinimized () |
96 | { | 98 | { |
97 | QWidget::showMinimized () ; | 99 | QWidget::showMinimized () ; |
98 | } | 100 | } |
99 | void KAddressBookMain::addEmail( QString addr ) | 101 | void KAddressBookMain::addEmail( QString addr ) |
100 | { | 102 | { |
101 | mCore->addEmail( addr ); | 103 | mCore->addEmail( addr ); |
102 | } | 104 | } |
103 | 105 | ||
104 | #ifndef KAB_EMBEDDED | 106 | #ifndef KAB_EMBEDDED |
105 | ASYNC KAddressBookMain::showContactEditor( QString uid ) | 107 | ASYNC KAddressBookMain::showContactEditor( QString uid ) |
106 | { | 108 | { |
107 | mCore->editContact( uid ); | 109 | mCore->editContact( uid ); |
108 | } | 110 | } |
109 | #endif //KAB_EMBEDDED | 111 | #endif //KAB_EMBEDDED |
110 | void KAddressBookMain::newContact() | 112 | void KAddressBookMain::newContact() |
111 | { | 113 | { |
112 | mCore->newContact(); | 114 | mCore->newContact(); |
113 | } | 115 | } |
114 | 116 | ||
115 | QString KAddressBookMain::getNameByPhone( QString phone ) | 117 | QString KAddressBookMain::getNameByPhone( QString phone ) |
116 | { | 118 | { |
117 | return mCore->getNameByPhone( phone ); | 119 | return mCore->getNameByPhone( phone ); |
118 | } | 120 | } |
119 | 121 | ||
120 | void KAddressBookMain::save() | 122 | void KAddressBookMain::save() |
121 | { | 123 | { |
122 | mCore->save(); | 124 | mCore->save(); |
123 | } | 125 | } |
124 | 126 | ||
125 | void KAddressBookMain::exit() | 127 | void KAddressBookMain::exit() |
126 | { | 128 | { |
127 | close( ); | 129 | close( ); |
128 | } | 130 | } |
129 | 131 | ||
130 | void KAddressBookMain::saveProperties( KConfig* ) | 132 | void KAddressBookMain::saveProperties( KConfig* ) |
131 | { | 133 | { |
132 | } | 134 | } |
133 | 135 | ||
134 | void KAddressBookMain::readProperties( KConfig* ) | 136 | void KAddressBookMain::readProperties( KConfig* ) |
135 | { | 137 | { |
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 93ba53c..2f3531d 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp | |||
@@ -34,87 +34,86 @@ int main( int argc, char **argv ) | |||
34 | QString hdir ( getenv( "HOME") ); | 34 | QString hdir ( getenv( "HOME") ); |
35 | if ( hdir.isEmpty() ) { | 35 | if ( hdir.isEmpty() ) { |
36 | QString hd ("C:/" ); | 36 | QString hd ("C:/" ); |
37 | //QMessageBox::information(0,"hh",QDir::homeDirPath()+" xx" +hd ); | 37 | //QMessageBox::information(0,"hh",QDir::homeDirPath()+" xx" +hd ); |
38 | if ( QDir::homeDirPath().lower() == hd.lower() ) { | 38 | if ( QDir::homeDirPath().lower() == hd.lower() ) { |
39 | _putenv( "HOME=C:"); | 39 | _putenv( "HOME=C:"); |
40 | //QMessageBox::information(0,"hh",QString ( getenv( "HOME") ) ); | 40 | //QMessageBox::information(0,"hh",QString ( getenv( "HOME") ) ); |
41 | } | 41 | } |
42 | } else { | 42 | } else { |
43 | QDir app_dir; | 43 | QDir app_dir; |
44 | if ( !app_dir.exists(hdir) ) | 44 | if ( !app_dir.exists(hdir) ) |
45 | app_dir.mkdir (hdir); | 45 | app_dir.mkdir (hdir); |
46 | } | 46 | } |
47 | #endif | 47 | #endif |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | bool exitHelp = false; | 50 | bool exitHelp = false; |
51 | if ( argc > 1 ) { | 51 | if ( argc > 1 ) { |
52 | QString command = argv[1]; | 52 | QString command = argv[1]; |
53 | if ( command == "-help" ){ | 53 | if ( command == "-help" ){ |
54 | printf("KA/E command line commands:\n"); | 54 | printf("KA/E command line commands:\n"); |
55 | printf(" no command: Start KA/E in usual way\n"); | 55 | printf(" no command: Start KA/E in usual way\n"); |
56 | printf(" -help: This output\n"); | 56 | printf(" -help: This output\n"); |
57 | printf(" KA/E is exiting now. Bye!\n"); | 57 | printf(" KA/E is exiting now. Bye!\n"); |
58 | exitHelp = true; | 58 | exitHelp = true; |
59 | } | 59 | } |
60 | } | 60 | } |
61 | if ( ! exitHelp ) { | 61 | if ( ! exitHelp ) { |
62 | 62 | ||
63 | KGlobal::setAppName( "kaddressbook" ); | 63 | KGlobal::setAppName( "kaddressbook" ); |
64 | #ifndef DESKTOP_VERSION | 64 | #ifndef DESKTOP_VERSION |
65 | if ( QApplication::desktop()->width() > 320 ) | 65 | if ( QApplication::desktop()->width() > 320 ) |
66 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); | 66 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); |
67 | else | 67 | else |
68 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); | 68 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); |
69 | #else | 69 | #else |
70 | QString fileName ; | 70 | QString fileName ; |
71 | fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; | 71 | fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; |
72 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); | 72 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); |
73 | QApplication::addLibraryPath ( qApp->applicationDirPath () ); | 73 | QApplication::addLibraryPath ( qApp->applicationDirPath () ); |
74 | 74 | ||
75 | #endif | 75 | #endif |
76 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); | 76 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); |
77 | // init language | 77 | // init language |
78 | KPimGlobalPrefs::instance()->setGlobalConfig(); | 78 | KPimGlobalPrefs::instance()->setGlobalConfig(); |
79 | QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont ); | 79 | QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont ); |
80 | KAddressBookMain m ; | 80 | KAddressBookMain m ; |
81 | //US MainWindow m; | 81 | //US MainWindow m; |
82 | #ifndef DESKTOP_VERSION | 82 | |
83 | QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | ||
84 | #endif | ||
85 | 83 | ||
86 | 84 | ||
87 | #ifndef DESKTOP_VERSION | 85 | #ifndef DESKTOP_VERSION |
88 | a.showMainWidget( &m ); | 86 | a.showMainWidget( &m ); |
89 | 87 | ||
90 | #else | 88 | #else |
91 | a.setMainWidget( &m ); | 89 | a.setMainWidget( &m ); |
92 | m.show(); | 90 | m.show(); |
93 | #endif | 91 | #endif |
92 | m.setCaption(i18n("Loading addressbook data ... please wait" )); | ||
94 | a.exec(); | 93 | a.exec(); |
95 | #ifdef DESKTOP_VERSION | 94 | #ifdef DESKTOP_VERSION |
96 | KConfig *config = KABPrefs::instance()->getConfig(); | 95 | KConfig *config = KABPrefs::instance()->getConfig(); |
97 | config->setGroup("WidgetLayout"); | 96 | config->setGroup("WidgetLayout"); |
98 | QStringList list ;//= config->readListEntry("MainLayout"); | 97 | QStringList list ;//= config->readListEntry("MainLayout"); |
99 | int x,y,w,h; | 98 | int x,y,w,h; |
100 | QWidget* wid; | 99 | QWidget* wid; |
101 | wid = &m; | 100 | wid = &m; |
102 | x = wid->geometry().x(); | 101 | x = wid->geometry().x(); |
103 | y = wid->geometry().y(); | 102 | y = wid->geometry().y(); |
104 | w = wid->width(); | 103 | w = wid->width(); |
105 | h = wid->height(); | 104 | h = wid->height(); |
106 | list.clear(); | 105 | list.clear(); |
107 | list << QString::number( x ); | 106 | list << QString::number( x ); |
108 | list << QString::number( y ); | 107 | list << QString::number( y ); |
109 | list << QString::number( w ); | 108 | list << QString::number( w ); |
110 | list << QString::number( h ); | 109 | list << QString::number( h ); |
111 | config->writeEntry("MainLayout",list ); | 110 | config->writeEntry("MainLayout",list ); |
112 | config->sync(); | 111 | config->sync(); |
113 | #endif | 112 | #endif |
114 | dumpMissing(); | 113 | dumpMissing(); |
115 | 114 | ||
116 | KPimGlobalPrefs::instance()->writeConfig(); | 115 | KPimGlobalPrefs::instance()->writeConfig(); |
117 | } | 116 | } |
118 | qDebug("KA: Bye! "); | 117 | qDebug("KA: Bye! "); |
119 | } | 118 | } |
120 | 119 | ||