summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp8
-rw-r--r--kaddressbook/kabcore.h1
2 files changed, 7 insertions, 2 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index e34a7d3..e2e3a66 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1369,97 +1369,101 @@ void KABCore::executeContact( const QString &uid /*US = QString::null*/ )
1369} 1369}
1370 1370
1371void KABCore::save() 1371void KABCore::save()
1372{ 1372{
1373 if (syncManager->blockSave()) 1373 if (syncManager->blockSave())
1374 return; 1374 return;
1375 if ( !mModified ) 1375 if ( !mModified )
1376 return; 1376 return;
1377 1377
1378 syncManager->setBlockSave(true); 1378 syncManager->setBlockSave(true);
1379 QString text = i18n( "There was an error while attempting to save\n the " 1379 QString text = i18n( "There was an error while attempting to save\n the "
1380 "address book. Please check that some \nother application is " 1380 "address book. Please check that some \nother application is "
1381 "not using it. " ); 1381 "not using it. " );
1382 message(i18n("Saving ... please wait! "), false); 1382 message(i18n("Saving ... please wait! "), false);
1383 //qApp->processEvents(); 1383 //qApp->processEvents();
1384#ifndef KAB_EMBEDDED 1384#ifndef KAB_EMBEDDED
1385 KABC::StdAddressBook *b = dynamic_cast<KABC::StdAddressBook*>( mAddressBook ); 1385 KABC::StdAddressBook *b = dynamic_cast<KABC::StdAddressBook*>( mAddressBook );
1386 if ( !b || !b->save() ) { 1386 if ( !b || !b->save() ) {
1387 KMessageBox::error( this, text, i18n( "Unable to Save" ) ); 1387 KMessageBox::error( this, text, i18n( "Unable to Save" ) );
1388 } 1388 }
1389#else //KAB_EMBEDDED 1389#else //KAB_EMBEDDED
1390 KABC::StdAddressBook *b = (KABC::StdAddressBook*)( mAddressBook ); 1390 KABC::StdAddressBook *b = (KABC::StdAddressBook*)( mAddressBook );
1391 if ( !b || !b->save() ) { 1391 if ( !b || !b->save() ) {
1392 QMessageBox::critical( this, i18n( "Unable to Save" ), text, i18n("Ok")); 1392 QMessageBox::critical( this, i18n( "Unable to Save" ), text, i18n("Ok"));
1393 } 1393 }
1394#endif //KAB_EMBEDDED 1394#endif //KAB_EMBEDDED
1395 1395
1396 message(i18n("Addressbook saved!")); 1396 message(i18n("Addressbook saved!"));
1397 setModified( false ); 1397 setModified( false );
1398 syncManager->setBlockSave(false); 1398 syncManager->setBlockSave(false);
1399} 1399}
1400 1400
1401 1401
1402void KABCore::undo() 1402void KABCore::undo()
1403{ 1403{
1404 UndoStack::instance()->undo(); 1404 UndoStack::instance()->undo();
1405 1405
1406 // Refresh the view 1406 // Refresh the view
1407 mViewManager->refreshView(); 1407 mViewManager->refreshView();
1408} 1408}
1409 1409
1410void KABCore::redo() 1410void KABCore::redo()
1411{ 1411{
1412 RedoStack::instance()->redo(); 1412 RedoStack::instance()->redo();
1413 1413
1414 // Refresh the view 1414 // Refresh the view
1415 mViewManager->refreshView(); 1415 mViewManager->refreshView();
1416} 1416}
1417 1417void KABCore::setJumpButtonBar( bool visible )
1418{
1419 setJumpButtonBarVisible(visible );
1420 saveSettings();
1421}
1418void KABCore::setJumpButtonBarVisible( bool visible ) 1422void KABCore::setJumpButtonBarVisible( bool visible )
1419{ 1423{
1420 if (mMultipleViewsAtOnce) 1424 if (mMultipleViewsAtOnce)
1421 { 1425 {
1422 if ( visible ) 1426 if ( visible )
1423 mJumpButtonBar->show(); 1427 mJumpButtonBar->show();
1424 else 1428 else
1425 mJumpButtonBar->hide(); 1429 mJumpButtonBar->hide();
1426 } 1430 }
1427 else 1431 else
1428 { 1432 {
1429 // show the jumpbar only if "the details are hidden" == "viewmanager are shown" 1433 // show the jumpbar only if "the details are hidden" == "viewmanager are shown"
1430 if (mViewManager->isVisible()) 1434 if (mViewManager->isVisible())
1431 { 1435 {
1432 if ( visible ) 1436 if ( visible )
1433 mJumpButtonBar->show(); 1437 mJumpButtonBar->show();
1434 else 1438 else
1435 mJumpButtonBar->hide(); 1439 mJumpButtonBar->hide();
1436 } 1440 }
1437 else 1441 else
1438 { 1442 {
1439 mJumpButtonBar->hide(); 1443 mJumpButtonBar->hide();
1440 } 1444 }
1441 } 1445 }
1442} 1446}
1443 1447
1444 1448
1445void KABCore::setDetailsToState() 1449void KABCore::setDetailsToState()
1446{ 1450{
1447 setDetailsVisible( mActionDetails->isChecked() ); 1451 setDetailsVisible( mActionDetails->isChecked() );
1448} 1452}
1449void KABCore::setDetailsToggle() 1453void KABCore::setDetailsToggle()
1450{ 1454{
1451 mActionDetails->setChecked( !mActionDetails->isChecked() ); 1455 mActionDetails->setChecked( !mActionDetails->isChecked() );
1452 setDetailsToState(); 1456 setDetailsToState();
1453} 1457}
1454 1458
1455 1459
1456 1460
1457void KABCore::setDetailsVisible( bool visible ) 1461void KABCore::setDetailsVisible( bool visible )
1458{ 1462{
1459 if (visible && mDetails->isHidden()) 1463 if (visible && mDetails->isHidden())
1460 { 1464 {
1461 KABC::Addressee::List addrList = mViewManager->selectedAddressees(); 1465 KABC::Addressee::List addrList = mViewManager->selectedAddressees();
1462 if ( addrList.count() > 0 ) 1466 if ( addrList.count() > 0 )
1463 mDetails->setAddressee( addrList[ 0 ] ); 1467 mDetails->setAddressee( addrList[ 0 ] );
1464 } 1468 }
1465 1469
@@ -1959,97 +1963,97 @@ void KABCore::initActions()
1959 } else { 1963 } else {
1960 mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() ); 1964 mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() );
1961 mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() ); 1965 mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() );
1962 mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() ); 1966 mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() );
1963 mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() ); 1967 mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() );
1964 mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() ); 1968 mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() );
1965 mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() ); 1969 mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() );
1966 } 1970 }
1967 1971
1968 mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete", 1972 mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete",
1969 Key_Delete, this, SLOT( deleteContacts() ), 1973 Key_Delete, this, SLOT( deleteContacts() ),
1970 actionCollection(), "edit_delete" ); 1974 actionCollection(), "edit_delete" );
1971 1975
1972 mActionUndo->setEnabled( false ); 1976 mActionUndo->setEnabled( false );
1973 mActionRedo->setEnabled( false ); 1977 mActionRedo->setEnabled( false );
1974 1978
1975 // settings menu 1979 // settings menu
1976#ifdef KAB_EMBEDDED 1980#ifdef KAB_EMBEDDED
1977//US special menuentry to configure the addressbook resources. On KDE 1981//US special menuentry to configure the addressbook resources. On KDE
1978// you do that through the control center !!! 1982// you do that through the control center !!!
1979 mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this, 1983 mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this,
1980 SLOT( configureResources() ), actionCollection(), 1984 SLOT( configureResources() ), actionCollection(),
1981 "kaddressbook_configure_resources" ); 1985 "kaddressbook_configure_resources" );
1982#endif //KAB_EMBEDDED 1986#endif //KAB_EMBEDDED
1983 1987
1984 if ( mIsPart ) { 1988 if ( mIsPart ) {
1985 mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this, 1989 mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this,
1986 SLOT( openConfigDialog() ), actionCollection(), 1990 SLOT( openConfigDialog() ), actionCollection(),
1987 "kaddressbook_configure" ); 1991 "kaddressbook_configure" );
1988 1992
1989 //US not implemented yet 1993 //US not implemented yet
1990 //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0, 1994 //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0,
1991 // this, SLOT( configureKeyBindings() ), actionCollection(), 1995 // this, SLOT( configureKeyBindings() ), actionCollection(),
1992 // "kaddressbook_configure_shortcuts" ); 1996 // "kaddressbook_configure_shortcuts" );
1993#ifdef KAB_EMBEDDED 1997#ifdef KAB_EMBEDDED
1994 mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() ); 1998 mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() );
1995 mActionConfigureToolbars->setEnabled( false ); 1999 mActionConfigureToolbars->setEnabled( false );
1996#endif //KAB_EMBEDDED 2000#endif //KAB_EMBEDDED
1997 2001
1998 } else { 2002 } else {
1999 mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() ); 2003 mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() );
2000 2004
2001 //US not implemented yet 2005 //US not implemented yet
2002 //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() ); 2006 //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() );
2003 } 2007 }
2004 2008
2005 mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0, 2009 mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0,
2006 actionCollection(), "options_show_jump_bar" ); 2010 actionCollection(), "options_show_jump_bar" );
2007 connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) ); 2011 connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBar( bool ) ) );
2008 2012
2009 mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0, 2013 mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0,
2010 actionCollection(), "options_show_details" ); 2014 actionCollection(), "options_show_details" );
2011 connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) ); 2015 connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) );
2012 2016
2013 2017
2014 mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this, 2018 mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this,
2015 SLOT( toggleBeamReceive() ), actionCollection(), 2019 SLOT( toggleBeamReceive() ), actionCollection(),
2016 "kaddressbook_beam_rec" ); 2020 "kaddressbook_beam_rec" );
2017 2021
2018 2022
2019 // misc 2023 // misc
2020 // only enable LDAP lookup if we can handle the protocol 2024 // only enable LDAP lookup if we can handle the protocol
2021#ifndef KAB_EMBEDDED 2025#ifndef KAB_EMBEDDED
2022 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { 2026 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) {
2023 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, 2027 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0,
2024 this, SLOT( openLDAPDialog() ), actionCollection(), 2028 this, SLOT( openLDAPDialog() ), actionCollection(),
2025 "ldap_lookup" ); 2029 "ldap_lookup" );
2026 } 2030 }
2027#else //KAB_EMBEDDED 2031#else //KAB_EMBEDDED
2028 //qDebug("KABCore::initActions() LDAP has to be implemented"); 2032 //qDebug("KABCore::initActions() LDAP has to be implemented");
2029#endif //KAB_EMBEDDED 2033#endif //KAB_EMBEDDED
2030 2034
2031 2035
2032 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this, 2036 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
2033 SLOT( setWhoAmI() ), actionCollection(), 2037 SLOT( setWhoAmI() ), actionCollection(),
2034 "set_personal" ); 2038 "set_personal" );
2035 2039
2036 2040
2037 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this, 2041 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this,
2038 SLOT( setCategories() ), actionCollection(), 2042 SLOT( setCategories() ), actionCollection(),
2039 "edit_set_categories" ); 2043 "edit_set_categories" );
2040 mActionEditCategories = new KAction( i18n( "Edit Categories" ), 0, this, 2044 mActionEditCategories = new KAction( i18n( "Edit Categories" ), 0, this,
2041 SLOT( editCategories() ), actionCollection(), 2045 SLOT( editCategories() ), actionCollection(),
2042 "edit__categories" ); 2046 "edit__categories" );
2043 2047
2044 mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this, 2048 mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this,
2045 SLOT( removeVoice() ), actionCollection(), 2049 SLOT( removeVoice() ), actionCollection(),
2046 "remove_voice" ); 2050 "remove_voice" );
2047 mActionSetFormattedName = new KAction( i18n( "Set formatted name..." ), 0, this, 2051 mActionSetFormattedName = new KAction( i18n( "Set formatted name..." ), 0, this,
2048 SLOT( setFormattedName() ), actionCollection(), 2052 SLOT( setFormattedName() ), actionCollection(),
2049 "set_formatted" ); 2053 "set_formatted" );
2050 2054
2051 mActionManageCategories= new KAction( i18n( "Manage new categories..." ), 0, this, 2055 mActionManageCategories= new KAction( i18n( "Manage new categories..." ), 0, this,
2052 SLOT( manageCategories() ), actionCollection(), 2056 SLOT( manageCategories() ), actionCollection(),
2053 "remove_voice" ); 2057 "remove_voice" );
2054 2058
2055 2059
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 786549a..c185117 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -321,96 +321,97 @@ class KABCore : public QWidget, public KSyncInterface
321 */ 321 */
322 void executeContact( const QString &uid /*US = QString::null*/ ); 322 void executeContact( const QString &uid /*US = QString::null*/ );
323 323
324 /** 324 /**
325 Launches the configuration dialog. 325 Launches the configuration dialog.
326 */ 326 */
327 void openConfigDialog(); 327 void openConfigDialog();
328 328
329 /** 329 /**
330 Launches the ldap search dialog. 330 Launches the ldap search dialog.
331 */ 331 */
332 void openLDAPDialog(); 332 void openLDAPDialog();
333 333
334 /** 334 /**
335 Creates a KAddressBookPrinter, which will display the print 335 Creates a KAddressBookPrinter, which will display the print
336 dialog and do the printing. 336 dialog and do the printing.
337 */ 337 */
338 void print(); 338 void print();
339 339
340 /** 340 /**
341 Registers a new GUI client, so plugins can register its actions. 341 Registers a new GUI client, so plugins can register its actions.
342 */ 342 */
343 void addGUIClient( KXMLGUIClient *client ); 343 void addGUIClient( KXMLGUIClient *client );
344 344
345 void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid); 345 void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid);
346 void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); 346 void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
347 void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); 347 void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid);
348 348
349 349
350 signals: 350 signals:
351 void contactSelected( const QString &name ); 351 void contactSelected( const QString &name );
352 void contactSelected( const QPixmap &pixmap ); 352 void contactSelected( const QPixmap &pixmap );
353 public slots: 353 public slots:
354 void recieve(QString cmsg ); 354 void recieve(QString cmsg );
355 void getFile( bool success ); 355 void getFile( bool success );
356 void syncFileRequest(); 356 void syncFileRequest();
357 void setDetailsVisible( bool visible ); 357 void setDetailsVisible( bool visible );
358 void setDetailsToState(); 358 void setDetailsToState();
359 359
360 void saveSettings(); 360 void saveSettings();
361 361
362 private slots: 362 private slots:
363 void updateToolBar(); 363 void updateToolBar();
364 void updateMainWindow(); 364 void updateMainWindow();
365 void receive( const QCString& cmsg, const QByteArray& data ); 365 void receive( const QCString& cmsg, const QByteArray& data );
366 void toggleBeamReceive( ); 366 void toggleBeamReceive( );
367 void disableBR(bool); 367 void disableBR(bool);
368 void setJumpButtonBarVisible( bool visible ); 368 void setJumpButtonBarVisible( bool visible );
369 void setJumpButtonBar( bool visible );
369 void setCaptionBack(); 370 void setCaptionBack();
370 void importFromOL(); 371 void importFromOL();
371 void extensionModified( const KABC::Addressee::List &list ); 372 void extensionModified( const KABC::Addressee::List &list );
372 void extensionChanged( int id ); 373 void extensionChanged( int id );
373 void clipboardDataChanged(); 374 void clipboardDataChanged();
374 void updateActionMenu(); 375 void updateActionMenu();
375 void configureKeyBindings(); 376 void configureKeyBindings();
376 void removeVoice(); 377 void removeVoice();
377 void setFormattedName(); 378 void setFormattedName();
378#ifdef KAB_EMBEDDED 379#ifdef KAB_EMBEDDED
379 void configureResources(); 380 void configureResources();
380#endif //KAB_EMBEDDED 381#endif //KAB_EMBEDDED
381 382
382 void slotEditorDestroyed( const QString &uid ); 383 void slotEditorDestroyed( const QString &uid );
383 void configurationChanged(); 384 void configurationChanged();
384 void addressBookChanged(); 385 void addressBookChanged();
385 386
386 private: 387 private:
387 void resizeEvent(QResizeEvent* e ); 388 void resizeEvent(QResizeEvent* e );
388 bool mBRdisabled; 389 bool mBRdisabled;
389#ifndef DESKTOP_VERSION 390#ifndef DESKTOP_VERSION
390 QCopChannel* infrared; 391 QCopChannel* infrared;
391#endif 392#endif
392 QTimer *mMessageTimer; 393 QTimer *mMessageTimer;
393 void initGUI(); 394 void initGUI();
394 void initActions(); 395 void initActions();
395 QString getPhoneFile(); 396 QString getPhoneFile();
396 397
397 AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, 398 AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent,
398 const char *name = 0 ); 399 const char *name = 0 );
399 400
400 KXMLGUIClient *mGUIClient; 401 KXMLGUIClient *mGUIClient;
401 402
402 KABC::AddressBook *mAddressBook; 403 KABC::AddressBook *mAddressBook;
403 404
404 ViewManager *mViewManager; 405 ViewManager *mViewManager;
405 // QSplitter *mDetailsSplitter; 406 // QSplitter *mDetailsSplitter;
406 KDGanttMinimizeSplitter *mExtensionBarSplitter; 407 KDGanttMinimizeSplitter *mExtensionBarSplitter;
407 ViewContainer *mDetails; 408 ViewContainer *mDetails;
408 KDGanttMinimizeSplitter* mMiniSplitter; 409 KDGanttMinimizeSplitter* mMiniSplitter;
409 XXPortManager *mXXPortManager; 410 XXPortManager *mXXPortManager;
410 JumpButtonBar *mJumpButtonBar; 411 JumpButtonBar *mJumpButtonBar;
411 IncSearchWidget *mIncSearchWidget; 412 IncSearchWidget *mIncSearchWidget;
412 ExtensionManager *mExtensionManager; 413 ExtensionManager *mExtensionManager;
413 414
414 KCMultiDialog *mConfigureDialog; 415 KCMultiDialog *mConfigureDialog;
415 416
416#ifndef KAB_EMBEDDED 417#ifndef KAB_EMBEDDED