| -rw-r--r-- | noncore/settings/packagemanager/installdlg.cpp | 34 | ||||
| -rw-r--r-- | noncore/settings/packagemanager/oipkgconfigdlg.cpp | 24 |
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 @@ -67,5 +67,5 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap m_packages[ m_numCommands ] = packages1; ++m_numCommands; - + if ( command1 == OPackage::Install ) m_installFound = true; @@ -76,5 +76,5 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap m_packages[ m_numCommands ] = packages2; ++m_numCommands; - + if ( command2 == OPackage::Install ) m_installFound = true; @@ -85,5 +85,5 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap m_packages[ m_numCommands ] = packages3; ++m_numCommands; - + if ( command3 == OPackage::Install ) m_installFound = true; @@ -130,9 +130,12 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap layout->addMultiCellWidget( groupBox, 2, 2, 0, 1 ); - 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 ); connect( m_btnStart, SIGNAL(clicked()), this, SLOT(slotBtnStart()) ); - 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 ); connect( m_btnOptions, SIGNAL( clicked() ), this, SLOT(slotBtnOptions()) ); @@ -218,5 +221,7 @@ void InstallDlg::slotBtnStart() // Allow user to close dialog 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; } @@ -235,10 +240,12 @@ void InstallDlg::slotBtnStart() m_destination->setEnabled( false ); } - + m_btnOptions->setEnabled( false ); if ( m_numCommands > 1 ) { 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 ); } else @@ -253,13 +260,16 @@ void InstallDlg::slotBtnStart() this, SLOT(slotOutput(const QString &)), true ); } - + // All commands executed, allow user to close dialog m_btnStart->setEnabled( true ); 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 ); m_btnOptions->setEnabled( true ); 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 ); } @@ -306,5 +316,5 @@ void InstallDlg::slotOutput( const QString &msg ) m_output->append( lineStr ); m_output->setCursorPosition( m_output->numLines(), 0 ); - + // Update available space slotDisplayAvailSpace( QString::null ); 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 @@ -181,10 +181,13 @@ void OIpkgConfigDlg::initServerWidget() 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." ) ); @@ -192,5 +195,6 @@ void OIpkgConfigDlg::initServerWidget() 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." ) ); @@ -219,10 +223,13 @@ void OIpkgConfigDlg::initDestinationWidget() 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." ) ); @@ -230,5 +237,6 @@ void OIpkgConfigDlg::initDestinationWidget() 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." ) ); @@ -342,5 +350,7 @@ void OIpkgConfigDlg::initOptionsWidget() 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." ) ); |