summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-01-12 20:38:44 (UTC)
committer zautrix <zautrix>2005-01-12 20:38:44 (UTC)
commit7a4a866cded40032766acb4fe8d02b6347b1d12e (patch) (side-by-side diff)
tree14cced6e387842839616cd6727b40a522586c364
parentffa81b34b0d7b3c53f46869a05194072a339a69d (diff)
downloadkdepimpi-7a4a866cded40032766acb4fe8d02b6347b1d12e.zip
kdepimpi-7a4a866cded40032766acb4fe8d02b6347b1d12e.tar.gz
kdepimpi-7a4a866cded40032766acb4fe8d02b6347b1d12e.tar.bz2
search fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt9
-rw-r--r--kaddressbook/kaddressbookview.cpp4
-rw-r--r--kaddressbook/kaddressbookview.h2
-rw-r--r--kaddressbook/views/kaddressbookcardview.cpp2
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp2
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp6
6 files changed, 18 insertions, 7 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index a425311..2fd63e7 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,6 +1,15 @@
Info about the changes in new versions of KDE-Pim/Pi
+********** VERSION 1.9.17 ************
+
+KO/Pi:
+Fixed that tooltips were not updated after moving an item in agenda view.
+
+KA/Pi:
+All fields search does now actually search all the (possible) fields,
+not only those listed in the contact list.
+
********** VERSION 1.9.16 ************
KO/Pi:
Fixed search dialog size on Z 6000 (480x640 display).
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 8062354..424d52a 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -127,8 +127,12 @@ void KAddressBookView::initGUI()
KABC::Field::List KAddressBookView::fields() const
{
return mFieldList;
}
+KABC::Field::List KAddressBookView::allFields() const
+{
+ return KABC::Field::allFields();
+}
void KAddressBookView::setFilter( const Filter &filter )
{
mFilter = filter;
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 2e91cbc..8646136 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -122,8 +122,10 @@ class KAddressBookView : public QWidget
list of fields.
*/
KABC::Field::List fields() const;
+ KABC::Field::List allFields() const;
+
/**
Sets the active filter. This filter will be used for filtering
the list of addressees to display. The view will <b>not</b>
automatically refresh itself, so in most cases you will want to call
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 2c9b162..2d7ed08 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -294,9 +294,9 @@ void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field )
addressBook(), *it, mCardView);
}
} else {
- KABC::Field::List fieldList = fields();
+ KABC::Field::List fieldList = allFields();
KABC::Field::List::ConstIterator fieldIt;
for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
continue;
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 0ce56c8..faeda06 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -281,9 +281,9 @@ void KAddressBookIconView::doSearch( const QString& s ,KABC::Field *field )
}
} else {
- KABC::Field::List fieldList = fields();
+ KABC::Field::List fieldList = allFields();
KABC::Field::List::ConstIterator fieldIt;
for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
continue;
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 89053c2..61703ee 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -162,9 +162,9 @@ void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field )
ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
}
} else {
- KABC::Field::List fieldList = fields();
+ KABC::Field::List fieldList = allFields();
KABC::Field::List::ConstIterator fieldIt;
for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
continue;
@@ -257,12 +257,8 @@ void KAddressBookTableView::readConfig(KConfig *config)
//US mListView->setHeaderFont( f );
mListView->header()->setFont( f );
}
-
-
-
-
// Set the list view options
mListView->setAlternateBackgroundEnabled(config->readBoolEntry("ABackground",
true));
mListView->setSingleLineEnabled(config->readBoolEntry("SingleLine", false));