summaryrefslogtreecommitdiffabout
path: root/kaddressbook
authorzautrix <zautrix>2004-10-28 11:03:42 (UTC)
committer zautrix <zautrix>2004-10-28 11:03:42 (UTC)
commit01cd4ef94b8604532181c390e9abd560aebaf372 (patch) (unidiff)
tree96ca1a524512ae2e2868f0bd3df03e4da5c445f9 /kaddressbook
parent61d9eb436349a841410559f51e2601a34ceb5794 (diff)
downloadkdepimpi-01cd4ef94b8604532181c390e9abd560aebaf372.zip
kdepimpi-01cd4ef94b8604532181c390e9abd560aebaf372.tar.gz
kdepimpi-01cd4ef94b8604532181c390e9abd560aebaf372.tar.bz2
added howto to menus
Diffstat (limited to 'kaddressbook') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp32
-rw-r--r--kaddressbook/kabcore.h4
2 files changed, 30 insertions, 6 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 5ebd3a4..bdc5bd8 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1865,96 +1865,102 @@ void KABCore::initActions()
1865 mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this, 1865 mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this,
1866 SLOT( toggleBeamReceive() ), actionCollection(), 1866 SLOT( toggleBeamReceive() ), actionCollection(),
1867 "kaddressbook_beam_rec" ); 1867 "kaddressbook_beam_rec" );
1868 1868
1869 1869
1870 // misc 1870 // misc
1871 // only enable LDAP lookup if we can handle the protocol 1871 // only enable LDAP lookup if we can handle the protocol
1872#ifndef KAB_EMBEDDED 1872#ifndef KAB_EMBEDDED
1873 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { 1873 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) {
1874 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, 1874 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0,
1875 this, SLOT( openLDAPDialog() ), actionCollection(), 1875 this, SLOT( openLDAPDialog() ), actionCollection(),
1876 "ldap_lookup" ); 1876 "ldap_lookup" );
1877 } 1877 }
1878#else //KAB_EMBEDDED 1878#else //KAB_EMBEDDED
1879 //qDebug("KABCore::initActions() LDAP has to be implemented"); 1879 //qDebug("KABCore::initActions() LDAP has to be implemented");
1880#endif //KAB_EMBEDDED 1880#endif //KAB_EMBEDDED
1881 1881
1882 1882
1883 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this, 1883 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
1884 SLOT( setWhoAmI() ), actionCollection(), 1884 SLOT( setWhoAmI() ), actionCollection(),
1885 "set_personal" ); 1885 "set_personal" );
1886 1886
1887 1887
1888 1888
1889 1889
1890 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this, 1890 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this,
1891 SLOT( setCategories() ), actionCollection(), 1891 SLOT( setCategories() ), actionCollection(),
1892 "edit_set_categories" ); 1892 "edit_set_categories" );
1893 1893
1894 mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this, 1894 mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this,
1895 SLOT( removeVoice() ), actionCollection(), 1895 SLOT( removeVoice() ), actionCollection(),
1896 "remove_voice" ); 1896 "remove_voice" );
1897 mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this, 1897 mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this,
1898 SLOT( importFromOL() ), actionCollection(), 1898 SLOT( importFromOL() ), actionCollection(),
1899 "import_OL" ); 1899 "import_OL" );
1900#ifdef KAB_EMBEDDED 1900#ifdef KAB_EMBEDDED
1901 mActionLicence = new KAction( i18n( "Licence" ), 0, 1901 mActionLicence = new KAction( i18n( "Licence" ), 0,
1902 this, SLOT( showLicence() ), actionCollection(), 1902 this, SLOT( showLicence() ), actionCollection(),
1903 "licence_about_data" ); 1903 "licence_about_data" );
1904 mActionFaq = new KAction( i18n( "Faq" ), 0, 1904 mActionFaq = new KAction( i18n( "Faq" ), 0,
1905 this, SLOT( faq() ), actionCollection(), 1905 this, SLOT( faq() ), actionCollection(),
1906 "faq_about_data" ); 1906 "faq_about_data" );
1907 mActionWN = new KAction( i18n( "What's New?" ), 0, 1907 mActionWN = new KAction( i18n( "What's New?" ), 0,
1908 this, SLOT( whatsnew() ), actionCollection(), 1908 this, SLOT( whatsnew() ), actionCollection(),
1909 "wn" ); 1909 "wn" );
1910 mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0, 1910 mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0,
1911 this, SLOT( synchowto() ), actionCollection(), 1911 this, SLOT( synchowto() ), actionCollection(),
1912 "sync" ); 1912 "sync" );
1913 mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0,
1914 this, SLOT( kdesynchowto() ), actionCollection(),
1915 "kdesync" );
1916 mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0,
1917 this, SLOT( multisynchowto() ), actionCollection(),
1918 "multisync" );
1913 1919
1914 mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, 1920 mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
1915 this, SLOT( createAboutData() ), actionCollection(), 1921 this, SLOT( createAboutData() ), actionCollection(),
1916 "kaddressbook_about_data" ); 1922 "kaddressbook_about_data" );
1917#endif //KAB_EMBEDDED 1923#endif //KAB_EMBEDDED
1918 1924
1919 clipboardDataChanged(); 1925 clipboardDataChanged();
1920 connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); 1926 connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
1921 connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); 1927 connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
1922} 1928}
1923 1929
1924//US we need this function, to plug all actions into the correct menues. 1930//US we need this function, to plug all actions into the correct menues.
1925// KDE uses a XML format to plug the actions, but we work her without this overhead. 1931// KDE uses a XML format to plug the actions, but we work her without this overhead.
1926void KABCore::addActionsManually() 1932void KABCore::addActionsManually()
1927{ 1933{
1928//US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); 1934//US qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
1929 1935
1930#ifdef KAB_EMBEDDED 1936#ifdef KAB_EMBEDDED
1931 QPopupMenu *fileMenu = new QPopupMenu( this ); 1937 QPopupMenu *fileMenu = new QPopupMenu( this );
1932 QPopupMenu *editMenu = new QPopupMenu( this ); 1938 QPopupMenu *editMenu = new QPopupMenu( this );
1933 QPopupMenu *helpMenu = new QPopupMenu( this ); 1939 QPopupMenu *helpMenu = new QPopupMenu( this );
1934 1940
1935 KToolBar* tb = mMainWindow->toolBar(); 1941 KToolBar* tb = mMainWindow->toolBar();
1936 1942
1937#ifndef DESKTOP_VERSION 1943#ifndef DESKTOP_VERSION
1938 if ( KABPrefs::instance()->mFullMenuBarVisible ) { 1944 if ( KABPrefs::instance()->mFullMenuBarVisible ) {
1939#endif 1945#endif
1940 QMenuBar* mb = mMainWindow->menuBar(); 1946 QMenuBar* mb = mMainWindow->menuBar();
1941 1947
1942 //US setup menubar. 1948 //US setup menubar.
1943 //Disable the following block if you do not want to have a menubar. 1949 //Disable the following block if you do not want to have a menubar.
1944 mb->insertItem( "&File", fileMenu ); 1950 mb->insertItem( "&File", fileMenu );
1945 mb->insertItem( "&Edit", editMenu ); 1951 mb->insertItem( "&Edit", editMenu );
1946 mb->insertItem( "&View", viewMenu ); 1952 mb->insertItem( "&View", viewMenu );
1947 mb->insertItem( "&Settings", settingsMenu ); 1953 mb->insertItem( "&Settings", settingsMenu );
1948 mb->insertItem( i18n("Synchronize"), syncMenu ); 1954 mb->insertItem( i18n("Synchronize"), syncMenu );
1949 mb->insertItem( "&Change selected", changeMenu ); 1955 mb->insertItem( "&Change selected", changeMenu );
1950 mb->insertItem( "&Help", helpMenu ); 1956 mb->insertItem( "&Help", helpMenu );
1951 mIncSearchWidget = new IncSearchWidget( tb ); 1957 mIncSearchWidget = new IncSearchWidget( tb );
1952 // tb->insertWidget(-1, 0, mIncSearchWidget); 1958 // tb->insertWidget(-1, 0, mIncSearchWidget);
1953#ifndef DESKTOP_VERSION 1959#ifndef DESKTOP_VERSION
1954 } else { 1960 } else {
1955 //US setup toolbar 1961 //US setup toolbar
1956 QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); 1962 QPEMenuBar *menuBarTB = new QPEMenuBar( tb );
1957 QPopupMenu *popupBarTB = new QPopupMenu( this ); 1963 QPopupMenu *popupBarTB = new QPopupMenu( this );
1958 menuBarTB->insertItem( "ME", popupBarTB); 1964 menuBarTB->insertItem( "ME", popupBarTB);
1959 tb->insertWidget(-1, 0, menuBarTB); 1965 tb->insertWidget(-1, 0, menuBarTB);
1960 mIncSearchWidget = new IncSearchWidget( tb ); 1966 mIncSearchWidget = new IncSearchWidget( tb );
@@ -2006,98 +2012,100 @@ void KABCore::addActionsManually()
2006 mActionImportOL->plug( ImportMenu ); 2012 mActionImportOL->plug( ImportMenu );
2007#endif 2013#endif
2008 // edit menu 2014 // edit menu
2009 mActionUndo->plug( editMenu ); 2015 mActionUndo->plug( editMenu );
2010 mActionRedo->plug( editMenu ); 2016 mActionRedo->plug( editMenu );
2011 editMenu->insertSeparator(); 2017 editMenu->insertSeparator();
2012 mActionCut->plug( editMenu ); 2018 mActionCut->plug( editMenu );
2013 mActionCopy->plug( editMenu ); 2019 mActionCopy->plug( editMenu );
2014 mActionPaste->plug( editMenu ); 2020 mActionPaste->plug( editMenu );
2015 mActionDelete->plug( editMenu ); 2021 mActionDelete->plug( editMenu );
2016 editMenu->insertSeparator(); 2022 editMenu->insertSeparator();
2017 mActionSelectAll->plug( editMenu ); 2023 mActionSelectAll->plug( editMenu );
2018 2024
2019 mActionRemoveVoice->plug( changeMenu ); 2025 mActionRemoveVoice->plug( changeMenu );
2020 // settings menu 2026 // settings menu
2021//US special menuentry to configure the addressbook resources. On KDE 2027//US special menuentry to configure the addressbook resources. On KDE
2022// you do that through the control center !!! 2028// you do that through the control center !!!
2023 mActionConfigResources->plug( settingsMenu ); 2029 mActionConfigResources->plug( settingsMenu );
2024 settingsMenu->insertSeparator(); 2030 settingsMenu->insertSeparator();
2025 2031
2026 mActionConfigKAddressbook->plug( settingsMenu ); 2032 mActionConfigKAddressbook->plug( settingsMenu );
2027 2033
2028 if ( mIsPart ) { 2034 if ( mIsPart ) {
2029 //US not implemented yet 2035 //US not implemented yet
2030 //mActionConfigShortcuts->plug( settingsMenu ); 2036 //mActionConfigShortcuts->plug( settingsMenu );
2031 //mActionConfigureToolbars->plug( settingsMenu ); 2037 //mActionConfigureToolbars->plug( settingsMenu );
2032 2038
2033 } else { 2039 } else {
2034 //US not implemented yet 2040 //US not implemented yet
2035 //mActionKeyBindings->plug( settingsMenu ); 2041 //mActionKeyBindings->plug( settingsMenu );
2036 } 2042 }
2037 2043
2038 settingsMenu->insertSeparator(); 2044 settingsMenu->insertSeparator();
2039 2045
2040 mActionJumpBar->plug( settingsMenu ); 2046 mActionJumpBar->plug( settingsMenu );
2041 mActionDetails->plug( settingsMenu ); 2047 mActionDetails->plug( settingsMenu );
2042 //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) 2048 //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop )
2043 mActionDetails->plug( tb ); 2049 mActionDetails->plug( tb );
2044 settingsMenu->insertSeparator(); 2050 settingsMenu->insertSeparator();
2045 mActionBR->plug(settingsMenu ); 2051 mActionBR->plug(settingsMenu );
2046 settingsMenu->insertSeparator(); 2052 settingsMenu->insertSeparator();
2047 2053
2048 mActionWhoAmI->plug( settingsMenu ); 2054 mActionWhoAmI->plug( settingsMenu );
2049 mActionCategories->plug( settingsMenu ); 2055 mActionCategories->plug( settingsMenu );
2050 2056
2051 2057
2052 mActionWN->plug( helpMenu ); 2058 mActionWN->plug( helpMenu );
2053 mActionSyncHowto->plug( helpMenu ); 2059 mActionSyncHowto->plug( helpMenu );
2054 mActionLicence->plug( helpMenu ); 2060 mActionKdeSyncHowto->plug( helpMenu );
2061 mActionMultiSyncHowto->plug( helpMenu );
2055 mActionFaq->plug( helpMenu ); 2062 mActionFaq->plug( helpMenu );
2063 mActionLicence->plug( helpMenu );
2056 mActionAboutKAddressbook->plug( helpMenu ); 2064 mActionAboutKAddressbook->plug( helpMenu );
2057 2065
2058 if (KGlobal::getDesktopSize() > KGlobal::Small ) { 2066 if (KGlobal::getDesktopSize() > KGlobal::Small ) {
2059 2067
2060 mActionSave->plug( tb ); 2068 mActionSave->plug( tb );
2061 mViewManager->getFilterAction()->plug ( tb); 2069 mViewManager->getFilterAction()->plug ( tb);
2062 if (KGlobal::getDesktopSize() == KGlobal::Desktop ) { 2070 if (KGlobal::getDesktopSize() == KGlobal::Desktop ) {
2063 mActionUndo->plug( tb ); 2071 mActionUndo->plug( tb );
2064 mActionDelete->plug( tb ); 2072 mActionDelete->plug( tb );
2065 mActionRedo->plug( tb ); 2073 mActionRedo->plug( tb );
2066 } 2074 }
2067 } else { 2075 } else {
2068 mActionSave->plug( tb ); 2076 mActionSave->plug( tb );
2069 tb->enableMoving(false); 2077 tb->enableMoving(false);
2070 } 2078 }
2071 //mActionQuit->plug ( tb ); 2079 //mActionQuit->plug ( tb );
2072 // tb->insertWidget(-1, 0, mIncSearchWidget, 6); 2080 // tb->insertWidget(-1, 0, mIncSearchWidget, 6);
2073 2081
2074 //US link the searchwidget first to this. 2082 //US link the searchwidget first to this.
2075 // The real linkage to the toolbar happens later. 2083 // The real linkage to the toolbar happens later.
2076//US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE); 2084//US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE);
2077//US tb->insertItem( mIncSearchWidget ); 2085//US tb->insertItem( mIncSearchWidget );
2078/*US 2086/*US
2079 mIncSearchWidget = new IncSearchWidget( tb ); 2087 mIncSearchWidget = new IncSearchWidget( tb );
2080 connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), 2088 connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
2081 SLOT( incrementalSearch( const QString& ) ) ); 2089 SLOT( incrementalSearch( const QString& ) ) );
2082 2090
2083 mJumpButtonBar = new JumpButtonBar( this, this ); 2091 mJumpButtonBar = new JumpButtonBar( this, this );
2084 2092
2085//US topLayout->addWidget( mJumpButtonBar ); 2093//US topLayout->addWidget( mJumpButtonBar );
2086 this->layout()->add( mJumpButtonBar ); 2094 this->layout()->add( mJumpButtonBar );
2087*/ 2095*/
2088 2096
2089#endif //KAB_EMBEDDED 2097#endif //KAB_EMBEDDED
2090 2098
2091 mActionExport2phone->plug( ExportMenu ); 2099 mActionExport2phone->plug( ExportMenu );
2092 connect ( syncMenu, SIGNAL( activated ( int ) ), syncManager, SLOT (slotSyncMenu( int ) ) ); 2100 connect ( syncMenu, SIGNAL( activated ( int ) ), syncManager, SLOT (slotSyncMenu( int ) ) );
2093 syncManager->fillSyncMenu(); 2101 syncManager->fillSyncMenu();
2094 2102
2095} 2103}
2096void KABCore::showLicence() 2104void KABCore::showLicence()
2097{ 2105{
2098 KApplication::showLicence(); 2106 KApplication::showLicence();
2099} 2107}
2100void KABCore::removeVoice() 2108void KABCore::removeVoice()
2101{ 2109{
2102 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 ) 2110 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 )
2103 return; 2111 return;
@@ -2305,97 +2313,104 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses
2305 { 2313 {
2306 if (namelist[i] == emaillist[j]) 2314 if (namelist[i] == emaillist[j])
2307 { 2315 {
2308 foundUid = namelist[i].uid(); 2316 foundUid = namelist[i].uid();
2309 } 2317 }
2310 } 2318 }
2311 } 2319 }
2312 } 2320 }
2313 } 2321 }
2314 else 2322 else
2315 { 2323 {
2316 foundUid = uid; 2324 foundUid = uid;
2317 } 2325 }
2318 2326
2319 if (!foundUid.isEmpty()) 2327 if (!foundUid.isEmpty())
2320 { 2328 {
2321 2329
2322 // raise Ka/Pi if it is in the background 2330 // raise Ka/Pi if it is in the background
2323#ifndef DESKTOP_VERSION 2331#ifndef DESKTOP_VERSION
2324#ifndef KORG_NODCOP 2332#ifndef KORG_NODCOP
2325 //QCopEnvelope e("QPE/Application/kapi", "raise()"); 2333 //QCopEnvelope e("QPE/Application/kapi", "raise()");
2326#endif 2334#endif
2327#endif 2335#endif
2328 2336
2329 mMainWindow->showMaximized(); 2337 mMainWindow->showMaximized();
2330 mMainWindow-> raise(); 2338 mMainWindow-> raise();
2331 2339
2332 mViewManager->setSelected( "", false); 2340 mViewManager->setSelected( "", false);
2333 mViewManager->refreshView( "" ); 2341 mViewManager->refreshView( "" );
2334 mViewManager->setSelected( foundUid, true ); 2342 mViewManager->setSelected( foundUid, true );
2335 mViewManager->refreshView( foundUid ); 2343 mViewManager->refreshView( foundUid );
2336 2344
2337 if ( !mMultipleViewsAtOnce ) 2345 if ( !mMultipleViewsAtOnce )
2338 { 2346 {
2339 setDetailsVisible( true ); 2347 setDetailsVisible( true );
2340 mActionDetails->setChecked(true); 2348 mActionDetails->setChecked(true);
2341 } 2349 }
2342 } 2350 }
2343} 2351}
2344 2352
2345void KABCore::whatsnew() 2353void KABCore::whatsnew()
2346{ 2354{
2347 KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); 2355 KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" );
2348} 2356}
2349void KABCore::synchowto() 2357void KABCore::synchowto()
2350{ 2358{
2351 KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); 2359 KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" );
2352} 2360}
2353 2361void KABCore::kdesynchowto()
2362{
2363 KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" );
2364}
2365void KABCore::multisynchowto()
2366{
2367 KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" );
2368}
2354void KABCore::faq() 2369void KABCore::faq()
2355{ 2370{
2356 KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" ); 2371 KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" );
2357} 2372}
2358 2373
2359#include <libkcal/syncdefines.h> 2374#include <libkcal/syncdefines.h>
2360 2375
2361KABC::Addressee KABCore::getLastSyncAddressee() 2376KABC::Addressee KABCore::getLastSyncAddressee()
2362{ 2377{
2363 Addressee lse; 2378 Addressee lse;
2364 QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); 2379 QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
2365 2380
2366 //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); 2381 //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
2367 lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); 2382 lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice );
2368 if (lse.isEmpty()) { 2383 if (lse.isEmpty()) {
2369 qDebug("Creating new last-syncAddressee "); 2384 qDebug("Creating new last-syncAddressee ");
2370 lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); 2385 lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice );
2371 QString sum = ""; 2386 QString sum = "";
2372 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) 2387 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL )
2373 sum = "E: "; 2388 sum = "E: ";
2374 lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event")); 2389 lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event"));
2375 lse.setRevision( mLastAddressbookSync ); 2390 lse.setRevision( mLastAddressbookSync );
2376 lse.setCategories( i18n("SyncEvent") ); 2391 lse.setCategories( i18n("SyncEvent") );
2377 mAddressBook->insertAddressee( lse ); 2392 mAddressBook->insertAddressee( lse );
2378 } 2393 }
2379 return lse; 2394 return lse;
2380} 2395}
2381int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ) 2396int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full )
2382{ 2397{
2383 2398
2384 //void setZaurusId(int id); 2399 //void setZaurusId(int id);
2385 // int zaurusId() const; 2400 // int zaurusId() const;
2386 // void setZaurusUid(int id); 2401 // void setZaurusUid(int id);
2387 // int zaurusUid() const; 2402 // int zaurusUid() const;
2388 // void setZaurusStat(int id); 2403 // void setZaurusStat(int id);
2389 // int zaurusStat() const; 2404 // int zaurusStat() const;
2390 // 0 equal 2405 // 0 equal
2391 // 1 take local 2406 // 1 take local
2392 // 2 take remote 2407 // 2 take remote
2393 // 3 cancel 2408 // 3 cancel
2394 QDateTime lastSync = mLastAddressbookSync; 2409 QDateTime lastSync = mLastAddressbookSync;
2395 QDateTime localMod = local->revision(); 2410 QDateTime localMod = local->revision();
2396 QDateTime remoteMod = remote->revision(); 2411 QDateTime remoteMod = remote->revision();
2397 2412
2398 QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); 2413 QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
2399 2414
2400 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { 2415 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
2401 bool remCh, locCh; 2416 bool remCh, locCh;
@@ -2733,193 +2748,198 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
2733 inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL ); 2748 inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL );
2734 inR.setResource( 0 ); 2749 inR.setResource( 0 );
2735 remote->insertAddressee( inR, false ); 2750 remote->insertAddressee( inR, false );
2736 } 2751 }
2737 } 2752 }
2738 } else { 2753 } else {
2739 if ( inL.revision() < mLastAddressbookSync && mode != 4 ) { 2754 if ( inL.revision() < mLastAddressbookSync && mode != 4 ) {
2740 // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); 2755 // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
2741 local->removeAddressee( inL ); 2756 local->removeAddressee( inL );
2742 ++deletedAddresseeL; 2757 ++deletedAddresseeL;
2743 } else { 2758 } else {
2744 if ( ! syncManager->mWriteBackExistingOnly ) { 2759 if ( ! syncManager->mWriteBackExistingOnly ) {
2745 ++addedAddresseeR; 2760 ++addedAddresseeR;
2746 inL.setRevision( modifiedCalendar ); 2761 inL.setRevision( modifiedCalendar );
2747 local->insertAddressee( inL, false ); 2762 local->insertAddressee( inL, false );
2748 inR = inL; 2763 inR = inL;
2749 inR.setResource( 0 ); 2764 inR.setResource( 0 );
2750 remote->insertAddressee( inR, false ); 2765 remote->insertAddressee( inR, false );
2751 } 2766 }
2752 } 2767 }
2753 } 2768 }
2754 } 2769 }
2755 } 2770 }
2756 } 2771 }
2757 ++incCounter; 2772 ++incCounter;
2758 } 2773 }
2759 el.clear(); 2774 el.clear();
2760 syncManager->hideProgressBar(); 2775 syncManager->hideProgressBar();
2761 mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 ); 2776 mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 );
2762 // get rid of micro seconds 2777 // get rid of micro seconds
2763 QTime t = mLastAddressbookSync.time(); 2778 QTime t = mLastAddressbookSync.time();
2764 mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () ) ); 2779 mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () ) );
2765 addresseeLSync.setRevision( mLastAddressbookSync ); 2780 addresseeLSync.setRevision( mLastAddressbookSync );
2766 addresseeRSync.setRevision( mLastAddressbookSync ); 2781 addresseeRSync.setRevision( mLastAddressbookSync );
2767 addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ; 2782 addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ;
2768 addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName ); 2783 addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName );
2769 addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ; 2784 addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ;
2770 addresseeLSync.setGivenName(i18n("!DO NOT EDIT!") ); 2785 addresseeLSync.setGivenName(i18n("!DO NOT EDIT!") );
2771 addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ; 2786 addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ;
2772 addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() ); 2787 addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() );
2773 addresseeRSync.setNote( "" ) ; 2788 addresseeRSync.setNote( "" ) ;
2774 addresseeLSync.setNote( "" ); 2789 addresseeLSync.setNote( "" );
2775 2790
2776 if ( mGlobalSyncMode == SYNC_MODE_NORMAL) 2791 if ( mGlobalSyncMode == SYNC_MODE_NORMAL)
2777 remote->insertAddressee( addresseeRSync, false ); 2792 remote->insertAddressee( addresseeRSync, false );
2778 local->insertAddressee( addresseeLSync, false ); 2793 local->insertAddressee( addresseeLSync, false );
2779 QString mes; 2794 QString mes;
2780 mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); 2795 mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR );
2781 if ( syncManager->mShowSyncSummary ) {
2782 KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") );
2783 }
2784 qDebug( mes ); 2796 qDebug( mes );
2797 if ( syncManager->mShowSyncSummary ) {
2798 if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
2799 i18n("KA/Pi Synchronization"),i18n("Write back"))) {
2800 qDebug("cancelled ");
2801 return false;
2802 }
2803 }
2785 return syncOK; 2804 return syncOK;
2786} 2805}
2787 2806
2788 2807
2789//this is a overwritten callbackmethods from the syncinterface 2808//this is a overwritten callbackmethods from the syncinterface
2790bool KABCore::sync(KSyncManager* manager, QString filename, int mode) 2809bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
2791{ 2810{
2792 2811
2793 //pending prepare addresseeview for output 2812 //pending prepare addresseeview for output
2794 //pending detect, if remote file has REV field. if not switch to external sync 2813 //pending detect, if remote file has REV field. if not switch to external sync
2795 mGlobalSyncMode = SYNC_MODE_NORMAL; 2814 mGlobalSyncMode = SYNC_MODE_NORMAL;
2796 QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); 2815 QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
2797 2816
2798 AddressBook abLocal(filename,"syncContact"); 2817 AddressBook abLocal(filename,"syncContact");
2799 bool syncOK = false; 2818 bool syncOK = false;
2800 if ( abLocal.load() ) { 2819 if ( abLocal.load() ) {
2801 qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode ); 2820 qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode );
2802 bool external = false; 2821 bool external = false;
2803 bool isXML = false; 2822 bool isXML = false;
2804 if ( filename.right(4) == ".xml") { 2823 if ( filename.right(4) == ".xml") {
2805 mGlobalSyncMode = SYNC_MODE_EXTERNAL; 2824 mGlobalSyncMode = SYNC_MODE_EXTERNAL;
2806 isXML = true; 2825 isXML = true;
2807 abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); 2826 abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
2808 } else { 2827 } else {
2809 external = !manager->mIsKapiFile; 2828 external = !manager->mIsKapiFile;
2810 if ( external ) { 2829 if ( external ) {
2811 qDebug("Setting vcf mode to external "); 2830 qDebug("Setting vcf mode to external ");
2812 mGlobalSyncMode = SYNC_MODE_EXTERNAL; 2831 mGlobalSyncMode = SYNC_MODE_EXTERNAL;
2813 AddressBook::Iterator it; 2832 AddressBook::Iterator it;
2814 for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { 2833 for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
2815 (*it).setID( mCurrentSyncDevice, (*it).uid() ); 2834 (*it).setID( mCurrentSyncDevice, (*it).uid() );
2816 (*it).computeCsum( mCurrentSyncDevice ); 2835 (*it).computeCsum( mCurrentSyncDevice );
2817 } 2836 }
2818 } 2837 }
2819 } 2838 }
2820 //AddressBook::Iterator it; 2839 //AddressBook::Iterator it;
2821 //QStringList vcards; 2840 //QStringList vcards;
2822 //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { 2841 //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
2823 // qDebug("Name %s ", (*it).familyName().latin1()); 2842 // qDebug("Name %s ", (*it).familyName().latin1());
2824 //} 2843 //}
2825 syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode ); 2844 syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
2826 if ( syncOK ) { 2845 if ( syncOK ) {
2827 if ( syncManager->mWriteBackFile ) 2846 if ( syncManager->mWriteBackFile )
2828 { 2847 {
2829 if ( external ) 2848 if ( external )
2830 abLocal.removeSyncAddressees( !isXML); 2849 abLocal.removeSyncAddressees( !isXML);
2831 qDebug("Saving remote AB "); 2850 qDebug("Saving remote AB ");
2832 if ( ! abLocal.saveAB()) 2851 if ( ! abLocal.saveAB())
2833 qDebug("Error writing back AB to file "); 2852 qDebug("Error writing back AB to file ");
2834 if ( external ) { 2853 if ( external ) {
2835 // afterwrite processing 2854 // afterwrite processing
2836 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ,isXML); 2855 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ,isXML);
2837 } 2856 }
2838 } 2857 }
2839 } 2858 }
2840 setModified(); 2859 setModified();
2841 2860
2842 } 2861 }
2843 if ( syncOK ) 2862 if ( syncOK )
2844 mViewManager->refreshView(); 2863 mViewManager->refreshView();
2845 return syncOK; 2864 return syncOK;
2846 2865
2847} 2866}
2848void KABCore::removeSyncInfo( QString syncProfile) 2867void KABCore::removeSyncInfo( QString syncProfile)
2849{ 2868{
2850 qDebug("AB:removeSyncInfo for profile %s ", syncProfile.latin1()); 2869 qDebug("AB:removeSyncInfo for profile %s ", syncProfile.latin1());
2851 mAddressBook->removeSyncInfo( syncProfile ); 2870 mAddressBook->removeSyncInfo( syncProfile );
2852 setModified(); 2871 setModified();
2853} 2872}
2854 2873
2855 2874
2856//this is a overwritten callbackmethods from the syncinterface 2875//this is a overwritten callbackmethods from the syncinterface
2857bool KABCore::syncExternal(KSyncManager* manager, QString resource) 2876bool KABCore::syncExternal(KSyncManager* manager, QString resource)
2858{ 2877{
2859 if ( resource == "phone" ) 2878 if ( resource == "phone" )
2860 return syncPhone(); 2879 return syncPhone();
2861 disableBR( true ); 2880 disableBR( true );
2862 QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); 2881 QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
2863 2882
2864 AddressBook abLocal( resource,"syncContact"); 2883 AddressBook abLocal( resource,"syncContact");
2865 bool syncOK = false; 2884 bool syncOK = false;
2866 if ( abLocal.load() ) { 2885 if ( abLocal.load() ) {
2867 qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); 2886 qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
2868 mGlobalSyncMode = SYNC_MODE_EXTERNAL; 2887 mGlobalSyncMode = SYNC_MODE_EXTERNAL;
2869 abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false ); 2888 abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false );
2870 syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); 2889 syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
2871 if ( syncOK ) { 2890 if ( syncOK ) {
2872 if ( syncManager->mWriteBackFile ) { 2891 if ( syncManager->mWriteBackFile ) {
2873 abLocal.removeSyncAddressees( false ); 2892 abLocal.removeSyncAddressees( false );
2874 abLocal.saveAB(); 2893 abLocal.saveAB();
2875 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true ); 2894 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true );
2876 } 2895 }
2877 } 2896 } else
2897 message( i18n("Sync cancelled or failed.") );
2878 setModified(); 2898 setModified();
2879 } 2899 }
2880 if ( syncOK ) 2900 if ( syncOK )
2881 mViewManager->refreshView(); 2901 mViewManager->refreshView();
2882 disableBR( false ); 2902 disableBR( false );
2883 return syncOK; 2903 return syncOK;
2884 2904
2885} 2905}
2886void KABCore::message( QString m ) 2906void KABCore::message( QString m )
2887{ 2907{
2888 topLevelWidget()->setCaption( m ); 2908 topLevelWidget()->setCaption( m );
2889 mMessageTimer->start( 15000, true ); 2909 mMessageTimer->start( 15000, true );
2890} 2910}
2891bool KABCore::syncPhone() 2911bool KABCore::syncPhone()
2892{ 2912{
2893 QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); 2913 QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
2894 QString fileName = getPhoneFile(); 2914 QString fileName = getPhoneFile();
2895 if ( !PhoneAccess::readFromPhone( fileName) ) { 2915 if ( !PhoneAccess::readFromPhone( fileName) ) {
2896 message(i18n("Phone access failed!")); 2916 message(i18n("Phone access failed!"));
2897 return false; 2917 return false;
2898 } 2918 }
2899 AddressBook abLocal( fileName,"syncContact"); 2919 AddressBook abLocal( fileName,"syncContact");
2900 bool syncOK = false; 2920 bool syncOK = false;
2901 { 2921 {
2902 abLocal.importFromFile( fileName ); 2922 abLocal.importFromFile( fileName );
2903 qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1()); 2923 qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1());
2904 mGlobalSyncMode = SYNC_MODE_EXTERNAL; 2924 mGlobalSyncMode = SYNC_MODE_EXTERNAL;
2905 abLocal.preparePhoneSync( mCurrentSyncDevice, true ); 2925 abLocal.preparePhoneSync( mCurrentSyncDevice, true );
2906 abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); 2926 abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
2907 syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); 2927 syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
2908 if ( syncOK ) { 2928 if ( syncOK ) {
2909 if ( syncManager->mWriteBackFile ) { 2929 if ( syncManager->mWriteBackFile ) {
2910 abLocal.removeSyncAddressees( true ); 2930 abLocal.removeSyncAddressees( true );
2911 abLocal.saveABphone( fileName ); 2931 abLocal.saveABphone( fileName );
2912 abLocal.findNewExtIds( fileName, mCurrentSyncDevice ); 2932 abLocal.findNewExtIds( fileName, mCurrentSyncDevice );
2913 //abLocal.preparePhoneSync( mCurrentSyncDevice, false ); 2933 //abLocal.preparePhoneSync( mCurrentSyncDevice, false );
2914 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true ); 2934 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true );
2915 } 2935 }
2916 } 2936 }
2917 setModified(); 2937 setModified();
2918 } 2938 }
2919 if ( syncOK ) 2939 if ( syncOK )
2920 mViewManager->refreshView(); 2940 mViewManager->refreshView();
2921 return syncOK; 2941 return syncOK;
2922} 2942}
2923void KABCore::getFile( bool success ) 2943void KABCore::getFile( bool success )
2924{ 2944{
2925 if ( ! success ) { 2945 if ( ! success ) {
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 6831ec9..c01d598 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -107,96 +107,98 @@ class KABCore : public QWidget, public KSyncInterface
107 107
108 /** 108 /**
109 Returns a pointer to the KConfig object of the application. 109 Returns a pointer to the KConfig object of the application.
110 */ 110 */
111 static KConfig *config(); 111 static KConfig *config();
112 112
113 /** 113 /**
114 Returns a pointer to the global KActionCollection object. So 114 Returns a pointer to the global KActionCollection object. So
115 other classes can register their actions easily. 115 other classes can register their actions easily.
116 */ 116 */
117 KActionCollection *actionCollection() const; 117 KActionCollection *actionCollection() const;
118 118
119 /** 119 /**
120 Returns the current search field of the Incremental Search Widget. 120 Returns the current search field of the Incremental Search Widget.
121 */ 121 */
122 KABC::Field *currentSearchField() const; 122 KABC::Field *currentSearchField() const;
123 123
124 /** 124 /**
125 Returns the uid list of the currently selected contacts. 125 Returns the uid list of the currently selected contacts.
126 */ 126 */
127 QStringList selectedUIDs() const; 127 QStringList selectedUIDs() const;
128 128
129 /** 129 /**
130 Displays the ResourceSelectDialog and returns the selected 130 Displays the ResourceSelectDialog and returns the selected
131 resource or a null pointer if no resource was selected by 131 resource or a null pointer if no resource was selected by
132 the user. 132 the user.
133 */ 133 */
134 KABC::Resource *requestResource( QWidget *parent ); 134 KABC::Resource *requestResource( QWidget *parent );
135 135
136#ifndef KAB_EMBEDDED 136#ifndef KAB_EMBEDDED
137 static KAboutData *createAboutData(); 137 static KAboutData *createAboutData();
138#endif //KAB_EMBEDDED 138#endif //KAB_EMBEDDED
139 139
140#ifdef KAB_EMBEDDED 140#ifdef KAB_EMBEDDED
141 inline QPopupMenu* getImportMenu() { return ImportMenu;} 141 inline QPopupMenu* getImportMenu() { return ImportMenu;}
142 inline QPopupMenu* getExportMenu() { return ExportMenu;} 142 inline QPopupMenu* getExportMenu() { return ExportMenu;}
143#endif //KAB_EMBEDDED 143#endif //KAB_EMBEDDED
144 144
145 public slots: 145 public slots:
146#ifdef KAB_EMBEDDED 146#ifdef KAB_EMBEDDED
147 void createAboutData(); 147 void createAboutData();
148#endif //KAB_EMBEDDED 148#endif //KAB_EMBEDDED
149 void setDetailsToggle(); 149 void setDetailsToggle();
150 150
151 void showLicence(); 151 void showLicence();
152 void faq(); 152 void faq();
153 void whatsnew() ; 153 void whatsnew() ;
154 void synchowto() ; 154 void synchowto() ;
155 void multisynchowto() ;
156 void kdesynchowto() ;
155 void writeToPhone(); 157 void writeToPhone();
156 158
157 /** 159 /**
158 Is called whenever a contact is selected in the view. 160 Is called whenever a contact is selected in the view.
159 */ 161 */
160 void setContactSelected( const QString &uid ); 162 void setContactSelected( const QString &uid );
161 163
162 /** 164 /**
163 Opens the preferred mail composer with all selected contacts as 165 Opens the preferred mail composer with all selected contacts as
164 arguments. 166 arguments.
165 */ 167 */
166 void sendMail(); 168 void sendMail();
167 169
168 /** 170 /**
169 Opens the preferred mail composer with the given contacts as 171 Opens the preferred mail composer with the given contacts as
170 arguments. 172 arguments.
171 */ 173 */
172 void sendMail( const QString& email ); 174 void sendMail( const QString& email );
173 175
174 176
175 void mailVCard(); 177 void mailVCard();
176 void mailVCard(const QStringList& uids); 178 void mailVCard(const QStringList& uids);
177 179
178 /** 180 /**
179 Beams the "WhoAmI contact. 181 Beams the "WhoAmI contact.
180 */ 182 */
181 void beamMySelf(); 183 void beamMySelf();
182 184
183 void beamVCard(); 185 void beamVCard();
184 void export2phone(); 186 void export2phone();
185 void beamVCard(const QStringList& uids); 187 void beamVCard(const QStringList& uids);
186 void beamDone( Ir *ir ); 188 void beamDone( Ir *ir );
187 189
188 190
189 /** 191 /**
190 Starts the preferred web browser with the given URL as argument. 192 Starts the preferred web browser with the given URL as argument.
191 */ 193 */
192 void browse( const QString& url ); 194 void browse( const QString& url );
193 195
194 /** 196 /**
195 Select all contacts in the view. 197 Select all contacts in the view.
196 */ 198 */
197 void selectAllContacts(); 199 void selectAllContacts();
198 200
199 /** 201 /**
200 Deletes all selected contacts from the address book. 202 Deletes all selected contacts from the address book.
201 */ 203 */
202 void deleteContacts(); 204 void deleteContacts();
@@ -409,96 +411,98 @@ class KABCore : public QWidget, public KSyncInterface
409 LDAPSearchDialog *mLdapSearchDialog; 411 LDAPSearchDialog *mLdapSearchDialog;
410#endif //KAB_EMBEDDED 412#endif //KAB_EMBEDDED
411 // QDict<AddresseeEditorDialog> mEditorDict; 413 // QDict<AddresseeEditorDialog> mEditorDict;
412 AddresseeEditorDialog *mEditorDialog; 414 AddresseeEditorDialog *mEditorDialog;
413 bool mReadWrite; 415 bool mReadWrite;
414 bool mModified; 416 bool mModified;
415 bool mIsPart; 417 bool mIsPart;
416 bool mMultipleViewsAtOnce; 418 bool mMultipleViewsAtOnce;
417 419
418 420
419 //US file menu 421 //US file menu
420 KAction *mActionMail; 422 KAction *mActionMail;
421 KAction *mActionBeam; 423 KAction *mActionBeam;
422 KToggleAction *mActionBR; 424 KToggleAction *mActionBR;
423 KAction *mActionExport2phone; 425 KAction *mActionExport2phone;
424 KAction* mActionPrint; 426 KAction* mActionPrint;
425 KAction* mActionNewContact; 427 KAction* mActionNewContact;
426 KAction *mActionSave; 428 KAction *mActionSave;
427 KAction *mActionEditAddressee; 429 KAction *mActionEditAddressee;
428 KAction *mActionMailVCard; 430 KAction *mActionMailVCard;
429 KAction *mActionBeamVCard; 431 KAction *mActionBeamVCard;
430 432
431 KAction *mActionQuit; 433 KAction *mActionQuit;
432 434
433 //US edit menu 435 //US edit menu
434 KAction *mActionCopy; 436 KAction *mActionCopy;
435 KAction *mActionCut; 437 KAction *mActionCut;
436 KAction *mActionPaste; 438 KAction *mActionPaste;
437 KAction *mActionSelectAll; 439 KAction *mActionSelectAll;
438 KAction *mActionUndo; 440 KAction *mActionUndo;
439 KAction *mActionRedo; 441 KAction *mActionRedo;
440 KAction *mActionDelete; 442 KAction *mActionDelete;
441 443
442 //US settings menu 444 //US settings menu
443 KAction *mActionConfigResources; 445 KAction *mActionConfigResources;
444 KAction *mActionConfigKAddressbook; 446 KAction *mActionConfigKAddressbook;
445 KAction *mActionConfigShortcuts; 447 KAction *mActionConfigShortcuts;
446 KAction *mActionConfigureToolbars; 448 KAction *mActionConfigureToolbars;
447 KAction *mActionKeyBindings; 449 KAction *mActionKeyBindings;
448 KToggleAction *mActionJumpBar; 450 KToggleAction *mActionJumpBar;
449 KToggleAction *mActionDetails; 451 KToggleAction *mActionDetails;
450 KAction *mActionWhoAmI; 452 KAction *mActionWhoAmI;
451 KAction *mActionCategories; 453 KAction *mActionCategories;
452 KAction *mActionAboutKAddressbook; 454 KAction *mActionAboutKAddressbook;
453 KAction *mActionLicence; 455 KAction *mActionLicence;
454 KAction *mActionFaq; 456 KAction *mActionFaq;
455 KAction *mActionWN; 457 KAction *mActionWN;
456 KAction *mActionSyncHowto; 458 KAction *mActionSyncHowto;
459 KAction *mActionKdeSyncHowto;
460 KAction *mActionMultiSyncHowto;
457 461
458 KAction *mActionDeleteView; 462 KAction *mActionDeleteView;
459 463
460 QPopupMenu *viewMenu; 464 QPopupMenu *viewMenu;
461 QPopupMenu *filterMenu; 465 QPopupMenu *filterMenu;
462 QPopupMenu *settingsMenu; 466 QPopupMenu *settingsMenu;
463 QPopupMenu *changeMenu; 467 QPopupMenu *changeMenu;
464//US QAction *mActionSave; 468//US QAction *mActionSave;
465 QPopupMenu *ImportMenu; 469 QPopupMenu *ImportMenu;
466 QPopupMenu *ExportMenu; 470 QPopupMenu *ExportMenu;
467 //LR additional methods 471 //LR additional methods
468 KAction *mActionRemoveVoice; 472 KAction *mActionRemoveVoice;
469 KAction * mActionImportOL; 473 KAction * mActionImportOL;
470 474
471#ifndef KAB_EMBEDDED 475#ifndef KAB_EMBEDDED
472 KAddressBookService *mAddressBookService; 476 KAddressBookService *mAddressBookService;
473#endif //KAB_EMBEDDED 477#endif //KAB_EMBEDDED
474 478
475 class KABCorePrivate; 479 class KABCorePrivate;
476 KABCorePrivate *d; 480 KABCorePrivate *d;
477 //US bool mBlockSaveFlag; 481 //US bool mBlockSaveFlag;
478 482
479#ifdef KAB_EMBEDDED 483#ifdef KAB_EMBEDDED
480 KAddressBookMain *mMainWindow; // should be the same like mGUIClient 484 KAddressBookMain *mMainWindow; // should be the same like mGUIClient
481#endif //KAB_EMBEDDED 485#endif //KAB_EMBEDDED
482 486
483 //this are the overwritten callbackmethods from the syncinterface 487 //this are the overwritten callbackmethods from the syncinterface
484 virtual bool sync(KSyncManager* manager, QString filename, int mode); 488 virtual bool sync(KSyncManager* manager, QString filename, int mode);
485 virtual bool syncExternal(KSyncManager* manager, QString resource); 489 virtual bool syncExternal(KSyncManager* manager, QString resource);
486 virtual void removeSyncInfo( QString syncProfile); 490 virtual void removeSyncInfo( QString syncProfile);
487 bool syncPhone(); 491 bool syncPhone();
488 void message( QString m ); 492 void message( QString m );
489 493
490 // LR ******************************* 494 // LR *******************************
491 // sync stuff! 495 // sync stuff!
492 QString sentSyncFile(); 496 QString sentSyncFile();
493 QPopupMenu *syncMenu; 497 QPopupMenu *syncMenu;
494 KSyncManager* syncManager; 498 KSyncManager* syncManager;
495 int mGlobalSyncMode; 499 int mGlobalSyncMode;
496 bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode); 500 bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode);
497 KABC::Addressee getLastSyncAddressee(); 501 KABC::Addressee getLastSyncAddressee();
498 QDateTime mLastAddressbookSync; 502 QDateTime mLastAddressbookSync;
499 int takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ); 503 int takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full );
500 // ********************* 504 // *********************
501 505
502}; 506};
503 507
504#endif 508#endif