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,282 +1,282 @@
 /**********************************************************************
 ** 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
 
   \brief QTableItem based class for showing slection of an entry
 */
 
 AbPickItem::AbPickItem( QTable *t ) :
         QTableItem(t, WhenCurrent, "?")
 {
 }
 
 QWidget *AbPickItem::createEditor() const
 {
         QComboBox* combo = new QComboBox( table()->viewport() );
         ( (AbPickItem*)this )->cb = combo;
         AbTable* t = static_cast<AbTable*>(table());
         QStringList c = t->choiceNames();
         int cur = 0;
         for (QStringList::ConstIterator it = c.begin(); it!=c.end(); ++it) {
                 if ( *it == text() )
                         cur = combo->count();
                 combo->insertItem(*it);
         }
         combo->setCurrentItem(cur);
         return combo;
 }
 
 void AbPickItem::setContentFromEditor( QWidget *w )
 {
         if ( w->inherits("QComboBox") )
                 setText( ( (QComboBox*)w )->currentText() );
         else
                 QTableItem::setContentFromEditor( w );
 }
 
 #endif
 
 /*!
   \class AbTable abtable.h
 
   \brief QTable based class for showing a list of entries
 */
 
 AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name )
         : QTable( parent, name ),
           lastSortCol( -1 ),
           asc( TRUE ),
           intFields( order ),
           enablePainting( true ),
           columnVisible( true ),
           countNested( 0 )
 {
                 //odebug << "C'tor start" << oendl;
         setSelectionMode( NoSelection );
         init();
         setSorting( false ); // The table should not sort by itself!
 
         connect( this, SIGNAL(clicked(int,int,int,const QPoint&)),
                  this, SLOT(itemClicked(int,int)) );
 
         // contactList.clear();
                 //odebug << "C'tor end" << oendl;
 }
 
 AbTable::~AbTable()
 {
 }
 
 void AbTable::init()
 {
         // :SX showChar = '\0';
         setNumRows( 0 );
         setNumCols( 2 );
 
         horizontalHeader()->setLabel( 0, tr( "Full Name" ));
         horizontalHeader()->setLabel( 1, tr( "Contact" ));
         setLeftMargin( 0 );
         verticalHeader()->hide();
         columnVisible = true;
 }
 
 void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
 {
         odebug << "AbTable::setContacts()" << oendl;
 
         clear();
         m_viewList = viewList;
 
         setPaintingEnabled( FALSE );
 
         setNumRows( m_viewList.count() );
 
 
         updateVisible();
 
         setPaintingEnabled( TRUE );
 
 }
 
 void AbTable::setOrderedList( const QValueList<int> ordered )
 {
         intFields = ordered;
 }
 
 
 bool AbTable::selectContact( int UID )
 {
         odebug << "AbTable::selectContact( " << UID << " )" << oendl;
         int rows = numRows();
         bool found = false;
 
         setPaintingEnabled( FALSE );
         odebug << "Search start" << oendl;
         for ( int r = 0; r < rows; ++r ) {
                 if ( m_viewList.uidAt( r ) == UID ){
                         ensureCellVisible( r, 0 );
                         setCurrentCell( r, 0 );
                         found = true;
                         break;
                 }
         }
         odebug << "Search end" << oendl;
 
         if ( !found ){
                 ensureCellVisible( 0,0 );
                 setCurrentCell( 0, 0 );
         }
 
         setPaintingEnabled( TRUE );
 
         return true;
 }
 
 
 void AbTable::columnClicked( int col )
 {
         odebug << "columClicked(" << col << ")" << oendl;
 
         if ( col == 0 ){
                 odebug << "Change sort order: " << asc << oendl;
                 asc = !asc;
                 emit signalSortOrderChanged( asc );
         }
 }
 
 void AbTable::resort()
 {
         owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl;
 
 }
 
 Opie::OPimContact AbTable::currentEntry()
 {
         return m_viewList[currentRow()];
 }
 
 int AbTable::currentEntry_UID()
 {
         return ( currentEntry().uid() );
 }
 
 void AbTable::clear()
 {
         odebug << "void AbTable::clear()" << oendl;
         // contactList.clear();
 
         setPaintingEnabled( FALSE );
         for ( int r = 0; r < numRows(); ++r ) {
                 for ( int c = 0; c < numCols(); ++c ) {
                         if ( cellWidget( r, c ) )
                                 clearCellWidget( r, c );
                         clearCell( r, c );
                 }
         }
         setNumRows( 0 );
         setPaintingEnabled( TRUE );
 }
 
 // Refresh updates column 2 if the contactsettings changed
 void AbTable::refresh()
 {
         owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl;
 
 #if 0
         int rows = numRows();
         AbTableItem *abi;
         ContactItem contactItem;
 
         setPaintingEnabled( FALSE );
         for ( int r = 0; r < rows; ++r ) {
                 abi = static_cast<AbTableItem*>( item(r, 0) );
                 contactItem = findContactContact( contactList[abi], r );
                 static_cast<AbTableItem*>( item(r, 1) )->setItem( contactItem.value, abi->text() );
                 if ( !contactItem.icon.isNull() ){
                         static_cast<AbTableItem*>( item(r, 1) )->
                                 setPixmap( contactItem.icon );
                 }else{
                         static_cast<AbTableItem*>( item(r, 1) )->
                                 setPixmap( QPixmap() );
                 }
         }
         resort();
         setPaintingEnabled( TRUE );
 
 #endif
 }
 
 void AbTable::keyPressEvent( QKeyEvent *e )
 {
         char key = toupper( e->ascii() );
 
@@ -376,385 +376,385 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
 // int AbTable::rowHeight( int ) const
 // {
 //     return 18;
 // }
 
 // int AbTable::rowPos( int row ) const
 // {
 //     return 18*row;
 // }
 
 // int AbTable::rowAt( int pos ) const
 // {
 //     return QMIN( pos/18, numRows()-1 );
 // }
 
 
 
 void AbTable::fitColumns()
 {
         odebug << "void AbTable::fitColumns()" << oendl;
         int contentsWidth = visibleWidth() / 2;
         // Fix to better value
         // contentsWidth = 130;
 
         setPaintingEnabled( FALSE );
 
         if ( columnVisible == false ){
                 showColumn(0);
                 columnVisible = true;
         }
 
                 //odebug << "Width: " << contentsWidth << oendl;
 
         setColumnWidth( 0, contentsWidth );
         adjustColumn(1);
         if ( columnWidth(1) < contentsWidth )
                 setColumnWidth( 1, contentsWidth );
 
         setPaintingEnabled( TRUE );
 }
 
 void AbTable::show()
 {
                 //odebug << "void AbTable::show()" << oendl;
         realignTable();
         QTable::show();
 }
 
 #if 0
 void AbTable::setChoiceNames( const QStringList& list)
 {
         choicenames = list;
         if ( choicenames.isEmpty() ) {
                 // hide pick column
                 setNumCols( 2 );
         } else {
                 // show pick column
                 setNumCols( 3 );
                 setColumnWidth( 2, fontMetrics().width(tr( "Pick" ))+8 );
                 horizontalHeader()->setLabel( 2, tr( "Pick" ));
         }
         fitColumns();
 }
 #endif
 
 void AbTable::itemClicked(int,int col)
 {
                 //odebug << "AbTable::itemClicked(int, col: " << col << ")" << oendl;
         if ( col == 2 ) {
                 return;
         } else {
                         //odebug << "Emitting signalSwitch()" << oendl;
                 emit signalSwitch();
         }
 }
 
 #if 0
 QStringList AbTable::choiceNames() const
 {
         return choicenames;
 }
 
 #endif
 void AbTable::setChoiceSelection( const QValueList<int>& list )
 {
         intFields = list;
 }
 
 QStringList AbTable::choiceSelection(int /*index*/) const
 {
         QStringList r;
         /* ######
 
         QString selname = choicenames.at(index);
         for (each row) {
         Opie::OPimContact *c = contactForRow(row);
         if ( text(row,2) == selname ) {
         r.append(c->email);
         }
         }
 
         */
         return r;
 }
 
 
 void AbTable::updateVisible()
 {
                 //odebug << "void AbTable::updateVisible()" << oendl;
 
         int visible,
                 totalRows,
                 row,
                 selectedRow = 0;
 
         visible = 0;
 
         setPaintingEnabled( FALSE );
 
         realignTable();
 
         totalRows = numRows();
         for ( row = 0; row < totalRows; row++ ) {
                 if ( rowHeight(row) == 0 ) {
                         showRow( row );
                         adjustRow( row );
                         if ( isSelected( row,0 ) || isSelected( row,1 ) )
                                 selectedRow = row;
                 }
                 visible++;
         }
 
         if ( selectedRow )
                 setCurrentCell( selectedRow, 0 );
 
         if ( !visible )
                 setCurrentCell( -1, 0 );
 
         setPaintingEnabled( TRUE );
 }
 
 
 void AbTable::setPaintingEnabled( bool e )
 {
                 //odebug << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: "
                 //                                      << countNested << oendl;
 
         if ( e ) {
                 if ( countNested > 0 )
                         --countNested;
                 if ( ! countNested ){
                         setUpdatesEnabled( true );
                         enablePainting = true;
                         rowHeightChanged( 0 );
                         viewport()->update();
                 }
         } else {
                 ++countNested;
                 enablePainting = false;
                 setUpdatesEnabled( false );
         }
                 //odebug << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: "
                 //                                      << countNested << oendl;
 }
 
 void AbTable::viewportPaintEvent( QPaintEvent* e ) {
                 //odebug << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> "
                 //                                      << enablePainting << oendl;
         if ( enablePainting )
                 QTable::viewportPaintEvent( e );
 }
 
 void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool ) {
     const QColorGroup &cg = colorGroup();
 
     p->save();
 
                 //odebug << "Paint row: " << row << oendl;
 
     Opie::OPimContact act_contact = m_viewList[row];
 
     // Paint alternating background bars
     if (  (row % 2 ) == 0 ) {
         p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) );
         p->setPen( QPen( cg.text() ) );
     }
     else {
         p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Background ) );
         p->setPen( QPen( cg.buttonText() ) );
     }
 
     QFont f = p->font();
     QFontMetrics fm(f);
 
     int marg = 2;
     int x = 0;
     int y = ( cr.height() - 14 ) / 2;
 
     QString nameText    = act_contact.fileAs();
 
     switch( col ){
             case 0:
                     p->drawText( x + marg,2 + fm.ascent(), nameText );
             break;
             case 1:{
 
                     ContactItem contactItem = findContactContact( act_contact, 0 );
                     QPixmap contactPic  = contactItem.icon; /* pixmap( row, col ); */
                     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,372 +1,376 @@
 /**********************************************************************
 ** 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 ) );
                 currentFont = new QFont (m_abView->font());
                 // abList->resizeRows(currentFont->pixelSize() + 7); :SX
                 // abList->resizeRows();
                 break;
         case 1:
                 m_abView->setFont( *defaultFont );
                 currentFont = new QFont (m_abView->font());
         //      // abList->resizeRows(currentFont->pixelSize() + 7);
         //      abList->resizeRows();
                 break;
         case 2:
                 m_abView->setFont( QFont( defaultFont->family(), defaultFont->pointSize() + 2 ) );
                 currentFont = new QFont (m_abView->font());
         //      //abList->resizeRows(currentFont->pixelSize() + 7);
         //      abList->resizeRows();
                 break;
         }
 }
 
 
 
 void AddressbookWindow::importvCard() {
         QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
         if(!str.isEmpty() ){
                 setDocument((const QString&) str );
         }
 
 }
 void AddressbookWindow::exportvCard()
 {
         odebug << "void AddressbookWindow::exportvCard()" << oendl;
         QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this );
         if( !filename.isEmpty() &&  ( filename[filename.length()-1] != '/' ) ){
                 odebug << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl;
                 Opie::OPimContact curCont = m_abView->currentEntry();
                 if ( !curCont.isEmpty() ){
                         Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                                                 filename );
                         Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook_exp", QString::null , vcard_backend, true );
                         if ( access ){
                                 access->add( curCont );
                                 access->save();
                         }
                         delete access;
                 }else
                         QMessageBox::critical( 0, "Export VCard",
                            QString( tr( "You have to select a contact !") ) );
 
         }else
                 QMessageBox::critical( 0, "Export VCard",
                                        QString( tr( "You have to set a filename !") ) );
 }
 
 void AddressbookWindow::setDocument( const QString &filename )
 {
         odebug << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
 
         // Switch to default backend. This should avoid to import into
         // the personal database accidently.
         if ( m_actionPersonal->isOn() ){
                 m_actionPersonal->setOn( false );
                 slotPersonalView();
         }
 
         if ( filename.find(".vcf") != int(filename.length()) - 4 ){
 
 
 
                 switch( QMessageBox::information( this, tr ( "Right file type ?" ),
                                                   tr( "The selected file \n does not end with \".vcf\".\n Do you really want to open it?" ),
                                                   tr( "&Yes" ), tr( "&No" ), QString::null,
                                                   0,      // Enter == button 0
                                                   2 ) ) { // Escape == button 2
                 case 0:
                         odebug << "YES clicked" << oendl;
                         break;
                 case 1:
                         odebug << "NO clicked" << oendl;
                         return;
                         break;
                 }
         }
 
         Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                          filename );
         Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
         Opie::OPimContactAccess::List allList = access->allRecords();
         odebug << "Found number of contacts in File: " << allList.count() << oendl;
 
         if ( !allList.count() ) {
                 QMessageBox::information( this, "Import VCard",
                                           "It was impossible to import\nthe VCard.\n"
                                           "The VCard may be corrupted!" );
         }
 
         bool doAsk = true;
         Opie::OPimContactAccess::List::Iterator it;
         for ( it = allList.begin(); it != allList.end(); ++it ){
                 odebug << "Adding Contact from: " << (*it).fullName() << oendl;
                 if ( doAsk ){
                         switch( QMessageBox::information( this, tr ( "Add Contact?" ),
                                                           tr( "Do you really want add contact for \n%1?" )
                                                           .arg( (*it).fullName().latin1() ),
                                                           tr( "&Yes" ), tr( "&No" ), tr( "&All Yes"),
                                                           0,      // Enter == button 0
                                                           2 ) ) { // Escape == button 2
                         case 0:
                                 odebug << "YES clicked" << oendl;
                                 m_abView->addEntry( *it );
                                 break;
                         case 1:
                                 odebug << "NO clicked" << oendl;
                                 break;
                         case 2:
                                 odebug << "YesAll clicked" << oendl;
                                 doAsk = false;
                                 break;
                         }
                 }else
                         m_abView->addEntry( *it );
 
         }
 
         delete access;
 }
 
 void AddressbookWindow::resizeEvent( QResizeEvent *e )
 {
         QMainWindow::resizeEvent( e );
 
 
 }
 
 AddressbookWindow::~AddressbookWindow()
 {
         ToolBarDock dock;
         int dummy;
         bool bDummy;
         getLocation ( listTools, dock, dummy, bDummy, dummy );
         m_config.setToolBarDock( dock );
         m_config.save();
 }
 
 int AddressbookWindow::create()
 {
     return 0;
 }
 
 bool AddressbookWindow::remove( int /*uid*/ )
 {
     return false;
 }
 
 void AddressbookWindow::beam( int /*uid*/ )
 {
 }
 
 void AddressbookWindow::show( int /*uid*/ )
 {
 }
 
 void AddressbookWindow::edit( int /*uid*/ )
 {
 }
 
 void AddressbookWindow::add( const Opie::OPimRecord& )
 {
 }
 
 void AddressbookWindow::slotItemNew()
 {
         Opie::OPimContact cnt;
         if( !syncing ) {
                 editEntry( NewEntry );
         } else {
                 QMessageBox::warning(this, tr("Contacts"),
                                      tr("Can not edit data, currently syncing"));
         }
 }
 
 void AddressbookWindow::slotItemEdit()
 {
         if(!syncing) {
                 if (m_actionPersonal->isOn()) {
                         editPersonal();
                 } else {
                         editEntry( EditEntry );
                 }
         } else {
                 QMessageBox::warning( this, tr("Contacts"),
                                       tr("Can not edit data, currently syncing") );
         }
 }
 
 void AddressbookWindow::slotItemDuplicate()
 {
     if(!syncing)
     {
         Opie::OPimContact entry = m_abView->currentEntry();
         entry.assignUid();
         m_abView->addEntry( entry );
         m_abView->setCurrentUid( entry.uid() );
     }
     else
     {
         QMessageBox::warning( this, tr("Contacts"),
                               tr("Can not edit data, currently syncing") );
     }
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,154 +1,153 @@
 #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 );
         }
 }
 
 void ConfigDlg::slotItemRemove()
 {
         odebug << "void ConfigDlg::slotItemRemove()" << oendl;
 
         int i = fieldListBox->currentItem();
         if ( i > 0 ) {
                 fieldListBox->removeItem( i );
         }
 }
 
 void ConfigDlg::setConfig( const AbConfig& cnf )
 {
         m_config = cnf;
 
         m_useRegExp->setChecked( m_config.useRegExp() );
         m_useWildCard->setChecked( m_config.useWildCards() );
         m_useQtMail->setChecked( m_config.useQtMail() );
         m_useOpieMail->setChecked( m_config.useOpieMail() );
         m_useCaseSensitive->setChecked( m_config.beCaseSensitive() );
 
         switch( m_config.fontSize() ){
         case 0:
                 m_smallFont->setChecked( true );
                 m_normalFont->setChecked( false );
                 m_largeFont->setChecked( false );
                 break;
         case 1:
                 m_smallFont->setChecked( false );
                 m_normalFont->setChecked( true );
                 m_largeFont->setChecked( false );
                 break;
         case 2:
                 m_smallFont->setChecked( false );
                 m_normalFont->setChecked( false );
                 m_largeFont->setChecked( true );
                 break;
         }
 
         for( uint i = 0; i < m_config.orderList().count(); i++ ) {
                 fieldListBox -> insertItem ( m_mapIDToStr[ m_config.orderList()[i] ] );
         }
 
         m_fixedBars->setChecked( m_config.fixedBars() );
         m_moveBars->setChecked( !m_config.fixedBars() );
 }
 
 AbConfig ConfigDlg::getConfig()
 {
         m_config.setUseRegExp( m_useRegExp->isOn() );
         m_config.setUseWildCards( m_useWildCard->isOn() );
         m_config.setUseQtMail( m_useQtMail->isOn() );
         m_config.setUseOpieMail( m_useOpieMail->isOn() );
         m_config.setBeCaseSensitive( m_useCaseSensitive->isChecked() );
 
         if ( m_smallFont->isChecked() )
                 m_config.setFontSize( 0 );
         if ( m_normalFont->isChecked() )
                 m_config.setFontSize( 1 );
         if ( m_largeFont->isChecked() )
                 m_config.setFontSize( 2 );
 
         QValueList<int> orderlist;
         for( int i = 0; i < (int)fieldListBox->count(); i++ ) {
                 orderlist.append( m_mapStrToID[ fieldListBox->text(i) ] );
         }
         m_config.setOrderList( orderlist );
 
         m_config.setFixedBars( m_fixedBars->isChecked() );
 
         return m_config;
 }
 
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,814 +1,815 @@
 /*
  * 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() {
 }
 
 void ContactEditor::init() {
         odebug << "init() START" << oendl;
 
         uint i = 0;
 
         QStringList trlChooserNames;
 
         for (i = 0; i <= 6; i++) {
                 slHomeAddress.append( "" );
                 slBusinessAddress.append( "" );
         }
 
         trlChooserNames   = Opie::OPimContactFields::trphonefields( false );
         slChooserNames    = Opie::OPimContactFields::untrphonefields( false );
         slDynamicEntries  = Opie::OPimContactFields::untrdetailsfields( false );
         trlDynamicEntries = Opie::OPimContactFields::trdetailsfields( false );
 
         // Ok, we have to remove elements from the list of dynamic entries
         // which are now stored in special (not dynamic) widgets..
         // Otherwise we will get problems with field assignments! (se)
         slDynamicEntries.remove("Anniversary");
         slDynamicEntries.remove("Birthday");
         slDynamicEntries.remove("Gender");
 
         // The same with translated fields.. But I will
         // use the translation map to avoid mismatches..
         QMap<int, QString> translMap = Opie::OPimContactFields::idToTrFields();
         trlDynamicEntries.remove( translMap[Qtopia::Anniversary] );
         trlDynamicEntries.remove( translMap[Qtopia::Birthday] );
         trlDynamicEntries.remove( translMap[Qtopia::Gender] );
 
         // Last Check to be sure..
         assert( slDynamicEntries.count() == trlDynamicEntries.count() );
         assert( slChooserNames.count() == trlChooserNames.count() );
 
         for (i = 0; i < slChooserNames.count(); i++)
           slChooserValues.append("");
 
 
         QVBoxLayout *vb = new QVBoxLayout( this );
 
         tabMain = new Opie::Ui::OTabWidget( this );
         vb->addWidget( tabMain );
 
         m_generalWidget = new QWidget ( tabMain );
 
         vb = new QVBoxLayout( m_generalWidget );
 
         svGeneral = new QScrollView( m_generalWidget );
         vb->addWidget( svGeneral, 0, 0 );
         svGeneral->setResizePolicy( QScrollView::AutoOneFit );
         // svGeneral->setHScrollBarMode( QScrollView::AlwaysOff );
         // svGeneral->setVScrollBarMode( QScrollView::AlwaysOff );
         svGeneral->setFrameStyle( QFrame::NoFrame );
 
         QWidget *container = new QWidget( svGeneral->viewport() );
         svGeneral->addChild( container );
 
         QGridLayout *gl = new QGridLayout( container, 10, 2, 2, 4 );
 
         btnFullName = new QPushButton( tr( "Full Name..." ), container );
         QWhatsThis::add( btnFullName, tr( "Press to enter last- middle and firstname" ) );
         gl->addWidget( btnFullName, 0, 0 );
         txtFullName = new ABOOK::NameLineEdit( container );
         QWhatsThis::add( txtFullName, tr( "Enter fullname directly ! If you have a lastname with multiple words ( for instance \"de la Guerra\"), please write <lastname>,<firstnames> like this: \"de la Guerra, Carlos Pedro\"" ) );
         gl->addWidget( txtFullName, 0, 1 );
 
         QLabel *l = new QLabel( tr( "Job Title" ), container );
         QWhatsThis::add( l, tr( "The jobtitle.." ) );
         gl->addWidget( l, 1, 0 );
         txtJobTitle = new QLineEdit( container );
         QWhatsThis::add( txtJobTitle, tr( "The jobtitle.." ) );
         gl->addWidget( txtJobTitle, 1, 1 );
 
         l = new QLabel( tr("Suffix"), container );
         QWhatsThis::add( l, tr( "Something like \"jr.\".." ) );
         gl->addWidget( l, 2, 0 );
         txtSuffix = new QLineEdit( container );
         QWhatsThis::add( txtSuffix, tr( "Something like \"jr.\".." ) );
         gl->addWidget( txtSuffix, 2, 1 );
 
         l = new QLabel( tr( "Organization" ), container );
         QWhatsThis::add( l, tr( "The working place of the contact" ) );
         gl->addWidget( l, 3, 0 );
         txtOrganization = new QLineEdit( container );
         QWhatsThis::add( txtOrganization, tr( "The working place of the contact" ) );
         gl->addWidget( txtOrganization, 3, 1 );
 
         // Chooser 1
         cmbChooserField1 = new QComboBox( false, container );
         QWhatsThis::add( cmbChooserField1, tr( "Press to select attribute to change" ) );
         cmbChooserField1->setMaximumWidth( 90 );
         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" ) );
         cmbCountry->insertItem( tr ( "United Kingdom" ) );
         cmbCountry->insertItem( tr ( "Afghanistan" ) );
         cmbCountry->insertItem( tr ( "Albania" ) );
         cmbCountry->insertItem( tr ( "Algeria" ) );
         cmbCountry->insertItem( tr ( "American Samoa" ) );
         cmbCountry->insertItem( tr ( "Andorra" ) );
         cmbCountry->insertItem( tr ( "Angola" ) );
         cmbCountry->insertItem( tr ( "Anguilla" ) );
         cmbCountry->insertItem( tr ( "Antarctica" ) );
         cmbCountry->insertItem( tr ( "Argentina" ) );
         cmbCountry->insertItem( tr ( "Armenia" ) );
         cmbCountry->insertItem( tr ( "Aruba" ) );
         cmbCountry->insertItem( tr ( "Australia" ) );
         cmbCountry->insertItem( tr ( "Austria" ) );
         cmbCountry->insertItem( tr ( "Azerbaijan" ) );
         cmbCountry->insertItem( tr ( "Bahamas" ) );
         cmbCountry->insertItem( tr ( "Bahrain" ) );
         cmbCountry->insertItem( tr ( "Bangladesh" ) );
         cmbCountry->insertItem( tr ( "Barbados" ) );
         cmbCountry->insertItem( tr ( "Belarus" ) );
         cmbCountry->insertItem( tr ( "Belgium" ) );
         cmbCountry->insertItem( tr ( "Belize" ) );
         cmbCountry->insertItem( tr ( "Benin" ) );
         cmbCountry->insertItem( tr ( "Bermuda" ) );
         cmbCountry->insertItem( tr ( "Bhutan" ) );
         cmbCountry->insertItem( tr ( "Bolivia" ) );
         cmbCountry->insertItem( tr ( "Botswana" ) );
         cmbCountry->insertItem( tr ( "Bouvet Island" ) );
         cmbCountry->insertItem( tr ( "Brazil" ) );
         cmbCountry->insertItem( tr ( "Brunei Darussalam" ) );
         cmbCountry->insertItem( tr ( "Bulgaria" ) );
         cmbCountry->insertItem( tr ( "Burkina Faso" ) );
         cmbCountry->insertItem( tr ( "Burundi" ) );
         cmbCountry->insertItem( tr ( "Cambodia" ) );
         cmbCountry->insertItem( tr ( "Cameroon" ) );
         cmbCountry->insertItem( tr ( "Canada" ) );
         cmbCountry->insertItem( tr ( "Cape Verde" ) );
         cmbCountry->insertItem( tr ( "Cayman Islands" ) );
         cmbCountry->insertItem( tr ( "Chad" ) );
         cmbCountry->insertItem( tr ( "Chile" ) );
         cmbCountry->insertItem( tr ( "China" ) );
         cmbCountry->insertItem( tr ( "Christmas Island" ) );
         cmbCountry->insertItem( tr ( "Colombia" ) );
         cmbCountry->insertItem( tr ( "Comoros" ) );
         cmbCountry->insertItem( tr ( "Congo" ) );
         cmbCountry->insertItem( tr ( "Cook Island" ) );
         cmbCountry->insertItem( tr ( "Costa Rica" ) );
         cmbCountry->insertItem( tr ( "Cote d'Ivoire" ) );
         cmbCountry->insertItem( tr ( "Croatia" ) );
         cmbCountry->insertItem( tr ( "Cuba" ) );
         cmbCountry->insertItem( tr ( "Cyprus" ) );
         cmbCountry->insertItem( tr ( "Czech Republic" ) );
         cmbCountry->insertItem( tr ( "Denmark" ) );
         cmbCountry->insertItem( tr ( "Djibouti" ) );
         cmbCountry->insertItem( tr ( "Dominica" ) );
         cmbCountry->insertItem( tr ( "Dominican Republic" ) );
         cmbCountry->insertItem( tr ( "East Timor" ) );
         cmbCountry->insertItem( tr ( "Ecuador" ) );
         cmbCountry->insertItem( tr ( "Egypt" ) );
         cmbCountry->insertItem( tr ( "El Salvador" ) );
         cmbCountry->insertItem( tr ( "Equatorial Guinea" ) );
         cmbCountry->insertItem( tr ( "Eritrea" ) );
         cmbCountry->insertItem( tr ( "Estonia" ) );
         cmbCountry->insertItem( tr ( "Ethiopia" ) );
         cmbCountry->insertItem( tr ( "Falkland Islands" ) );
         cmbCountry->insertItem( tr ( "Faroe Islands" ) );
         cmbCountry->insertItem( tr ( "Fiji" ) );
         cmbCountry->insertItem( tr ( "Finland" ) );
         cmbCountry->insertItem( tr ( "France" ) );
         cmbCountry->insertItem( tr ( "French Guiana" ) );
         cmbCountry->insertItem( tr ( "French Polynesia" ) );
         cmbCountry->insertItem( tr ( "Gabon" ) );
         cmbCountry->insertItem( tr ( "Gambia" ) );
         cmbCountry->insertItem( tr ( "Georgia" ) );
         cmbCountry->insertItem( tr ( "Germany" ) );
         cmbCountry->insertItem( tr ( "Ghana" ) );
         cmbCountry->insertItem( tr ( "Gibraltar" ) );
         cmbCountry->insertItem( tr ( "Greece" ) );
         cmbCountry->insertItem( tr ( "Greenland" ) );
         cmbCountry->insertItem( tr ( "Grenada" ) );
         cmbCountry->insertItem( tr ( "Guadeloupe" ) );
         cmbCountry->insertItem( tr ( "Guam" ) );
         cmbCountry->insertItem( tr ( "Guatemala" ) );
         cmbCountry->insertItem( tr ( "Guinea" ) );
         cmbCountry->insertItem( tr ( "Guinea-Bissau" ) );
         cmbCountry->insertItem( tr ( "Guyana" ) );
         cmbCountry->insertItem( tr ( "Haiti" ) );
         cmbCountry->insertItem( tr ( "Holy See" ) );
         cmbCountry->insertItem( tr ( "Honduras" ) );
         cmbCountry->insertItem( tr ( "Hong Kong" ) );
         cmbCountry->insertItem( tr ( "Hungary" ) );
         cmbCountry->insertItem( tr ( "Iceland" ) );
         cmbCountry->insertItem( tr ( "India" ) );
         cmbCountry->insertItem( tr ( "Indonesia" ) );
         cmbCountry->insertItem( tr ( "Ireland" ) );
         cmbCountry->insertItem( tr ( "Israel" ) );
         cmbCountry->insertItem( tr ( "Italy" ) );
         cmbCountry->insertItem( tr ( "Jamaica" ) );
         cmbCountry->insertItem( tr ( "Japan" ) );
         cmbCountry->insertItem( tr ( "Jordan" ) );
         cmbCountry->insertItem( tr ( "Kazakhstan" ) );
         cmbCountry->insertItem( tr ( "Kenya" ) );
         cmbCountry->insertItem( tr ( "Kiribati" ) );
         cmbCountry->insertItem( tr ( "Korea" ) );
         cmbCountry->insertItem( tr ( "Kuwait" ) );
         cmbCountry->insertItem( tr ( "Kyrgyzstan" ) );
         cmbCountry->insertItem( tr ( "Laos" ) );
         cmbCountry->insertItem( tr ( "Latvia" ) );
         cmbCountry->insertItem( tr ( "Lebanon" ) );
         cmbCountry->insertItem( tr ( "Lesotho" ) );
         cmbCountry->insertItem( tr ( "Liberia" ) );
         cmbCountry->insertItem( tr ( "Liechtenstein" ) );
         cmbCountry->insertItem( tr ( "Lithuania" ) );
         cmbCountry->insertItem( tr ( "Luxembourg" ) );
         cmbCountry->insertItem( tr ( "Macau" ) );
         cmbCountry->insertItem( tr ( "Macedonia" ) );
         cmbCountry->insertItem( tr ( "Madagascar" ) );
         cmbCountry->insertItem( tr ( "Malawi" ) );
         cmbCountry->insertItem( tr ( "Malaysia" ) );
         cmbCountry->insertItem( tr ( "Maldives" ) );
         cmbCountry->insertItem( tr ( "Mali" ) );
         cmbCountry->insertItem( tr ( "Malta" ) );
         cmbCountry->insertItem( tr ( "Martinique" ) );
         cmbCountry->insertItem( tr ( "Mauritania" ) );
         cmbCountry->insertItem( tr ( "Mauritius" ) );
         cmbCountry->insertItem( tr ( "Mayotte" ) );
         cmbCountry->insertItem( tr ( "Mexico" ) );
         cmbCountry->insertItem( tr ( "Micronesia" ) );
         cmbCountry->insertItem( tr ( "Moldova" ) );
         cmbCountry->insertItem( tr ( "Monaco" ) );
         cmbCountry->insertItem( tr ( "Mongolia" ) );
         cmbCountry->insertItem( tr ( "Montserrat" ) );
         cmbCountry->insertItem( tr ( "Morocco" ) );
         cmbCountry->insertItem( tr ( "Mozambique" ) );
         cmbCountry->insertItem( tr ( "Myanmar" ) );
         cmbCountry->insertItem( tr ( "Namibia" ) );
         cmbCountry->insertItem( tr ( "Nauru" ) );
         cmbCountry->insertItem( tr ( "Nepal" ) );
         cmbCountry->insertItem( tr ( "Netherlands" ) );
         cmbCountry->insertItem( tr ( "New Caledonia" ) );
         cmbCountry->insertItem( tr ( "New Zealand" ) );
         cmbCountry->insertItem( tr ( "Nicaragua" ) );
         cmbCountry->insertItem( tr ( "Niger" ) );
         cmbCountry->insertItem( tr ( "Nigeria" ) );
         cmbCountry->insertItem( tr ( "Niue" ) );
         cmbCountry->insertItem( tr ( "Norway" ) );
         cmbCountry->insertItem( tr ( "Oman" ) );
         cmbCountry->insertItem( tr ( "Pakistan" ) );
         cmbCountry->insertItem( tr ( "Palau" ) );
         cmbCountry->insertItem( tr ( "Palestinian Sovereign Areas" ) );
         cmbCountry->insertItem( tr ( "Panama" ) );
         cmbCountry->insertItem( tr ( "Papua New Guinea" ) );
         cmbCountry->insertItem( tr ( "Paraguay" ) );
         cmbCountry->insertItem( tr ( "Peru" ) );
         cmbCountry->insertItem( tr ( "Philippines" ) );
         cmbCountry->insertItem( tr ( "Pitcairn Islands" ) );
         cmbCountry->insertItem( tr ( "Poland" ) );
         cmbCountry->insertItem( tr ( "Portugal" ) );
         cmbCountry->insertItem( tr ( "Puerto Rico" ) );
         cmbCountry->insertItem( tr ( "Qatar" ) );
         cmbCountry->insertItem( tr ( "Reunion" ) );
         cmbCountry->insertItem( tr ( "Romania" ) );
         cmbCountry->insertItem( tr ( "Russia" ) );
         cmbCountry->insertItem( tr ( "Rwanda" ) );
         cmbCountry->insertItem( tr ( "Saint Lucia" ) );
         cmbCountry->insertItem( tr ( "Samoa" ) );
         cmbCountry->insertItem( tr ( "San Marino" ) );
         cmbCountry->insertItem( tr ( "Saudi Arabia" ) );
         cmbCountry->insertItem( tr ( "Senegal" ) );
         cmbCountry->insertItem( tr ( "Seychelles" ) );
         cmbCountry->insertItem( tr ( "Sierra Leone" ) );
         cmbCountry->insertItem( tr ( "Singapore" ) );
         cmbCountry->insertItem( tr ( "Slovakia" ) );
         cmbCountry->insertItem( tr ( "Slovenia" ) );
         cmbCountry->insertItem( tr ( "Solomon Islands" ) );
         cmbCountry->insertItem( tr ( "Somalia" ) );
         cmbCountry->insertItem( tr ( "South Africa" ) );
         cmbCountry->insertItem( tr ( "Spain" ) );
         cmbCountry->insertItem( tr ( "Sri Lanka" ) );
         cmbCountry->insertItem( tr ( "St. Helena" ) );
         cmbCountry->insertItem( tr ( "Sudan" ) );
         cmbCountry->insertItem( tr ( "Suriname" ) );
         cmbCountry->insertItem( tr ( "Swaziland" ) );
         cmbCountry->insertItem( tr ( "Sweden" ) );
         cmbCountry->insertItem( tr ( "Switzerland" ) );
         cmbCountry->insertItem( tr ( "Taiwan" ) );
         cmbCountry->insertItem( tr ( "Tajikistan" ) );
         cmbCountry->insertItem( tr ( "Tanzania" ) );
         cmbCountry->insertItem( tr ( "Thailand" ) );
         cmbCountry->insertItem( tr ( "Togo" ) );
         cmbCountry->insertItem( tr ( "Tokelau" ) );
         cmbCountry->insertItem( tr ( "Tonga" ) );
         cmbCountry->insertItem( tr ( "Tunisia" ) );
         cmbCountry->insertItem( tr ( "Turkey" ) );
         cmbCountry->insertItem( tr ( "Turkmenistan" ) );
         cmbCountry->insertItem( tr ( "Tuvalu" ) );
         cmbCountry->insertItem( tr ( "Uganda" ) );
         cmbCountry->insertItem( tr ( "Ukraine" ) );
         cmbCountry->insertItem( tr ( "Uruguay" ) );
         cmbCountry->insertItem( tr ( "Uzbekistan" ) );
         cmbCountry->insertItem( tr ( "Vanuatu" ) );
         cmbCountry->insertItem( tr ( "Venezuela" ) );
         cmbCountry->insertItem( tr ( "Vietnam" ) );
         cmbCountry->insertItem( tr ( "Virgin Islands" ) );
         cmbCountry->insertItem( tr ( "Western Sahara" ) );
         cmbCountry->insertItem( tr ( "Yemen" ) );
         cmbCountry->insertItem( tr ( "Yugoslavia" ) );
         cmbCountry->insertItem( tr ( "Zambia" ) );
         cmbCountry->insertItem( tr ( "Zimbabwe" ) );
         if (cmbCountry->listBox()!=0)
            cmbCountry->listBox()->sort();
 
         cmbCountry->setMaximumWidth( 135 );
 
         gl->addMultiCellWidget( cmbCountry, 5, 5, 1, 2 );
 
         // 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 );
         connect( btnNote, SIGNAL(clicked()), this, SLOT(slotNote()) );
 
         dlgName = new QDialog( this, "Name Dialog", true );
         dlgName->setCaption( tr("Edit Name") );
         gl = new QGridLayout( dlgName, 5, 2, 2, 3 );
 
         l = new QLabel( tr("First Name"), dlgName );
         gl->addWidget( l, 0, 0 );
         txtFirstName = new ABOOK::NameLineEdit( dlgName );
         gl->addWidget( txtFirstName, 0, 1 );
 
         l = new QLabel( tr("Middle Name"), dlgName );
         gl->addWidget( l, 1, 0 );
         txtMiddleName = new ABOOK::NameLineEdit( dlgName );
         gl->addWidget( txtMiddleName, 1, 1 );
 
         l = new QLabel( tr("Last Name"), dlgName );
         gl->addWidget( l, 2, 0 );
         txtLastName = new ABOOK::NameLineEdit( dlgName );
         gl->addWidget( txtLastName, 2, 1 );
 
         // l = new QLabel( tr("Suffix"), dlgName );
         // gl->addWidget( l, 3, 0 );
         // txtSuffix = new QLineEdit( dlgName );
         // gl->addWidget( txtSuffix, 3, 1 );
         space = new QSpacerItem(1,1,
                                 QSizePolicy::Maximum,
                                 QSizePolicy::MinimumExpanding );
         gl->addItem( space, 4,  0 );
 
         cmbChooserField1->insertStringList( trlChooserNames );
         cmbChooserField2->insertStringList( trlChooserNames );
         cmbChooserField3->insertStringList( trlChooserNames );
         cmbChooserField4->insertStringList( trlChooserNames );
 
          cmbChooserField1->setCurrentItem( 0 );
          cmbChooserField2->setCurrentItem( 1 );
          cmbChooserField3->setCurrentItem( 2 );
 
         connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) );
 
         connect( txtFullName, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotFullNameChange(const QString&)) );
         connect( txtSuffix, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotSuffixChange(const QString&)) );
          connect( txtOrganization, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotOrganizationChange(const QString&)) );
         connect( txtChooserField1, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotChooser1Change(const QString&)) );
         connect( txtChooserField2, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotChooser2Change(const QString&)) );
         connect( txtChooserField3, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotChooser3Change(const QString&)) );
         connect( txtChooserField4, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotChooser4Change(const QString&)) );
         connect( txtAddress, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotAddressChange(const QString&)) );
         connect( txtCity, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotCityChange(const QString&)) );
         connect( txtState, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotStateChange(const QString&)) );
         connect( txtZip, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotZipChange(const QString&)) );
         connect( cmbCountry, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotCountryChange(const QString&)) );
         connect( cmbCountry, SIGNAL(activated(const QString&)),
                  this, SLOT(slotCountryChange(const QString&)) );
         connect( cmbChooserField1, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser1Change(int)) );
         connect( cmbChooserField2, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser2Change(int)) );
         connect( cmbChooserField3, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser3Change(int)) );
         connect( cmbChooserField4, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser4Change(int)) );
         connect( cmbAddress, SIGNAL(activated(int)),
                  this, SLOT(slotAddressTypeChange(int)) );
 
         new QPEDialogListener(this);
 
         setPersonalView ( m_personalView );
 
         odebug << "init() END" << oendl;
 }
 
 void ContactEditor::defaultEmailChanged(int i){
         odebug << "defaultEmailChanged" << oendl;
 
         // was sollte das ? (se)
         // int index = cmbChooserField1->currentItem();
         // slChooserValues[index] = cmbDefaultEmail->text(i);
 
         defaultEmail = cmbDefaultEmail->text(i);
         odebug << "Changed to: " << defaultEmail << oendl;
 
 }
 
 void ContactEditor::populateDefaultEmailCmb(){
 
         // if the default-email combo was not selected and therfore not created
         // we get a lot of trouble.. Therfore create an invisible one..
         if ( !cmbDefaultEmail ){
                 cmbDefaultEmail = new QComboBox(this);
                 cmbDefaultEmail -> hide();
         }
         cmbDefaultEmail->clear();
         cmbDefaultEmail->insertStringList( emails );
         // cmbDefaultEmail->show();
 
         // Select default email in combo..
         bool found = false;
         for ( int i = 0; i < cmbDefaultEmail->count(); i++){
                 odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i )
                                                         << "< defaultEmail >" << defaultEmail << "<" << oendl;
 
                 if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
                         cmbDefaultEmail->setCurrentItem( i );
                         odebug << "set" << oendl;
                         found = true;
                 }
         }
 
         // If the current default email is not found in the list, we choose the
         // first one..
         if ( !found )
                 defaultEmail = cmbDefaultEmail->text(0);
 }
 
 // Called when any combobox was changed.
 // "true" returned if the change was chandled by this function, else it should
 // be handled by something else..
 bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) {
         QString type = slChooserNames[index];
         odebug << "ContactEditor::cmbChooserChange -> Type: " << type
                                                 << ", WidgetPos: " << widgetPos << oendl;
 
         if ( !initializing )
                 contactfields.setFieldOrder( widgetPos-1, index );
 
         // Create and connect combobox for selecting the default email
         if ( type == "Default Email"){
                 odebug << "Choosing default-email (defaultEmailChooserPosition= "
                                                         << defaultEmailChooserPosition << ") " << oendl;
 
                 // More than one default-email chooser is not allowed !
                 if ( ( defaultEmailChooserPosition != -1 ) &&
                      defaultEmailChooserPosition != widgetPos && !initializing){
                         chooserError( widgetPos );
                         return true;
                 }
 
                 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
                 if ( cmbo ){
                         inputStack->raiseWidget( TextField );
                         inputStack -> removeWidget( cmbo );
                         delete cmbo;
                 }
                 cmbo = new QComboBox( inputStack );
                 cmbo -> insertStringList( emails );
 
                 inputStack -> addWidget( cmbo, Combo );
                 inputStack -> raiseWidget( Combo );
 
                 defaultEmailChooserPosition = widgetPos;
                 cmbDefaultEmail = cmbo;
 
                 connect( cmbo,SIGNAL( activated(int) ),
                          SLOT( defaultEmailChanged(int) ) );
 
                 // Set current default email
                 populateDefaultEmailCmb();
 
 
         } else {
                 // Something else was selected: Hide combo..
                 odebug << " Hiding default-email combo" << oendl;
                 if ( defaultEmailChooserPosition == widgetPos ){
                         defaultEmailChooserPosition = -1;
                 }
                 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
                 if ( cmbo ){
                         inputStack->raiseWidget( TextField );
                         inputStack -> removeWidget( cmbo );
                         cmbDefaultEmail = 0l;
                         delete cmbo;
                 }
 
                 // Caller should initialize the responsible textfield, therefore
                 // "false" is returned
                 return false;
         }
 
         // Everything is worked off ..
         return true;
 
 }
 
 // Currently accessed when we select default-email more than once !
 void ContactEditor::chooserError( int index )
 {
         owarn << "ContactEditor::chooserError( " << index << " )" << oendl;
         QMessageBox::warning( this, "Chooser Error",
                               "Multiple selection of this\n"
                               "Item is not allowed !\n\n"
                               "First deselect the previous one !",
                               "&OK", 0, 0,
                               0, 0 );