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
@@ -12,7 +12,9 @@
 //
 #include "contactitem.h"
 
+#include <qpixmap.h>
 #include <opie/ocontact.h>
+#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 ContactItem::ContactItem(OListViewItem* parent, OContact *contact)
@@ -20,8 +22,93 @@ ContactItem::ContactItem(OListViewItem* parent, OContact *contact)
 {
         _contact = 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 );
+}
 
 ContactItem::~ContactItem()
 {
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
@@ -33,6 +33,7 @@ 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
@@ -13,6 +13,8 @@
 #include "eventitem.h"
 
 #include <qdatetime.h>
+#include <qpixmap.h>
+#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <opie/oevent.h>
 
@@ -21,6 +23,7 @@ EventItem::EventItem(OListViewItem* parent, OEvent *event)
 {
         _event = event;
         setText(0, _event->toShortText() );
+        setIcon();
 }
 
 
@@ -52,3 +55,28 @@ QIntDict<QString> EventItem::actions()
         result.insert( 1, new QString( QObject::tr("edit") ) );
         return result;
 }
+
+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
@@ -32,6 +32,7 @@ public:
     virtual QIntDict<QString> actions();
 
 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
@@ -13,6 +13,8 @@
 #include "todoitem.h"
 
 #include <opie/otodo.h>
+#include <qpixmap.h>
+#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 TodoItem::TodoItem(OListViewItem* parent, OTodo *todo)
@@ -20,6 +22,7 @@ TodoItem::TodoItem(OListViewItem* parent, OTodo *todo)
 {
         _todo = todo;
         setText( 0, todo->toShortText() );
+        setIcon();
 }
 
 TodoItem::~TodoItem()
@@ -50,3 +53,27 @@ QIntDict<QString> TodoItem::actions()
         result.insert( 1, new QString( QObject::tr("edit") ) );
         return result;
 }
+
+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
@@ -30,6 +30,7 @@ public:
     virtual QIntDict<QString> actions();
 
 private:
+    void setIcon();
     OTodo *_todo;
 
 };