85 lines
5.2 KiB
Plaintext
85 lines
5.2 KiB
Plaintext
$OpenBSD: patch-src_settingsdialog_cpp,v 1.1.1.1 2010/05/31 19:37:36 dcoppa Exp $
|
|
--- src/settingsdialog.cpp.orig Fri May 28 08:32:33 2010
|
|
+++ src/settingsdialog.cpp Fri May 28 08:32:09 2010
|
|
@@ -92,16 +92,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" ), "" );
|
|
@@ -129,29 +124,19 @@ SettingsDialog::SettingsDialog( QWidget *parent )
|
|
UnicornUtils::qtLanguageToLfmLangCode( QLocale::Chinese ) );
|
|
|
|
// 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 );
|
|
@@ -214,7 +199,6 @@ SettingsDialog::SettingsDialog( QWidget *parent )
|
|
connect( ui_connection.automaticProxyButton, SIGNAL( toggled( bool ) ), this, SLOT( configChanged() ) );
|
|
connect( ui_connection.manualProxyButton, SIGNAL( toggled( bool ) ), this, SLOT( configChanged() ) );
|
|
connect( ui_connection.downloadMetadataCheck, SIGNAL( toggled( bool ) ), this, SLOT( configChanged() ) );
|
|
- connect( ui_connection.crashReportCheck, SIGNAL( toggled( bool ) ), this, SLOT( configChanged() ) );
|
|
|
|
#ifndef Q_WS_X11
|
|
connect( ui_mediadevices.deviceWidget, SIGNAL( currentItemChanged( QTreeWidgetItem*, QTreeWidgetItem* ) ), this, SLOT( mediaDeviceItemSelected( QTreeWidgetItem*, QTreeWidgetItem* ) ) );
|
|
@@ -350,7 +334,6 @@ SettingsDialog::populateConnection()
|
|
ui_connection.proxyUsernameEdit->setText( The::settings().getProxyUser() );
|
|
ui_connection.proxyPasswordEdit->setText( The::settings().getProxyPassword() );
|
|
ui_connection.downloadMetadataCheck->setChecked( The::settings().currentUser().isMetaDataEnabled() );
|
|
- ui_connection.crashReportCheck->setChecked( The::settings().currentUser().crashReportingEnabled() );
|
|
ui_connection.manualProxyButton->setChecked( The::settings().isUseProxy() );
|
|
}
|
|
|
|
@@ -524,7 +507,6 @@ SettingsDialog::saveConnection()
|
|
The::settings().setProxyPort( ui_connection.proxyPortEdit->text().toInt() );
|
|
The::settings().setUseProxy( ui_connection.manualProxyButton->isChecked() );
|
|
The::settings().currentUser().setMetaDataEnabled( ui_connection.downloadMetadataCheck->isChecked() );
|
|
- The::settings().currentUser().setCrashReportingEnabled( ui_connection.crashReportCheck->isChecked() );
|
|
|
|
m_reconnect = ui_connection.proxyHostEdit->text() != originalProxyHost ||
|
|
ui_connection.proxyUsernameEdit->text() != originalProxyUsername ||
|