2 files changed, 83 insertions, 83 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 8937227..14e5b3f 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -91,3 +91,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         setRightJustification( true );
-        
+
         // Create Toolbar
@@ -97,12 +97,12 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         moveToolBar( listTools, m_config.getToolBarPos() );
-        
+
         QPEMenuBar *mbList = new QPEMenuBar( this  );
         mbList->setMargin( 0 );
-        
+
         QPopupMenu *edit = new QPopupMenu( mbList );
         mbList->insertItem( tr( "Contact" ), edit );
-        
-        
+
+
         // View Icons
-        m_tableViewButton  = new QAction( tr( "List" ), Resource::loadPixmap( "addressbook/weeklst" ),  
+        m_tableViewButton  = new QAction( tr( "List" ), Resource::loadPixmap( "addressbook/weeklst" ),
                                           QString::null, 0, this, 0 );
@@ -125,3 +125,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         a->addTo( listTools );
-        
+
         a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null,
@@ -132,3 +132,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         a->addTo( listTools );
-        
+
         a = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null,
@@ -139,7 +139,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         a->addTo( listTools );
-        
-        
+
+
         // make it possible to go directly to businesscard via qcop call
         //#if defined(Q_WS_QWS) // Why this ? (se)
-#if !defined(QT_NO_COP) 
+#if !defined(QT_NO_COP)
         QCopChannel *addressChannel = new QCopChannel("QPE/Addressbook" , this );
@@ -148,3 +148,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 #endif
-        // #endif 
+        // #endif
         a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ),
@@ -184,3 +184,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         a->addTo( listTools );
-        
+
         if ( Ir::supported() ) {
@@ -193,6 +193,6 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         }
-        
+
         edit->insertSeparator();
-        
-        a = new QAction( tr("Import vCard"), Resource::loadPixmap( "addressbook/fileimport"), QString::null, 
+
+        a = new QAction( tr("Import vCard"), Resource::loadPixmap( "addressbook/fileimport"), QString::null,
                                                                    0, this, 0);
@@ -201,6 +201,6 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         a->addTo( edit );
-        
+
         edit->insertSeparator();
-        
-        a = new QAction( tr("My Personal Details"), Resource::loadPixmap( "addressbook/identity" ), 
+
+        a = new QAction( tr("My Personal Details"), Resource::loadPixmap( "addressbook/identity" ),
                          QString::null, 0, this, 0 , TRUE );
@@ -209,3 +209,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         a->addTo( edit );
-        
+
 
@@ -218,3 +218,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 #endif
-        a = new QAction( tr( "Config" ), Resource::loadPixmap( "addressbook/configure" ), QString::null,
+        a = new QAction( tr( "Config" ), Resource::loadPixmap( "SettingsIcon" ), QString::null,
                          0, this, 0 );
@@ -226,3 +226,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         QVBoxLayout *vb = new QVBoxLayout( listContainer );
-        
+
          m_abView = new AbView( listContainer, m_config.orderList() );
@@ -230,10 +230,10 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         // abList->setHScrollBarMode( QScrollView::AlwaysOff );
-        connect( m_abView, SIGNAL( signalViewSwitched ( int ) ), 
+        connect( m_abView, SIGNAL( signalViewSwitched ( int ) ),
                  this, SLOT( slotViewSwitched( int ) ) );
 
-        
+
         QObject::connect( m_abView, SIGNAL(signalNotFound()), this, SLOT(slotNotFound()) );
-        
+
         m_abView->load();
-        
+
         // Letter Picker
@@ -251,3 +251,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         mbList->insertItem( tr("View"), catMenu );
-        
+
          defaultFont = new QFont( m_abView->font() );
@@ -255,8 +255,8 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         m_curFontSize = m_config.fontSize();
-        
+
         setCentralWidget(listContainer);
-        
+
         //    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
 
-        
+
         isLoading = false;
@@ -285,13 +285,13 @@ void AddressbookWindow::slotConfig()
 
-void AddressbookWindow::slotSetFont( int size ) 
+void AddressbookWindow::slotSetFont( int size )
 {
         qWarning("void AddressbookWindow::slotSetFont( %d )", size);
-        
+
         if (size > 2 || size < 0)
                 size = 1;
-        
+
         m_config.setFontSize( size );
-        
+
         QFont *currentFont;
-        
+
         switch (size) {
@@ -325,3 +325,3 @@ void AddressbookWindow::importvCard() {
         }
-        
+
 }
@@ -332,3 +332,3 @@ void AddressbookWindow::setDocument( const QString &filename )
 
-        if ( filename.find(".vcf") != int(filename.length()) - 4 ){ 
+        if ( filename.find(".vcf") != int(filename.length()) - 4 ){
 
@@ -341,6 +341,6 @@ void AddressbookWindow::setDocument( const QString &filename )
                                                   2 ) ) { // Escape == button 2
-                case 0: 
+                case 0:
                         qWarning("YES clicked");
                         break;
-                case 1: 
+                case 1:
                         qWarning("NO clicked");
@@ -351,3 +351,3 @@ void AddressbookWindow::setDocument( const QString &filename )
 
-        OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, 
+        OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
                                                                          filename );
@@ -374,3 +374,3 @@ void AddressbookWindow::setDocument( const QString &filename )
                                                           2 ) ) { // Escape == button 2
-                        case 0: 
+                        case 0:
                                 qWarning("YES clicked");
@@ -378,3 +378,3 @@ void AddressbookWindow::setDocument( const QString &filename )
                                 break;
-                        case 1: 
+                        case 1:
                                 qWarning("NO clicked");
@@ -390,3 +390,3 @@ void AddressbookWindow::setDocument( const QString &filename )
         }
-        
+
         delete access;
@@ -397,3 +397,3 @@ void AddressbookWindow::resizeEvent( QResizeEvent *e )
         QMainWindow::resizeEvent( e );
-        
+
 
@@ -439,3 +439,3 @@ void AddressbookWindow::slotListDelete()
                 OContact tmpEntry = m_abView ->currentEntry();
-                
+
                 // get a name, do the best we can...
@@ -447,4 +447,4 @@ void AddressbookWindow::slotListDelete()
                 }
-                
-                
+
+
                 if ( QPEMessageBox::confirmDelete( this, tr( "Contacts" ),
@@ -476,6 +476,6 @@ void AddressbookWindow::slotFind()
         m_abView->slotDoFind( searchEdit->text(), m_config.beCaseSensitive(), m_config.useRegExp(), false);
-        
+
         searchEdit->clearFocus();
         // m_abView->setFocus();
-        
+
 }
@@ -509,3 +509,3 @@ void AddressbookWindow::writeMail()
 
-        // I prefer the OPIE-Environment variable before the 
+        // I prefer the OPIE-Environment variable before the
         // QPE-one..
@@ -515,4 +515,4 @@ void AddressbookWindow::writeMail()
 
-        // Try to access the preferred. If not possible, try to 
-        // switch to the other one.. 
+        // Try to access the preferred. If not possible, try to
+        // switch to the other one..
         if ( m_config.useQtMail() ){
@@ -550,3 +550,3 @@ void AddressbookWindow::slotBeam()
                         return; // can't beam a non-existent file
-                OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, 
+                OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
                                                                                         beamFilename );
@@ -562,3 +562,3 @@ void AddressbookWindow::slotBeam()
                 c = m_abView -> currentEntry();
-                OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, 
+                OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
                                                                                         beamfile );
@@ -591,3 +591,3 @@ static void parseName( const QString& name, QString *first, QString *middle,
 {
-        
+
         int comma = name.find ( "," );
@@ -612,3 +612,3 @@ static void parseName( const QString& name, QString *first, QString *middle,
         }
-        
+
 }
@@ -627,3 +627,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
                 stream >> name >> email;
-                
+
                 OContact cnt;
@@ -638,5 +638,5 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
                 cnt.setFileAs();
-                
+
                 m_abView -> addEntry( cnt );
-                
+
                 // :SXm_abView()->init( cnt );
@@ -670,5 +670,5 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
                 picker.exec();
-                
+
                 // ###### note: contacts may have been added - save here!
-                
+
                 setCentralWidget(abList);
@@ -682,3 +682,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 #endif
-        
+
 }
@@ -697,3 +697,3 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
         abEditor->setCaption( tr("Edit Address") );
-        
+
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
@@ -760,6 +760,6 @@ void AddressbookWindow::slotPersonalView()
                 m_abView->showPersonal( false );
-                
+
                 return;
         }
-        
+
         qWarning("slotPersonalView()-> ON");
@@ -770,3 +770,3 @@ void AddressbookWindow::slotPersonalView()
         actionMail->setEnabled(FALSE);
-        
+
         setCaption( tr("Contacts - My Personal Details") );
@@ -774,3 +774,3 @@ void AddressbookWindow::slotPersonalView()
         m_abView->showPersonal( true );
-        
+
 }
@@ -858,3 +858,3 @@ void AddressbookWindow::slotNotFound()
 
-        
+
 }
@@ -866,3 +866,3 @@ void AddressbookWindow::slotWrapAround()
         //                                tr( "End of list. Wrap around now...!" ) + "\n" );
-                
+
 }
@@ -872,10 +872,10 @@ void AddressbookWindow::slotSetCategory( int c )
         qWarning( "void AddressbookWindow::slotSetCategory( %d ) from %d", c, catMenu->count() );
-        
+
         QString cat, book;
         AbView::Views  view = AbView::TableView;
-        
+
         if ( c <= 0 )
                 return;
-        
-        // Switch view 
+
+        // Switch view
         if ( c < 3 )
@@ -886,6 +886,6 @@ void AddressbookWindow::slotSetCategory( int c )
         else
-         // Checkmark Category Menu Item Selected 
+         // Checkmark Category Menu Item Selected
                 for ( unsigned int i = 3; i < catMenu->count(); i++ )
                         catMenu->setItemChecked( i, c == (int)i );
-        
+
         // Now switch to the selected category
@@ -912,3 +912,3 @@ void AddressbookWindow::slotSetCategory( int c )
         }
-        
+
         // Switch to the selected View
@@ -923,3 +923,3 @@ void AddressbookWindow::slotSetCategory( int c )
                 cat = "All";
-        
+
         setCaption( tr( "Contacts" ) + " - " + book + " - " + tr( cat ) );
@@ -967,5 +967,5 @@ void AddressbookWindow::slotCardView()
 void AddressbookWindow::slotSetLetter( char c ) {
-        
+
          m_abView->setShowByLetter( c );
-        
+
 }
@@ -976,3 +976,3 @@ void AddressbookWindow::populateCategories()
         catMenu->clear();
-        
+
         int id, rememberId;
@@ -980,3 +980,3 @@ void AddressbookWindow::populateCategories()
         rememberId = 0;
-        
+
         catMenu->insertItem( Resource::loadPixmap( "datebook/weeklst" ), tr( "List" ), id++ );
@@ -985,3 +985,3 @@ void AddressbookWindow::populateCategories()
         catMenu->insertSeparator();
-        
+
         catMenu->insertItem( tr( "All" ), id++ );
@@ -997,3 +997,3 @@ void AddressbookWindow::populateCategories()
 
-        
+
         if ( m_abView -> showCategory().isEmpty() ) {
diff --git a/pics/addressbook/configure.png b/pics/addressbook/configure.png
deleted file mode 100644
index dd68320..0000000
--- a/pics/addressbook/configure.png
+++ b/dev/null