-rw-r--r-- | kaddressbook/kabcore.cpp | 33 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 3 | ||||
-rw-r--r-- | kaddressbook/mainembedded.cpp | 19 |
3 files changed, 46 insertions, 9 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 6807bed..e7c815e 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -38,64 +38,66 @@ | |||
38 | #include <kabc/errorhandler.h> | 38 | #include <kabc/errorhandler.h> |
39 | #include <kabc/resource.h> | 39 | #include <kabc/resource.h> |
40 | #include <kabc/vcardconverter.h> | 40 | #include <kabc/vcardconverter.h> |
41 | #include <kapplication.h> | 41 | #include <kapplication.h> |
42 | #include <kactionclasses.h> | 42 | #include <kactionclasses.h> |
43 | #include <kcmultidialog.h> | 43 | #include <kcmultidialog.h> |
44 | #include <kdebug.h> | 44 | #include <kdebug.h> |
45 | #include <kdeversion.h> | 45 | #include <kdeversion.h> |
46 | #include <kkeydialog.h> | 46 | #include <kkeydialog.h> |
47 | #include <kmessagebox.h> | 47 | #include <kmessagebox.h> |
48 | #include <kprinter.h> | 48 | #include <kprinter.h> |
49 | #include <kprotocolinfo.h> | 49 | #include <kprotocolinfo.h> |
50 | #include <kresources/selectdialog.h> | 50 | #include <kresources/selectdialog.h> |
51 | #include <kstandarddirs.h> | 51 | #include <kstandarddirs.h> |
52 | #include <ktempfile.h> | 52 | #include <ktempfile.h> |
53 | #include <kxmlguiclient.h> | 53 | #include <kxmlguiclient.h> |
54 | #include <kaboutdata.h> | 54 | #include <kaboutdata.h> |
55 | #include <libkdepim/categoryselectdialog.h> | 55 | #include <libkdepim/categoryselectdialog.h> |
56 | 56 | ||
57 | #include "addresseeutil.h" | 57 | #include "addresseeutil.h" |
58 | #include "addresseeeditordialog.h" | 58 | #include "addresseeeditordialog.h" |
59 | #include "extensionmanager.h" | 59 | #include "extensionmanager.h" |
60 | #include "kstdaction.h" | 60 | #include "kstdaction.h" |
61 | #include "kaddressbookservice.h" | 61 | #include "kaddressbookservice.h" |
62 | #include "ldapsearchdialog.h" | 62 | #include "ldapsearchdialog.h" |
63 | #include "printing/printingwizard.h" | 63 | #include "printing/printingwizard.h" |
64 | #else // KAB_EMBEDDED | 64 | #else // KAB_EMBEDDED |
65 | 65 | ||
66 | #include <kapplication.h> | 66 | #include <kapplication.h> |
67 | #include "KDGanttMinimizeSplitter.h" | 67 | #include "KDGanttMinimizeSplitter.h" |
68 | #include "kaddressbookmain.h" | 68 | #include "kaddressbookmain.h" |
69 | #include "kactioncollection.h" | 69 | #include "kactioncollection.h" |
70 | #include "addresseedialog.h" | ||
71 | |||
70 | #include <qapp.h> | 72 | #include <qapp.h> |
71 | #include <qmenubar.h> | 73 | #include <qmenubar.h> |
72 | //#include <qtoolbar.h> | 74 | //#include <qtoolbar.h> |
73 | #include <qmessagebox.h> | 75 | #include <qmessagebox.h> |
74 | #include <kdebug.h> | 76 | #include <kdebug.h> |
75 | #include <kiconloader.h> // needed for SmallIcon | 77 | #include <kiconloader.h> // needed for SmallIcon |
76 | #include <kresources/kcmkresources.h> | 78 | #include <kresources/kcmkresources.h> |
77 | #include <ktoolbar.h> | 79 | #include <ktoolbar.h> |
78 | 80 | ||
79 | 81 | ||
80 | //#include <qlabel.h> | 82 | //#include <qlabel.h> |
81 | 83 | ||
82 | 84 | ||
83 | #ifndef DESKTOP_VERSION | 85 | #ifndef DESKTOP_VERSION |
84 | #include <qpe/ir.h> | 86 | #include <qpe/ir.h> |
85 | #endif | 87 | #endif |
86 | 88 | ||
87 | #endif // KAB_EMBEDDED | 89 | #endif // KAB_EMBEDDED |
88 | #include "kcmconfigs/kcmkabconfig.h" | 90 | #include "kcmconfigs/kcmkabconfig.h" |
89 | #include "kcmconfigs/kcmkdepimconfig.h" | 91 | #include "kcmconfigs/kcmkdepimconfig.h" |
90 | #include "kpimglobalprefs.h" | 92 | #include "kpimglobalprefs.h" |
91 | #include "externalapphandler.h" | 93 | #include "externalapphandler.h" |
92 | 94 | ||
93 | 95 | ||
94 | #include <kresources/selectdialog.h> | 96 | #include <kresources/selectdialog.h> |
95 | #include <kmessagebox.h> | 97 | #include <kmessagebox.h> |
96 | 98 | ||
97 | #include <picture.h> | 99 | #include <picture.h> |
98 | #include <resource.h> | 100 | #include <resource.h> |
99 | 101 | ||
100 | //US#include <qsplitter.h> | 102 | //US#include <qsplitter.h> |
101 | #include <qmap.h> | 103 | #include <qmap.h> |
@@ -182,71 +184,76 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
182 | mAddressBook->addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal, | 184 | mAddressBook->addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal, |
183 | "X-FreeBusyUrl", "KADDRESSBOOK" ); | 185 | "X-FreeBusyUrl", "KADDRESSBOOK" ); |
184 | 186 | ||
185 | initGUI(); | 187 | initGUI(); |
186 | 188 | ||
187 | mIncSearchWidget->setFocus(); | 189 | mIncSearchWidget->setFocus(); |
188 | 190 | ||
189 | 191 | ||
190 | connect( mViewManager, SIGNAL( selected( const QString& ) ), | 192 | connect( mViewManager, SIGNAL( selected( const QString& ) ), |
191 | SLOT( setContactSelected( const QString& ) ) ); | 193 | SLOT( setContactSelected( const QString& ) ) ); |
192 | connect( mViewManager, SIGNAL( executed( const QString& ) ), | 194 | connect( mViewManager, SIGNAL( executed( const QString& ) ), |
193 | SLOT( executeContact( const QString& ) ) ); | 195 | SLOT( executeContact( const QString& ) ) ); |
194 | 196 | ||
195 | connect( mViewManager, SIGNAL( deleteRequest( ) ), | 197 | connect( mViewManager, SIGNAL( deleteRequest( ) ), |
196 | SLOT( deleteContacts( ) ) ); | 198 | SLOT( deleteContacts( ) ) ); |
197 | connect( mViewManager, SIGNAL( modified() ), | 199 | connect( mViewManager, SIGNAL( modified() ), |
198 | SLOT( setModified() ) ); | 200 | SLOT( setModified() ) ); |
199 | 201 | ||
200 | connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); | 202 | connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); |
201 | connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) ); | 203 | connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) ); |
202 | 204 | ||
203 | connect( mXXPortManager, SIGNAL( modified() ), | 205 | connect( mXXPortManager, SIGNAL( modified() ), |
204 | SLOT( setModified() ) ); | 206 | SLOT( setModified() ) ); |
205 | 207 | ||
206 | connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), | 208 | connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), |
207 | SLOT( incrementalSearch( const QString& ) ) ); | 209 | SLOT( incrementalSearch( const QString& ) ) ); |
208 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), | 210 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), |
209 | mJumpButtonBar, SLOT( recreateButtons() ) ); | 211 | mJumpButtonBar, SLOT( recreateButtons() ) ); |
210 | 212 | ||
211 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), | 213 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), |
212 | SLOT( sendMail( const QString& ) ) ); | 214 | SLOT( sendMail( const QString& ) ) ); |
213 | 215 | ||
216 | |||
217 | connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&, const QString&))); | ||
218 | |||
219 | |||
214 | #ifndef KAB_EMBEDDED | 220 | #ifndef KAB_EMBEDDED |
215 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), | 221 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), |
216 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); | 222 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); |
217 | 223 | ||
218 | connect( mDetails, SIGNAL( browse( const QString& ) ), | 224 | connect( mDetails, SIGNAL( browse( const QString& ) ), |
219 | SLOT( browse( const QString& ) ) ); | 225 | SLOT( browse( const QString& ) ) ); |
220 | 226 | ||
227 | |||
221 | mAddressBookService = new KAddressBookService( this ); | 228 | mAddressBookService = new KAddressBookService( this ); |
222 | 229 | ||
223 | #endif //KAB_EMBEDDED | 230 | #endif //KAB_EMBEDDED |
224 | mEditorDialog = 0; | 231 | mEditorDialog = 0; |
225 | createAddresseeEditorDialog( this ); | 232 | createAddresseeEditorDialog( this ); |
226 | setModified( false ); | 233 | setModified( false ); |
227 | } | 234 | } |
228 | 235 | ||
229 | KABCore::~KABCore() | 236 | KABCore::~KABCore() |
230 | { | 237 | { |
231 | // save(); | 238 | // save(); |
232 | //saveSettings(); | 239 | //saveSettings(); |
233 | //KABPrefs::instance()->writeConfig(); | 240 | //KABPrefs::instance()->writeConfig(); |
234 | delete AddresseeConfig::instance(); | 241 | delete AddresseeConfig::instance(); |
235 | mAddressBook = 0; | 242 | mAddressBook = 0; |
236 | KABC::StdAddressBook::close(); | 243 | KABC::StdAddressBook::close(); |
237 | } | 244 | } |
238 | 245 | ||
239 | void KABCore::restoreSettings() | 246 | void KABCore::restoreSettings() |
240 | { | 247 | { |
241 | mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce; | 248 | mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce; |
242 | 249 | ||
243 | bool state; | 250 | bool state; |
244 | 251 | ||
245 | if (mMultipleViewsAtOnce) | 252 | if (mMultipleViewsAtOnce) |
246 | state = KABPrefs::instance()->mDetailsPageVisible; | 253 | state = KABPrefs::instance()->mDetailsPageVisible; |
247 | else | 254 | else |
248 | state = false; | 255 | state = false; |
249 | 256 | ||
250 | mActionDetails->setChecked( state ); | 257 | mActionDetails->setChecked( state ); |
251 | setDetailsVisible( state ); | 258 | setDetailsVisible( state ); |
252 | 259 | ||
@@ -1936,36 +1943,62 @@ void KABCore::updateActionMenu() | |||
1936 | 1943 | ||
1937 | mActionUndo->setEnabled( !undo->isEmpty() ); | 1944 | mActionUndo->setEnabled( !undo->isEmpty() ); |
1938 | 1945 | ||
1939 | if ( !redo->top() ) | 1946 | if ( !redo->top() ) |
1940 | mActionRedo->setText( i18n( "Redo" ) ); | 1947 | mActionRedo->setText( i18n( "Redo" ) ); |
1941 | else | 1948 | else |
1942 | mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) ); | 1949 | mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) ); |
1943 | 1950 | ||
1944 | mActionRedo->setEnabled( !redo->isEmpty() ); | 1951 | mActionRedo->setEnabled( !redo->isEmpty() ); |
1945 | } | 1952 | } |
1946 | 1953 | ||
1947 | void KABCore::configureKeyBindings() | 1954 | void KABCore::configureKeyBindings() |
1948 | { | 1955 | { |
1949 | #ifndef KAB_EMBEDDED | 1956 | #ifndef KAB_EMBEDDED |
1950 | KKeyDialog::configure( actionCollection(), true ); | 1957 | KKeyDialog::configure( actionCollection(), true ); |
1951 | #else //KAB_EMBEDDED | 1958 | #else //KAB_EMBEDDED |
1952 | qDebug("KABCore::configureKeyBindings() not implemented"); | 1959 | qDebug("KABCore::configureKeyBindings() not implemented"); |
1953 | #endif //KAB_EMBEDDED | 1960 | #endif //KAB_EMBEDDED |
1954 | } | 1961 | } |
1955 | 1962 | ||
1956 | #ifdef KAB_EMBEDDED | 1963 | #ifdef KAB_EMBEDDED |
1957 | void KABCore::configureResources() | 1964 | void KABCore::configureResources() |
1958 | { | 1965 | { |
1959 | KRES::KCMKResources dlg( this, "" , 0 ); | 1966 | KRES::KCMKResources dlg( this, "" , 0 ); |
1960 | 1967 | ||
1961 | if ( !dlg.exec() ) | 1968 | if ( !dlg.exec() ) |
1962 | return; | 1969 | return; |
1963 | KMessageBox::information( this, i18n("Please restart to get the \nchanged resources (re)loaded!\n") ); | 1970 | KMessageBox::information( this, i18n("Please restart to get the \nchanged resources (re)loaded!\n") ); |
1964 | } | 1971 | } |
1965 | #endif //KAB_EMBEDDED | 1972 | #endif //KAB_EMBEDDED |
1966 | 1973 | ||
1967 | 1974 | ||
1975 | /* this method will be called through the QCop interface from Ko/Pi to select addresses | ||
1976 | * for the attendees list of an event. | ||
1977 | */ | ||
1978 | void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid, const QString& param1) | ||
1979 | { | ||
1980 | //param1 is usually empty for this kind of request | ||
1981 | |||
1982 | QStringList nameList; | ||
1983 | QStringList emailList; | ||
1984 | QStringList uidList; | ||
1985 | |||
1986 | KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); | ||
1987 | uint i=0; | ||
1988 | for (i=0; i < list.count(); i++) | ||
1989 | { | ||
1990 | nameList.append(list[i].realName()); | ||
1991 | emailList.append(list[i].preferredEmail()); | ||
1992 | uidList.append(list[i].uid()); | ||
1993 | } | ||
1994 | |||
1995 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList); | ||
1996 | |||
1997 | } | ||
1998 | |||
1999 | |||
2000 | |||
1968 | 2001 | ||
1969 | #ifndef KAB_EMBEDDED | 2002 | #ifndef KAB_EMBEDDED |
1970 | #include "kabcore.moc" | 2003 | #include "kabcore.moc" |
1971 | #endif //KAB_EMBEDDED | 2004 | #endif //KAB_EMBEDDED |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index d4d28f1..fe778af 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -299,64 +299,67 @@ class KABCore : public QWidget | |||
299 | */ | 299 | */ |
300 | void editContact( const QString &uid /*US = QString::null*/ ); | 300 | void editContact( const QString &uid /*US = QString::null*/ ); |
301 | //US added a second method without defaultparameter | 301 | //US added a second method without defaultparameter |
302 | void editContact2(); | 302 | void editContact2(); |
303 | 303 | ||
304 | /** | 304 | /** |
305 | Shows or edits the detail view for the given uid. If the uid is QString::null, | 305 | Shows or edits the detail view for the given uid. If the uid is QString::null, |
306 | the method will try to find a selected addressee in the view. | 306 | the method will try to find a selected addressee in the view. |
307 | */ | 307 | */ |
308 | void executeContact( const QString &uid /*US = QString::null*/ ); | 308 | void executeContact( const QString &uid /*US = QString::null*/ ); |
309 | 309 | ||
310 | /** | 310 | /** |
311 | Launches the configuration dialog. | 311 | Launches the configuration dialog. |
312 | */ | 312 | */ |
313 | void openConfigDialog(); | 313 | void openConfigDialog(); |
314 | 314 | ||
315 | /** | 315 | /** |
316 | Launches the ldap search dialog. | 316 | Launches the ldap search dialog. |
317 | */ | 317 | */ |
318 | void openLDAPDialog(); | 318 | void openLDAPDialog(); |
319 | 319 | ||
320 | /** | 320 | /** |
321 | Creates a KAddressBookPrinter, which will display the print | 321 | Creates a KAddressBookPrinter, which will display the print |
322 | dialog and do the printing. | 322 | dialog and do the printing. |
323 | */ | 323 | */ |
324 | void print(); | 324 | void print(); |
325 | 325 | ||
326 | /** | 326 | /** |
327 | Registers a new GUI client, so plugins can register its actions. | 327 | Registers a new GUI client, so plugins can register its actions. |
328 | */ | 328 | */ |
329 | void addGUIClient( KXMLGUIClient *client ); | 329 | void addGUIClient( KXMLGUIClient *client ); |
330 | 330 | ||
331 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid, const QString& param1); | ||
332 | |||
333 | |||
331 | signals: | 334 | signals: |
332 | void contactSelected( const QString &name ); | 335 | void contactSelected( const QString &name ); |
333 | void contactSelected( const QPixmap &pixmap ); | 336 | void contactSelected( const QPixmap &pixmap ); |
334 | public slots: | 337 | public slots: |
335 | void setDetailsVisible( bool visible ); | 338 | void setDetailsVisible( bool visible ); |
336 | void setDetailsToState(); | 339 | void setDetailsToState(); |
337 | private slots: | 340 | private slots: |
338 | void setJumpButtonBarVisible( bool visible ); | 341 | void setJumpButtonBarVisible( bool visible ); |
339 | void importFromOL(); | 342 | void importFromOL(); |
340 | void extensionModified( const KABC::Addressee::List &list ); | 343 | void extensionModified( const KABC::Addressee::List &list ); |
341 | void extensionChanged( int id ); | 344 | void extensionChanged( int id ); |
342 | void clipboardDataChanged(); | 345 | void clipboardDataChanged(); |
343 | void updateActionMenu(); | 346 | void updateActionMenu(); |
344 | void configureKeyBindings(); | 347 | void configureKeyBindings(); |
345 | void removeVoice(); | 348 | void removeVoice(); |
346 | #ifdef KAB_EMBEDDED | 349 | #ifdef KAB_EMBEDDED |
347 | void configureResources(); | 350 | void configureResources(); |
348 | #endif //KAB_EMBEDDED | 351 | #endif //KAB_EMBEDDED |
349 | 352 | ||
350 | void slotEditorDestroyed( const QString &uid ); | 353 | void slotEditorDestroyed( const QString &uid ); |
351 | void configurationChanged(); | 354 | void configurationChanged(); |
352 | void addressBookChanged(); | 355 | void addressBookChanged(); |
353 | 356 | ||
354 | private: | 357 | private: |
355 | void initGUI(); | 358 | void initGUI(); |
356 | void initActions(); | 359 | void initActions(); |
357 | 360 | ||
358 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, | 361 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, |
359 | const char *name = 0 ); | 362 | const char *name = 0 ); |
360 | 363 | ||
361 | KXMLGUIClient *mGUIClient; | 364 | KXMLGUIClient *mGUIClient; |
362 | 365 | ||
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 7f368eb..850e5b2 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp | |||
@@ -1,98 +1,99 @@ | |||
1 | #ifndef DESKTOP_VERSION | 1 | #ifndef DESKTOP_VERSION |
2 | #include <qpe/qpeapplication.h> | 2 | #include <qpe/qpeapplication.h> |
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #else | 4 | #else |
5 | #include <qapplication.h> | 5 | #include <qapplication.h> |
6 | #include <qwindowsstyle.h> | 6 | #include <qwindowsstyle.h> |
7 | #include <qplatinumstyle.h> | 7 | #include <qplatinumstyle.h> |
8 | #include <qmainwindow.h> | 8 | #include <qmainwindow.h> |
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | #include <kstandarddirs.h> | 11 | #include <kstandarddirs.h> |
12 | #include <kglobal.h> | 12 | #include <kglobal.h> |
13 | #include <stdio.h> | 13 | #include <stdio.h> |
14 | #include <qdir.h> | 14 | #include <qdir.h> |
15 | #include "kaddressbookmain.h" | 15 | #include "kaddressbookmain.h" |
16 | #include "externalapphandler.h" | ||
16 | 17 | ||
17 | int main( int argc, char **argv ) | 18 | int main( int argc, char **argv ) |
18 | { | 19 | { |
19 | #ifndef DESKTOP_VERSION | 20 | #ifndef DESKTOP_VERSION |
20 | QPEApplication a( argc, argv ); | 21 | QPEApplication a( argc, argv ); |
21 | a.setKeepRunning (); | 22 | a.setKeepRunning (); |
22 | #else | 23 | #else |
23 | QApplication a( argc, argv ); | 24 | QApplication a( argc, argv ); |
24 | QApplication::setStyle( new QPlatinumStyle ()); | 25 | QApplication::setStyle( new QPlatinumStyle ()); |
25 | #endif | 26 | #endif |
26 | 27 | ||
27 | bool exitHelp = false; | 28 | bool exitHelp = false; |
28 | if ( argc > 1 ) { | 29 | if ( argc > 1 ) { |
29 | QString command = argv[1]; | 30 | QString command = argv[1]; |
30 | if ( command == "-help" ){ | 31 | if ( command == "-help" ){ |
31 | printf("KA/E command line commands:\n"); | 32 | printf("KA/E command line commands:\n"); |
32 | printf(" no command: Start KA/E in usual way\n"); | 33 | printf(" no command: Start KA/E in usual way\n"); |
33 | printf(" -help: This output\n"); | 34 | printf(" -help: This output\n"); |
34 | printf(" KA/E is exiting now. Bye!\n"); | 35 | printf(" KA/E is exiting now. Bye!\n"); |
35 | exitHelp = true; | 36 | exitHelp = true; |
36 | } | 37 | } |
37 | } | 38 | } |
38 | if ( ! exitHelp ) { | 39 | if ( ! exitHelp ) { |
39 | 40 | ||
40 | KGlobal::setAppName( "kaddressbook" ); | 41 | KGlobal::setAppName( "kaddressbook" ); |
41 | #ifndef DESKTOP_VERSION | 42 | #ifndef DESKTOP_VERSION |
42 | if ( QApplication::desktop()->width() > 320 ) | 43 | if ( QApplication::desktop()->width() > 320 ) |
43 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); | 44 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); |
44 | else | 45 | else |
45 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); | 46 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); |
46 | #else | 47 | #else |
47 | QString fileName ; | 48 | QString fileName ; |
48 | fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; | 49 | fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; |
49 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); | 50 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); |
50 | QApplication::addLibraryPath ( qApp->applicationDirPath () ); | 51 | QApplication::addLibraryPath ( qApp->applicationDirPath () ); |
51 | 52 | ||
52 | #endif | 53 | #endif |
53 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); | 54 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); |
54 | KAddressBookMain m ; | 55 | KAddressBookMain m ; |
55 | //US MainWindow m; | 56 | //US MainWindow m; |
56 | //US QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve( const QCString&, const QByteArray& ))); | 57 | QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
57 | 58 | ||
58 | #ifndef DESKTOP_VERSION | 59 | #ifndef DESKTOP_VERSION |
59 | a.showMainWidget( &m ); | 60 | a.showMainWidget( &m ); |
60 | #else | 61 | #else |
61 | a.setMainWidget( &m ); | 62 | a.setMainWidget( &m ); |
62 | m.resize (640, 480 ); | 63 | m.resize (640, 480 ); |
63 | m.show(); | 64 | m.show(); |
64 | #endif | 65 | #endif |
65 | a.exec(); | 66 | a.exec(); |
66 | 67 | ||
67 | } | 68 | } |
68 | qDebug("KA: Bye! "); | 69 | qDebug("KA: Bye! "); |
69 | } | 70 | } |
70 | 71 | ||
71 | /* | 72 | /* |
72 | #include <stdlib.h> | 73 | #include <stdlib.h> |
73 | 74 | ||
74 | #include <qstring.h> | 75 | #include <qstring.h> |
75 | 76 | ||
76 | #include <kabc/stdaddressbook.h> | 77 | #include <kabc/stdaddressbook.h> |
77 | #include <kaboutdata.h> | 78 | #include <kaboutdata.h> |
78 | #include <kcmdlineargs.h> | 79 | #include <kcmdlineargs.h> |
79 | #include <kcrash.h> | 80 | #include <kcrash.h> |
80 | #include <kdebug.h> | 81 | #include <kdebug.h> |
81 | #include <klocale.h> | 82 | #include <klocale.h> |
82 | #include <kstartupinfo.h> | 83 | #include <kstartupinfo.h> |
83 | #include <kuniqueapplication.h> | 84 | #include <kuniqueapplication.h> |
84 | #include <kwin.h> | 85 | #include <kwin.h> |
85 | 86 | ||
86 | #include "kaddressbookmain.h" | 87 | #include "kaddressbookmain.h" |
87 | #include "kabcore.h" | 88 | #include "kabcore.h" |
88 | 89 | ||
89 | extern "C" { | 90 | extern "C" { |
90 | 91 | ||
91 | void crashHandler( int ) | 92 | void crashHandler( int ) |
92 | { | 93 | { |
93 | KABC::StdAddressBook::handleCrash(); | 94 | KABC::StdAddressBook::handleCrash(); |
94 | ::exit( 0 ); | 95 | ::exit( 0 ); |
95 | } | 96 | } |
96 | 97 | ||
97 | } | 98 | } |
98 | 99 | ||