Diffstat (limited to 'noncore/settings/packagemanager/installdlg.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/settings/packagemanager/installdlg.cpp | 34 |
1 files changed, 22 insertions, 12 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 ); |