diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2011-04-05 14:26:38 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2011-04-05 14:26:38 +0000 |
commit | 415856bdd4f48ab4f2732996f0bae58595092bbe (patch) | |
tree | ede2018b591f6dfb477fe9341ba17b9bc000fab9 /community/lastfm-client/qt46.diff |
Tue Apr 5 14:26:38 UTC 2011
Diffstat (limited to 'community/lastfm-client/qt46.diff')
-rw-r--r-- | community/lastfm-client/qt46.diff | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/community/lastfm-client/qt46.diff b/community/lastfm-client/qt46.diff new file mode 100644 index 000000000..b2370abee --- /dev/null +++ b/community/lastfm-client/qt46.diff @@ -0,0 +1,57 @@ +Fix some text/icon display issues with Qt 4.6 +--- a/src/libUnicorn/draglabel.cpp ++++ b/src/libUnicorn/draglabel.cpp +@@ -324,6 +324,11 @@ + { + rect.setHeight( fm.height() ); + } ++ // Qt 4.6 seems to have problems with the width too ++ if ( fm.width( d.m_text ) > rect.width() ) ++ { ++ rect.setWidth( fm.width( d.m_text ) ); ++ } + + // boundingRect sometimes returns negative values so make sure it's at 0, 0 + rect.moveTo( 0, 0 ); +--- a/src/settingsdialog.cpp ++++ b/src/settingsdialog.cpp +@@ -140,29 +140,29 @@ + UnicornUtils::qtLanguageToLfmLangCode( QLocale::Japanese ) ); + + // Add icons to sidebar +- pixmap.load( MooseUtils::dataPath( "/icons/options_account.png" ) ); ++ //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.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.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.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.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 ); |