From d3d29acf09a2a4bd62bbbb48d6e5ff1f59184e37 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 19 Oct 2011 03:13:45 +0200 Subject: [PATCH] * Auto resize OverlayButton and adjust helper texts. --- src/libtomahawk/database/databasecommand_allalbums.cpp | 4 ++++ src/libtomahawk/widgets/OverlayButton.cpp | 5 ++++- src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/database/databasecommand_allalbums.cpp b/src/libtomahawk/database/databasecommand_allalbums.cpp index bbc61195b..5de1f6be0 100644 --- a/src/libtomahawk/database/databasecommand_allalbums.cpp +++ b/src/libtomahawk/database/databasecommand_allalbums.cpp @@ -26,6 +26,7 @@ #include "utils/tomahawkutils.h" #include "utils/logger.h" + DatabaseCommand_AllAlbums::DatabaseCommand_AllAlbums( const Tomahawk::collection_ptr &collection, const Tomahawk::artist_ptr &artist, QObject *parent ) : DatabaseCommand( parent ) , m_collection( collection ) @@ -35,15 +36,18 @@ DatabaseCommand_AllAlbums::DatabaseCommand_AllAlbums( const Tomahawk::collection , m_sortDescending( false ) {} + DatabaseCommand_AllAlbums::~DatabaseCommand_AllAlbums() {} + void DatabaseCommand_AllAlbums::setArtist( const Tomahawk::artist_ptr &artist ) { m_artist = artist; } + void DatabaseCommand_AllAlbums::execForArtist( DatabaseImpl* dbi ) { diff --git a/src/libtomahawk/widgets/OverlayButton.cpp b/src/libtomahawk/widgets/OverlayButton.cpp index 472521bf4..3cdb88507 100644 --- a/src/libtomahawk/widgets/OverlayButton.cpp +++ b/src/libtomahawk/widgets/OverlayButton.cpp @@ -34,7 +34,7 @@ OverlayButton::OverlayButton( QWidget* parent ) , m_opacity( 0.0 ) , m_parent( parent ) { - resize( 160, 26 ); + resize( 0, 26 ); setAttribute( Qt::WA_TranslucentBackground, true ); setOpacity( m_opacity ); @@ -77,6 +77,9 @@ void OverlayButton::setText( const QString& text ) { m_text = text; + + QFontMetrics fm( font() ); + resize( fm.width( text ) + 16, height() ); } diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index 4824aaba3..b2d07dec6 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -64,7 +64,7 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par m_pixmap = QPixmap( RESPATH "images/no-album-art-placeholder.png" ).scaledToWidth( 48, Qt::SmoothTransformation ); m_button = new OverlayButton( ui->tracksView ); - m_button->setText( tr( "Click to show All Tracks" ) ); + m_button->setText( tr( "Click to show Super Collection Tracks" ) ); m_button->setCheckable( true ); m_button->setChecked( true ); @@ -96,7 +96,7 @@ AlbumInfoWidget::onModeToggle() m_tracksModel->addTracks( m_album, QModelIndex() ); if ( m_button->isChecked() ) - m_button->setText( tr( "Click to show All Tracks" ) ); + m_button->setText( tr( "Click to show Super Collection Tracks" ) ); else m_button->setText( tr( "Click to show Official Tracks" ) ); }