6 files changed, 145 insertions, 0 deletions

diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp
index 7d8ecf1..3928b1f 100644
--- a/core/pim/osearch/contactitem.cpp
+++ b/core/pim/osearch/contactitem.cpp
@@ -14,3 +14,5 @@
 
+#include <qpixmap.h>
 #include <opie/ocontact.h>
+#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
@@ -22,4 +24,89 @@ ContactItem::ContactItem(OListViewItem* parent, OContact *contact)
 	setText(0, _contact->toShortText());
+	setIcon();
 }
 
+void ContactItem::setIcon()
+{
+	QPixmap icon;
+	switch ( _contact->lastHitField() ) {
+	case -1:
+		icon = Resource::loadPixmap( "reset" );
+		break;
+	case Qtopia::BusinessPhone:
+		icon = Resource::loadPixmap( "addressbook/phonework" );
+		break;
+	case Qtopia::BusinessFax:
+		icon = Resource::loadPixmap( "addressbook/faxwork" );
+		break;
+	case Qtopia::BusinessMobile:
+		icon = Resource::loadPixmap( "addressbook/mobilework" );
+		break;
+	case Qtopia::DefaultEmail:
+		icon = Resource::loadPixmap( "addressbook/email" );
+		break;
+	case Qtopia::Emails:
+		icon = Resource::loadPixmap( "addressbook/email" );
+		break;
+	case Qtopia::HomePhone:
+		qDebug("homephone");
+		icon = Resource::loadPixmap( "addressbook/phonehome" );
+		break;
+	case Qtopia::HomeFax:
+		icon = Resource::loadPixmap( "addressbook/faxhome" );
+		break;
+	case Qtopia::HomeMobile:
+		icon = Resource::loadPixmap( "addressbook/mobilehome" );
+		break;
+	case Qtopia::HomeWebPage:
+		icon = Resource::loadPixmap( "addressbook/webpagehome" );
+		break;
+	case Qtopia::BusinessWebPage:
+		icon = Resource::loadPixmap( "addressbook/webpagework" );
+		break;
+	case Qtopia::Title:
+	case Qtopia::FirstName:
+	case Qtopia::MiddleName:
+	case Qtopia::LastName:
+	case Qtopia::Suffix:
+	case Qtopia::Nickname:
+ 	case Qtopia::FileAs:
+		icon = Resource::loadPixmap( "addressbook/identity" );
+ 		break;
+ 	case Qtopia::HomeStreet:
+ 	case Qtopia::HomeCity:
+ 	case Qtopia::HomeState:
+ 	case Qtopia::HomeZip:
+ 	case Qtopia::HomeCountry:
+		icon = Resource::loadPixmap( "addressbook/addresshome" );
+ 		break;
+ 	case Qtopia::Company:
+ 	case Qtopia::BusinessCity:
+ 	case Qtopia::BusinessStreet:
+ 	case Qtopia::BusinessZip:
+ 	case Qtopia::BusinessCountry:
+ 	case Qtopia::JobTitle:
+ 	case Qtopia::Department:
+ 	case Qtopia::Office:
+ 	case Qtopia::Manager:
+ 	case Qtopia::BusinessPager:
+ 	case Qtopia::Profession:
+		icon = Resource::loadPixmap( "addressbook/addresshome" );
+ 		break;
+ 	case Qtopia::Assistant:
+	case Qtopia::Spouse:
+ 	case Qtopia::Children:
+		icon = Resource::loadPixmap( "osearch/personal" );
+ 		break;
+ 	case Qtopia::Birthday:
+ 	case Qtopia::Anniversary:
+		icon = Resource::loadPixmap( "osearch/clock" );
+ 		break;
+ 	case Qtopia::Notes:
+ 		break;
+	default:
+		icon = Resource::loadPixmap( "DocsIcon" );
+		break;
+	}
+	setPixmap( 0, icon );
+}
 
diff --git a/core/pim/osearch/contactitem.h b/core/pim/osearch/contactitem.h
index 5e0017d..d6303e2 100644
--- a/core/pim/osearch/contactitem.h
+++ b/core/pim/osearch/contactitem.h
@@ -35,2 +35,3 @@ public:
 private:
+	void setIcon();
 	OContact *_contact;
diff --git a/core/pim/osearch/eventitem.cpp b/core/pim/osearch/eventitem.cpp
index 3b84b42..5b7a840 100644
--- a/core/pim/osearch/eventitem.cpp
+++ b/core/pim/osearch/eventitem.cpp
@@ -15,2 +15,4 @@
 #include <qdatetime.h>
+#include <qpixmap.h>
+#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
@@ -23,2 +25,3 @@ EventItem::EventItem(OListViewItem* parent, OEvent *event)
 	setText(0, _event->toShortText() );
+	setIcon();
 }
@@ -54 +57,26 @@ QIntDict<QString> EventItem::actions()
 }
+
+void EventItem::setIcon()
+{
+	QPixmap icon;
+	switch ( _event->lastHitField() ) {
+	case -1:
+		icon = Resource::loadPixmap( "reset" );
+		break;
+	case Qtopia::DatebookDescription:
+ 	case Qtopia::Notes:
+		icon = Resource::loadPixmap( "osearch/personal" );
+ 		break;
+	case Qtopia::Location:
+		icon = Resource::loadPixmap( "home" );
+ 		break;
+ 	case Qtopia::StartDateTime:
+ 	case Qtopia::EndDateTime:
+		icon = Resource::loadPixmap( "osearch/clock" );
+ 		break;
+	default:
+		icon = Resource::loadPixmap( "DocsIcon" );
+		break;
+	}
+	setPixmap( 0, icon );
+}
diff --git a/core/pim/osearch/eventitem.h b/core/pim/osearch/eventitem.h
index d0d45a8..5f9c9fc 100644
--- a/core/pim/osearch/eventitem.h
+++ b/core/pim/osearch/eventitem.h
@@ -34,2 +34,3 @@ public:
 private:
+    void setIcon();
     OEvent *_event;
diff --git a/core/pim/osearch/todoitem.cpp b/core/pim/osearch/todoitem.cpp
index 8b354f1..de4ea97 100644
--- a/core/pim/osearch/todoitem.cpp
+++ b/core/pim/osearch/todoitem.cpp
@@ -15,2 +15,4 @@
 #include <opie/otodo.h>
+#include <qpixmap.h>
+#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
@@ -22,2 +24,3 @@ TodoItem::TodoItem(OListViewItem* parent, OTodo *todo)
 	setText( 0, todo->toShortText() );
+	setIcon();
 }
@@ -52 +55,25 @@ QIntDict<QString> TodoItem::actions()
 }
+
+void TodoItem::setIcon()
+{
+	QPixmap icon;
+	switch ( _todo->lastHitField() ) {
+	case -1:
+		icon = Resource::loadPixmap( "reset" );
+		break;
+	case OTodo::Description:
+ 	case OTodo::Summary:
+		icon = Resource::loadPixmap( "osearch/personal" );
+ 		break;
+	case OTodo::Priority:
+		icon = Resource::loadPixmap( "todo/priority1" );
+ 		break;
+ 	case OTodo::HasDate:
+		icon = Resource::loadPixmap( "osearch/clock" );
+ 		break;
+	default:
+		icon = Resource::loadPixmap( "DocsIcon" );
+		break;
+	}
+	setPixmap( 0, icon );
+}
diff --git a/core/pim/osearch/todoitem.h b/core/pim/osearch/todoitem.h
index 9dfd4ff..cc78e57 100644
--- a/core/pim/osearch/todoitem.h
+++ b/core/pim/osearch/todoitem.h
@@ -32,2 +32,3 @@ public:
 private:
+    void setIcon();
     OTodo *_todo;