| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 4 | ||||
| -rw-r--r-- | kabc/addresseedialog.cpp | 15 | ||||
| -rw-r--r-- | korganizer/searchdialog.cpp | 8 |
3 files changed, 20 insertions, 7 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index c4557ef..2aac9ff 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -1,14 +1,18 @@ Info about the changes in new versions of KDE-Pim/Pi +********** VERSION 2.1.9 ************ + +KO/Pi: +Fixed some problems of the new search options in the search dialog. ********** VERSION 2.1.8 ************ KO/Pi: Added info about the completion state of a todo in the ListView/Searchdialog. If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well. Fixed some updating problems when changing the filter. KA/Pi: In the addressee selection dialog now the formatted name is shown, if not empty. Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category. Now in the addressee selection dialog a selected contact is remove with a single click from the selected list. diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index 3e7b72c..9197850 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp @@ -66,53 +66,56 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : QWidget *topWidget = plainPage(); QBoxLayout *topLayout = new QHBoxLayout( topWidget ); KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, topWidget); mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); topLayout->addWidget(mMiniSplitter ); QWidget *listWidget = new QWidget( mMiniSplitter ); - QBoxLayout *listLayout = new QVBoxLayout (listWidget) ; + QVBoxLayout *listLayout = new QVBoxLayout (listWidget) ; //topLayout->addLayout( listLayout ); mAddresseeList = new KListView( listWidget ); mAddresseeList->addColumn( i18n("Name") ); mAddresseeList->addColumn( i18n("Email") ); mAddresseeList->addColumn( i18n("Category") ); mAddresseeList->setAllColumnsShowFocus( true ); mAddresseeList->setFullWidth( true ); listLayout->addWidget( mAddresseeList ); connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ), SLOT( slotOk() ) ); - QHBox* searchBox = new QHBox ( listWidget ); - mAddresseeEdit = new QLineEdit( searchBox ); + //QHBox* searchBox = new QHBox ( listWidget ); + mAddresseeEdit = new QLineEdit( listWidget ); connect( mAddresseeEdit, SIGNAL( returnPressed() ), SLOT( loadAddressBook() ) ); mAddresseeEdit->setFocus(); - QPushButton *searchButton = new QPushButton( i18n("Search!"), searchBox ); + QPushButton *searchButton = new QPushButton( i18n("Search!"), listWidget ); connect ( searchButton, SIGNAL( clicked() ), SLOT( loadAddressBook() ) ); - listLayout->addWidget( searchBox ); + QHBoxLayout *searchLayout = new QHBoxLayout (listLayout) ; + searchLayout->addWidget( mAddresseeEdit ); + searchLayout->addWidget( searchButton ); + //listLayout->addWidget( searchBox ); if ( mMultiple ) { //QBoxLayout *selectedLayout = new QVBoxLayout; //topLayout->addLayout( selectedLayout ); //topLayout->setSpacing( spacingHint() ); - QVBox *selectedGroup = new QVBox( mMiniSplitter ); + QVBox *selectedGroup = new QVBox( mMiniSplitter ); new QLabel ( i18n("Selected:"), selectedGroup ); //selectedLayout->addWidget( selectedGroup ); mSelectedList = new KListView( selectedGroup ); mSelectedList->addColumn( i18n("Name") ); mSelectedList->addColumn( i18n("Email") ); mSelectedList->setAllColumnsShowFocus( true ); mSelectedList->setFullWidth( true ); //connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ), // SLOT( removeSelected() ) ); connect( mSelectedList, SIGNAL( clicked( QListViewItem * ) ), SLOT( removeSelected() ) ); diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index a8de297..0713980 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -552,25 +552,31 @@ void SearchDialog::search(const QRegExp &re) if (re.match(journ->description()) != -1) #endif { if ( mSubItems->isChecked() ) mMatchedJournals.remove(journ); else if (!mMatchedJournals.contains( journ )) mMatchedJournals.append(journ); continue; } } } } - + if ( mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() < 1 ) { + qDebug("count %d ", mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() ); + if ( mRefineItems->isChecked() ) + mRefineItems->setChecked( false ); + else if ( mSubItems->isChecked() ) + mSubItems->setChecked( false ); + } } void SearchDialog::keyPressEvent ( QKeyEvent *e) { switch ( e->key() ) { case Qt::Key_Escape: close(); break; case Qt::Key_F: if ( e->state() == Qt::ControlButton ) { } |