summaryrefslogtreecommitdiff
path: root/core
Side-by-side diff
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/abtable.cpp22
-rw-r--r--core/pim/addressbook/addressbook.cpp26
-rw-r--r--core/pim/addressbook/configdlg.cpp13
-rw-r--r--core/pim/addressbook/contacteditor.cpp9
4 files changed, 37 insertions, 33 deletions
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 60f3177..539d6ba 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -18,15 +18,15 @@
** not clear to you.
**
**********************************************************************/
#include <opie2/odebug.h>
#include <opie2/opimrecordlist.h>
+#include <opie2/oresource.h>
#include <qpe/timestring.h>
-#include <qpe/resource.h>
#include "abtable.h"
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
@@ -626,18 +626,18 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
case Qtopia::FileAs:
item.value = entry.fileAs();
break;
case Qtopia::DefaultEmail:
item.value = entry.defaultEmail();
if ( !item.value.isEmpty() )
- item.icon = Resource::loadPixmap( "addressbook/email" );
+ item.icon = Opie::Core::OResource::loadPixmap( "addressbook/email" );
break;
case Qtopia::Emails:
item.value = entry.emails();
if ( !item.value.isEmpty() )
- item.icon = Resource::loadPixmap( "addressbook/email" );
+ item.icon = Opie::Core::OResource::loadPixmap( "addressbook/email" );
break;
case Qtopia::HomeStreet:
item.value = entry.homeStreet();
break;
case Qtopia::HomeCity:
item.value = entry.homeCity();
@@ -651,28 +651,28 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
case Qtopia::HomeCountry:
item.value = entry.homeCountry();
break;
case Qtopia::HomePhone:
item.value = entry.homePhone();
if ( !item.value.isEmpty() )
- item.icon = Resource::loadPixmap( "addressbook/phonehome" );
+ item.icon = Opie::Core::OResource::loadPixmap( "addressbook/phonehome" );
break;
case Qtopia::HomeFax:
item.value = entry.homeFax();
if ( !item.value.isEmpty() )
- item.icon = Resource::loadPixmap( "addressbook/faxhome" );
+ item.icon = Opie::Core::OResource::loadPixmap( "addressbook/faxhome" );
break;
case Qtopia::HomeMobile:
item.value = entry.homeMobile();
if ( !item.value.isEmpty() )
- item.icon = Resource::loadPixmap( "addressbook/mobilehome" );
+ item.icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilehome" );
break;
case Qtopia::HomeWebPage:
item.value = entry.homeWebpage();
if ( !item.value.isEmpty() )
- item.icon = Resource::loadPixmap( "addressbook/webpagehome" );
+ item.icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagehome" );
break;
case Qtopia::Company:
item.value = entry.company();
break;
case Qtopia::BusinessCity:
item.value = entry.businessCity();
@@ -686,13 +686,13 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
case Qtopia::BusinessCountry:
item.value = entry.businessCountry();
break;
case Qtopia::BusinessWebPage:
item.value = entry.businessWebpage();
if ( !item.value.isEmpty() )
- item.icon = Resource::loadPixmap( "addressbook/webpagework" );
+ item.icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagework" );
break;
case Qtopia::JobTitle:
item.value = entry.jobTitle();
break;
case Qtopia::Department:
item.value = entry.department();
@@ -700,23 +700,23 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
case Qtopia::Office:
item.value = entry.office();
break;
case Qtopia::BusinessPhone:
item.value = entry.businessPhone();
if ( !item.value.isEmpty() )
- item.icon = Resource::loadPixmap( "addressbook/phonework" );
+ item.icon = Opie::Core::OResource::loadPixmap( "addressbook/phonework" );
break;
case Qtopia::BusinessFax:
item.value = entry.businessFax();
if ( !item.value.isEmpty() )
- item.icon = Resource::loadPixmap( "addressbook/faxwork" );
+ item.icon = Opie::Core::OResource::loadPixmap( "addressbook/faxwork" );
break;
case Qtopia::BusinessMobile:
item.value = entry.businessMobile();
if ( !item.value.isEmpty() )
- item.icon = Resource::loadPixmap( "addressbook/mobilework" );
+ item.icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilework" );
break;
case Qtopia::BusinessPager:
item.value = entry.businessPager();
break;
case Qtopia::Profession:
item.value = entry.profession();
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index faae0a9..4fa9253 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -24,19 +24,17 @@
#include <opie2/odebug.h>
#include <opie2/ofileselector.h>
#include <opie2/ofiledialog.h>
#include <opie2/opimcontact.h>
#include <opie2/ocontactaccessbackend_vcard.h>
+#include <opie2/oresource.h>
-#include <qpe/resource.h>
#include <qpe/ir.h>
#include <qpe/qpemessagebox.h>
#include <qmenubar.h>
-// #include <qtoolbar.h>
-// #include <qmenubar.h>
#include <qpe/qpeapplication.h>
#include <qaction.h>
#include <qlayout.h>
#include <qmessagebox.h>
#include <qtoolbutton.h>
@@ -90,33 +88,39 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
m_searchBar->hide();
m_searchEdit = new QLineEdit( m_searchBar, "m_searchEdit" );
m_searchBar->setStretchableWidget( m_searchEdit );
connect( m_searchEdit, SIGNAL(returnPressed()), this, SLOT(slotFind()) );
- QAction *a = new QAction( tr( "Start Search" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
+ QAction *a = new QAction( tr( "Start Search" ),
+ Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
a->addTo( m_searchBar );
// Insert Contact menu items
QActionGroup *items = new QActionGroup( this, QString::null, false );
- m_actionMail = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "addressbook/sendmail" ),
- QString::null, 0, items, 0 );
+ m_actionMail = new QAction( tr( "Write Mail To" ),
+ Opie::Core::OResource::loadPixmap( "addressbook/sendmail" ),
+ QString::null, 0, items, 0 );
connect( m_actionMail, SIGNAL(activated()), this, SLOT(writeMail()) );
- a = new QAction( tr("Import vCard"), Resource::loadPixmap( "addressbook/fileimport"),
- QString::null, 0, items, 0 );
+ a = new QAction( tr("Import vCard"),
+ Opie::Core::OResource::loadPixmap( "addressbook/fileimport" ),
+ QString::null, 0, items, 0 );
connect( a, SIGNAL(activated()), this, SLOT(importvCard()) );
- a = new QAction( tr("Export vCard"), Resource::loadPixmap( "addressbook/fileexport"),
+ a = new QAction( tr("Export vCard"),
+ Opie::Core::OResource::loadPixmap( "addressbook/fileexport" ),
QString::null, 0, items, 0 );
connect( a, SIGNAL(activated()), this, SLOT(exportvCard()) );
- m_actionPersonal = new QAction( tr("My Personal Details"), Resource::loadPixmap( "addressbook/identity" ),
- QString::null, 0, items, 0 , true );
+ m_actionPersonal = new QAction( tr("My Personal Details"),
+ Opie::Core::OResource::loadPixmap( "addressbook/identity" ),
+ QString::null, 0, items, 0 , true );
connect( m_actionPersonal, SIGNAL(activated()), this, SLOT(slotPersonalView()) );
insertItemMenuItems( items );
// Insert View menu items
items = new QActionGroup( this, QString::null, false );
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index 61e6c7e..a491fc7 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -1,13 +1,12 @@
#include "configdlg.h"
#include <opie2/odebug.h>
#include <opie2/opimcontact.h>
-#include "opie2/opimcontactfields.h"
-
-#include <qpe/resource.h>
+#include <opie2/opimcontactfields.h>
+#include <opie2/oresource.h>
#include <qcheckbox.h>
#include <qradiobutton.h>
#include <qlistbox.h>
#include <qpushbutton.h>
@@ -22,16 +21,16 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
}
// Reset Widget Flags: This was not changeable by designer :(
setWFlags ( WStyle_ContextHelp );
// Set Pics to Buttons and Tabs
- m_upButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/up" ) ) );
- m_downButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/down" ) ) );
- m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) );
- m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) );
+ m_upButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/up" ) ) );
+ m_downButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/down" ) ) );
+ m_addButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/add" ) ) );
+ m_removeButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/sub" ) ) );
// Get the translation maps between Field ID and translated strings
m_mapStrToID = Opie::OPimContactFields::trFieldsToId();
m_mapIDToStr = Opie::OPimContactFields::idToTrFields();
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index dec4c7c..4a0059a 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -21,17 +21,17 @@
#include "contacteditor.h"
#include "namelineedit.h"
#include <opie2/odebug.h>
#include <opie2/opimcontact.h>
+#include <opie2/oresource.h>
#include <qpe/categoryselect.h>
#include <qpe/qpeapplication.h>
#include <qpe/qpedialog.h>
-#include <qpe/resource.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qlineedit.h>
#include <qmultilineedit.h>
#include <qtoolbutton.h>
@@ -214,13 +214,14 @@ void ContactEditor::init() {
gl->addWidget( labCat, 8, 0 );
cmbCat = new CategorySelect( container );
gl->addWidget( cmbCat, 8, 1 );
labCat->show();
cmbCat->show();
- btnNote = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Notes..." ), container );
+ btnNote = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
+ tr( "Notes..." ), container );
gl->addWidget( btnNote, 9, 1 );
tabMain->addTab( m_generalWidget, "addressbook/AddressBookSmall", tr( "General" ) );
QWidget *tabViewport = new QWidget ( tabMain );
@@ -527,13 +528,13 @@ void ContactEditor::init() {
m1->insertItem( birthdayPicker );
birthdayButton= new QToolButton( hBox, "buttonStart" );
birthdayButton->setPopup( m1 );
birthdayButton->setPopupDelay(0);
- QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ),
+ QPushButton* deleteButton = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
tr( "Delete" ),
hBox, 0 );
gl->addWidget( hBox, counter , 1 );
connect( birthdayPicker, SIGNAL( dateClicked(int,int,int) ),
@@ -552,13 +553,13 @@ void ContactEditor::init() {
m1->insertItem( anniversaryPicker );
anniversaryButton= new QToolButton( hBox, "buttonStart" );
anniversaryButton->setPopup( m1 );
anniversaryButton->setPopupDelay(0);
- deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ),
+ deleteButton = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
tr( "Delete" ),
hBox, 0 );
gl->addWidget( hBox, counter , 1 );
connect( anniversaryPicker, SIGNAL( dateClicked(int,int,int) ),
this, SLOT( slotAnniversaryDateChanged(int,int,int) ) );