Use OResource for loading images

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
@@ -1,74 +1,74 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 ** Copyright (c) 2002 Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** 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>
 #include <stdlib.h>
 
 #include <ctype.h> //toupper() for key hack
 
 #if 0
 
 /*!
   \class AbTableItem abtable.h
 
   \brief QTableItem based class for showing a field of an entry
 */
 
 AbTableItem::AbTableItem( QTable *t, EditType et, const QString &s,
                           const QString &secondSortKey)
         : QTableItem( t, et, s )
 {
         //    sortKey = s.lower() + QChar( '\0' ) + secondSortKey.lower();
         sortKey = Qtopia::buildSortKey( s, secondSortKey );
 }
 
 int AbTableItem::alignment() const
 {
         return AlignLeft|AlignVCenter;
 }
 
 QString AbTableItem::key() const
 {
         return sortKey;
 }
 
 // A way to reset the item, without out doing a delete or a new...
 void AbTableItem::setItem( const QString &txt, const QString &secondKey )
 {
         setText( txt );
         sortKey = Qtopia::buildSortKey( txt, secondKey );
 
         //    sortKey = txt.lower() + QChar( '\0' ) + secondKey.lower();
 }
 
 /*!
   \class AbPickItem abtable.h
 
@@ -584,177 +584,177 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
                     QString contactText = contactItem.value;
 
                     if ( !contactPic.isNull() )
                             {
                                     p->drawPixmap( x + marg, y, contactPic );
                                     p->drawText( x + marg + contactPic.width()
                                                  + 4,2 + fm.ascent(), contactText );
                             }
                     else
                             {
                                     p->drawText( x + marg,2 + fm.ascent(), contactText );
                             }
             }
             break;
 
     }
     p->restore();
 }
 
 void AbTable::rowHeightChanged( int row )
 {
         if ( enablePainting )
                 QTable::rowHeightChanged( row );
 }
 ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /* row */ )
 {
 
         ContactItem item;
 
         item.value = "";
 
         for ( QValueList<int>::ConstIterator it = intFields.begin();
               it != intFields.end(); ++it ) {
                 switch ( *it ) {
                 default:
                         break;
                 case Qtopia::Title:
                         item.value = entry.title();
                         break;
                 case Qtopia::Suffix:
                         item.value = entry.suffix();
                         break;
                 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();
                         break;
                 case Qtopia::HomeState:
                         item.value = entry.homeState();
                         break;
                 case Qtopia::HomeZip:
                         item.value = entry.homeZip();
                         break;
                 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();
                         break;
                 case Qtopia::BusinessStreet:
                         item.value = entry.businessStreet();
                         break;
                 case Qtopia::BusinessZip:
                         item.value = entry.businessZip();
                         break;
                 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();
                         break;
                 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();
                         break;
                 case Qtopia::Assistant:
                         item.value = entry.assistant();
                         break;
                 case Qtopia::Manager:
                         item.value = entry.manager();
                         break;
                 case Qtopia::Spouse:
                         item.value = entry.spouse();
                         break;
                 case Qtopia::Gender:
                         item.value = entry.gender();
                         break;
                 case Qtopia::Birthday:
                         if ( ! entry.birthday().isNull() ){
                                 item.value = TimeString::numberDateString( entry.birthday() );
                         }
                         break;
                 case Qtopia::Anniversary:
                         if ( ! entry.anniversary().isNull() ){
                                 item.value = TimeString::numberDateString( entry.anniversary() );
                         }
                         break;
                 case Qtopia::Nickname:
                         item.value = entry.nickname();
                         break;
                 case Qtopia::Children:
                         item.value = entry.children();
                         break;
                 case Qtopia::Notes:
                         item.value = entry.notes();
                         break;
                 }
                 if ( !item.value.isEmpty() )
                         break;
         }
         return item;
 }
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
@@ -1,164 +1,168 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 ** Copyright (C) 2003 Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file is part of the Open Palmtop Environment (see www.opie.info).
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_FD
 
 // #include "addresssettings.h"
 #include "addressbook.h"
 
 #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>
 
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 
 #include "picker.h"
 #include "configdlg.h"
 
 extern QString addressbookPersonalVCardName();
 
 AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
                                       WFlags /*f*/ )
         : Opie::OPimMainWindow( "Addressbook", "Contacts", tr( "Contact" ), "AddressBook",
                             parent, name, WType_TopLevel | WStyle_ContextHelp ),
           abEditor(0l),
           syncing(false)
 {
     setCaption( tr( "Contacts" ) );
 
         isLoading = true;
 
         m_config.load();
 
         // Create Views
         m_listContainer = new QWidget( this );
         QVBoxLayout *vb = new QVBoxLayout( m_listContainer );
 
         m_abView = new AbView( m_listContainer, m_config.orderList() );
         vb->addWidget( m_abView );
         connect( m_abView, SIGNAL(signalViewSwitched(int)),
                  this, SLOT(slotViewSwitched(int)) );
 
         QObject::connect( m_abView, SIGNAL(signalNotFound()), this, SLOT(slotNotFound()) );
 
         // Letter Picker
         pLabel = new LetterPicker( m_listContainer );
         connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char)));
         connect(m_abView, SIGNAL(signalClearLetterPicker()), pLabel, SLOT(clear()) );
 
         vb->addWidget( pLabel );
 
     // Quick search bar
     m_searchBar = new OFloatBar( "Search", this, QMainWindow::Top, true );
     m_searchBar->setHorizontalStretchable( true );
     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 );
 
     a = new QAction( tr("Show quick search bar"),QString::null, 0, items, 0, true );
     connect( a, SIGNAL(toggled(bool)), this, SLOT(slotShowFind(bool)) );
 
     insertViewMenuItems( items );
 
         // Fontsize
         defaultFont = new QFont( m_abView->font() );
          slotSetFont(m_config.fontSize());
         m_curFontSize = m_config.fontSize();
 
         setCentralWidget(m_listContainer);
 
                 //odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl;
         connect( qApp, SIGNAL(flush()), this, SLOT(flush()) );
         connect( qApp, SIGNAL(reload()), this, SLOT(reload()) );
         connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)),
         this, SLOT(appMessage(const QCString&,const QByteArray&)) );
 
         isLoading = false;
 
     // Handle category selection
     setViewCategory( m_config.category() );
     m_abView->setShowByCategory( m_config.category() );
     connect( this, SIGNAL(categorySelected(const QString&)),
              this, SLOT(slotSetCategory(const QString&)) );
 }
 
 void AddressbookWindow::slotSetFont( int size )
 {
         odebug << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl;
 
         if (size > 2 || size < 0)
                 size = 1;
 
         m_config.setFontSize( size );
 
         QFont *currentFont;
 
         switch (size) {
         case 0:
                 m_abView->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) );
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,79 +1,78 @@
 #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>
 
 ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
         ConfigDlg_Base(parent, name, true )
 {
         contFields = Opie::OPimContactFields::trfields();
 
         // We add all Fields into the Listbox
         for (uint i=0; i < contFields.count(); i++) {
                 allFieldListBox->insertItem( contFields[i] );
         }
 
         // 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();
 
         connect ( m_addButton, SIGNAL( clicked() ), this, SLOT( slotItemAdd() ) );
         connect ( m_removeButton, SIGNAL( clicked() ), this, SLOT( slotItemRemove() ) );
         connect ( m_upButton, SIGNAL( clicked() ), this, SLOT( slotItemUp() ) );
         connect ( m_downButton, SIGNAL( clicked() ), this, SLOT( slotItemDown() ) );
 }
 
 void ConfigDlg::slotItemUp()
 {
         odebug << "void ConfigDlg::slotItemUp()" << oendl;
 
         int i = fieldListBox->currentItem();
         if ( i > 0 ) {
                 QString item = fieldListBox->currentText();
                 fieldListBox->removeItem( i );
                 fieldListBox->insertItem( item, i-1 );
                 fieldListBox->setCurrentItem( i-1 );
         }
 
 }
 
 void ConfigDlg::slotItemDown()
 {
         odebug << "void ConfigDlg::slotItemDown()" << oendl;
 
         int i = fieldListBox->currentItem();
         if ( i < (int)fieldListBox->count() - 1 ) {
                 QString item = fieldListBox->currentText();
                 fieldListBox->removeItem( i );
                 fieldListBox->insertItem( item, i+1 );
                 fieldListBox->setCurrentItem( i+1 );
         }
 }
 
 void ConfigDlg::slotItemAdd()
 {
         odebug << "void ConfigDlg::slotItemAdd()" << oendl;
 
         int i = allFieldListBox->currentItem();
         if ( i > 0 ) {
                 QString item = allFieldListBox->currentText();
                 odebug << "Adding " << item << oendl;
                 fieldListBox->insertItem( item );
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
@@ -1,79 +1,79 @@
 /*
  * Copyright (c) 2002 Michael R. Crawford <mike@tuxnami.org>
  * Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de)
  *
  * This file is an add-on for the OPIE Palmtop Environment
  *
  * This file may be distributed and/or modified under the terms of the
  * GNU General Public License version 2 as published by the Free Software
  * Foundation and appearing in the file LICENSE.GPL included in the pacakaging
  * of this file.
  *
  * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
  * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  *
  * This is a rewrite of the abeditor.h file, modified to provide a more
  * intuitive interface to TrollTech's original Address Book editor.  This
  * is made to operate exactly in interface with the exception of name.
  *
  */
 
 #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>
 #include <qlistbox.h>
 #include <qmessagebox.h>
 #include <qwhatsthis.h>
 
 #include <assert.h>
 
 static inline bool containsAlphaNum( const QString &str );
 static inline bool constainsWhiteSpace( const QString &str );
 
 // helper functions, convert our comma delimited list to proper
 // file format...
 void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
                      QString &strAll );
 
 // helper convert from file format to comma delimited...
 void parseEmailTo( const QString &strDefaultEmail,
                    const QString &strOtherEmail, QString &strBack );
 
         ContactEditor::ContactEditor(const Opie::OPimContact &entry,
                                 QWidget *parent,
                                 const char *name,
                                 WFlags )
         : QDialog( parent, name, true, WStyle_ContextHelp ),
           defaultEmailChooserPosition( -1 ),
           m_personalView ( false ),
           cmbDefaultEmail( 0 ),
           initializing ( false )
 {
 
         initializing = true;
 
         init();
         setEntry( entry );
         // cmbDefaultEmail = 0;
         // defaultEmailChooserPosition = -1;
 
         initializing = false;
 }
 
 ContactEditor::~ContactEditor() {
 }
 
@@ -172,97 +172,98 @@ void ContactEditor::init() {
         gl->addWidget( cmbChooserField1, 4, 0 );
         // Textfield for chooser 1.
         // Now use Widgetstack to contain the textfield and the default-email combo !
         m_widgetStack1 = new QWidgetStack( container );
         txtChooserField1 = new QLineEdit( m_widgetStack1 );
         m_widgetStack1 -> addWidget( txtChooserField1, TextField );
         gl->addWidget( m_widgetStack1, 4, 1 );
         m_widgetStack1 -> raiseWidget( TextField );
 
         // Chooser 2
         cmbChooserField2 = new QComboBox( false, container );
         QWhatsThis::add( cmbChooserField2, tr( "Press to select attribute to change" ) );
         cmbChooserField2->setMaximumWidth( 90 );
         gl->addWidget( cmbChooserField2, 5, 0 );
         // Textfield for chooser 2
         // Now use WidgetStack to contain the textfield and the default-email combo!
         m_widgetStack2 = new QWidgetStack( container );
         txtChooserField2 = new QLineEdit( m_widgetStack2 );
         m_widgetStack2 -> addWidget( txtChooserField2, TextField );
         gl->addWidget( m_widgetStack2, 5, 1 );
         m_widgetStack2 -> raiseWidget( TextField );
 
         // Chooser 3
         cmbChooserField3 = new QComboBox( false, container );
         QWhatsThis::add( cmbChooserField3, tr( "Press to select attribute to change" ) );
         cmbChooserField3->setMaximumWidth( 90 );
         gl->addWidget( cmbChooserField3, 6, 0 );
         // Textfield for chooser 2
         // Now use WidgetStack to contain the textfield and the default-email combo!
         m_widgetStack3 = new QWidgetStack( container );
         txtChooserField3 = new QLineEdit( m_widgetStack3 );
         m_widgetStack3 -> addWidget( txtChooserField3, TextField );
         gl->addWidget( m_widgetStack3, 6, 1 );
         m_widgetStack3 -> raiseWidget( TextField );
 
         l = new QLabel( tr( "File As" ), container );
         QWhatsThis::add( l, tr( "Press to select how to store the name (and howto show it in the listview)" ) );
         gl->addWidget( l, 7, 0 );
         cmbFileAs = new QComboBox( true, container );
         gl->addWidget( cmbFileAs, 7, 1 );
 
         labCat = new QLabel( tr( "Category" ), container );
         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 );
 
         vb = new QVBoxLayout( tabViewport );
 
         svAddress = new QScrollView( tabViewport );
         vb->addWidget( svAddress, 0, 0 );
         svAddress->setResizePolicy( QScrollView::AutoOneFit );
         svAddress->setFrameStyle( QFrame::NoFrame );
 
         container = new QWidget( svAddress->viewport() );
         svAddress->addChild( container );
 
         gl = new QGridLayout( container, 8, 3, 2, 4 ); // row 7 QSpacerItem
 
         cmbAddress = new QComboBox( false, container );
         cmbAddress->insertItem( tr( "Business" ) );
         cmbAddress->insertItem( tr( "Home" ) );
         gl->addMultiCellWidget( cmbAddress, 0, 0, 0, 1 );
 
         l = new QLabel( tr( "Address" ), container );
         gl->addWidget( l, 1, 0 );
         txtAddress = new QLineEdit( container );
         gl->addMultiCellWidget( txtAddress, 1, 1, 1, 2 );
 
         l = new QLabel( tr( "City" ), container );
         gl->addWidget( l, 2, 0 );
         txtCity = new QLineEdit( container );
         gl->addMultiCellWidget( txtCity, 2, 2, 1, 2 );
 
         l = new QLabel( tr( "State" ), container );
         gl->addWidget( l, 3, 0 );
         txtState = new QLineEdit( container );
         gl->addMultiCellWidget( txtState, 3, 3, 1, 2 );
 
         l = new QLabel( tr( "Zip Code" ), container );
         gl->addWidget( l, 4, 0 );
         txtZip = new QLineEdit( container );
         gl->addMultiCellWidget( txtZip, 4, 4, 1, 2 );
 
         l = new QLabel( tr( "Country" ), container );
         gl->addWidget( l, 5, 0 );
         cmbCountry = new QComboBox( true, container );
         cmbCountry->insertItem( "" );
         cmbCountry->insertItem( tr ( "United States" ) );
@@ -485,122 +486,122 @@ void ContactEditor::init() {
         // Chooser 4
         cmbChooserField4 = new QComboBox( false, container );
         cmbChooserField4->setMaximumWidth( 90 );
         gl->addWidget( cmbChooserField4, 6, 0 );
         // Textfield for chooser 2
         // Now use WidgetStack to contain the textfield and the default-email combo!
         m_widgetStack4 = new QWidgetStack( container );
         txtChooserField4 = new QLineEdit( m_widgetStack4 );
         m_widgetStack4 -> addWidget( txtChooserField4, TextField );
         gl->addMultiCellWidget( m_widgetStack4, 6, 6, 1, 2 );
         m_widgetStack4 -> raiseWidget( TextField );
 
         QSpacerItem *space = new QSpacerItem(1,1,
                                              QSizePolicy::Maximum,
                                              QSizePolicy::MinimumExpanding );
         gl->addItem( space, 7, 0 );
 
         tabMain->addTab( tabViewport, "home", tr( "Address" ) );
 
         tabViewport = new QWidget ( tabMain );
 
         vb = new QVBoxLayout( tabViewport );
 
         svDetails = new QScrollView( tabViewport );
         vb->addWidget( svDetails, 0, 0 );
         svDetails->setResizePolicy( QScrollView::AutoOneFit );
         svDetails->setFrameStyle( QFrame::NoFrame );
 
         container = new QWidget( svDetails->viewport() );
         svDetails->addChild( container );
 
         gl = new QGridLayout( container, 1, 2, 2, 4 );
 
         int counter = 0;
 
         // Birthday
         QHBox* hBox = new QHBox( container );
         l = new QLabel( tr("Birthday"), container );
         gl->addWidget( l, counter, 0 );
 
          QPopupMenu* m1 = new QPopupMenu( container );
          birthdayPicker = new DateBookMonth( m1, 0, true );
          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) ),
                  this, SLOT( slotBirthdayDateChanged(int,int,int) ) );
         connect( deleteButton, SIGNAL( clicked() ), this, SLOT( slotRemoveBirthday() ) );
 
         ++counter;
 
         // Anniversary
         hBox = new QHBox( container );
         l = new QLabel( tr("Anniversary"), container );
         gl->addWidget( l, counter, 0 );
 
          m1 = new QPopupMenu( container );
          anniversaryPicker = new DateBookMonth( m1, 0, true );
          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) ) );
         connect( deleteButton, SIGNAL( clicked() ), this, SLOT( slotRemoveAnniversary() ) );
 
         ++counter;
 
         // Gender
         l = new QLabel( tr("Gender"), container );
         gl->addWidget( l, counter, 0 );
         cmbGender = new QComboBox( container );
         cmbGender->insertItem( "", 0 );
         cmbGender->insertItem( tr("Male"), 1);
         cmbGender->insertItem( tr("Female"), 2);
         gl->addWidget( cmbGender, counter, 1 );
 
         ++counter;
 
         // Create Labels and lineedit fields for every dynamic entry
         QStringList::ConstIterator it = slDynamicEntries.begin();
         QMap<QString, int> mapStrToID = Opie::OPimContactFields::untrFieldsToId();
         QMap<int, QString> mapIdToStr = Opie::OPimContactFields::idToTrFields();
         for (i = counter; it != slDynamicEntries.end(); i++, ++it ) {
 
           if (((*it) == "Anniversary") ||
               ((*it) == "Birthday")|| ((*it) == "Gender")) continue;
 
           l = new QLabel( mapIdToStr[mapStrToID[*it]], container );
                 listName.append( l );
                 gl->addWidget( l, i, 0 );
                 QLineEdit *e = new QLineEdit( container );
                 listValue.append( e );
                 gl->addWidget( e, i, 1);
         }
         // Fill labels with names..
                 //loadFields();
 
 
         tabMain->addTab( tabViewport, "UtilsIcon", tr( "Details" ) );
 
         dlgNote = new QDialog( this, "Note Dialog", true );
         dlgNote->setCaption( tr("Enter Note") );
         QVBoxLayout *vbNote = new QVBoxLayout( dlgNote );
         txtNote = new QMultiLineEdit( dlgNote );
         vbNote->addWidget( txtNote );