2 files changed, 39 insertions, 19 deletions

diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index 7dea591..36851b0 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -68,3 +68,3 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
         ++m_numCommands;
-        
+
         if ( command1 == OPackage::Install )
@@ -77,3 +77,3 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
         ++m_numCommands;
-        
+
         if ( command2 == OPackage::Install )
@@ -86,3 +86,3 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
         ++m_numCommands;
-        
+
         if ( command3 == OPackage::Install )
@@ -131,3 +131,5 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
 
-    m_btnStart = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ), tr( "Start" ), this );
+    QPixmap pic;
+    pic.convertFromImage( Resource::loadImage( "packagemanager/apply" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    m_btnStart = new QPushButton( pic, tr( "Start" ), this );
     layout->addWidget( m_btnStart, 3, 0 );
@@ -135,3 +137,4 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
 
-    m_btnOptions = new QPushButton( Resource::loadPixmap( "SettingsIcon" ), tr( "Options" ), this );
+    pic.convertFromImage( Resource::loadImage( "SettingsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    m_btnOptions = new QPushButton( pic, tr( "Options" ), this );
     layout->addWidget( m_btnOptions, 3, 1 );
@@ -219,3 +222,5 @@ void InstallDlg::slotBtnStart()
         m_btnStart->setText( tr( "Close" ) );
-        m_btnStart->setIconSet( Resource::loadPixmap( "enter" ) );
+        QPixmap pic;
+        pic.convertFromImage( Resource::loadImage( "enter" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+        m_btnStart->setIconSet( pic );
         return;
@@ -236,3 +241,3 @@ void InstallDlg::slotBtnStart()
     }
-    
+
     m_btnOptions->setEnabled( false );
@@ -241,3 +246,5 @@ void InstallDlg::slotBtnStart()
         m_btnStart->setText( tr( "Abort" ) );
-        m_btnStart->setIconSet( Resource::loadPixmap( "close" ) );
+        QPixmap pic;
+        pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+        m_btnStart->setIconSet( pic );
     }
@@ -254,3 +261,3 @@ void InstallDlg::slotBtnStart()
     }
-    
+
     // All commands executed, allow user to close dialog
@@ -258,3 +265,5 @@ void InstallDlg::slotBtnStart()
     m_btnStart->setText( tr( "Close" ) );
-    m_btnStart->setIconSet( Resource::loadPixmap( "enter" ) );
+    QPixmap pic;
+    pic.convertFromImage( Resource::loadImage( "enter" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    m_btnStart->setIconSet( pic );
 
@@ -262,3 +271,4 @@ void InstallDlg::slotBtnStart()
     m_btnOptions->setText( tr( "Save output" ) );
-    m_btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
+    pic.convertFromImage( Resource::loadImage( "save" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    m_btnOptions->setIconSet( pic );
 }
@@ -307,3 +317,3 @@ void InstallDlg::slotOutput( const QString &msg )
     m_output->setCursorPosition( m_output->numLines(), 0 );
-    
+
     // Update available space
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
@@ -182,3 +182,5 @@ void OIpkgConfigDlg::initServerWidget()
 
-    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." ) );
@@ -187,3 +189,4 @@ void OIpkgConfigDlg::initServerWidget()
 
-    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 );
@@ -193,3 +196,4 @@ void OIpkgConfigDlg::initServerWidget()
 
-    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 );
@@ -220,3 +224,5 @@ void OIpkgConfigDlg::initDestinationWidget()
 
-    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." ) );
@@ -225,3 +231,4 @@ void OIpkgConfigDlg::initDestinationWidget()
 
-    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 );
@@ -231,3 +238,4 @@ void OIpkgConfigDlg::initDestinationWidget()
 
-    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 );
@@ -343,3 +351,5 @@ void OIpkgConfigDlg::initOptionsWidget()
     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() );