Scale icons appropriately

1 files changed, 17 insertions, 7 deletions

diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index 7ee2d74..5f60990 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -159,98 +159,106 @@ void OIpkgConfigDlg::reject()
     if ( m_configs )
         delete m_configs;
 }
 
 void OIpkgConfigDlg::initServerWidget()
 {
     m_serverWidget = new QWidget( this );
 
     // Initialize UI
     QVBoxLayout *vb = new QVBoxLayout( m_serverWidget );
     QScrollView *sv = new QScrollView( m_serverWidget );
     vb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
     QWidget *container = new QWidget( sv->viewport() );
     sv->addChild( container );
     QGridLayout *layout = new QGridLayout( container, 2, 3, 2, 4 );
 
     m_serverList = new QListBox( container );
     QWhatsThis::add( m_serverList, tr( "This is a list of all servers configured.  Select one here to edit or delete, or add a new one below." ) );
     m_serverList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
     connect( m_serverList, SIGNAL(highlighted(int)), this, SLOT(slotServerSelected(int)) );
     layout->addMultiCellWidget( m_serverList, 0, 0, 0, 2 );
 
-    QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
+    QPixmap pic;
+    pic.convertFromImage( Resource::loadImage( "new" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    QPushButton *btn = new QPushButton( pic, tr( "New" ), container );
     QWhatsThis::add( btn, tr( "Tap here to create a new entry.  Fill in the fields below and then tap on Update." ) );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotServerNew()) );
     layout->addWidget( btn, 1, 0 );
 
-    m_serverEditBtn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Edit" ), container );
+    pic.convertFromImage( Resource::loadImage( "edit" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    m_serverEditBtn = new QPushButton( pic, tr( "Edit" ), container );
     m_serverEditBtn->setEnabled( false );
     QWhatsThis::add( m_serverEditBtn, tr( "Tap here to edit the entry selected above." ) );
     connect( m_serverEditBtn, SIGNAL(clicked()), this, SLOT(slotServerEdit()) );
     layout->addWidget( m_serverEditBtn, 1, 1 );
 
-    m_serverDeleteBtn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
+    pic.convertFromImage( Resource::loadImage( "trash" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    m_serverDeleteBtn = new QPushButton( pic, tr( "Delete" ), container );
     m_serverDeleteBtn->setEnabled( false );
     QWhatsThis::add( m_serverDeleteBtn, tr( "Tap here to delete the entry selected above." ) );
     connect( m_serverDeleteBtn, SIGNAL(clicked()), this, SLOT(slotServerDelete()) );
     layout->addWidget( m_serverDeleteBtn, 1, 2 );
 }
 
 void OIpkgConfigDlg::initDestinationWidget()
 {
     m_destWidget = new QWidget( this );
 
     // Initialize UI
     QVBoxLayout *vb = new QVBoxLayout( m_destWidget );
     QScrollView *sv = new QScrollView( m_destWidget );
     vb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
     QWidget *container = new QWidget( sv->viewport() );
     sv->addChild( container );
     QGridLayout *layout = new QGridLayout( container, 2, 3, 2, 4 );
 
     m_destList = new QListBox( container );
     QWhatsThis::add( m_destList, tr( "This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below." ) );
     m_destList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
     connect( m_destList, SIGNAL(highlighted(int)), this, SLOT(slotDestSelected(int)) );
     layout->addMultiCellWidget( m_destList, 0, 0, 0, 2 );
 
-    QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
+    QPixmap pic;
+    pic.convertFromImage( Resource::loadImage( "new" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    QPushButton *btn = new QPushButton( pic, tr( "New" ), container );
     QWhatsThis::add( btn, tr( "Tap here to create a new entry.  Fill in the fields below and then tap on Update." ) );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotDestNew()) );
     layout->addWidget( btn, 1, 0 );
 
-    m_destEditBtn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Edit" ), container );
+    pic.convertFromImage( Resource::loadImage( "edit" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    m_destEditBtn = new QPushButton( pic, tr( "Edit" ), container );
     m_destEditBtn->setEnabled( false );
     QWhatsThis::add( m_destEditBtn, tr( "Tap here to edit the entry selected above." ) );
     connect( m_destEditBtn, SIGNAL(clicked()), this, SLOT(slotDestEdit()) );
     layout->addWidget( m_destEditBtn, 1, 1 );
 
-    m_destDeleteBtn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
+    pic.convertFromImage( Resource::loadImage( "trash" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    m_destDeleteBtn = new QPushButton( pic, tr( "Delete" ), container );
     m_destDeleteBtn->setEnabled( false );
     QWhatsThis::add( m_destDeleteBtn, tr( "Tap here to delete the entry selected above." ) );
     connect( m_destDeleteBtn, SIGNAL(clicked()), this, SLOT(slotDestDelete()) );
     layout->addWidget( m_destDeleteBtn, 1, 2 );
 }
 
 void OIpkgConfigDlg::initProxyWidget()
 {
     m_proxyWidget = new QWidget( this );
 
     // Initialize UI
     QVBoxLayout *vb = new QVBoxLayout( m_proxyWidget );
     QScrollView *sv = new QScrollView( m_proxyWidget );
     vb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
     QWidget *container = new QWidget( sv->viewport() );
     sv->addChild( container );
     QGridLayout *layout = new QGridLayout( container, 4, 2, 2, 4 );
 
     // HTTP proxy server configuration
     QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "HTTP Proxy" ), container );
     grpbox->layout()->setSpacing( 2 );
     grpbox->layout()->setMargin( 4 );
@@ -320,49 +328,51 @@ void OIpkgConfigDlg::initOptionsWidget()
 
     m_optForceOverwrite = new QCheckBox( tr( "Force Overwrite" ), container );
     QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) );
     layout->addMultiCellWidget( m_optForceOverwrite, 3, 3, 0, 1 );
 
     QLabel *l = new QLabel( tr( "Information level:" ), container );
     QWhatsThis::add( l, tr( "Select information level for Ipkg." ) );
     layout->addMultiCellWidget( l, 4, 4, 0, 1 );
 
     m_optVerboseIpkg = new QComboBox( container );
     QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) );
     m_optVerboseIpkg->insertItem( tr( "Errors only" ) );
     m_optVerboseIpkg->insertItem( tr( "Normal messages" ) );
     m_optVerboseIpkg->insertItem( tr( "Informative messages" ) );
     m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) );
     layout->addMultiCellWidget( m_optVerboseIpkg, 5, 5, 0, 1 );
 
     l = new QLabel( tr( "Package source lists directory:" ), container );
     QWhatsThis::add( l, tr( "Enter the directory where package source feed information is stored." ) );
     layout->addMultiCellWidget( l, 6, 6, 0, 1 );
 
     m_optSourceLists = new QLineEdit( container );
     QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) );
     layout->addWidget( m_optSourceLists, 7, 0 );
-    QPushButton *btn = new QPushButton( Resource::loadPixmap( "folder" ), QString::null, container );
+    QPixmap pic;
+    pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    QPushButton *btn = new QPushButton( pic, QString::null, container );
     btn->setMaximumWidth( btn->height() );
     QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) );
     layout->addWidget( btn, 7, 1 );
 
     layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 }
 
 void OIpkgConfigDlg::initData()
 {
     // Read ipkg configuration (server/destination/proxy) information
     if ( m_ipkg && !m_installOptions )
     {
         m_configs = m_ipkg->configItems();
         if ( m_configs )
         {
             for ( OConfItemListIterator configIt( *m_configs ); configIt.current(); ++configIt )
             {
                 OConfItem *config = configIt.current();
 
                 // Add configuration item to the appropriate dialog controls
                 if ( config )
                 {
                     switch ( config->type() )