author | zautrix <zautrix> | 2005-01-16 12:48:47 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-16 12:48:47 (UTC) |
commit | 3f61f5a339e9c0c67c17b16214abded0d123f246 (patch) (unidiff) | |
tree | e3e858f70d85f5a8c6e1547113eae924be73c5c3 | |
parent | f3f63a1a1363cba9f58790812e43d6eda14f733c (diff) | |
download | kdepimpi-3f61f5a339e9c0c67c17b16214abded0d123f246.zip kdepimpi-3f61f5a339e9c0c67c17b16214abded0d123f246.tar.gz kdepimpi-3f61f5a339e9c0c67c17b16214abded0d123f246.tar.bz2 |
applied AB filters
-rw-r--r-- | kaddressbook/kabcore.cpp | 9 | ||||
-rw-r--r-- | kaddressbook/viewmanager.cpp | 9 | ||||
-rw-r--r-- | kaddressbook/viewmanager.h | 2 |
3 files changed, 20 insertions, 0 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index c6288fa..c5a36e2 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2868,4 +2868,9 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2868 | #endif | 2868 | #endif |
2869 | 2869 | ||
2870 | |||
2871 | // ********** setting filters **************** | ||
2872 | Filter filterIN = mViewManager->getFilterByName( syncManager->mFilterInAB ); | ||
2873 | Filter filterOUT = mViewManager->getFilterByName( syncManager->mFilterOutAB ); | ||
2874 | |||
2870 | //qDebug("*************************** "); | 2875 | //qDebug("*************************** "); |
2871 | // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() ); | 2876 | // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() ); |
@@ -2947,4 +2952,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2947 | } | 2952 | } |
2948 | } else { // no conflict ********** add or delete remote | 2953 | } else { // no conflict ********** add or delete remote |
2954 | if ( filterIN.name().isEmpty() || filterIN.filterAddressee( inR ) ) { | ||
2949 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2955 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2950 | QString des = addresseeLSync.note(); | 2956 | QString des = addresseeLSync.note(); |
@@ -2979,4 +2985,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2979 | } | 2985 | } |
2980 | } | 2986 | } |
2987 | } | ||
2981 | ++incCounter; | 2988 | ++incCounter; |
2982 | } | 2989 | } |
@@ -2997,4 +3004,6 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2997 | if ( uid.left(19) == QString("last-syncAddressee-") ) | 3004 | if ( uid.left(19) == QString("last-syncAddressee-") ) |
2998 | skipIncidence = true; | 3005 | skipIncidence = true; |
3006 | if ( !filterOUT.name().isEmpty() && ! filterOUT.filterAddressee( inL ) ) | ||
3007 | skipIncidence = true; | ||
2999 | if ( !skipIncidence ) { | 3008 | if ( !skipIncidence ) { |
3000 | inL = local->findByUid( uid ); | 3009 | inL = local->findByUid( uid ); |
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 59bddd9..9c3a641 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp | |||
@@ -619,4 +619,13 @@ QStringList ViewManager::filterNames() const | |||
619 | return names; | 619 | return names; |
620 | } | 620 | } |
621 | Filter ViewManager::getFilterByName( const QString &name ) const | ||
622 | { | ||
623 | Filter::List::ConstIterator it; | ||
624 | for ( it = mFilterList.begin(); it != mFilterList.end(); ++it ) | ||
625 | if ( name == (*it).name() ) | ||
626 | return (*it); | ||
627 | |||
628 | return Filter(); | ||
629 | } | ||
621 | 630 | ||
622 | int ViewManager::filterPosition( const QString &name ) const | 631 | int ViewManager::filterPosition( const QString &name ) const |
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h index a03a83f..272e1b0 100644 --- a/kaddressbook/viewmanager.h +++ b/kaddressbook/viewmanager.h | |||
@@ -29,4 +29,5 @@ | |||
29 | #include <kaddressbookview.h> | 29 | #include <kaddressbookview.h> |
30 | #include <qdict.h> | 30 | #include <qdict.h> |
31 | #include "filter.h" | ||
31 | 32 | ||
32 | class KAction; | 33 | class KAction; |
@@ -60,4 +61,5 @@ class ViewManager : public QWidget | |||
60 | void unloadViews(); | 61 | void unloadViews(); |
61 | KSelectAction * getFilterAction() { return mActionSelectFilter; } | 62 | KSelectAction * getFilterAction() { return mActionSelectFilter; } |
63 | Filter getFilterByName( const QString &name ) const; | ||
62 | 64 | ||
63 | QStringList selectedUids() const; | 65 | QStringList selectedUids() const; |