summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/abtable.cpp31
-rw-r--r--core/pim/addressbook/configdlg.cpp9
2 files changed, 24 insertions, 16 deletions
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 539d6ba..52aff36 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -610,4 +610,6 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
610 610
611 ContactItem item; 611 int iconsize = fontMetrics().height();
612 QImage icon;
612 613
614 ContactItem item;
613 item.value = ""; 615 item.value = "";
@@ -616,2 +618,4 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
616 it != intFields.end(); ++it ) { 618 it != intFields.end(); ++it ) {
619 icon.reset();
620
617 switch ( *it ) { 621 switch ( *it ) {
@@ -631,3 +635,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
631 if ( !item.value.isEmpty() ) 635 if ( !item.value.isEmpty() )
632 item.icon = Opie::Core::OResource::loadPixmap( "addressbook/email" ); 636 icon = Opie::Core::OResource::loadPixmap( "addressbook/email" );
633 break; 637 break;
@@ -636,3 +640,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
636 if ( !item.value.isEmpty() ) 640 if ( !item.value.isEmpty() )
637 item.icon = Opie::Core::OResource::loadPixmap( "addressbook/email" ); 641 icon = Opie::Core::OResource::loadPixmap( "addressbook/email" );
638 break; 642 break;
@@ -656,3 +660,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
656 if ( !item.value.isEmpty() ) 660 if ( !item.value.isEmpty() )
657 item.icon = Opie::Core::OResource::loadPixmap( "addressbook/phonehome" ); 661 icon = Opie::Core::OResource::loadPixmap( "addressbook/phonehome" );
658 break; 662 break;
@@ -661,3 +665,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
661 if ( !item.value.isEmpty() ) 665 if ( !item.value.isEmpty() )
662 item.icon = Opie::Core::OResource::loadPixmap( "addressbook/faxhome" ); 666 icon = Opie::Core::OResource::loadPixmap( "addressbook/faxhome" );
663 break; 667 break;
@@ -666,3 +670,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
666 if ( !item.value.isEmpty() ) 670 if ( !item.value.isEmpty() )
667 item.icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilehome" ); 671 icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilehome" );
668 break; 672 break;
@@ -671,3 +675,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
671 if ( !item.value.isEmpty() ) 675 if ( !item.value.isEmpty() )
672 item.icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagehome" ); 676 icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagehome" );
673 break; 677 break;
@@ -691,3 +695,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
691 if ( !item.value.isEmpty() ) 695 if ( !item.value.isEmpty() )
692 item.icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagework" ); 696 icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagework" );
693 break; 697 break;
@@ -705,3 +709,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
705 if ( !item.value.isEmpty() ) 709 if ( !item.value.isEmpty() )
706 item.icon = Opie::Core::OResource::loadPixmap( "addressbook/phonework" ); 710 icon = Opie::Core::OResource::loadPixmap( "addressbook/phonework" );
707 break; 711 break;
@@ -710,3 +714,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
710 if ( !item.value.isEmpty() ) 714 if ( !item.value.isEmpty() )
711 item.icon = Opie::Core::OResource::loadPixmap( "addressbook/faxwork" ); 715 icon = Opie::Core::OResource::loadPixmap( "addressbook/faxwork" );
712 break; 716 break;
@@ -715,3 +719,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
715 if ( !item.value.isEmpty() ) 719 if ( !item.value.isEmpty() )
716 item.icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilework" ); 720 icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilework" );
717 break; 721 break;
@@ -755,2 +759,7 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
755 } 759 }
760
761 if ( !icon.isNull() ) {
762 item.icon = icon.smoothScale( iconsize, iconsize );
763 }
764
756 if ( !item.value.isEmpty() ) 765 if ( !item.value.isEmpty() )
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index a491fc7..648ad52 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -26,7 +26,6 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
26 // Set Pics to Buttons and Tabs 26 // Set Pics to Buttons and Tabs
27 m_upButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/up" ) ) ); 27 m_upButton->setPixmap( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) );
28 m_downButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/down" ) ) ); 28 m_downButton->setPixmap( Opie::Core::OResource::loadPixmap( "down", Opie::Core::OResource::SmallIcon ) );
29 m_addButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/add" ) ) ); 29 m_addButton->setPixmap( Opie::Core::OResource::loadPixmap( "addressbook/add", Opie::Core::OResource::SmallIcon ) );
30 m_removeButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/sub" ) ) ); 30 m_removeButton->setPixmap( Opie::Core::OResource::loadPixmap( "addressbook/sub", Opie::Core::OResource::SmallIcon ) );
31
32 31