author | drw <drw> | 2005-06-05 22:41:15 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-05 22:41:15 (UTC) |
commit | 56b8917e2cca3715e9a19941965ddd73e6bba5d4 (patch) (side-by-side diff) | |
tree | 77f19a696d1cc4568083f38467390b59c5270da2 /noncore/settings/packagemanager/installdlg.cpp | |
parent | 31e8d6aad8220f747113870cfa10261435a2a162 (diff) | |
download | opie-56b8917e2cca3715e9a19941965ddd73e6bba5d4.zip opie-56b8917e2cca3715e9a19941965ddd73e6bba5d4.tar.gz opie-56b8917e2cca3715e9a19941965ddd73e6bba5d4.tar.bz2 |
Resource -> OResource
Diffstat (limited to 'noncore/settings/packagemanager/installdlg.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/packagemanager/installdlg.cpp | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp index 205d7ed..15d88ad 100644 --- a/noncore/settings/packagemanager/installdlg.cpp +++ b/noncore/settings/packagemanager/installdlg.cpp @@ -30,11 +30,11 @@ #include "installdlg.h" #include <opie2/ofiledialog.h> +#include <opie2/oresource.h> #include <qpe/fileselector.h> -#include <qpe/resource.h> #include <qpe/storage.h> #include <qapplication.h> #include <qcombobox.h> @@ -129,17 +129,16 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap m_output->setReadOnly( true ); groupBoxLayout->addWidget( m_output ); layout->addMultiCellWidget( groupBox, 2, 2, 0, 1 ); - QPixmap pic; - pic.convertFromImage( Resource::loadImage( "packagemanager/apply" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - m_btnStart = new QPushButton( pic, tr( "Start" ), this ); + m_btnStart = new QPushButton( Opie::Core::OResource::loadPixmap( "packagemanager/apply", + Opie::Core::OResource::SmallIcon ), tr( "Start" ), this ); m_btnStart->setMinimumHeight( AppLnk::smallIconSize() ); layout->addWidget( m_btnStart, 3, 0 ); connect( m_btnStart, SIGNAL(clicked()), this, SLOT(slotBtnStart()) ); - pic.convertFromImage( Resource::loadImage( "SettingsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - m_btnOptions = new QPushButton( pic, tr( "Options" ), this ); + m_btnOptions = new QPushButton( Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ), + tr( "Options" ), this ); m_btnOptions->setMinimumHeight( AppLnk::smallIconSize() ); layout->addWidget( m_btnOptions, 3, 1 ); connect( m_btnOptions, SIGNAL( clicked() ), this, SLOT(slotBtnOptions()) ); @@ -222,11 +221,9 @@ void InstallDlg::slotBtnStart() m_currCommand = 999; // Allow user to close dialog m_btnStart->setText( tr( "Close" ) ); - QPixmap pic; - pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - m_btnStart->setIconSet( pic ); + m_btnStart->setIconSet( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ) ); return; } else if ( btnText == tr( "Close" ) ) { @@ -246,11 +243,9 @@ void InstallDlg::slotBtnStart() m_btnOptions->setEnabled( false ); if ( m_numCommands > 1 ) { m_btnStart->setText( tr( "Abort" ) ); - QPixmap pic; - pic.convertFromImage( Resource::loadImage( "reset" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - m_btnStart->setIconSet( pic ); + m_btnStart->setIconSet( Opie::Core::OResource::loadPixmap( "reset", Opie::Core::OResource::SmallIcon ) ); } else { m_btnStart->setEnabled( false ); @@ -265,16 +260,13 @@ void InstallDlg::slotBtnStart() // All commands executed, allow user to close dialog m_btnStart->setEnabled( true ); m_btnStart->setText( tr( "Close" ) ); - QPixmap pic; - pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - m_btnStart->setIconSet( pic ); + m_btnStart->setIconSet( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ) ); m_btnOptions->setEnabled( true ); m_btnOptions->setText( tr( "Save output" ) ); - pic.convertFromImage( Resource::loadImage( "save" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - m_btnOptions->setIconSet( pic ); + m_btnOptions->setIconSet( Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ) ); } void InstallDlg::slotBtnOptions() { |