summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt4
-rw-r--r--kabc/addresseedialog.cpp15
-rw-r--r--korganizer/searchdialog.cpp8
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,4 +1,8 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.1.9 ************
4
5KO/Pi:
6Fixed some problems of the new search options in the search dialog.
3 7
4********** VERSION 2.1.8 ************ 8********** VERSION 2.1.8 ************
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 3e7b72c..9197850 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -76,5 +76,5 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
76 QWidget *listWidget = new QWidget( mMiniSplitter ); 76 QWidget *listWidget = new QWidget( mMiniSplitter );
77 77
78 QBoxLayout *listLayout = new QVBoxLayout (listWidget) ; 78 QVBoxLayout *listLayout = new QVBoxLayout (listWidget) ;
79 //topLayout->addLayout( listLayout ); 79 //topLayout->addLayout( listLayout );
80 80
@@ -89,13 +89,16 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
89 SLOT( slotOk() ) ); 89 SLOT( slotOk() ) );
90 90
91 QHBox* searchBox = new QHBox ( listWidget ); 91 //QHBox* searchBox = new QHBox ( listWidget );
92 mAddresseeEdit = new QLineEdit( searchBox ); 92 mAddresseeEdit = new QLineEdit( listWidget );
93 connect( mAddresseeEdit, SIGNAL( returnPressed() ), 93 connect( mAddresseeEdit, SIGNAL( returnPressed() ),
94 SLOT( loadAddressBook() ) ); 94 SLOT( loadAddressBook() ) );
95 mAddresseeEdit->setFocus(); 95 mAddresseeEdit->setFocus();
96 QPushButton *searchButton = new QPushButton( i18n("Search!"), searchBox ); 96 QPushButton *searchButton = new QPushButton( i18n("Search!"), listWidget );
97 connect ( searchButton, SIGNAL( clicked() ), SLOT( loadAddressBook() ) ); 97 connect ( searchButton, SIGNAL( clicked() ), SLOT( loadAddressBook() ) );
98 98
99 listLayout->addWidget( searchBox ); 99 QHBoxLayout *searchLayout = new QHBoxLayout (listLayout) ;
100 searchLayout->addWidget( mAddresseeEdit );
101 searchLayout->addWidget( searchButton );
102 //listLayout->addWidget( searchBox );
100 103
101 if ( mMultiple ) { 104 if ( mMultiple ) {
@@ -104,5 +107,5 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
104 //topLayout->setSpacing( spacingHint() ); 107 //topLayout->setSpacing( spacingHint() );
105 108
106 QVBox *selectedGroup = new QVBox( mMiniSplitter ); 109 QVBox *selectedGroup = new QVBox( mMiniSplitter );
107 new QLabel ( i18n("Selected:"), selectedGroup ); 110 new QLabel ( i18n("Selected:"), selectedGroup );
108 //selectedLayout->addWidget( selectedGroup ); 111 //selectedLayout->addWidget( selectedGroup );
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index a8de297..0713980 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -562,5 +562,11 @@ void SearchDialog::search(const QRegExp &re)
562 } 562 }
563 } 563 }
564 564 if ( mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() < 1 ) {
565 qDebug("count %d ", mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() );
566 if ( mRefineItems->isChecked() )
567 mRefineItems->setChecked( false );
568 else if ( mSubItems->isChecked() )
569 mSubItems->setChecked( false );
570 }
565} 571}
566 572