-rw-r--r-- | kaddressbook/filter.cpp | 22 | ||||
-rw-r--r-- | kaddressbook/filter.h | 4 | ||||
-rw-r--r-- | kaddressbook/filtereditdialog.cpp | 40 | ||||
-rw-r--r-- | kaddressbook/filtereditdialog.h | 7 |
4 files changed, 59 insertions, 14 deletions
diff --git a/kaddressbook/filter.cpp b/kaddressbook/filter.cpp index 39d2ae4..9cb4c2d 100644 --- a/kaddressbook/filter.cpp +++ b/kaddressbook/filter.cpp | |||
@@ -25,23 +25,26 @@ | |||
25 | #include <kconfigbase.h> | 25 | #include <kconfigbase.h> |
26 | #include <kdebug.h> | 26 | #include <kdebug.h> |
27 | 27 | ||
28 | #include "kabprefs.h" | 28 | #include "kabprefs.h" |
29 | 29 | ||
30 | #include "filter.h" | 30 | #include "filter.h" |
31 | #include <secrecy.h> | ||
31 | 32 | ||
32 | Filter::Filter() | 33 | Filter::Filter() |
33 | : mName( QString::null ), mMatchRule( Matching ), mEnabled( true ), | 34 | : mName( QString::null ), mMatchRule( Matching ), mEnabled( true ), |
34 | mInternal( false ) | 35 | mInternal( false ) |
35 | { | 36 | { |
37 | mCriteria = ShowPublic | ShowPrivate| ShowConfidential ; | ||
36 | } | 38 | } |
37 | 39 | ||
38 | Filter::Filter( const QString &name ) | 40 | Filter::Filter( const QString &name ) |
39 | : mName( name ), mMatchRule( Matching ), mEnabled( true ), | 41 | : mName( name ), mMatchRule( Matching ), mEnabled( true ), |
40 | mInternal( false ) | 42 | mInternal( false ) |
41 | { | 43 | { |
44 | mCriteria = ShowPublic | ShowPrivate| ShowConfidential ; | ||
42 | } | 45 | } |
43 | 46 | ||
44 | Filter::~Filter() | 47 | Filter::~Filter() |
45 | { | 48 | { |
46 | } | 49 | } |
47 | 50 | ||
@@ -76,12 +79,29 @@ void Filter::apply( KABC::Addressee::List &addresseeList ) | |||
76 | } | 79 | } |
77 | } | 80 | } |
78 | } | 81 | } |
79 | 82 | ||
80 | bool Filter::filterAddressee( const KABC::Addressee &a ) | 83 | bool Filter::filterAddressee( const KABC::Addressee &a ) |
81 | { | 84 | { |
85 | switch ( a.secrecy().type()) { | ||
86 | case KABC::Secrecy::Public: | ||
87 | if (! (mCriteria & ShowPublic )) | ||
88 | return false; | ||
89 | break; | ||
90 | case KABC::Secrecy::Private: | ||
91 | if (! (mCriteria & ShowPrivate )) | ||
92 | return false; | ||
93 | break; | ||
94 | case KABC::Secrecy::Confidential: | ||
95 | if (! (mCriteria & ShowConfidential )) | ||
96 | return false; | ||
97 | break; | ||
98 | default: | ||
99 | return false; | ||
100 | break; | ||
101 | } | ||
82 | QStringList::Iterator iter; | 102 | QStringList::Iterator iter; |
83 | iter = mCategoryList.begin(); | 103 | iter = mCategoryList.begin(); |
84 | // empty filter always matches | 104 | // empty filter always matches |
85 | 105 | ||
86 | if ( iter == mCategoryList.end() ) | 106 | if ( iter == mCategoryList.end() ) |
87 | return true; | 107 | return true; |
@@ -117,20 +137,22 @@ const QStringList &Filter::categories() const | |||
117 | void Filter::save( KConfig *config ) | 137 | void Filter::save( KConfig *config ) |
118 | { | 138 | { |
119 | config->writeEntry( "Name", mName ); | 139 | config->writeEntry( "Name", mName ); |
120 | config->writeEntry( "Enabled", mEnabled ); | 140 | config->writeEntry( "Enabled", mEnabled ); |
121 | config->writeEntry( "Categories", mCategoryList ); | 141 | config->writeEntry( "Categories", mCategoryList ); |
122 | config->writeEntry( "MatchRule", (int)mMatchRule ); | 142 | config->writeEntry( "MatchRule", (int)mMatchRule ); |
143 | config->writeEntry( "Criteria", (int)mCriteria ); | ||
123 | } | 144 | } |
124 | 145 | ||
125 | void Filter::restore( KConfig *config ) | 146 | void Filter::restore( KConfig *config ) |
126 | { | 147 | { |
127 | mName = config->readEntry( "Name", "<internal error>" ); | 148 | mName = config->readEntry( "Name", "<internal error>" ); |
128 | mEnabled = config->readBoolEntry( "Enabled", true ); | 149 | mEnabled = config->readBoolEntry( "Enabled", true ); |
129 | mCategoryList = config->readListEntry( "Categories" ); | 150 | mCategoryList = config->readListEntry( "Categories" ); |
130 | mMatchRule = (MatchRule)config->readNumEntry( "MatchRule", Matching ); | 151 | mMatchRule = (MatchRule)config->readNumEntry( "MatchRule", Matching ); |
152 | mCriteria = config->readNumEntry( "Criteria", (ShowPublic | ShowPrivate| ShowConfidential) ); | ||
131 | } | 153 | } |
132 | 154 | ||
133 | void Filter::save( KConfig *config, QString baseGroup, Filter::List &list ) | 155 | void Filter::save( KConfig *config, QString baseGroup, Filter::List &list ) |
134 | { | 156 | { |
135 | { | 157 | { |
136 | KConfigGroupSaver s( config, baseGroup ); | 158 | KConfigGroupSaver s( config, baseGroup ); |
diff --git a/kaddressbook/filter.h b/kaddressbook/filter.h index cf2c0a1..26870d7 100644 --- a/kaddressbook/filter.h +++ b/kaddressbook/filter.h | |||
@@ -36,12 +36,15 @@ | |||
36 | 36 | ||
37 | @todo This class should be switched to use shared data. | 37 | @todo This class should be switched to use shared data. |
38 | */ | 38 | */ |
39 | class Filter | 39 | class Filter |
40 | { | 40 | { |
41 | public: | 41 | public: |
42 | enum { ShowPublic = 1, ShowPrivate = 2, ShowConfidential = 4}; | ||
43 | void setCriteria(int c) { mCriteria = c ;} | ||
44 | int criteria() const { return mCriteria;} | ||
42 | typedef QValueList<Filter> List; | 45 | typedef QValueList<Filter> List; |
43 | 46 | ||
44 | enum MatchRule { Matching = 0, NotMatching = 1 }; | 47 | enum MatchRule { Matching = 0, NotMatching = 1 }; |
45 | 48 | ||
46 | Filter(); | 49 | Filter(); |
47 | Filter( const QString& name ); | 50 | Filter( const QString& name ); |
@@ -140,12 +143,13 @@ class Filter | |||
140 | 143 | ||
141 | /** @return The current match rule. | 144 | /** @return The current match rule. |
142 | */ | 145 | */ |
143 | MatchRule matchRule() const; | 146 | MatchRule matchRule() const; |
144 | 147 | ||
145 | private: | 148 | private: |
149 | int mCriteria; | ||
146 | QString mName; | 150 | QString mName; |
147 | QStringList mCategoryList; | 151 | QStringList mCategoryList; |
148 | MatchRule mMatchRule; | 152 | MatchRule mMatchRule; |
149 | bool mEnabled; | 153 | bool mEnabled; |
150 | bool mInternal; | 154 | bool mInternal; |
151 | }; | 155 | }; |
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index 063585a..987f234 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp | |||
@@ -31,12 +31,13 @@ $Id$ | |||
31 | #include <qbuttongroup.h> | 31 | #include <qbuttongroup.h> |
32 | #include <qhbox.h> | 32 | #include <qhbox.h> |
33 | #include <qlabel.h> | 33 | #include <qlabel.h> |
34 | #include <qlayout.h> | 34 | #include <qlayout.h> |
35 | #include <qpushbutton.h> | 35 | #include <qpushbutton.h> |
36 | #include <qradiobutton.h> | 36 | #include <qradiobutton.h> |
37 | #include <qcheckbox.h> | ||
37 | #include <qregexp.h> | 38 | #include <qregexp.h> |
38 | #include <qstring.h> | 39 | #include <qstring.h> |
39 | #include <qtoolbutton.h> | 40 | #include <qtoolbutton.h> |
40 | #include <qtooltip.h> | 41 | #include <qtooltip.h> |
41 | #include <qwidget.h> | 42 | #include <qwidget.h> |
42 | 43 | ||
@@ -87,12 +88,18 @@ void FilterEditDialog::setFilter( const Filter &filter ) | |||
87 | } | 88 | } |
88 | 89 | ||
89 | if ( filter.matchRule() == Filter::Matching ) | 90 | if ( filter.matchRule() == Filter::Matching ) |
90 | mMatchRuleGroup->setButton( 0 ); | 91 | mMatchRuleGroup->setButton( 0 ); |
91 | else | 92 | else |
92 | mMatchRuleGroup->setButton( 1 ); | 93 | mMatchRuleGroup->setButton( 1 ); |
94 | |||
95 | int c = filter.criteria() ; | ||
96 | mPublic->setChecked(c &Filter::ShowPublic); | ||
97 | mPrivate->setChecked(c & Filter::ShowPrivate); | ||
98 | mConfidential->setChecked(c & Filter::ShowConfidential); | ||
99 | |||
93 | } | 100 | } |
94 | 101 | ||
95 | Filter FilterEditDialog::filter() | 102 | Filter FilterEditDialog::filter() |
96 | { | 103 | { |
97 | Filter filter; | 104 | Filter filter; |
98 | 105 | ||
@@ -111,12 +118,18 @@ Filter FilterEditDialog::filter() | |||
111 | 118 | ||
112 | if ( mMatchRuleGroup->find( 0 )->isOn() ) | 119 | if ( mMatchRuleGroup->find( 0 )->isOn() ) |
113 | filter.setMatchRule( Filter::Matching ); | 120 | filter.setMatchRule( Filter::Matching ); |
114 | else | 121 | else |
115 | filter.setMatchRule( Filter::NotMatching ); | 122 | filter.setMatchRule( Filter::NotMatching ); |
116 | 123 | ||
124 | int c = 0; | ||
125 | if (mPublic->isChecked()) c |= Filter::ShowPublic; | ||
126 | if (mPrivate->isChecked()) c |= Filter::ShowPrivate; | ||
127 | if (mConfidential->isChecked()) c |= Filter::ShowConfidential; | ||
128 | filter.setCriteria( c ) ; | ||
129 | |||
117 | return filter; | 130 | return filter; |
118 | } | 131 | } |
119 | 132 | ||
120 | void FilterEditDialog::initGUI() | 133 | void FilterEditDialog::initGUI() |
121 | { | 134 | { |
122 | #ifndef KAB_EMBEDDED | 135 | #ifndef KAB_EMBEDDED |
@@ -140,29 +153,30 @@ void FilterEditDialog::initGUI() | |||
140 | SLOT( filterNameTextChanged( const QString&) ) ); | 153 | SLOT( filterNameTextChanged( const QString&) ) ); |
141 | 154 | ||
142 | mCategoriesView = new KListView( page ); | 155 | mCategoriesView = new KListView( page ); |
143 | mCategoriesView->addColumn( i18n( "Categories" ) ); | 156 | mCategoriesView->addColumn( i18n( "Categories" ) ); |
144 | topLayout->addMultiCellWidget( mCategoriesView, 1, 1, 0, 1 ); | 157 | topLayout->addMultiCellWidget( mCategoriesView, 1, 1, 0, 1 ); |
145 | 158 | ||
146 | mMatchRuleGroup = new QButtonGroup( page ); | 159 | mMatchRuleGroup = new QHButtonGroup( i18n( "Category rule" ), page ); |
147 | mMatchRuleGroup->setExclusive( true ); | 160 | mMatchRuleGroup->setExclusive( true ); |
148 | 161 | QRadioButton *radio = new QRadioButton( i18n( "Include categories" ), mMatchRuleGroup ); | |
149 | QBoxLayout *gbLayout = new QVBoxLayout( mMatchRuleGroup ); | ||
150 | gbLayout->setSpacing( KDialog::spacingHint() ); | ||
151 | gbLayout->setMargin( KDialog::marginHint() ); | ||
152 | |||
153 | QRadioButton *radio = new QRadioButton( i18n( "Show only contacts matching\n the selected categories" ), mMatchRuleGroup ); | ||
154 | radio->setChecked( true ); | 162 | radio->setChecked( true ); |
155 | mMatchRuleGroup->insert( radio ); | 163 | //mMatchRuleGroup->insert( radio ); |
156 | gbLayout->addWidget( radio ); | 164 | radio = new QRadioButton( i18n( "Exclude categories" ), mMatchRuleGroup ); |
165 | //mMatchRuleGroup->insert( radio ); | ||
166 | topLayout->addMultiCellWidget( mMatchRuleGroup, 2, 2, 0, 1 ); | ||
157 | 167 | ||
158 | radio = new QRadioButton( i18n( "Show all contacts except those\n matching the selected categories" ), mMatchRuleGroup ); | 168 | QHButtonGroup * mMatchPPCGroup = new QHButtonGroup(i18n( "Include contacts, that are:" ), page ); |
159 | mMatchRuleGroup->insert( radio ); | 169 | mPublic = new QCheckBox( i18n( "public" ), mMatchPPCGroup ); |
160 | gbLayout->addWidget( radio ); | 170 | mPrivate = new QCheckBox( i18n( "private" ), mMatchPPCGroup ); |
171 | mConfidential = new QCheckBox( i18n( "confidential" ), mMatchPPCGroup ); | ||
172 | mPublic->setChecked( true ); | ||
173 | mPrivate->setChecked( true ); | ||
174 | mConfidential->setChecked( true ); | ||
175 | topLayout->addMultiCellWidget( mMatchPPCGroup, 3, 3, 0, 1 ); | ||
161 | 176 | ||
162 | topLayout->addMultiCellWidget( mMatchRuleGroup, 2, 2, 0, 1 ); | ||
163 | } | 177 | } |
164 | 178 | ||
165 | void FilterEditDialog::filterNameTextChanged( const QString &text ) | 179 | void FilterEditDialog::filterNameTextChanged( const QString &text ) |
166 | { | 180 | { |
167 | enableButtonOK( !text.isEmpty() ); | 181 | enableButtonOK( !text.isEmpty() ); |
168 | } | 182 | } |
diff --git a/kaddressbook/filtereditdialog.h b/kaddressbook/filtereditdialog.h index 4dd75e4..5a8bad1 100644 --- a/kaddressbook/filtereditdialog.h +++ b/kaddressbook/filtereditdialog.h | |||
@@ -33,18 +33,20 @@ $Id$ | |||
33 | 33 | ||
34 | class QButtonGroup; | 34 | class QButtonGroup; |
35 | class QString; | 35 | class QString; |
36 | class QToolButton; | 36 | class QToolButton; |
37 | class QWidget; | 37 | class QWidget; |
38 | class QListBoxItem; | 38 | class QListBoxItem; |
39 | class QCheckBox; | ||
39 | 40 | ||
40 | class KLineEdit; | 41 | class KLineEdit; |
41 | class KListBox; | 42 | class KListBox; |
42 | class KListView; | 43 | class KListView; |
43 | 44 | ||
44 | #include <kdialogbase.h> | 45 | #include <kdialogbase.h> |
46 | #include <qhbuttongroup.h> | ||
45 | 47 | ||
46 | #include "filter.h" | 48 | #include "filter.h" |
47 | 49 | ||
48 | class FilterDialog : public KDialogBase | 50 | class FilterDialog : public KDialogBase |
49 | { | 51 | { |
50 | Q_OBJECT | 52 | Q_OBJECT |
@@ -93,12 +95,15 @@ class FilterEditDialog : public KDialogBase | |||
93 | void initGUI(); | 95 | void initGUI(); |
94 | 96 | ||
95 | Filter mFilter; | 97 | Filter mFilter; |
96 | 98 | ||
97 | KLineEdit *mNameEdit; | 99 | KLineEdit *mNameEdit; |
98 | KListView *mCategoriesView; | 100 | KListView *mCategoriesView; |
99 | QButtonGroup *mMatchRuleGroup; | 101 | QHButtonGroup *mMatchRuleGroup; |
102 | QCheckBox *mPrivate; | ||
103 | QCheckBox *mPublic; | ||
104 | QCheckBox *mConfidential; | ||
100 | QPushButton *mEditButton; | 105 | QPushButton *mEditButton; |
101 | QPushButton *mRemoveButton; | 106 | QPushButton *mRemoveButton; |
102 | }; | 107 | }; |
103 | 108 | ||
104 | #endif | 109 | #endif |