author | zautrix <zautrix> | 2004-12-05 13:41:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-12-05 13:41:41 (UTC) |
commit | 06bebf5be01898145c4f721a8d002519141e7f3b (patch) (unidiff) | |
tree | bc44d996a58a63de8c43cb5ba54d55bf1494eb5c /kaddressbook | |
parent | 5ab47964d8b52897bb0662ef4a5fcf9604acaf6c (diff) | |
download | kdepimpi-06bebf5be01898145c4f721a8d002519141e7f3b.zip kdepimpi-06bebf5be01898145c4f721a8d002519141e7f3b.tar.gz kdepimpi-06bebf5be01898145c4f721a8d002519141e7f3b.tar.bz2 |
added better debug output to sync file problems
-rw-r--r-- | kaddressbook/kabcore.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 15cab73..b7edccd 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1605,385 +1605,387 @@ void KABCore::configurationChanged() | |||
1605 | { | 1605 | { |
1606 | mExtensionManager->reconfigure(); | 1606 | mExtensionManager->reconfigure(); |
1607 | } | 1607 | } |
1608 | 1608 | ||
1609 | void KABCore::addressBookChanged() | 1609 | void KABCore::addressBookChanged() |
1610 | { | 1610 | { |
1611 | /*US | 1611 | /*US |
1612 | QDictIterator<AddresseeEditorDialog> it( mEditorDict ); | 1612 | QDictIterator<AddresseeEditorDialog> it( mEditorDict ); |
1613 | while ( it.current() ) { | 1613 | while ( it.current() ) { |
1614 | if ( it.current()->dirty() ) { | 1614 | if ( it.current()->dirty() ) { |
1615 | QString text = i18n( "Data has been changed externally. Unsaved " | 1615 | QString text = i18n( "Data has been changed externally. Unsaved " |
1616 | "changes will be lost." ); | 1616 | "changes will be lost." ); |
1617 | KMessageBox::information( this, text ); | 1617 | KMessageBox::information( this, text ); |
1618 | } | 1618 | } |
1619 | it.current()->setAddressee( mAddressBook->findByUid( it.currentKey() ) ); | 1619 | it.current()->setAddressee( mAddressBook->findByUid( it.currentKey() ) ); |
1620 | ++it; | 1620 | ++it; |
1621 | } | 1621 | } |
1622 | */ | 1622 | */ |
1623 | if (mEditorDialog) | 1623 | if (mEditorDialog) |
1624 | { | 1624 | { |
1625 | if (mEditorDialog->dirty()) | 1625 | if (mEditorDialog->dirty()) |
1626 | { | 1626 | { |
1627 | QString text = i18n( "Data has been changed externally. Unsaved " | 1627 | QString text = i18n( "Data has been changed externally. Unsaved " |
1628 | "changes will be lost." ); | 1628 | "changes will be lost." ); |
1629 | KMessageBox::information( this, text ); | 1629 | KMessageBox::information( this, text ); |
1630 | } | 1630 | } |
1631 | QString currentuid = mEditorDialog->addressee().uid(); | 1631 | QString currentuid = mEditorDialog->addressee().uid(); |
1632 | mEditorDialog->setAddressee( mAddressBook->findByUid( currentuid ) ); | 1632 | mEditorDialog->setAddressee( mAddressBook->findByUid( currentuid ) ); |
1633 | } | 1633 | } |
1634 | mViewManager->refreshView(); | 1634 | mViewManager->refreshView(); |
1635 | // mDetails->refreshView(); | 1635 | // mDetails->refreshView(); |
1636 | 1636 | ||
1637 | 1637 | ||
1638 | } | 1638 | } |
1639 | 1639 | ||
1640 | AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent, | 1640 | AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent, |
1641 | const char *name ) | 1641 | const char *name ) |
1642 | { | 1642 | { |
1643 | 1643 | ||
1644 | if ( mEditorDialog == 0 ) { | 1644 | if ( mEditorDialog == 0 ) { |
1645 | mEditorDialog = new AddresseeEditorDialog( this, parent, | 1645 | mEditorDialog = new AddresseeEditorDialog( this, parent, |
1646 | name ? name : "editorDialog" ); | 1646 | name ? name : "editorDialog" ); |
1647 | 1647 | ||
1648 | 1648 | ||
1649 | connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ), | 1649 | connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ), |
1650 | SLOT( contactModified( const KABC::Addressee& ) ) ); | 1650 | SLOT( contactModified( const KABC::Addressee& ) ) ); |
1651 | //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ), | 1651 | //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ), |
1652 | // SLOT( slotEditorDestroyed( const QString& ) ) ; | 1652 | // SLOT( slotEditorDestroyed( const QString& ) ) ; |
1653 | } | 1653 | } |
1654 | 1654 | ||
1655 | return mEditorDialog; | 1655 | return mEditorDialog; |
1656 | } | 1656 | } |
1657 | 1657 | ||
1658 | void KABCore::slotEditorDestroyed( const QString &uid ) | 1658 | void KABCore::slotEditorDestroyed( const QString &uid ) |
1659 | { | 1659 | { |
1660 | //mEditorDict.remove( uid ); | 1660 | //mEditorDict.remove( uid ); |
1661 | } | 1661 | } |
1662 | 1662 | ||
1663 | void KABCore::initGUI() | 1663 | void KABCore::initGUI() |
1664 | { | 1664 | { |
1665 | #ifndef KAB_EMBEDDED | 1665 | #ifndef KAB_EMBEDDED |
1666 | QHBoxLayout *topLayout = new QHBoxLayout( this ); | 1666 | QHBoxLayout *topLayout = new QHBoxLayout( this ); |
1667 | topLayout->setSpacing( KDialogBase::spacingHint() ); | 1667 | topLayout->setSpacing( KDialogBase::spacingHint() ); |
1668 | 1668 | ||
1669 | mExtensionBarSplitter = new QSplitter( this ); | 1669 | mExtensionBarSplitter = new QSplitter( this ); |
1670 | mExtensionBarSplitter->setOrientation( Qt::Vertical ); | 1670 | mExtensionBarSplitter->setOrientation( Qt::Vertical ); |
1671 | 1671 | ||
1672 | mDetailsSplitter = new QSplitter( mExtensionBarSplitter ); | 1672 | mDetailsSplitter = new QSplitter( mExtensionBarSplitter ); |
1673 | 1673 | ||
1674 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); | 1674 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); |
1675 | mIncSearchWidget = new IncSearchWidget( viewSpace ); | 1675 | mIncSearchWidget = new IncSearchWidget( viewSpace ); |
1676 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), | 1676 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), |
1677 | SLOT( incrementalSearch( const QString& ) ) ); | 1677 | SLOT( incrementalSearch( const QString& ) ) ); |
1678 | 1678 | ||
1679 | mViewManager = new ViewManager( this, viewSpace ); | 1679 | mViewManager = new ViewManager( this, viewSpace ); |
1680 | viewSpace->setStretchFactor( mViewManager, 1 ); | 1680 | viewSpace->setStretchFactor( mViewManager, 1 ); |
1681 | 1681 | ||
1682 | mDetails = new ViewContainer( mDetailsSplitter ); | 1682 | mDetails = new ViewContainer( mDetailsSplitter ); |
1683 | 1683 | ||
1684 | mJumpButtonBar = new JumpButtonBar( this, this ); | 1684 | mJumpButtonBar = new JumpButtonBar( this, this ); |
1685 | 1685 | ||
1686 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); | 1686 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); |
1687 | 1687 | ||
1688 | topLayout->addWidget( mExtensionBarSplitter ); | 1688 | topLayout->addWidget( mExtensionBarSplitter ); |
1689 | topLayout->setStretchFactor( mExtensionBarSplitter, 100 ); | 1689 | topLayout->setStretchFactor( mExtensionBarSplitter, 100 ); |
1690 | topLayout->addWidget( mJumpButtonBar ); | 1690 | topLayout->addWidget( mJumpButtonBar ); |
1691 | topLayout->setStretchFactor( mJumpButtonBar, 1 ); | 1691 | topLayout->setStretchFactor( mJumpButtonBar, 1 ); |
1692 | 1692 | ||
1693 | mXXPortManager = new XXPortManager( this, this ); | 1693 | mXXPortManager = new XXPortManager( this, this ); |
1694 | 1694 | ||
1695 | #else //KAB_EMBEDDED | 1695 | #else //KAB_EMBEDDED |
1696 | //US initialize viewMenu before settingup viewmanager. | 1696 | //US initialize viewMenu before settingup viewmanager. |
1697 | // Viewmanager needs this menu to plugin submenues. | 1697 | // Viewmanager needs this menu to plugin submenues. |
1698 | viewMenu = new QPopupMenu( this ); | 1698 | viewMenu = new QPopupMenu( this ); |
1699 | settingsMenu = new QPopupMenu( this ); | 1699 | settingsMenu = new QPopupMenu( this ); |
1700 | //filterMenu = new QPopupMenu( this ); | 1700 | //filterMenu = new QPopupMenu( this ); |
1701 | ImportMenu = new QPopupMenu( this ); | 1701 | ImportMenu = new QPopupMenu( this ); |
1702 | ExportMenu = new QPopupMenu( this ); | 1702 | ExportMenu = new QPopupMenu( this ); |
1703 | syncMenu = new QPopupMenu( this ); | 1703 | syncMenu = new QPopupMenu( this ); |
1704 | changeMenu= new QPopupMenu( this ); | 1704 | changeMenu= new QPopupMenu( this ); |
1705 | beamMenu= new QPopupMenu( this ); | 1705 | beamMenu= new QPopupMenu( this ); |
1706 | 1706 | ||
1707 | //US since we have no splitter for the embedded system, setup | 1707 | //US since we have no splitter for the embedded system, setup |
1708 | // a layout with two frames. One left and one right. | 1708 | // a layout with two frames. One left and one right. |
1709 | 1709 | ||
1710 | QBoxLayout *topLayout; | 1710 | QBoxLayout *topLayout; |
1711 | 1711 | ||
1712 | // = new QHBoxLayout( this ); | 1712 | // = new QHBoxLayout( this ); |
1713 | // QBoxLayout *topLayout = (QBoxLayout*)layout(); | 1713 | // QBoxLayout *topLayout = (QBoxLayout*)layout(); |
1714 | 1714 | ||
1715 | // QWidget *mainBox = new QWidget( this ); | 1715 | // QWidget *mainBox = new QWidget( this ); |
1716 | // QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox); | 1716 | // QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox); |
1717 | 1717 | ||
1718 | #ifdef DESKTOP_VERSION | 1718 | #ifdef DESKTOP_VERSION |
1719 | topLayout = new QHBoxLayout( this ); | 1719 | topLayout = new QHBoxLayout( this ); |
1720 | 1720 | ||
1721 | 1721 | ||
1722 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); | 1722 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); |
1723 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 1723 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
1724 | 1724 | ||
1725 | topLayout->addWidget(mMiniSplitter ); | 1725 | topLayout->addWidget(mMiniSplitter ); |
1726 | 1726 | ||
1727 | mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter ); | 1727 | mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter ); |
1728 | mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 1728 | mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
1729 | mViewManager = new ViewManager( this, mExtensionBarSplitter ); | 1729 | mViewManager = new ViewManager( this, mExtensionBarSplitter ); |
1730 | mDetails = new ViewContainer( mMiniSplitter ); | 1730 | mDetails = new ViewContainer( mMiniSplitter ); |
1731 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); | 1731 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); |
1732 | #else | 1732 | #else |
1733 | if ( QApplication::desktop()->width() > 480 ) { | 1733 | if ( QApplication::desktop()->width() > 480 ) { |
1734 | topLayout = new QHBoxLayout( this ); | 1734 | topLayout = new QHBoxLayout( this ); |
1735 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); | 1735 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); |
1736 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 1736 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
1737 | } else { | 1737 | } else { |
1738 | 1738 | ||
1739 | topLayout = new QHBoxLayout( this ); | 1739 | topLayout = new QHBoxLayout( this ); |
1740 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this); | 1740 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this); |
1741 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 1741 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
1742 | } | 1742 | } |
1743 | 1743 | ||
1744 | topLayout->addWidget(mMiniSplitter ); | 1744 | topLayout->addWidget(mMiniSplitter ); |
1745 | mViewManager = new ViewManager( this, mMiniSplitter ); | 1745 | mViewManager = new ViewManager( this, mMiniSplitter ); |
1746 | mDetails = new ViewContainer( mMiniSplitter ); | 1746 | mDetails = new ViewContainer( mMiniSplitter ); |
1747 | 1747 | ||
1748 | 1748 | ||
1749 | mExtensionManager = new ExtensionManager( this, mMiniSplitter ); | 1749 | mExtensionManager = new ExtensionManager( this, mMiniSplitter ); |
1750 | #endif | 1750 | #endif |
1751 | //eh->hide(); | 1751 | //eh->hide(); |
1752 | // topLayout->addWidget(mExtensionManager ); | 1752 | // topLayout->addWidget(mExtensionManager ); |
1753 | 1753 | ||
1754 | 1754 | ||
1755 | /*US | 1755 | /*US |
1756 | #ifndef KAB_NOSPLITTER | 1756 | #ifndef KAB_NOSPLITTER |
1757 | QHBoxLayout *topLayout = new QHBoxLayout( this ); | 1757 | QHBoxLayout *topLayout = new QHBoxLayout( this ); |
1758 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); | 1758 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); |
1759 | topLayout->setSpacing( 10 ); | 1759 | topLayout->setSpacing( 10 ); |
1760 | 1760 | ||
1761 | mDetailsSplitter = new QSplitter( this ); | 1761 | mDetailsSplitter = new QSplitter( this ); |
1762 | 1762 | ||
1763 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); | 1763 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); |
1764 | 1764 | ||
1765 | mViewManager = new ViewManager( this, viewSpace ); | 1765 | mViewManager = new ViewManager( this, viewSpace ); |
1766 | viewSpace->setStretchFactor( mViewManager, 1 ); | 1766 | viewSpace->setStretchFactor( mViewManager, 1 ); |
1767 | 1767 | ||
1768 | mDetails = new ViewContainer( mDetailsSplitter ); | 1768 | mDetails = new ViewContainer( mDetailsSplitter ); |
1769 | 1769 | ||
1770 | topLayout->addWidget( mDetailsSplitter ); | 1770 | topLayout->addWidget( mDetailsSplitter ); |
1771 | topLayout->setStretchFactor( mDetailsSplitter, 100 ); | 1771 | topLayout->setStretchFactor( mDetailsSplitter, 100 ); |
1772 | #else //KAB_NOSPLITTER | 1772 | #else //KAB_NOSPLITTER |
1773 | QHBoxLayout *topLayout = new QHBoxLayout( this ); | 1773 | QHBoxLayout *topLayout = new QHBoxLayout( this ); |
1774 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); | 1774 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); |
1775 | topLayout->setSpacing( 10 ); | 1775 | topLayout->setSpacing( 10 ); |
1776 | 1776 | ||
1777 | // mDetailsSplitter = new QSplitter( this ); | 1777 | // mDetailsSplitter = new QSplitter( this ); |
1778 | 1778 | ||
1779 | QVBox *viewSpace = new QVBox( this ); | 1779 | QVBox *viewSpace = new QVBox( this ); |
1780 | 1780 | ||
1781 | mViewManager = new ViewManager( this, viewSpace ); | 1781 | mViewManager = new ViewManager( this, viewSpace ); |
1782 | viewSpace->setStretchFactor( mViewManager, 1 ); | 1782 | viewSpace->setStretchFactor( mViewManager, 1 ); |
1783 | 1783 | ||
1784 | mDetails = new ViewContainer( this ); | 1784 | mDetails = new ViewContainer( this ); |
1785 | 1785 | ||
1786 | topLayout->addWidget( viewSpace ); | 1786 | topLayout->addWidget( viewSpace ); |
1787 | // topLayout->setStretchFactor( mDetailsSplitter, 100 ); | 1787 | // topLayout->setStretchFactor( mDetailsSplitter, 100 ); |
1788 | topLayout->addWidget( mDetails ); | 1788 | topLayout->addWidget( mDetails ); |
1789 | #endif //KAB_NOSPLITTER | 1789 | #endif //KAB_NOSPLITTER |
1790 | */ | 1790 | */ |
1791 | 1791 | ||
1792 | syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); | 1792 | syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); |
1793 | syncManager->setBlockSave(false); | 1793 | syncManager->setBlockSave(false); |
1794 | 1794 | ||
1795 | connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); | 1795 | connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); |
1796 | connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); | 1796 | connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); |
1797 | syncManager->setDefaultFileName( sentSyncFile()); | 1797 | QString sync_file = sentSyncFile(); |
1798 | qDebug("KABCore::initGUI()::setting tmp sync file to:%s ",sync_file.latin1()); | ||
1799 | syncManager->setDefaultFileName( sync_file ); | ||
1798 | //connect(syncManager , SIGNAL( ), this, SLOT( ) ); | 1800 | //connect(syncManager , SIGNAL( ), this, SLOT( ) ); |
1799 | 1801 | ||
1800 | #endif //KAB_EMBEDDED | 1802 | #endif //KAB_EMBEDDED |
1801 | initActions(); | 1803 | initActions(); |
1802 | 1804 | ||
1803 | #ifdef KAB_EMBEDDED | 1805 | #ifdef KAB_EMBEDDED |
1804 | addActionsManually(); | 1806 | addActionsManually(); |
1805 | //US make sure the export and import menues are initialized before creating the xxPortManager. | 1807 | //US make sure the export and import menues are initialized before creating the xxPortManager. |
1806 | mXXPortManager = new XXPortManager( this, this ); | 1808 | mXXPortManager = new XXPortManager( this, this ); |
1807 | 1809 | ||
1808 | // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() ); | 1810 | // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() ); |
1809 | //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget); | 1811 | //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget); |
1810 | // mActionQuit->plug ( mMainWindow->toolBar()); | 1812 | // mActionQuit->plug ( mMainWindow->toolBar()); |
1811 | //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() ); | 1813 | //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() ); |
1812 | //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget); | 1814 | //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget); |
1813 | // mIncSearchWidget->hide(); | 1815 | // mIncSearchWidget->hide(); |
1814 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), | 1816 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), |
1815 | SLOT( incrementalSearch( const QString& ) ) ); | 1817 | SLOT( incrementalSearch( const QString& ) ) ); |
1816 | connect( mIncSearchWidget, SIGNAL( scrollUP() ),mViewManager, SLOT( scrollUP() ) ); | 1818 | connect( mIncSearchWidget, SIGNAL( scrollUP() ),mViewManager, SLOT( scrollUP() ) ); |
1817 | connect( mIncSearchWidget, SIGNAL( scrollDOWN() ),mViewManager, SLOT( scrollDOWN() ) ); | 1819 | connect( mIncSearchWidget, SIGNAL( scrollDOWN() ),mViewManager, SLOT( scrollDOWN() ) ); |
1818 | 1820 | ||
1819 | mJumpButtonBar = new JumpButtonBar( this, this ); | 1821 | mJumpButtonBar = new JumpButtonBar( this, this ); |
1820 | 1822 | ||
1821 | topLayout->addWidget( mJumpButtonBar ); | 1823 | topLayout->addWidget( mJumpButtonBar ); |
1822 | //US topLayout->setStretchFactor( mJumpButtonBar, 10 ); | 1824 | //US topLayout->setStretchFactor( mJumpButtonBar, 10 ); |
1823 | 1825 | ||
1824 | // mMainWindow->getIconToolBar()->raise(); | 1826 | // mMainWindow->getIconToolBar()->raise(); |
1825 | 1827 | ||
1826 | #endif //KAB_EMBEDDED | 1828 | #endif //KAB_EMBEDDED |
1827 | 1829 | ||
1828 | } | 1830 | } |
1829 | void KABCore::initActions() | 1831 | void KABCore::initActions() |
1830 | { | 1832 | { |
1831 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); | 1833 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); |
1832 | 1834 | ||
1833 | #ifndef KAB_EMBEDDED | 1835 | #ifndef KAB_EMBEDDED |
1834 | connect( QApplication::clipboard(), SIGNAL( dataChanged() ), | 1836 | connect( QApplication::clipboard(), SIGNAL( dataChanged() ), |
1835 | SLOT( clipboardDataChanged() ) ); | 1837 | SLOT( clipboardDataChanged() ) ); |
1836 | #endif //KAB_EMBEDDED | 1838 | #endif //KAB_EMBEDDED |
1837 | 1839 | ||
1838 | // file menu | 1840 | // file menu |
1839 | if ( mIsPart ) { | 1841 | if ( mIsPart ) { |
1840 | mActionMail = new KAction( i18n( "&Mail" ), "mail_generic", 0, this, | 1842 | mActionMail = new KAction( i18n( "&Mail" ), "mail_generic", 0, this, |
1841 | SLOT( sendMail() ), actionCollection(), | 1843 | SLOT( sendMail() ), actionCollection(), |
1842 | "kaddressbook_mail" ); | 1844 | "kaddressbook_mail" ); |
1843 | mActionPrint = new KAction( i18n( "&Print" ), "fileprint", CTRL + Key_P, this, | 1845 | mActionPrint = new KAction( i18n( "&Print" ), "fileprint", CTRL + Key_P, this, |
1844 | SLOT( print() ), actionCollection(), "kaddressbook_print" ); | 1846 | SLOT( print() ), actionCollection(), "kaddressbook_print" ); |
1845 | 1847 | ||
1846 | } else { | 1848 | } else { |
1847 | mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() ); | 1849 | mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() ); |
1848 | mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() ); | 1850 | mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() ); |
1849 | } | 1851 | } |
1850 | 1852 | ||
1851 | 1853 | ||
1852 | mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this, | 1854 | mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this, |
1853 | SLOT( save() ), actionCollection(), "file_sync" ); | 1855 | SLOT( save() ), actionCollection(), "file_sync" ); |
1854 | 1856 | ||
1855 | mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this, | 1857 | mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this, |
1856 | SLOT( newContact() ), actionCollection(), "file_new_contact" ); | 1858 | SLOT( newContact() ), actionCollection(), "file_new_contact" ); |
1857 | 1859 | ||
1858 | mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0, | 1860 | mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0, |
1859 | this, SLOT( mailVCard() ), | 1861 | this, SLOT( mailVCard() ), |
1860 | actionCollection(), "file_mail_vcard"); | 1862 | actionCollection(), "file_mail_vcard"); |
1861 | 1863 | ||
1862 | mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this, | 1864 | mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this, |
1863 | SLOT( export2phone() ), actionCollection(), | 1865 | SLOT( export2phone() ), actionCollection(), |
1864 | "kaddressbook_ex2phone" ); | 1866 | "kaddressbook_ex2phone" ); |
1865 | 1867 | ||
1866 | mActionBeamVCard = 0; | 1868 | mActionBeamVCard = 0; |
1867 | mActionBeam = 0; | 1869 | mActionBeam = 0; |
1868 | 1870 | ||
1869 | #ifndef DESKTOP_VERSION | 1871 | #ifndef DESKTOP_VERSION |
1870 | if ( Ir::supported() ) { | 1872 | if ( Ir::supported() ) { |
1871 | mActionBeamVCard = new KAction( i18n( "Beam v&Card(s)..." ), "beam", 0, this, | 1873 | mActionBeamVCard = new KAction( i18n( "Beam v&Card(s)..." ), "beam", 0, this, |
1872 | SLOT( beamVCard() ), actionCollection(), | 1874 | SLOT( beamVCard() ), actionCollection(), |
1873 | "kaddressbook_beam_vcard" ); | 1875 | "kaddressbook_beam_vcard" ); |
1874 | 1876 | ||
1875 | mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this, | 1877 | mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this, |
1876 | SLOT( beamMySelf() ), actionCollection(), | 1878 | SLOT( beamMySelf() ), actionCollection(), |
1877 | "kaddressbook_beam_myself" ); | 1879 | "kaddressbook_beam_myself" ); |
1878 | } | 1880 | } |
1879 | #endif | 1881 | #endif |
1880 | 1882 | ||
1881 | mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0, | 1883 | mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0, |
1882 | this, SLOT( editContact2() ), | 1884 | this, SLOT( editContact2() ), |
1883 | actionCollection(), "file_properties" ); | 1885 | actionCollection(), "file_properties" ); |
1884 | 1886 | ||
1885 | #ifdef KAB_EMBEDDED | 1887 | #ifdef KAB_EMBEDDED |
1886 | // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() ); | 1888 | // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() ); |
1887 | mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0, | 1889 | mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0, |
1888 | mMainWindow, SLOT( exit() ), | 1890 | mMainWindow, SLOT( exit() ), |
1889 | actionCollection(), "quit" ); | 1891 | actionCollection(), "quit" ); |
1890 | #endif //KAB_EMBEDDED | 1892 | #endif //KAB_EMBEDDED |
1891 | 1893 | ||
1892 | // edit menu | 1894 | // edit menu |
1893 | if ( mIsPart ) { | 1895 | if ( mIsPart ) { |
1894 | mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this, | 1896 | mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this, |
1895 | SLOT( copyContacts() ), actionCollection(), | 1897 | SLOT( copyContacts() ), actionCollection(), |
1896 | "kaddressbook_copy" ); | 1898 | "kaddressbook_copy" ); |
1897 | mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this, | 1899 | mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this, |
1898 | SLOT( cutContacts() ), actionCollection(), | 1900 | SLOT( cutContacts() ), actionCollection(), |
1899 | "kaddressbook_cut" ); | 1901 | "kaddressbook_cut" ); |
1900 | mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this, | 1902 | mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this, |
1901 | SLOT( pasteContacts() ), actionCollection(), | 1903 | SLOT( pasteContacts() ), actionCollection(), |
1902 | "kaddressbook_paste" ); | 1904 | "kaddressbook_paste" ); |
1903 | mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this, | 1905 | mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this, |
1904 | SLOT( selectAllContacts() ), actionCollection(), | 1906 | SLOT( selectAllContacts() ), actionCollection(), |
1905 | "kaddressbook_select_all" ); | 1907 | "kaddressbook_select_all" ); |
1906 | mActionUndo = new KAction( i18n( "&Undo" ), "undo", CTRL + Key_Z, this, | 1908 | mActionUndo = new KAction( i18n( "&Undo" ), "undo", CTRL + Key_Z, this, |
1907 | SLOT( undo() ), actionCollection(), | 1909 | SLOT( undo() ), actionCollection(), |
1908 | "kaddressbook_undo" ); | 1910 | "kaddressbook_undo" ); |
1909 | mActionRedo = new KAction( i18n( "Re&do" ), "redo", CTRL + SHIFT + Key_Z, | 1911 | mActionRedo = new KAction( i18n( "Re&do" ), "redo", CTRL + SHIFT + Key_Z, |
1910 | this, SLOT( redo() ), actionCollection(), | 1912 | this, SLOT( redo() ), actionCollection(), |
1911 | "kaddressbook_redo" ); | 1913 | "kaddressbook_redo" ); |
1912 | } else { | 1914 | } else { |
1913 | mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() ); | 1915 | mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() ); |
1914 | mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() ); | 1916 | mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() ); |
1915 | mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() ); | 1917 | mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() ); |
1916 | mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() ); | 1918 | mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() ); |
1917 | mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() ); | 1919 | mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() ); |
1918 | mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() ); | 1920 | mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() ); |
1919 | } | 1921 | } |
1920 | 1922 | ||
1921 | mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete", | 1923 | mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete", |
1922 | Key_Delete, this, SLOT( deleteContacts() ), | 1924 | Key_Delete, this, SLOT( deleteContacts() ), |
1923 | actionCollection(), "edit_delete" ); | 1925 | actionCollection(), "edit_delete" ); |
1924 | 1926 | ||
1925 | mActionUndo->setEnabled( false ); | 1927 | mActionUndo->setEnabled( false ); |
1926 | mActionRedo->setEnabled( false ); | 1928 | mActionRedo->setEnabled( false ); |
1927 | 1929 | ||
1928 | // settings menu | 1930 | // settings menu |
1929 | #ifdef KAB_EMBEDDED | 1931 | #ifdef KAB_EMBEDDED |
1930 | //US special menuentry to configure the addressbook resources. On KDE | 1932 | //US special menuentry to configure the addressbook resources. On KDE |
1931 | // you do that through the control center !!! | 1933 | // you do that through the control center !!! |
1932 | mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this, | 1934 | mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this, |
1933 | SLOT( configureResources() ), actionCollection(), | 1935 | SLOT( configureResources() ), actionCollection(), |
1934 | "kaddressbook_configure_resources" ); | 1936 | "kaddressbook_configure_resources" ); |
1935 | #endif //KAB_EMBEDDED | 1937 | #endif //KAB_EMBEDDED |
1936 | 1938 | ||
1937 | if ( mIsPart ) { | 1939 | if ( mIsPart ) { |
1938 | mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this, | 1940 | mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this, |
1939 | SLOT( openConfigDialog() ), actionCollection(), | 1941 | SLOT( openConfigDialog() ), actionCollection(), |
1940 | "kaddressbook_configure" ); | 1942 | "kaddressbook_configure" ); |
1941 | 1943 | ||
1942 | //US not implemented yet | 1944 | //US not implemented yet |
1943 | //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0, | 1945 | //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0, |
1944 | // this, SLOT( configureKeyBindings() ), actionCollection(), | 1946 | // this, SLOT( configureKeyBindings() ), actionCollection(), |
1945 | // "kaddressbook_configure_shortcuts" ); | 1947 | // "kaddressbook_configure_shortcuts" ); |
1946 | #ifdef KAB_EMBEDDED | 1948 | #ifdef KAB_EMBEDDED |
1947 | mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() ); | 1949 | mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() ); |
1948 | mActionConfigureToolbars->setEnabled( false ); | 1950 | mActionConfigureToolbars->setEnabled( false ); |
1949 | #endif //KAB_EMBEDDED | 1951 | #endif //KAB_EMBEDDED |
1950 | 1952 | ||
1951 | } else { | 1953 | } else { |
1952 | mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() ); | 1954 | mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() ); |
1953 | 1955 | ||
1954 | //US not implemented yet | 1956 | //US not implemented yet |
1955 | //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() ); | 1957 | //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() ); |
1956 | } | 1958 | } |
1957 | 1959 | ||
1958 | mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0, | 1960 | mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0, |
1959 | actionCollection(), "options_show_jump_bar" ); | 1961 | actionCollection(), "options_show_jump_bar" ); |
1960 | connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) ); | 1962 | connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) ); |
1961 | 1963 | ||
1962 | mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0, | 1964 | mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0, |
1963 | actionCollection(), "options_show_details" ); | 1965 | actionCollection(), "options_show_details" ); |
1964 | connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) ); | 1966 | connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) ); |
1965 | 1967 | ||
1966 | 1968 | ||
1967 | mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this, | 1969 | mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this, |
1968 | SLOT( toggleBeamReceive() ), actionCollection(), | 1970 | SLOT( toggleBeamReceive() ), actionCollection(), |
1969 | "kaddressbook_beam_rec" ); | 1971 | "kaddressbook_beam_rec" ); |
1970 | 1972 | ||
1971 | 1973 | ||
1972 | // misc | 1974 | // misc |
1973 | // only enable LDAP lookup if we can handle the protocol | 1975 | // only enable LDAP lookup if we can handle the protocol |
1974 | #ifndef KAB_EMBEDDED | 1976 | #ifndef KAB_EMBEDDED |
1975 | if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { | 1977 | if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { |
1976 | new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, | 1978 | new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, |
1977 | this, SLOT( openLDAPDialog() ), actionCollection(), | 1979 | this, SLOT( openLDAPDialog() ), actionCollection(), |
1978 | "ldap_lookup" ); | 1980 | "ldap_lookup" ); |
1979 | } | 1981 | } |
1980 | #else //KAB_EMBEDDED | 1982 | #else //KAB_EMBEDDED |
1981 | //qDebug("KABCore::initActions() LDAP has to be implemented"); | 1983 | //qDebug("KABCore::initActions() LDAP has to be implemented"); |
1982 | #endif //KAB_EMBEDDED | 1984 | #endif //KAB_EMBEDDED |
1983 | 1985 | ||
1984 | 1986 | ||
1985 | mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this, | 1987 | mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this, |
1986 | SLOT( setWhoAmI() ), actionCollection(), | 1988 | SLOT( setWhoAmI() ), actionCollection(), |
1987 | "set_personal" ); | 1989 | "set_personal" ); |
1988 | 1990 | ||
1989 | 1991 | ||
@@ -2817,356 +2819,360 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2817 | inR = remote->findByUid( uid ); | 2819 | inR = remote->findByUid( uid ); |
2818 | //inL.setResource( 0 ); | 2820 | //inL.setResource( 0 ); |
2819 | //inR.setResource( 0 ); | 2821 | //inR.setResource( 0 ); |
2820 | if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars | 2822 | if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars |
2821 | if ( !inL.resource() || inL.resource()->includeInSync() ) { | 2823 | if ( !inL.resource() || inL.resource()->includeInSync() ) { |
2822 | if ( (take = takeAddressee( &inL, &inR, mode, fullDateRange )) ) { | 2824 | if ( (take = takeAddressee( &inL, &inR, mode, fullDateRange )) ) { |
2823 | //qDebug("take %d %s ", take, inL.summary().latin1()); | 2825 | //qDebug("take %d %s ", take, inL.summary().latin1()); |
2824 | if ( take == 3 ) | 2826 | if ( take == 3 ) |
2825 | return false; | 2827 | return false; |
2826 | if ( take == 1 ) {// take local ********************** | 2828 | if ( take == 1 ) {// take local ********************** |
2827 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2829 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2828 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); | 2830 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); |
2829 | inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); | 2831 | inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); |
2830 | local->insertAddressee( inL, false ); | 2832 | local->insertAddressee( inL, false ); |
2831 | idS = inR.externalUID(); | 2833 | idS = inR.externalUID(); |
2832 | OidS = inR.originalExternalUID(); | 2834 | OidS = inR.originalExternalUID(); |
2833 | } | 2835 | } |
2834 | else | 2836 | else |
2835 | idS = inR.IDStr(); | 2837 | idS = inR.IDStr(); |
2836 | remote->removeAddressee( inR ); | 2838 | remote->removeAddressee( inR ); |
2837 | inR = inL; | 2839 | inR = inL; |
2838 | inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 2840 | inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
2839 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2841 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2840 | inR.setOriginalExternalUID( OidS ); | 2842 | inR.setOriginalExternalUID( OidS ); |
2841 | inR.setExternalUID( idS ); | 2843 | inR.setExternalUID( idS ); |
2842 | if ( syncManager->syncWithDesktop() ) { | 2844 | if ( syncManager->syncWithDesktop() ) { |
2843 | inR.setIDStr("changed" ); | 2845 | inR.setIDStr("changed" ); |
2844 | } | 2846 | } |
2845 | //inR.insertCustom( "KADDRESSBOOK", "X-KDESYNC","changed" ); | 2847 | //inR.insertCustom( "KADDRESSBOOK", "X-KDESYNC","changed" ); |
2846 | } else { | 2848 | } else { |
2847 | inR.setIDStr( idS ); | 2849 | inR.setIDStr( idS ); |
2848 | } | 2850 | } |
2849 | inR.setResource( 0 ); | 2851 | inR.setResource( 0 ); |
2850 | remote->insertAddressee( inR , false); | 2852 | remote->insertAddressee( inR , false); |
2851 | ++changedRemote; | 2853 | ++changedRemote; |
2852 | } else { // take == 2 take remote ********************** | 2854 | } else { // take == 2 take remote ********************** |
2853 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2855 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2854 | if ( inR.revision().date().year() < 2004 ) | 2856 | if ( inR.revision().date().year() < 2004 ) |
2855 | inR.setRevision( modifiedCalendar ); | 2857 | inR.setRevision( modifiedCalendar ); |
2856 | } | 2858 | } |
2857 | idS = inL.IDStr(); | 2859 | idS = inL.IDStr(); |
2858 | local->removeAddressee( inL ); | 2860 | local->removeAddressee( inL ); |
2859 | inL = inR; | 2861 | inL = inR; |
2860 | inL.setIDStr( idS ); | 2862 | inL.setIDStr( idS ); |
2861 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2863 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2862 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); | 2864 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); |
2863 | inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); | 2865 | inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); |
2864 | } | 2866 | } |
2865 | inL.setResource( 0 ); | 2867 | inL.setResource( 0 ); |
2866 | local->insertAddressee( inL , false ); | 2868 | local->insertAddressee( inL , false ); |
2867 | ++changedLocal; | 2869 | ++changedLocal; |
2868 | } | 2870 | } |
2869 | } | 2871 | } |
2870 | } | 2872 | } |
2871 | } else { // no conflict ********** add or delete remote | 2873 | } else { // no conflict ********** add or delete remote |
2872 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2874 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2873 | QString des = addresseeLSync.note(); | 2875 | QString des = addresseeLSync.note(); |
2874 | if ( des.find( inR.getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it | 2876 | if ( des.find( inR.getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it |
2875 | inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE ); | 2877 | inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE ); |
2876 | remote->insertAddressee( inR, false ); | 2878 | remote->insertAddressee( inR, false ); |
2877 | ++deletedAddresseeR; | 2879 | ++deletedAddresseeR; |
2878 | } else { | 2880 | } else { |
2879 | inR.setRevision( modifiedCalendar ); | 2881 | inR.setRevision( modifiedCalendar ); |
2880 | remote->insertAddressee( inR, false ); | 2882 | remote->insertAddressee( inR, false ); |
2881 | inL = inR; | 2883 | inL = inR; |
2882 | inL.setIDStr( ":" ); | 2884 | inL.setIDStr( ":" ); |
2883 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); | 2885 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); |
2884 | inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); | 2886 | inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); |
2885 | inL.setResource( 0 ); | 2887 | inL.setResource( 0 ); |
2886 | local->insertAddressee( inL , false); | 2888 | local->insertAddressee( inL , false); |
2887 | ++addedAddressee; | 2889 | ++addedAddressee; |
2888 | } | 2890 | } |
2889 | } else { | 2891 | } else { |
2890 | if ( inR.revision() > mLastAddressbookSync || mode == 5 ) { | 2892 | if ( inR.revision() > mLastAddressbookSync || mode == 5 ) { |
2891 | inR.setRevision( modifiedCalendar ); | 2893 | inR.setRevision( modifiedCalendar ); |
2892 | remote->insertAddressee( inR, false ); | 2894 | remote->insertAddressee( inR, false ); |
2893 | inR.setResource( 0 ); | 2895 | inR.setResource( 0 ); |
2894 | local->insertAddressee( inR, false ); | 2896 | local->insertAddressee( inR, false ); |
2895 | ++addedAddressee; | 2897 | ++addedAddressee; |
2896 | } else { | 2898 | } else { |
2897 | // pending checkExternSyncAddressee(addresseeRSyncSharp, inR); | 2899 | // pending checkExternSyncAddressee(addresseeRSyncSharp, inR); |
2898 | remote->removeAddressee( inR ); | 2900 | remote->removeAddressee( inR ); |
2899 | ++deletedAddresseeR; | 2901 | ++deletedAddresseeR; |
2900 | } | 2902 | } |
2901 | } | 2903 | } |
2902 | } | 2904 | } |
2903 | } | 2905 | } |
2904 | ++incCounter; | 2906 | ++incCounter; |
2905 | } | 2907 | } |
2906 | er.clear(); | 2908 | er.clear(); |
2907 | QStringList el = local->uidList(); | 2909 | QStringList el = local->uidList(); |
2908 | modulo = (el.count()/10)+1; | 2910 | modulo = (el.count()/10)+1; |
2909 | 2911 | ||
2910 | syncManager->showProgressBar(0, i18n("Add / remove addressees"), el.count()); | 2912 | syncManager->showProgressBar(0, i18n("Add / remove addressees"), el.count()); |
2911 | incCounter = 0; | 2913 | incCounter = 0; |
2912 | while ( incCounter < el.count()) { | 2914 | while ( incCounter < el.count()) { |
2913 | qApp->processEvents(); | 2915 | qApp->processEvents(); |
2914 | if (syncManager->isProgressBarCanceled()) | 2916 | if (syncManager->isProgressBarCanceled()) |
2915 | return false; | 2917 | return false; |
2916 | if ( incCounter % modulo == 0 ) | 2918 | if ( incCounter % modulo == 0 ) |
2917 | syncManager->showProgressBar(incCounter); | 2919 | syncManager->showProgressBar(incCounter); |
2918 | uid = el[ incCounter ]; | 2920 | uid = el[ incCounter ]; |
2919 | bool skipIncidence = false; | 2921 | bool skipIncidence = false; |
2920 | if ( uid.left(19) == QString("last-syncAddressee-") ) | 2922 | if ( uid.left(19) == QString("last-syncAddressee-") ) |
2921 | skipIncidence = true; | 2923 | skipIncidence = true; |
2922 | if ( !skipIncidence ) { | 2924 | if ( !skipIncidence ) { |
2923 | inL = local->findByUid( uid ); | 2925 | inL = local->findByUid( uid ); |
2924 | if ( !inL.resource() || inL.resource()->includeInSync() ) { | 2926 | if ( !inL.resource() || inL.resource()->includeInSync() ) { |
2925 | inR = remote->findByUid( uid ); | 2927 | inR = remote->findByUid( uid ); |
2926 | if ( inR.isEmpty() ) { // no conflict ********** add or delete local | 2928 | if ( inR.isEmpty() ) { // no conflict ********** add or delete local |
2927 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2929 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2928 | if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { | 2930 | if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { |
2929 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); | 2931 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); |
2930 | local->removeAddressee( inL ); | 2932 | local->removeAddressee( inL ); |
2931 | ++deletedAddresseeL; | 2933 | ++deletedAddresseeL; |
2932 | } else { | 2934 | } else { |
2933 | if ( ! syncManager->mWriteBackExistingOnly ) { | 2935 | if ( ! syncManager->mWriteBackExistingOnly ) { |
2934 | inL.removeID(mCurrentSyncDevice ); | 2936 | inL.removeID(mCurrentSyncDevice ); |
2935 | ++addedAddresseeR; | 2937 | ++addedAddresseeR; |
2936 | inL.setRevision( modifiedCalendar ); | 2938 | inL.setRevision( modifiedCalendar ); |
2937 | local->insertAddressee( inL, false ); | 2939 | local->insertAddressee( inL, false ); |
2938 | inR = inL; | 2940 | inR = inL; |
2939 | inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL ); | 2941 | inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL ); |
2940 | inR.setResource( 0 ); | 2942 | inR.setResource( 0 ); |
2941 | remote->insertAddressee( inR, false ); | 2943 | remote->insertAddressee( inR, false ); |
2942 | } | 2944 | } |
2943 | } | 2945 | } |
2944 | } else { | 2946 | } else { |
2945 | if ( inL.revision() < mLastAddressbookSync && mode != 4 ) { | 2947 | if ( inL.revision() < mLastAddressbookSync && mode != 4 ) { |
2946 | //qDebug("data %s ", inL.revision().toString().latin1()); | 2948 | //qDebug("data %s ", inL.revision().toString().latin1()); |
2947 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); | 2949 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); |
2948 | local->removeAddressee( inL ); | 2950 | local->removeAddressee( inL ); |
2949 | ++deletedAddresseeL; | 2951 | ++deletedAddresseeL; |
2950 | } else { | 2952 | } else { |
2951 | if ( ! syncManager->mWriteBackExistingOnly ) { | 2953 | if ( ! syncManager->mWriteBackExistingOnly ) { |
2952 | ++addedAddresseeR; | 2954 | ++addedAddresseeR; |
2953 | inL.setRevision( modifiedCalendar ); | 2955 | inL.setRevision( modifiedCalendar ); |
2954 | local->insertAddressee( inL, false ); | 2956 | local->insertAddressee( inL, false ); |
2955 | inR = inL; | 2957 | inR = inL; |
2956 | inR.setIDStr( ":" ); | 2958 | inR.setIDStr( ":" ); |
2957 | inR.setResource( 0 ); | 2959 | inR.setResource( 0 ); |
2958 | remote->insertAddressee( inR, false ); | 2960 | remote->insertAddressee( inR, false ); |
2959 | } | 2961 | } |
2960 | } | 2962 | } |
2961 | } | 2963 | } |
2962 | } | 2964 | } |
2963 | } | 2965 | } |
2964 | } | 2966 | } |
2965 | ++incCounter; | 2967 | ++incCounter; |
2966 | } | 2968 | } |
2967 | el.clear(); | 2969 | el.clear(); |
2968 | syncManager->hideProgressBar(); | 2970 | syncManager->hideProgressBar(); |
2969 | mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 ); | 2971 | mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 ); |
2970 | // get rid of micro seconds | 2972 | // get rid of micro seconds |
2971 | QTime t = mLastAddressbookSync.time(); | 2973 | QTime t = mLastAddressbookSync.time(); |
2972 | mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () ) ); | 2974 | mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () ) ); |
2973 | addresseeLSync.setRevision( mLastAddressbookSync ); | 2975 | addresseeLSync.setRevision( mLastAddressbookSync ); |
2974 | addresseeRSync.setRevision( mLastAddressbookSync ); | 2976 | addresseeRSync.setRevision( mLastAddressbookSync ); |
2975 | addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ; | 2977 | addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ; |
2976 | addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName ); | 2978 | addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName ); |
2977 | addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ; | 2979 | addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ; |
2978 | addresseeLSync.setGivenName(i18n("!DO NOT EDIT!") ); | 2980 | addresseeLSync.setGivenName(i18n("!DO NOT EDIT!") ); |
2979 | addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ; | 2981 | addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ; |
2980 | addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() ); | 2982 | addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() ); |
2981 | addresseeRSync.setNote( "" ) ; | 2983 | addresseeRSync.setNote( "" ) ; |
2982 | addresseeLSync.setNote( "" ); | 2984 | addresseeLSync.setNote( "" ); |
2983 | 2985 | ||
2984 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) | 2986 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) |
2985 | remote->insertAddressee( addresseeRSync, false ); | 2987 | remote->insertAddressee( addresseeRSync, false ); |
2986 | local->insertAddressee( addresseeLSync, false ); | 2988 | local->insertAddressee( addresseeLSync, false ); |
2987 | QString mes; | 2989 | QString mes; |
2988 | 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 ); | 2990 | 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 ); |
2989 | qDebug( mes ); | 2991 | qDebug( mes ); |
2990 | mes = i18n("Local addressbook changed!\n") +mes; | 2992 | mes = i18n("Local addressbook changed!\n") +mes; |
2991 | if ( syncManager->mShowSyncSummary ) { | 2993 | if ( syncManager->mShowSyncSummary ) { |
2992 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, | 2994 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, |
2993 | i18n("KA/Pi Synchronization"),i18n("Write back"))) { | 2995 | i18n("KA/Pi Synchronization"),i18n("Write back"))) { |
2994 | qDebug("cancelled "); | 2996 | qDebug("cancelled "); |
2995 | return false; | 2997 | return false; |
2996 | } | 2998 | } |
2997 | } | 2999 | } |
2998 | return syncOK; | 3000 | return syncOK; |
2999 | } | 3001 | } |
3000 | 3002 | ||
3001 | 3003 | ||
3002 | //this is a overwritten callbackmethods from the syncinterface | 3004 | //this is a overwritten callbackmethods from the syncinterface |
3003 | bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | 3005 | bool KABCore::sync(KSyncManager* manager, QString filename, int mode) |
3004 | { | 3006 | { |
3005 | 3007 | ||
3006 | //pending prepare addresseeview for output | 3008 | //pending prepare addresseeview for output |
3007 | //pending detect, if remote file has REV field. if not switch to external sync | 3009 | //pending detect, if remote file has REV field. if not switch to external sync |
3008 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 3010 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
3011 | if ( manager != syncManager ) | ||
3012 | qDebug("KABCore::sync:: ERROR! :: manager != syncManager "); | ||
3009 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); | 3013 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); |
3010 | 3014 | ||
3011 | AddressBook abLocal(filename,"syncContact"); | 3015 | AddressBook abLocal(filename,"syncContact"); |
3012 | bool syncOK = false; | 3016 | bool syncOK = false; |
3013 | if ( abLocal.load() ) { | 3017 | if ( abLocal.load() ) { |
3014 | qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode ); | 3018 | qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode ); |
3015 | bool external = false; | 3019 | bool external = false; |
3016 | bool isXML = false; | 3020 | bool isXML = false; |
3017 | if ( filename.right(4) == ".xml") { | 3021 | if ( filename.right(4) == ".xml") { |
3018 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 3022 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
3019 | isXML = true; | 3023 | isXML = true; |
3020 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); | 3024 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); |
3021 | } else { | 3025 | } else { |
3022 | external = !manager->mIsKapiFile; | 3026 | external = !manager->mIsKapiFile; |
3023 | if ( external ) { | 3027 | if ( external ) { |
3024 | qDebug("Setting vcf mode to external "); | 3028 | qDebug("Setting vcf mode to external "); |
3025 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 3029 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
3026 | AddressBook::Iterator it; | 3030 | AddressBook::Iterator it; |
3027 | for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { | 3031 | for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { |
3028 | (*it).setID( mCurrentSyncDevice, (*it).uid() ); | 3032 | (*it).setID( mCurrentSyncDevice, (*it).uid() ); |
3029 | (*it).computeCsum( mCurrentSyncDevice ); | 3033 | (*it).computeCsum( mCurrentSyncDevice ); |
3030 | } | 3034 | } |
3031 | } | 3035 | } |
3032 | } | 3036 | } |
3033 | //AddressBook::Iterator it; | 3037 | //AddressBook::Iterator it; |
3034 | //QStringList vcards; | 3038 | //QStringList vcards; |
3035 | //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { | 3039 | //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { |
3036 | // qDebug("Name %s ", (*it).familyName().latin1()); | 3040 | // qDebug("Name %s ", (*it).familyName().latin1()); |
3037 | //} | 3041 | //} |
3038 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode ); | 3042 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode ); |
3039 | if ( syncOK ) { | 3043 | if ( syncOK ) { |
3040 | if ( syncManager->mWriteBackFile ) | 3044 | if ( syncManager->mWriteBackFile ) |
3041 | { | 3045 | { |
3042 | if ( external ) | 3046 | if ( external ) |
3043 | abLocal.removeSyncAddressees( !isXML); | 3047 | abLocal.removeSyncAddressees( !isXML); |
3044 | qDebug("Saving remote AB "); | 3048 | qDebug("Saving remote AB "); |
3045 | if ( ! abLocal.saveAB()) | 3049 | if ( ! abLocal.saveAB()) |
3046 | qDebug("Error writing back AB to file "); | 3050 | qDebug("Error writing back AB to file "); |
3047 | if ( external ) { | 3051 | if ( external ) { |
3048 | // afterwrite processing | 3052 | // afterwrite processing |
3049 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ,isXML); | 3053 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ,isXML); |
3050 | } | 3054 | } |
3051 | } | 3055 | } |
3052 | } | 3056 | } |
3053 | setModified(); | 3057 | setModified(); |
3054 | 3058 | ||
3055 | } | 3059 | } |
3056 | abLocal.removeResources(); | 3060 | abLocal.removeResources(); |
3057 | if ( syncOK ) | 3061 | if ( syncOK ) |
3058 | mViewManager->refreshView(); | 3062 | mViewManager->refreshView(); |
3059 | return syncOK; | 3063 | return syncOK; |
3060 | 3064 | ||
3061 | } | 3065 | } |
3062 | void KABCore::removeSyncInfo( QString syncProfile) | 3066 | void KABCore::removeSyncInfo( QString syncProfile) |
3063 | { | 3067 | { |
3064 | qDebug("AB:removeSyncInfo for profile %s ", syncProfile.latin1()); | 3068 | qDebug("AB:removeSyncInfo for profile %s ", syncProfile.latin1()); |
3065 | mAddressBook->removeSyncInfo( syncProfile ); | 3069 | mAddressBook->removeSyncInfo( syncProfile ); |
3066 | setModified(); | 3070 | setModified(); |
3067 | } | 3071 | } |
3068 | 3072 | ||
3069 | 3073 | ||
3070 | //this is a overwritten callbackmethods from the syncinterface | 3074 | //this is a overwritten callbackmethods from the syncinterface |
3071 | bool KABCore::syncExternal(KSyncManager* manager, QString resource) | 3075 | bool KABCore::syncExternal(KSyncManager* manager, QString resource) |
3072 | { | 3076 | { |
3073 | if ( resource == "phone" ) | 3077 | if ( resource == "phone" ) |
3074 | return syncPhone(); | 3078 | return syncPhone(); |
3075 | disableBR( true ); | 3079 | disableBR( true ); |
3080 | if ( manager != syncManager ) | ||
3081 | qDebug("KABCore::syncExternal:: ERROR! :: manager != syncManager "); | ||
3076 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); | 3082 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); |
3077 | 3083 | ||
3078 | AddressBook abLocal( resource,"syncContact"); | 3084 | AddressBook abLocal( resource,"syncContact"); |
3079 | bool syncOK = false; | 3085 | bool syncOK = false; |
3080 | if ( abLocal.load() ) { | 3086 | if ( abLocal.load() ) { |
3081 | qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); | 3087 | qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); |
3082 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 3088 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
3083 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false ); | 3089 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false ); |
3084 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); | 3090 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); |
3085 | if ( syncOK ) { | 3091 | if ( syncOK ) { |
3086 | if ( syncManager->mWriteBackFile ) { | 3092 | if ( syncManager->mWriteBackFile ) { |
3087 | abLocal.removeSyncAddressees( false ); | 3093 | abLocal.removeSyncAddressees( false ); |
3088 | abLocal.saveAB(); | 3094 | abLocal.saveAB(); |
3089 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true ); | 3095 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true ); |
3090 | } | 3096 | } |
3091 | } else | 3097 | } else |
3092 | message( i18n("Sync cancelled or failed.") ); | 3098 | message( i18n("Sync cancelled or failed.") ); |
3093 | setModified(); | 3099 | setModified(); |
3094 | } | 3100 | } |
3095 | abLocal.removeResources(); | 3101 | abLocal.removeResources(); |
3096 | if ( syncOK ) | 3102 | if ( syncOK ) |
3097 | mViewManager->refreshView(); | 3103 | mViewManager->refreshView(); |
3098 | disableBR( false ); | 3104 | disableBR( false ); |
3099 | return syncOK; | 3105 | return syncOK; |
3100 | 3106 | ||
3101 | } | 3107 | } |
3102 | void KABCore::message( QString m ) | 3108 | void KABCore::message( QString m ) |
3103 | { | 3109 | { |
3104 | topLevelWidget()->setCaption( m ); | 3110 | topLevelWidget()->setCaption( m ); |
3105 | mMessageTimer->start( 15000, true ); | 3111 | mMessageTimer->start( 15000, true ); |
3106 | } | 3112 | } |
3107 | bool KABCore::syncPhone() | 3113 | bool KABCore::syncPhone() |
3108 | { | 3114 | { |
3109 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); | 3115 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); |
3110 | QString fileName = getPhoneFile(); | 3116 | QString fileName = getPhoneFile(); |
3111 | if ( !PhoneAccess::readFromPhone( fileName) ) { | 3117 | if ( !PhoneAccess::readFromPhone( fileName) ) { |
3112 | message(i18n("Phone access failed!")); | 3118 | message(i18n("Phone access failed!")); |
3113 | return false; | 3119 | return false; |
3114 | } | 3120 | } |
3115 | AddressBook abLocal( fileName,"syncContact"); | 3121 | AddressBook abLocal( fileName,"syncContact"); |
3116 | bool syncOK = false; | 3122 | bool syncOK = false; |
3117 | { | 3123 | { |
3118 | abLocal.importFromFile( fileName ); | 3124 | abLocal.importFromFile( fileName ); |
3119 | qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1()); | 3125 | qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1()); |
3120 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 3126 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
3121 | abLocal.preparePhoneSync( mCurrentSyncDevice, true ); | 3127 | abLocal.preparePhoneSync( mCurrentSyncDevice, true ); |
3122 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); | 3128 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); |
3123 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); | 3129 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); |
3124 | if ( syncOK ) { | 3130 | if ( syncOK ) { |
3125 | if ( syncManager->mWriteBackFile ) { | 3131 | if ( syncManager->mWriteBackFile ) { |
3126 | abLocal.removeSyncAddressees( true ); | 3132 | abLocal.removeSyncAddressees( true ); |
3127 | abLocal.saveABphone( fileName ); | 3133 | abLocal.saveABphone( fileName ); |
3128 | abLocal.findNewExtIds( fileName, mCurrentSyncDevice ); | 3134 | abLocal.findNewExtIds( fileName, mCurrentSyncDevice ); |
3129 | //abLocal.preparePhoneSync( mCurrentSyncDevice, false ); | 3135 | //abLocal.preparePhoneSync( mCurrentSyncDevice, false ); |
3130 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true ); | 3136 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true ); |
3131 | } | 3137 | } |
3132 | } | 3138 | } |
3133 | setModified(); | 3139 | setModified(); |
3134 | } | 3140 | } |
3135 | abLocal.removeResources(); | 3141 | abLocal.removeResources(); |
3136 | if ( syncOK ) | 3142 | if ( syncOK ) |
3137 | mViewManager->refreshView(); | 3143 | mViewManager->refreshView(); |
3138 | return syncOK; | 3144 | return syncOK; |
3139 | } | 3145 | } |
3140 | void KABCore::getFile( bool success ) | 3146 | void KABCore::getFile( bool success ) |
3141 | { | 3147 | { |
3142 | if ( ! success ) { | 3148 | if ( ! success ) { |
3143 | message( i18n("Error receiving file. Nothing changed!") ); | 3149 | message( i18n("Error receiving file. Nothing changed!") ); |
3144 | return; | 3150 | return; |
3145 | } | 3151 | } |
3146 | int count = mAddressBook->importFromFile( sentSyncFile() , false, true ); | 3152 | int count = mAddressBook->importFromFile( sentSyncFile() , false, true ); |
3147 | if ( count ) | 3153 | if ( count ) |
3148 | setModified( true ); | 3154 | setModified( true ); |
3149 | message( i18n("Pi-Sync successful!") ); | 3155 | message( i18n("Pi-Sync successful!") ); |
3150 | mViewManager->refreshView(); | 3156 | mViewManager->refreshView(); |
3151 | } | 3157 | } |
3152 | void KABCore::syncFileRequest() | 3158 | void KABCore::syncFileRequest() |
3153 | { | 3159 | { |
3154 | if ( KABPrefs::instance()->mPassiveSyncWithDesktop ) { | 3160 | if ( KABPrefs::instance()->mPassiveSyncWithDesktop ) { |
3155 | syncManager->slotSyncMenu( 999 ); | 3161 | syncManager->slotSyncMenu( 999 ); |
3156 | } | 3162 | } |
3157 | mAddressBook->export2File( sentSyncFile() ); | 3163 | mAddressBook->export2File( sentSyncFile() ); |
3158 | } | 3164 | } |
3159 | QString KABCore::sentSyncFile() | 3165 | QString KABCore::sentSyncFile() |
3160 | { | 3166 | { |
3161 | #ifdef DESKTOP_VERSION | 3167 | #ifdef DESKTOP_VERSION |
3162 | return locateLocal( "tmp", "copysyncab.vcf" ); | 3168 | return locateLocal( "tmp", "copysyncab.vcf" ); |
3163 | #else | 3169 | #else |
3164 | return QString( "/tmp/copysyncab.vcf" ); | 3170 | return QString( "/tmp/copysyncab.vcf" ); |
3165 | #endif | 3171 | #endif |
3166 | } | 3172 | } |
3167 | 3173 | ||
3168 | void KABCore::setCaptionBack() | 3174 | void KABCore::setCaptionBack() |
3169 | { | 3175 | { |
3170 | mMessageTimer->stop(); | 3176 | mMessageTimer->stop(); |
3171 | topLevelWidget()->setCaption( i18n("KAddressbook/Pi") ); | 3177 | topLevelWidget()->setCaption( i18n("KAddressbook/Pi") ); |
3172 | } | 3178 | } |