summaryrefslogtreecommitdiff
path: root/core
authordrw <drw>2005-08-29 18:08:09 (UTC)
committer drw <drw>2005-08-29 18:08:09 (UTC)
commit9ff75dd54765230e0058264d0d4666d6d38f94c8 (patch) (unidiff)
treec4afc83d7fda536b90dee36a9ca650750c4cecc2 /core
parent8456ec4039ffb824fc727d74b9473376b26ad530 (diff)
downloadopie-9ff75dd54765230e0058264d0d4666d6d38f94c8.zip
opie-9ff75dd54765230e0058264d0d4666d6d38f94c8.tar.gz
opie-9ff75dd54765230e0058264d0d4666d6d38f94c8.tar.bz2
Scale icons in contact table listing and in configure dialog
Diffstat (limited to 'core') (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
@@ -608,12 +608,16 @@ void AbTable::rowHeightChanged( int row )
608ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /* row */ ) 608ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /* row */ )
609{ 609{
610 610
611 ContactItem item; 611 int iconsize = fontMetrics().height();
612 QImage icon;
612 613
614 ContactItem item;
613 item.value = ""; 615 item.value = "";
614 616
615 for ( QValueList<int>::ConstIterator it = intFields.begin(); 617 for ( QValueList<int>::ConstIterator it = intFields.begin();
616 it != intFields.end(); ++it ) { 618 it != intFields.end(); ++it ) {
619 icon.reset();
620
617 switch ( *it ) { 621 switch ( *it ) {
618 default: 622 default:
619 break; 623 break;
@@ -629,12 +633,12 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
629 case Qtopia::DefaultEmail: 633 case Qtopia::DefaultEmail:
630 item.value = entry.defaultEmail(); 634 item.value = entry.defaultEmail();
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;
634 case Qtopia::Emails: 638 case Qtopia::Emails:
635 item.value = entry.emails(); 639 item.value = entry.emails();
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;
639 case Qtopia::HomeStreet: 643 case Qtopia::HomeStreet:
640 item.value = entry.homeStreet(); 644 item.value = entry.homeStreet();
@@ -654,22 +658,22 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
654 case Qtopia::HomePhone: 658 case Qtopia::HomePhone:
655 item.value = entry.homePhone(); 659 item.value = entry.homePhone();
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;
659 case Qtopia::HomeFax: 663 case Qtopia::HomeFax:
660 item.value = entry.homeFax(); 664 item.value = entry.homeFax();
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;
664 case Qtopia::HomeMobile: 668 case Qtopia::HomeMobile:
665 item.value = entry.homeMobile(); 669 item.value = entry.homeMobile();
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;
669 case Qtopia::HomeWebPage: 673 case Qtopia::HomeWebPage:
670 item.value = entry.homeWebpage(); 674 item.value = entry.homeWebpage();
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;
674 case Qtopia::Company: 678 case Qtopia::Company:
675 item.value = entry.company(); 679 item.value = entry.company();
@@ -689,7 +693,7 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
689 case Qtopia::BusinessWebPage: 693 case Qtopia::BusinessWebPage:
690 item.value = entry.businessWebpage(); 694 item.value = entry.businessWebpage();
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;
694 case Qtopia::JobTitle: 698 case Qtopia::JobTitle:
695 item.value = entry.jobTitle(); 699 item.value = entry.jobTitle();
@@ -703,17 +707,17 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
703 case Qtopia::BusinessPhone: 707 case Qtopia::BusinessPhone:
704 item.value = entry.businessPhone(); 708 item.value = entry.businessPhone();
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;
708 case Qtopia::BusinessFax: 712 case Qtopia::BusinessFax:
709 item.value = entry.businessFax(); 713 item.value = entry.businessFax();
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;
713 case Qtopia::BusinessMobile: 717 case Qtopia::BusinessMobile:
714 item.value = entry.businessMobile(); 718 item.value = entry.businessMobile();
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;
718 case Qtopia::BusinessPager: 722 case Qtopia::BusinessPager:
719 item.value = entry.businessPager(); 723 item.value = entry.businessPager();
@@ -753,6 +757,11 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
753 item.value = entry.notes(); 757 item.value = entry.notes();
754 break; 758 break;
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() )
757 break; 766 break;
758 } 767 }
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
@@ -24,11 +24,10 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
24 setWFlags ( WStyle_ContextHelp ); 24 setWFlags ( WStyle_ContextHelp );
25 25
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
33 // Get the translation maps between Field ID and translated strings 32 // Get the translation maps between Field ID and translated strings
34 m_mapStrToID = Opie::OPimContactFields::trFieldsToId(); 33 m_mapStrToID = Opie::OPimContactFields::trFieldsToId();