-rw-r--r-- | kaddressbook/kabcore.cpp | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index cba5850..cd833cf 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -75,48 +75,49 @@ $Id$ | |||
75 | #include "addresseeeditordialog.h" | 75 | #include "addresseeeditordialog.h" |
76 | #include "extensionmanager.h" | 76 | #include "extensionmanager.h" |
77 | #include "kstdaction.h" | 77 | #include "kstdaction.h" |
78 | #include "kaddressbookservice.h" | 78 | #include "kaddressbookservice.h" |
79 | #include "ldapsearchdialog.h" | 79 | #include "ldapsearchdialog.h" |
80 | #include "printing/printingwizard.h" | 80 | #include "printing/printingwizard.h" |
81 | #else // KAB_EMBEDDED | 81 | #else // KAB_EMBEDDED |
82 | 82 | ||
83 | #include <kapplication.h> | 83 | #include <kapplication.h> |
84 | #include "KDGanttMinimizeSplitter.h" | 84 | #include "KDGanttMinimizeSplitter.h" |
85 | #include "kaddressbookmain.h" | 85 | #include "kaddressbookmain.h" |
86 | #include "kactioncollection.h" | 86 | #include "kactioncollection.h" |
87 | #include "addresseedialog.h" | 87 | #include "addresseedialog.h" |
88 | //US | 88 | //US |
89 | #include <addresseeview.h> | 89 | #include <addresseeview.h> |
90 | 90 | ||
91 | #include <qapp.h> | 91 | #include <qapp.h> |
92 | #include <qmenubar.h> | 92 | #include <qmenubar.h> |
93 | //#include <qtoolbar.h> | 93 | //#include <qtoolbar.h> |
94 | #include <qmessagebox.h> | 94 | #include <qmessagebox.h> |
95 | #include <kdebug.h> | 95 | #include <kdebug.h> |
96 | #include <kiconloader.h> // needed for SmallIcon | 96 | #include <kiconloader.h> // needed for SmallIcon |
97 | #include <kresources/kcmkresources.h> | 97 | #include <kresources/kcmkresources.h> |
98 | #include <ktoolbar.h> | 98 | #include <ktoolbar.h> |
99 | #include <kprefsdialog.h> | ||
99 | 100 | ||
100 | 101 | ||
101 | //#include <qlabel.h> | 102 | //#include <qlabel.h> |
102 | 103 | ||
103 | 104 | ||
104 | #ifndef DESKTOP_VERSION | 105 | #ifndef DESKTOP_VERSION |
105 | #include <qpe/ir.h> | 106 | #include <qpe/ir.h> |
106 | #include <qpe/qpemenubar.h> | 107 | #include <qpe/qpemenubar.h> |
107 | #include <qtopia/qcopenvelope_qws.h> | 108 | #include <qtopia/qcopenvelope_qws.h> |
108 | #else | 109 | #else |
109 | 110 | ||
110 | #include <qmenubar.h> | 111 | #include <qmenubar.h> |
111 | #endif | 112 | #endif |
112 | 113 | ||
113 | #endif // KAB_EMBEDDED | 114 | #endif // KAB_EMBEDDED |
114 | #include "kcmconfigs/kcmkabconfig.h" | 115 | #include "kcmconfigs/kcmkabconfig.h" |
115 | #include "kcmconfigs/kcmkdepimconfig.h" | 116 | #include "kcmconfigs/kcmkdepimconfig.h" |
116 | #include "kpimglobalprefs.h" | 117 | #include "kpimglobalprefs.h" |
117 | #include "externalapphandler.h" | 118 | #include "externalapphandler.h" |
118 | #include "xxportselectdialog.h" | 119 | #include "xxportselectdialog.h" |
119 | 120 | ||
120 | 121 | ||
121 | #include <kresources/selectdialog.h> | 122 | #include <kresources/selectdialog.h> |
122 | #include <kmessagebox.h> | 123 | #include <kmessagebox.h> |
@@ -1590,63 +1591,74 @@ QString KABCore::getNameByPhone( const QString &phone ) | |||
1590 | bool found = false; | 1591 | bool found = false; |
1591 | QString ownerName = ""; | 1592 | QString ownerName = ""; |
1592 | KABC::AddressBook::Iterator iter; | 1593 | KABC::AddressBook::Iterator iter; |
1593 | KABC::PhoneNumber::List::Iterator phoneIter; | 1594 | KABC::PhoneNumber::List::Iterator phoneIter; |
1594 | KABC::PhoneNumber::List phoneList; | 1595 | KABC::PhoneNumber::List phoneList; |
1595 | for ( iter = mAddressBook->begin(); !found && ( iter != mAddressBook->end() ); ++iter ) { | 1596 | for ( iter = mAddressBook->begin(); !found && ( iter != mAddressBook->end() ); ++iter ) { |
1596 | phoneList = (*iter).phoneNumbers(); | 1597 | phoneList = (*iter).phoneNumbers(); |
1597 | for ( phoneIter = phoneList.begin(); !found && ( phoneIter != phoneList.end() ); | 1598 | for ( phoneIter = phoneList.begin(); !found && ( phoneIter != phoneList.end() ); |
1598 | ++phoneIter) { | 1599 | ++phoneIter) { |
1599 | // Get rid of separator chars so just the numbers are compared. | 1600 | // Get rid of separator chars so just the numbers are compared. |
1600 | if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) { | 1601 | if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) { |
1601 | ownerName = (*iter).formattedName(); | 1602 | ownerName = (*iter).formattedName(); |
1602 | found = true; | 1603 | found = true; |
1603 | } | 1604 | } |
1604 | } | 1605 | } |
1605 | } | 1606 | } |
1606 | 1607 | ||
1607 | return ownerName; | 1608 | return ownerName; |
1608 | #else //KAB_EMBEDDED | 1609 | #else //KAB_EMBEDDED |
1609 | qDebug("KABCore::getNameByPhone finsih method"); | 1610 | qDebug("KABCore::getNameByPhone finsih method"); |
1610 | return ""; | 1611 | return ""; |
1611 | #endif //KAB_EMBEDDED | 1612 | #endif //KAB_EMBEDDED |
1612 | 1613 | ||
1613 | } | 1614 | } |
1614 | 1615 | void KABCore::openConfigGlobalDialog() | |
1616 | { | ||
1617 | KPimPrefsGlobalDialog gc ( this ); | ||
1618 | gc.exec(); | ||
1619 | } | ||
1615 | void KABCore::openConfigDialog() | 1620 | void KABCore::openConfigDialog() |
1616 | { | 1621 | { |
1617 | KCMultiDialog* ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true ); | 1622 | KDialogBase * ConfigureDialog = new KDialogBase ( KDialogBase::Plain , i18n("Configure KA/Pi"), KDialogBase::Default |KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Ok, KDialogBase::Ok,0, "name", true, true); |
1618 | KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" ); | ||
1619 | ConfigureDialog->addModule(kabcfg ); | ||
1620 | KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" ); | ||
1621 | ConfigureDialog->addModule(kdelibcfg ); | ||
1622 | 1623 | ||
1624 | KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog , "KCMKabConfig" ); | ||
1625 | ConfigureDialog->setMainWidget( kabcfg ); | ||
1623 | connect( ConfigureDialog, SIGNAL( applyClicked() ), | 1626 | connect( ConfigureDialog, SIGNAL( applyClicked() ), |
1624 | this, SLOT( configurationChanged() ) ); | 1627 | this, SLOT( configurationChanged() ) ); |
1628 | connect( ConfigureDialog, SIGNAL( applyClicked() ), | ||
1629 | kabcfg, SLOT( save() ) ); | ||
1625 | connect( ConfigureDialog, SIGNAL( okClicked() ), | 1630 | connect( ConfigureDialog, SIGNAL( okClicked() ), |
1626 | this, SLOT( configurationChanged() ) ); | 1631 | this, SLOT( configurationChanged() ) ); |
1632 | connect( ConfigureDialog, SIGNAL( okClicked() ), | ||
1633 | kabcfg, SLOT( save() ) ); | ||
1634 | connect( ConfigureDialog, SIGNAL( defaultClicked() ), | ||
1635 | kabcfg, SLOT( defaults() ) ); | ||
1627 | saveSettings(); | 1636 | saveSettings(); |
1637 | kabcfg->load(); | ||
1628 | #ifndef DESKTOP_VERSION | 1638 | #ifndef DESKTOP_VERSION |
1639 | if ( QApplication::desktop()->height() <= 480 ) | ||
1640 | ConfigureDialog->hideButtons(); | ||
1629 | ConfigureDialog->showMaximized(); | 1641 | ConfigureDialog->showMaximized(); |
1630 | #endif | 1642 | #endif |
1631 | if ( ConfigureDialog->exec() ) | 1643 | if ( ConfigureDialog->exec() ) |
1632 | KMessageBox::information( this, i18n("Some changes are only\neffective after a restart!\n") ); | 1644 | KMessageBox::information( this, i18n("Some changes are only\neffective after a restart!\n") ); |
1633 | delete ConfigureDialog; | 1645 | delete ConfigureDialog; |
1634 | } | 1646 | } |
1635 | 1647 | ||
1636 | void KABCore::openLDAPDialog() | 1648 | void KABCore::openLDAPDialog() |
1637 | { | 1649 | { |
1638 | #ifndef KAB_EMBEDDED | 1650 | #ifndef KAB_EMBEDDED |
1639 | if ( !mLdapSearchDialog ) { | 1651 | if ( !mLdapSearchDialog ) { |
1640 | mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this ); | 1652 | mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this ); |
1641 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager, | 1653 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager, |
1642 | SLOT( refreshView() ) ); | 1654 | SLOT( refreshView() ) ); |
1643 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this, | 1655 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this, |
1644 | SLOT( setModified() ) ); | 1656 | SLOT( setModified() ) ); |
1645 | } else | 1657 | } else |
1646 | mLdapSearchDialog->restoreSettings(); | 1658 | mLdapSearchDialog->restoreSettings(); |
1647 | 1659 | ||
1648 | if ( mLdapSearchDialog->isOK() ) | 1660 | if ( mLdapSearchDialog->isOK() ) |
1649 | mLdapSearchDialog->exec(); | 1661 | mLdapSearchDialog->exec(); |
1650 | #else //KAB_EMBEDDED | 1662 | #else //KAB_EMBEDDED |
1651 | qDebug("KABCore::openLDAPDialog() finsih method"); | 1663 | qDebug("KABCore::openLDAPDialog() finsih method"); |
1652 | #endif //KAB_EMBEDDED | 1664 | #endif //KAB_EMBEDDED |
@@ -2004,54 +2016,55 @@ void KABCore::initActions() | |||
2004 | // settings menu | 2016 | // settings menu |
2005 | #ifdef KAB_EMBEDDED | 2017 | #ifdef KAB_EMBEDDED |
2006 | //US special menuentry to configure the addressbook resources. On KDE | 2018 | //US special menuentry to configure the addressbook resources. On KDE |
2007 | // you do that through the control center !!! | 2019 | // you do that through the control center !!! |
2008 | mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this, | 2020 | mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this, |
2009 | SLOT( configureResources() ), actionCollection(), | 2021 | SLOT( configureResources() ), actionCollection(), |
2010 | "kaddressbook_configure_resources" ); | 2022 | "kaddressbook_configure_resources" ); |
2011 | #endif //KAB_EMBEDDED | 2023 | #endif //KAB_EMBEDDED |
2012 | 2024 | ||
2013 | if ( mIsPart ) { | 2025 | if ( mIsPart ) { |
2014 | mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this, | 2026 | mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this, |
2015 | SLOT( openConfigDialog() ), actionCollection(), | 2027 | SLOT( openConfigDialog() ), actionCollection(), |
2016 | "kaddressbook_configure" ); | 2028 | "kaddressbook_configure" ); |
2017 | 2029 | ||
2018 | //US not implemented yet | 2030 | //US not implemented yet |
2019 | //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0, | 2031 | //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0, |
2020 | // this, SLOT( configureKeyBindings() ), actionCollection(), | 2032 | // this, SLOT( configureKeyBindings() ), actionCollection(), |
2021 | // "kaddressbook_configure_shortcuts" ); | 2033 | // "kaddressbook_configure_shortcuts" ); |
2022 | #ifdef KAB_EMBEDDED | 2034 | #ifdef KAB_EMBEDDED |
2023 | mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() ); | 2035 | mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() ); |
2024 | mActionConfigureToolbars->setEnabled( false ); | 2036 | mActionConfigureToolbars->setEnabled( false ); |
2025 | #endif //KAB_EMBEDDED | 2037 | #endif //KAB_EMBEDDED |
2026 | 2038 | ||
2027 | } else { | 2039 | } else { |
2028 | mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() ); | 2040 | mActionConfigKAddressbook = new KAction( i18n( "&Configure KA/Pi..." ), "configure", 0, this, |
2029 | 2041 | SLOT( openConfigDialog() ), actionCollection(), | |
2030 | //US not implemented yet | 2042 | "kaddressbook_configure" ); |
2031 | //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() ); | 2043 | mActionConfigGlobal = new KAction( i18n( "Global Settings..." ), "configure", 0, this, |
2044 | SLOT( openConfigGlobalDialog() ), actionCollection(), | ||
2045 | "kaddressbook_configure" ); | ||
2032 | } | 2046 | } |
2033 | |||
2034 | mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0, | 2047 | mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0, |
2035 | actionCollection(), "options_show_jump_bar" ); | 2048 | actionCollection(), "options_show_jump_bar" ); |
2036 | connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBar( bool ) ) ); | 2049 | connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBar( bool ) ) ); |
2037 | 2050 | ||
2038 | mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0, | 2051 | mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0, |
2039 | actionCollection(), "options_show_details" ); | 2052 | actionCollection(), "options_show_details" ); |
2040 | connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) ); | 2053 | connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) ); |
2041 | 2054 | ||
2042 | 2055 | ||
2043 | mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this, | 2056 | mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this, |
2044 | SLOT( toggleBeamReceive() ), actionCollection(), | 2057 | SLOT( toggleBeamReceive() ), actionCollection(), |
2045 | "kaddressbook_beam_rec" ); | 2058 | "kaddressbook_beam_rec" ); |
2046 | 2059 | ||
2047 | 2060 | ||
2048 | // misc | 2061 | // misc |
2049 | // only enable LDAP lookup if we can handle the protocol | 2062 | // only enable LDAP lookup if we can handle the protocol |
2050 | #ifndef KAB_EMBEDDED | 2063 | #ifndef KAB_EMBEDDED |
2051 | if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { | 2064 | if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { |
2052 | new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, | 2065 | new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, |
2053 | this, SLOT( openLDAPDialog() ), actionCollection(), | 2066 | this, SLOT( openLDAPDialog() ), actionCollection(), |
2054 | "ldap_lookup" ); | 2067 | "ldap_lookup" ); |
2055 | } | 2068 | } |
2056 | #else //KAB_EMBEDDED | 2069 | #else //KAB_EMBEDDED |
2057 | //qDebug("KABCore::initActions() LDAP has to be implemented"); | 2070 | //qDebug("KABCore::initActions() LDAP has to be implemented"); |
@@ -2222,50 +2235,51 @@ void KABCore::addActionsManually() | |||
2222 | fileMenu->insertSeparator(); | 2235 | fileMenu->insertSeparator(); |
2223 | mActionQuit->plug( fileMenu ); | 2236 | mActionQuit->plug( fileMenu ); |
2224 | #ifdef _OL_IMPORT_ | 2237 | #ifdef _OL_IMPORT_ |
2225 | mActionImportOL->plug( ImportMenu ); | 2238 | mActionImportOL->plug( ImportMenu ); |
2226 | #endif | 2239 | #endif |
2227 | // edit menu | 2240 | // edit menu |
2228 | mActionUndo->plug( editMenu ); | 2241 | mActionUndo->plug( editMenu ); |
2229 | mActionRedo->plug( editMenu ); | 2242 | mActionRedo->plug( editMenu ); |
2230 | editMenu->insertSeparator(); | 2243 | editMenu->insertSeparator(); |
2231 | mActionCut->plug( editMenu ); | 2244 | mActionCut->plug( editMenu ); |
2232 | mActionCopy->plug( editMenu ); | 2245 | mActionCopy->plug( editMenu ); |
2233 | mActionPaste->plug( editMenu ); | 2246 | mActionPaste->plug( editMenu ); |
2234 | mActionDelete->plug( editMenu ); | 2247 | mActionDelete->plug( editMenu ); |
2235 | editMenu->insertSeparator(); | 2248 | editMenu->insertSeparator(); |
2236 | mActionSelectAll->plug( editMenu ); | 2249 | mActionSelectAll->plug( editMenu ); |
2237 | 2250 | ||
2238 | mActionSetFormattedName->plug( changeMenu ); | 2251 | mActionSetFormattedName->plug( changeMenu ); |
2239 | mActionRemoveVoice->plug( changeMenu ); | 2252 | mActionRemoveVoice->plug( changeMenu ); |
2240 | // settingsmings menu | 2253 | // settingsmings menu |
2241 | //US special menuentry to configure the addressbook resources. On KDE | 2254 | //US special menuentry to configure the addressbook resources. On KDE |
2242 | // you do that through the control center !!! | 2255 | // you do that through the control center !!! |
2243 | // settingsMenu->insertSeparator(); | 2256 | // settingsMenu->insertSeparator(); |
2244 | 2257 | ||
2245 | mActionConfigKAddressbook->plug( settingsMenu, 0 ); | 2258 | mActionConfigKAddressbook->plug( settingsMenu, 0 ); |
2246 | mActionConfigResources->plug( settingsMenu,1 ); | 2259 | mActionConfigGlobal->plug( settingsMenu, 1 ); |
2247 | settingsMenu->insertSeparator(2); | 2260 | mActionConfigResources->plug( settingsMenu,2 ); |
2261 | settingsMenu->insertSeparator(3); | ||
2248 | 2262 | ||
2249 | if ( mIsPart ) { | 2263 | if ( mIsPart ) { |
2250 | //US not implemented yet | 2264 | //US not implemented yet |
2251 | //mActionConfigShortcuts->plug( settingsMenu ); | 2265 | //mActionConfigShortcuts->plug( settingsMenu ); |
2252 | //mActionConfigureToolbars->plug( settingsMenu ); | 2266 | //mActionConfigureToolbars->plug( settingsMenu ); |
2253 | 2267 | ||
2254 | } else { | 2268 | } else { |
2255 | //US not implemented yet | 2269 | //US not implemented yet |
2256 | //mActionKeyBindings->plug( settingsMenu ); | 2270 | //mActionKeyBindings->plug( settingsMenu ); |
2257 | } | 2271 | } |
2258 | 2272 | ||
2259 | mActionEditCategories->plug( settingsMenu ); | 2273 | mActionEditCategories->plug( settingsMenu ); |
2260 | mActionManageCategories->plug( settingsMenu ); | 2274 | mActionManageCategories->plug( settingsMenu ); |
2261 | mActionJumpBar->plug( viewMenu,0 ); | 2275 | mActionJumpBar->plug( viewMenu,0 ); |
2262 | mActionDetails->plug( viewMenu,0 ); | 2276 | mActionDetails->plug( viewMenu,0 ); |
2263 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) | 2277 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) |
2264 | mActionDetails->plug( tb ); | 2278 | mActionDetails->plug( tb ); |
2265 | settingsMenu->insertSeparator(); | 2279 | settingsMenu->insertSeparator(); |
2266 | #ifndef DESKTOP_VERSION | 2280 | #ifndef DESKTOP_VERSION |
2267 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); | 2281 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); |
2268 | settingsMenu->insertSeparator(); | 2282 | settingsMenu->insertSeparator(); |
2269 | #endif | 2283 | #endif |
2270 | 2284 | ||
2271 | mActionWhoAmI->plug( settingsMenu ); | 2285 | mActionWhoAmI->plug( settingsMenu ); |