1 files changed, 27 insertions, 13 deletions

diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 063585a..987f234 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -25,24 +25,25 @@
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qbuttongroup.h>
 #include <qhbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
+#include <qcheckbox.h>
 #include <qregexp.h>
 #include <qstring.h>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <qwidget.h>
 
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klistbox.h>
@@ -81,48 +82,60 @@ void FilterEditDialog::setFilter( const Filter &filter )
     if ( categories.contains( item->text( 0 ) ) ) {
       QCheckListItem *checkItem = static_cast<QCheckListItem*>( item );
       checkItem->setOn( true );
     }
 
     item = item->nextSibling();
   }
 
   if ( filter.matchRule() == Filter::Matching )
     mMatchRuleGroup->setButton( 0 );
   else
     mMatchRuleGroup->setButton( 1 );
+
+  int c = filter.criteria() ;
+  mPublic->setChecked(c &Filter::ShowPublic);
+  mPrivate->setChecked(c & Filter::ShowPrivate);
+  mConfidential->setChecked(c & Filter::ShowConfidential);
+
 }
 
 Filter FilterEditDialog::filter()
 {
   Filter filter;
 
   filter.setName( mNameEdit->text() );
 
   QStringList categories;
   QListViewItem *item = mCategoriesView->firstChild();
   while ( item != 0 ) {
     QCheckListItem *checkItem = static_cast<QCheckListItem*>( item );
     if ( checkItem->isOn() )
       categories.append( item->text( 0 ) );
 
     item = item->nextSibling();
   }
   filter.setCategories( categories );
 
   if ( mMatchRuleGroup->find( 0 )->isOn() )
     filter.setMatchRule( Filter::Matching );
   else
     filter.setMatchRule( Filter::NotMatching );
 
+  int c = 0;
+  if (mPublic->isChecked()) c |= Filter::ShowPublic;
+  if (mPrivate->isChecked()) c |= Filter::ShowPrivate;
+  if (mConfidential->isChecked()) c |= Filter::ShowConfidential;
+  filter.setCriteria( c ) ;
+
   return filter;
 }
 
 void FilterEditDialog::initGUI()
 {
 #ifndef KAB_EMBEDDED  
   resize( 490, 300 );
 #else //KAB_EMBEDDED  
   resize( KMIN(KGlobal::getDesktopWidth()-10, 490), KMIN(KGlobal::getDesktopHeight()-50, 300));
 #endif //KAB_EMBEDDED  
   
 
@@ -134,41 +147,42 @@ void FilterEditDialog::initGUI()
   label = new QLabel( i18n( "Name" ), page );
   mNameEdit = new KLineEdit( page );
   mNameEdit->setFocus();
   topLayout->addWidget( label, 0, 0 );
   topLayout->addWidget( mNameEdit, 0, 1 );
   connect( mNameEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( filterNameTextChanged( const QString&) ) );
 
   mCategoriesView = new KListView( page );
   mCategoriesView->addColumn( i18n( "Categories" ) );
   topLayout->addMultiCellWidget( mCategoriesView, 1, 1, 0, 1 );
 
-  mMatchRuleGroup = new QButtonGroup( page );
+  mMatchRuleGroup = new QHButtonGroup( i18n( "Category rule" ), page );
   mMatchRuleGroup->setExclusive( true );
-
-  QBoxLayout *gbLayout = new QVBoxLayout( mMatchRuleGroup );
-  gbLayout->setSpacing( KDialog::spacingHint() );
-  gbLayout->setMargin( KDialog::marginHint() );
-
-  QRadioButton *radio = new QRadioButton( i18n( "Show only contacts matching\n the selected categories" ), mMatchRuleGroup );
+  QRadioButton *radio = new QRadioButton( i18n( "Include categories" ), mMatchRuleGroup );
   radio->setChecked( true );
-  mMatchRuleGroup->insert( radio );
-  gbLayout->addWidget( radio );
+  //mMatchRuleGroup->insert( radio );
+  radio = new QRadioButton( i18n( "Exclude categories" ), mMatchRuleGroup );
+  //mMatchRuleGroup->insert( radio );
+  topLayout->addMultiCellWidget( mMatchRuleGroup, 2, 2, 0, 1 );
 
-  radio = new QRadioButton( i18n( "Show all contacts except those\n matching the selected categories" ), mMatchRuleGroup );
-  mMatchRuleGroup->insert( radio );
-  gbLayout->addWidget( radio );
+  QHButtonGroup * mMatchPPCGroup = new QHButtonGroup(i18n( "Include contacts, that are:" ), page );
+  mPublic = new QCheckBox( i18n( "public" ), mMatchPPCGroup );
+  mPrivate = new QCheckBox( i18n( "private" ), mMatchPPCGroup );
+  mConfidential = new QCheckBox( i18n( "confidential" ), mMatchPPCGroup );
+  mPublic->setChecked( true );
+  mPrivate->setChecked( true );
+  mConfidential->setChecked( true );
+  topLayout->addMultiCellWidget( mMatchPPCGroup, 3, 3, 0, 1 );
 
-  topLayout->addMultiCellWidget( mMatchRuleGroup, 2, 2, 0, 1 );
 }
 
 void FilterEditDialog::filterNameTextChanged( const QString &text )
 {
   enableButtonOK( !text.isEmpty() );
 }
 
 void FilterEditDialog::slotHelp()
 {
 #ifndef KAB_EMBEDDED
   kapp->invokeHelp( "using-filters" );
 #endif //KAB_EMBEDDED