summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/adresssearch.cpp5
-rw-r--r--core/pim/osearch/applnksearch.cpp7
-rw-r--r--core/pim/osearch/contactitem.cpp37
-rw-r--r--core/pim/osearch/datebooksearch.cpp6
-rw-r--r--core/pim/osearch/doclnksearch.cpp5
-rw-r--r--core/pim/osearch/eventitem.cpp14
-rw-r--r--core/pim/osearch/mainwindow.cpp5
-rw-r--r--core/pim/osearch/todoitem.cpp16
-rw-r--r--core/pim/osearch/todosearch.cpp7
9 files changed, 49 insertions, 53 deletions
diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp
index e1f575d..d260670 100644
--- a/core/pim/osearch/adresssearch.cpp
+++ b/core/pim/osearch/adresssearch.cpp
@@ -13,7 +13,7 @@
13#include "adresssearch.h" 13#include "adresssearch.h"
14#include "contactitem.h" 14#include "contactitem.h"
15 15
16#include <qpe/resource.h> 16#include <opie2/oresource.h>
17 17
18//#include <qwhatsthis.h> 18//#include <qwhatsthis.h>
19 19
@@ -22,8 +22,7 @@ AdressSearch::AdressSearch(QListView* parent, QString name):
22 SearchGroup(parent, name) 22 SearchGroup(parent, name)
23{ 23{
24 _contacts = 0; 24 _contacts = 0;
25 QIconSet is = Resource::loadIconSet( "addressbook/AddressBook" ); 25 setPixmap( 0, Opie::Core::OResource::loadPixmap( "addressbook/AddressBook", Opie::Core::OResource::SmallIcon ) );
26 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
27 26
28 27
29 //QWhatsThis::add( this, QObject::tr("Search the addressbook") ); 28 //QWhatsThis::add( this, QObject::tr("Search the addressbook") );
diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp
index 474dbb2..69170c9 100644
--- a/core/pim/osearch/applnksearch.cpp
+++ b/core/pim/osearch/applnksearch.cpp
@@ -13,17 +13,16 @@
13#include "applnksearch.h" 13#include "applnksearch.h"
14#include "applnkitem.h" 14#include "applnkitem.h"
15 15
16#include <opie2/oresource.h>
17
16#include <qpe/applnk.h> 18#include <qpe/applnk.h>
17#include <qpe/qpeapplication.h> 19#include <qpe/qpeapplication.h>
18#include <qpe/resource.h>
19 20
20 21
21AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name) 22AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name)
22{ 23{
23 _apps = 0; 24 _apps = 0;
24 QIconSet is = Resource::loadIconSet( "osearch/applications" ); 25 setPixmap( 0, Opie::Core::OResource::loadPixmap( "osearch/applications", Opie::Core::OResource::SmallIcon ) );
25 //QIconSet is = Resource::loadIconSet( "AppsIcon" );
26 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
27} 26}
28 27
29 28
diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp
index c89c6e2..81b6359 100644
--- a/core/pim/osearch/contactitem.cpp
+++ b/core/pim/osearch/contactitem.cpp
@@ -12,7 +12,8 @@
12// 12//
13#include "contactitem.h" 13#include "contactitem.h"
14 14
15#include <qpe/resource.h> 15#include <opie2/oresource.h>
16
16#include <qpe/qcopenvelope_qws.h> 17#include <qpe/qcopenvelope_qws.h>
17 18
18 19
@@ -30,35 +31,35 @@ void ContactItem::setIcon()
30 QPixmap icon; 31 QPixmap icon;
31 switch ( _contact->lastHitField() ) { 32 switch ( _contact->lastHitField() ) {
32 case -1: 33 case -1:
33 icon = Resource::loadPixmap( "reset" ); 34 icon = Opie::Core::OResource::loadPixmap( "reset", Opie::Core::OResource::SmallIcon );
34 break; 35 break;
35 case Qtopia::BusinessPhone: 36 case Qtopia::BusinessPhone:
36 icon = Resource::loadPixmap( "addressbook/phonework" ); 37 icon = Opie::Core::OResource::loadPixmap( "addressbook/phonework", Opie::Core::OResource::SmallIcon );
37 break; 38 break;
38 case Qtopia::BusinessFax: 39 case Qtopia::BusinessFax:
39 icon = Resource::loadPixmap( "addressbook/faxwork" ); 40 icon = Opie::Core::OResource::loadPixmap( "addressbook/faxwork", Opie::Core::OResource::SmallIcon );
40 break; 41 break;
41 case Qtopia::BusinessMobile: 42 case Qtopia::BusinessMobile:
42 icon = Resource::loadPixmap( "addressbook/mobilework" ); 43 icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilework", Opie::Core::OResource::SmallIcon );
43 break; 44 break;
44 case Qtopia::DefaultEmail: 45 case Qtopia::DefaultEmail:
45 case Qtopia::Emails: 46 case Qtopia::Emails:
46 icon = Resource::loadPixmap( "addressbook/email" ); 47 icon = Opie::Core::OResource::loadPixmap( "addressbook/email", Opie::Core::OResource::SmallIcon );
47 break; 48 break;
48 case Qtopia::HomePhone: 49 case Qtopia::HomePhone:
49 icon = Resource::loadPixmap( "addressbook/phonehome" ); 50 icon = Opie::Core::OResource::loadPixmap( "addressbook/phonehome", Opie::Core::OResource::SmallIcon );
50 break; 51 break;
51 case Qtopia::HomeFax: 52 case Qtopia::HomeFax:
52 icon = Resource::loadPixmap( "addressbook/faxhome" ); 53 icon = Opie::Core::OResource::loadPixmap( "addressbook/faxhome", Opie::Core::OResource::SmallIcon );
53 break; 54 break;
54 case Qtopia::HomeMobile: 55 case Qtopia::HomeMobile:
55 icon = Resource::loadPixmap( "addressbook/mobilehome" ); 56 icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilehome", Opie::Core::OResource::SmallIcon );
56 break; 57 break;
57 case Qtopia::HomeWebPage: 58 case Qtopia::HomeWebPage:
58 icon = Resource::loadPixmap( "addressbook/webpagehome" ); 59 icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagehome", Opie::Core::OResource::SmallIcon );
59 break; 60 break;
60 case Qtopia::BusinessWebPage: 61 case Qtopia::BusinessWebPage:
61 icon = Resource::loadPixmap( "addressbook/webpagework" ); 62 icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagework", Opie::Core::OResource::SmallIcon );
62 break; 63 break;
63 case Qtopia::Title: 64 case Qtopia::Title:
64 case Qtopia::JobTitle: 65 case Qtopia::JobTitle:
@@ -68,14 +69,14 @@ void ContactItem::setIcon()
68 case Qtopia::Suffix: 69 case Qtopia::Suffix:
69 case Qtopia::Nickname: 70 case Qtopia::Nickname:
70 case Qtopia::FileAs: 71 case Qtopia::FileAs:
71 icon = Resource::loadPixmap( "addressbook/identity" ); 72 icon = Opie::Core::OResource::loadPixmap( "addressbook/identity", Opie::Core::OResource::SmallIcon );
72 break; 73 break;
73 case Qtopia::HomeStreet: 74 case Qtopia::HomeStreet:
74 case Qtopia::HomeCity: 75 case Qtopia::HomeCity:
75 case Qtopia::HomeState: 76 case Qtopia::HomeState:
76 case Qtopia::HomeZip: 77 case Qtopia::HomeZip:
77 case Qtopia::HomeCountry: 78 case Qtopia::HomeCountry:
78 icon = Resource::loadPixmap( "osearch/addresshome" ); 79 icon = Opie::Core::OResource::loadPixmap( "osearch/addresshome", Opie::Core::OResource::SmallIcon );
79 break; 80 break;
80 case Qtopia::Company: 81 case Qtopia::Company:
81 case Qtopia::BusinessCity: 82 case Qtopia::BusinessCity:
@@ -87,22 +88,22 @@ void ContactItem::setIcon()
87 case Qtopia::Manager: 88 case Qtopia::Manager:
88 case Qtopia::BusinessPager: 89 case Qtopia::BusinessPager:
89 case Qtopia::Profession: 90 case Qtopia::Profession:
90 icon = Resource::loadPixmap( "osearch/addresshome" ); 91 icon = Opie::Core::OResource::loadPixmap( "osearch/addresshome", Opie::Core::OResource::SmallIcon );
91 break; 92 break;
92 case Qtopia::Assistant: 93 case Qtopia::Assistant:
93 case Qtopia::Spouse: 94 case Qtopia::Spouse:
94 case Qtopia::Children: 95 case Qtopia::Children:
95 icon = Resource::loadPixmap( "osearch/personal" ); 96 icon = Opie::Core::OResource::loadPixmap( "osearch/personal", Opie::Core::OResource::SmallIcon );
96 break; 97 break;
97 case Qtopia::Birthday: 98 case Qtopia::Birthday:
98 case Qtopia::Anniversary: 99 case Qtopia::Anniversary:
99 icon = Resource::loadPixmap( "osearch/clock" ); 100 icon = Opie::Core::OResource::loadPixmap( "osearch/clock", Opie::Core::OResource::SmallIcon );
100 break; 101 break;
101 case Qtopia::Notes: 102 case Qtopia::Notes:
102 icon = Resource::loadPixmap( "txt" ); 103 icon = Opie::Core::OResource::loadPixmap( "txt", Opie::Core::OResource::SmallIcon );
103 break; 104 break;
104 default: 105 default:
105 icon = Resource::loadPixmap( "DocsIcon" ); 106 icon = Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon );
106 break; 107 break;
107 } 108 }
108 setPixmap( 0, icon ); 109 setPixmap( 0, icon );
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index ef3b006..13df6bf 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -16,8 +16,8 @@
16#include <opie2/odebug.h> 16#include <opie2/odebug.h>
17#include <opie2/opimevent.h> 17#include <opie2/opimevent.h>
18#include <opie2/opimrecurrence.h> 18#include <opie2/opimrecurrence.h>
19#include <opie2/oresource.h>
19 20
20#include <qpe/resource.h>
21#include <qpe/config.h> 21#include <qpe/config.h>
22 22
23#include <qaction.h> 23#include <qaction.h>
@@ -28,8 +28,8 @@
28DatebookSearch::DatebookSearch(QListView* parent, QString name) 28DatebookSearch::DatebookSearch(QListView* parent, QString name)
29: SearchGroup(parent, name), _dates(0), _popupMenu(0) 29: SearchGroup(parent, name), _dates(0), _popupMenu(0)
30{ 30{
31 QIconSet is = Resource::loadIconSet( "datebook/DateBook" ); 31 setPixmap( 0, Opie::Core::OResource::loadPixmap( "datebook/DateBook", Opie::Core::OResource::SmallIcon ) );
32 setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); 32
33 actionShowPastEvents = new QAction( QObject::tr("Show past events"),QString::null, 0, 0, 0, true ); 33 actionShowPastEvents = new QAction( QObject::tr("Show past events"),QString::null, 0, 0, 0, true );
34 actionSearchInDates = new QAction( QObject::tr("Search in dates"),QString::null, 0, 0, 0, true ); 34 actionSearchInDates = new QAction( QObject::tr("Search in dates"),QString::null, 0, 0, 0, true );
35 Config cfg( "osearch", Config::User ); 35 Config cfg( "osearch", Config::User );
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp
index 3d91c1f..9d165be 100644
--- a/core/pim/osearch/doclnksearch.cpp
+++ b/core/pim/osearch/doclnksearch.cpp
@@ -15,11 +15,11 @@
15#include "doclnkitem.h" 15#include "doclnkitem.h"
16#include "doclnksearch.h" 16#include "doclnksearch.h"
17 17
18#include <opie2/oresource.h>
18#include <opie2/owait.h> 19#include <opie2/owait.h>
19 20
20#include <qpe/applnk.h> 21#include <qpe/applnk.h>
21#include <qpe/config.h> 22#include <qpe/config.h>
22#include <qpe/resource.h>
23#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
24 24
25#include <qaction.h> 25#include <qaction.h>
@@ -31,8 +31,7 @@
31DocLnkSearch::DocLnkSearch(QListView* parent, QString name) 31DocLnkSearch::DocLnkSearch(QListView* parent, QString name)
32: AppLnkSearch(parent, name), _popupMenu(0) 32: AppLnkSearch(parent, name), _popupMenu(0)
33{ 33{
34 QIconSet is = Resource::loadIconSet( "osearch/documents" ); 34 setPixmap( 0, Opie::Core::OResource::loadPixmap( "osearch/documents", Opie::Core::OResource::SmallIcon ) );
35 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
36 35
37 actionSearchInFiles = new QAction( QObject::tr("Search content"),QString::null, 0, 0, 0, true ); 36 actionSearchInFiles = new QAction( QObject::tr("Search content"),QString::null, 0, 0, 0, true );
38 Config cfg( "osearch", Config::User ); 37 Config cfg( "osearch", Config::User );
diff --git a/core/pim/osearch/eventitem.cpp b/core/pim/osearch/eventitem.cpp
index 7bcf340..36adc63 100644
--- a/core/pim/osearch/eventitem.cpp
+++ b/core/pim/osearch/eventitem.cpp
@@ -12,8 +12,8 @@
12// 12//
13#include "eventitem.h" 13#include "eventitem.h"
14 14
15#include <opie2/oresource.h>
15 16
16#include <qpe/resource.h>
17#include <qpe/qcopenvelope_qws.h> 17#include <qpe/qcopenvelope_qws.h>
18 18
19 19
@@ -61,24 +61,24 @@ void EventItem::setIcon()
61 QPixmap icon; 61 QPixmap icon;
62 switch ( _event->lastHitField() ) { 62 switch ( _event->lastHitField() ) {
63 case -1: 63 case -1:
64 icon = Resource::loadPixmap( "reset" ); 64 icon = Opie::Core::OResource::loadPixmap( "reset", Opie::Core::OResource::SmallIcon );
65 // QWhatsThis::add( icon, QObject::tr("Enter your search terms here") ); 65 // QWhatsThis::add( icon, QObject::tr("Enter your search terms here") );
66 break; 66 break;
67 case Qtopia::DatebookDescription: 67 case Qtopia::DatebookDescription:
68 icon = Resource::loadPixmap( "osearch/summary" ); 68 icon = Opie::Core::OResource::loadPixmap( "osearch/summary", Opie::Core::OResource::SmallIcon );
69 break; 69 break;
70 case Qtopia::Notes: 70 case Qtopia::Notes:
71 icon = Resource::loadPixmap( "txt" ); 71 icon = Opie::Core::OResource::loadPixmap( "txt", Opie::Core::OResource::SmallIcon );
72 break; 72 break;
73 case Qtopia::Location: 73 case Qtopia::Location:
74 icon = Resource::loadPixmap( "home" ); 74 icon = Opie::Core::OResource::loadPixmap( "home", Opie::Core::OResource::SmallIcon );
75 break; 75 break;
76 case Qtopia::StartDateTime: 76 case Qtopia::StartDateTime:
77 case Qtopia::EndDateTime: 77 case Qtopia::EndDateTime:
78 icon = Resource::loadPixmap( "osearch/clock" ); 78 icon = Opie::Core::OResource::loadPixmap( "osearch/clock", Opie::Core::OResource::SmallIcon );
79 break; 79 break;
80 default: 80 default:
81 icon = Resource::loadPixmap( "DocsIcon" ); 81 icon = Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon );
82 break; 82 break;
83 } 83 }
84 setPixmap( 0, icon ); 84 setPixmap( 0, icon );
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 1d0331c..d71b167 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -21,13 +21,12 @@
21#include "mainwindow.h" 21#include "mainwindow.h"
22 22
23#include <opie2/odebug.h> 23#include <opie2/odebug.h>
24#include <opie2/oresource.h>
24#include <opie2/owait.h> 25#include <opie2/owait.h>
25 26
26#include <qpe/qpemessagebox.h> 27#include <qpe/qpemessagebox.h>
27#include <qpe/resource.h>
28#include <qpe/config.h> 28#include <qpe/config.h>
29 29
30
31#include <qpe/qpeapplication.h> 30#include <qpe/qpeapplication.h>
32#include <qpe/global.h> 31#include <qpe/global.h>
33 32
@@ -165,7 +164,7 @@ void MainWindow::makeMenu()
165 164
166 //SEARCH 165 //SEARCH
167 SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 ); 166 SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 );
168 SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) ); 167 SearchAllAction->setIconSet( Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ) );
169 // QWhatsThis::add( SearchAllAction, tr("Search everything...") ); 168 // QWhatsThis::add( SearchAllAction, tr("Search everything...") );
170 connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); 169 connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) );
171 SearchAllAction->addTo( searchMenu ); 170 SearchAllAction->addTo( searchMenu );
diff --git a/core/pim/osearch/todoitem.cpp b/core/pim/osearch/todoitem.cpp
index 34e790a..9172344 100644
--- a/core/pim/osearch/todoitem.cpp
+++ b/core/pim/osearch/todoitem.cpp
@@ -12,12 +12,10 @@
12// 12//
13#include "todoitem.h" 13#include "todoitem.h"
14 14
15#include <opie2/oresource.h>
15 16
16#include <qpe/resource.h>
17#include <qpe/qcopenvelope_qws.h> 17#include <qpe/qcopenvelope_qws.h>
18 18
19
20
21using namespace Opie; 19using namespace Opie;
22TodoItem::TodoItem(OListViewItem* parent, OPimTodo *todo) 20TodoItem::TodoItem(OListViewItem* parent, OPimTodo *todo)
23: ResultItem(parent) 21: ResultItem(parent)
@@ -61,22 +59,22 @@ void TodoItem::setIcon()
61 QPixmap icon; 59 QPixmap icon;
62 switch ( _todo->lastHitField() ) { 60 switch ( _todo->lastHitField() ) {
63 case -1: 61 case -1:
64 icon = Resource::loadPixmap( "reset" ); 62 icon = Opie::Core::OResource::loadPixmap( "reset", Opie::Core::OResource::SmallIcon );
65 break; 63 break;
66 case OPimTodo::Description: 64 case OPimTodo::Description:
67 icon = Resource::loadPixmap( "txt" ); 65 icon = Opie::Core::OResource::loadPixmap( "txt", Opie::Core::OResource::SmallIcon );
68 break; 66 break;
69 case OPimTodo::Summary: 67 case OPimTodo::Summary:
70 icon = Resource::loadPixmap( "osearch/summary" ); 68 icon = Opie::Core::OResource::loadPixmap( "osearch/summary", Opie::Core::OResource::SmallIcon );
71 break; 69 break;
72 case OPimTodo::Priority: 70 case OPimTodo::Priority:
73 icon = Resource::loadPixmap( "todo/priority1" ); 71 icon = Opie::Core::OResource::loadPixmap( "todo/priority1", Opie::Core::OResource::SmallIcon );
74 break; 72 break;
75 case OPimTodo::HasDate: 73 case OPimTodo::HasDate:
76 icon = Resource::loadPixmap( "osearch/clock" ); 74 icon = Opie::Core::OResource::loadPixmap( "osearch/clock", Opie::Core::OResource::SmallIcon );
77 break; 75 break;
78 default: 76 default:
79 icon = Resource::loadPixmap( "DocsIcon" ); 77 icon = Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon );
80 break; 78 break;
81 } 79 }
82 setPixmap( 0, icon ); 80 setPixmap( 0, icon );
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp
index 1ed7370..8a9ae39 100644
--- a/core/pim/osearch/todosearch.cpp
+++ b/core/pim/osearch/todosearch.cpp
@@ -13,7 +13,8 @@
13#include "todosearch.h" 13#include "todosearch.h"
14#include "todoitem.h" 14#include "todoitem.h"
15 15
16#include <qpe/resource.h> 16#include <opie2/oresource.h>
17
17#include <qpe/config.h> 18#include <qpe/config.h>
18 19
19#include <qaction.h> 20#include <qaction.h>
@@ -25,8 +26,8 @@ TodoSearch::TodoSearch(QListView* parent, QString name)
25{ 26{
26 //AppLnkSet als(QPEApplication::qpeDir()); 27 //AppLnkSet als(QPEApplication::qpeDir());
27 //setPixmap( 0, als.findExec("todolist")->pixmap() ); 28 //setPixmap( 0, als.findExec("todolist")->pixmap() );
28 QIconSet is = Resource::loadIconSet( "todo/TodoList" ); 29 setPixmap( 0, Opie::Core::OResource::loadPixmap( "todo/TodoList", Opie::Core::OResource::SmallIcon ) );
29 setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); 30
30 actionShowCompleted = new QAction( QObject::tr("Show completed tasks"),QString::null, 0, 0, 0, true ); 31 actionShowCompleted = new QAction( QObject::tr("Show completed tasks"),QString::null, 0, 0, 0, true );
31 Config cfg( "osearch", Config::User ); 32 Config cfg( "osearch", Config::User );
32 cfg.setGroup( "todo_settings" ); 33 cfg.setGroup( "todo_settings" );