$OpenBSD: patch-src_settingsdialog_cpp,v 1.2 2011/03/30 14:00:48 dcoppa Exp $ --- src/settingsdialog.cpp.orig Tue Mar 29 14:46:10 2011 +++ src/settingsdialog.cpp Tue Mar 29 14:49:31 2011 @@ -99,16 +99,11 @@ SettingsDialog::SettingsDialog( QWidget *parent ) #endif // Add icons to user icon dropdown - QPixmap pixmap( MooseUtils::dataPath( "icons/user_red.png" ) ); - ui_account.colourCombo->setItemIcon( 0, pixmap ); - pixmap.load( MooseUtils::dataPath( "icons/user_blue.png" ) ); - ui_account.colourCombo->setItemIcon( 1, pixmap ); - pixmap.load( MooseUtils::dataPath( "icons/user_green.png" ) ); - ui_account.colourCombo->setItemIcon( 2, pixmap ); - pixmap.load( MooseUtils::dataPath( "icons/user_orange.png" ) ); - ui_account.colourCombo->setItemIcon( 3, pixmap ); - pixmap.load( MooseUtils::dataPath( "icons/user_black.png" ) ); - ui_account.colourCombo->setItemIcon( 4, pixmap ); + ui_account.colourCombo->setItemIcon( 0, QPixmap( MooseUtils::dataPath( "icons/user_red.png" ) ) ); + ui_account.colourCombo->setItemIcon( 1, QPixmap( MooseUtils::dataPath( "icons/user_blue.png" ) ) ); + ui_account.colourCombo->setItemIcon( 2, QPixmap( MooseUtils::dataPath( "icons/user_green.png" ) ) ); + ui_account.colourCombo->setItemIcon( 3, QPixmap( MooseUtils::dataPath( "icons/user_orange.png" ) ) ); + ui_account.colourCombo->setItemIcon( 4, QPixmap( MooseUtils::dataPath( "icons/user_black.png" ) ) ); // Add languages to language drop-down ui_account.languageCombo->addItem( tr( "System Language" ), "" ); @@ -138,29 +133,19 @@ SettingsDialog::SettingsDialog( QWidget *parent ) UnicornUtils::qtLanguageToLfmLangCode( QLocale::Japanese ) ); // Add icons to sidebar - pixmap.load( MooseUtils::dataPath( "/icons/options_account.png" ) ); - //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); - ui.pageList->item( 0 )->setIcon( pixmap ); + ui.pageList->item( 0 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_account.png" ) ) ); - pixmap.load( MooseUtils::dataPath( "/icons/options_radio.png" ) ); - //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); - ui.pageList->item( 1 )->setIcon( pixmap ); + ui.pageList->item( 1 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_radio.png" ) ) ); #ifdef HIDE_RADIO ui.pageList->setItemHidden( ui.pageList->item( 1 ), true ); #endif // HIDE_RADIO - pixmap.load( MooseUtils::dataPath( "/icons/options_scrobbling.png" ) ); - //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); - ui.pageList->item( 2 )->setIcon( pixmap ); + ui.pageList->item( 2 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_scrobbling.png" ) ) ); - pixmap.load( MooseUtils::dataPath( "/icons/options_connection.png" ) ); - //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); - ui.pageList->item( 3 )->setIcon( pixmap ); + ui.pageList->item( 3 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_connection.png" ) ) ); - pixmap.load( MooseUtils::dataPath( "/icons/options_mediadevices.png" ) ); - //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); - ui.pageList->item( 4 )->setIcon( pixmap ); + ui.pageList->item( 4 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_mediadevices.png" ) ) ); #ifdef Q_WS_X11 ui.pageList->setRowHidden( 4, true );