mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-13 17:43:59 +02:00
Code Issues Releases Wiki Activity

Set correct GridItemDelegate mode and correctly calculate height for remaining GridViews.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-11-04 17:11:46 +01:00
parent 46ac9d46ee
commit 819b6d0f0a
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/viewpages/CollectionViewPage.cpp
View File

@@ -28,6 +28,7 @@
#include "playlist/TreeModel.h" #include "playlist/TreeModel.h"
#include "playlist/ColumnView.h" #include "playlist/ColumnView.h"
#include "playlist/TrackView.h" #include "playlist/TrackView.h"
#include "playlist/GridItemDelegate.h"
#include "playlist/GridView.h" #include "playlist/GridView.h"
#include "playlist/PlayableProxyModelPlaylistInterface.h" #include "playlist/PlayableProxyModelPlaylistInterface.h"
#include "resolvers/ScriptCollection.h" #include "resolvers/ScriptCollection.h"
@@ -68,6 +69,7 @@ CollectionViewPage::CollectionViewPage( const Tomahawk::collection_ptr& collecti
m_albumView->setAutoFitItems( true ); m_albumView->setAutoFitItems( true );
m_albumView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); m_albumView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
m_albumView->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 170 ) ); m_albumView->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 170 ) );
m_albumView->delegate()->setWordWrapping( true );
m_albumView->proxyModel()->sort( -1 ); m_albumView->proxyModel()->sort( -1 );
m_albumView->setEmptyTip( tr( "Sorry, there are no albums in this collection!" ) ); m_albumView->setEmptyTip( tr( "Sorry, there are no albums in this collection!" ) );

9
src/libtomahawk/viewpages/SearchViewPage.cpp
View File

@@ -28,6 +28,7 @@
#include "playlist/TrackView.h" #include "playlist/TrackView.h"
#include "playlist/PlayableModel.h" #include "playlist/PlayableModel.h"
#include "playlist/PlaylistModel.h" #include "playlist/PlaylistModel.h"
#include "playlist/GridItemDelegate.h"
#include "utils/AnimatedSpinner.h" #include "utils/AnimatedSpinner.h"
#include "utils/TomahawkStyle.h" #include "utils/TomahawkStyle.h"
#include "utils/TomahawkUtilsGui.h" #include "utils/TomahawkUtilsGui.h"
@@ -56,7 +57,7 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
ui->artists->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); ui->artists->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
ui->artists->setWrapping( false ); ui->artists->setWrapping( false );
ui->artists->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 140 ) ); ui->artists->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 140 ) );
ui->artists->setFixedHeight( 140 + 32 + 38 ); ui->artists->setFixedHeight( ui->artists->itemSize().height() + ui->artists->spacing() * 2 );
m_artistsModel = new PlayableModel( ui->artists ); m_artistsModel = new PlayableModel( ui->artists );
ui->artists->setPlayableModel( m_artistsModel ); ui->artists->setPlayableModel( m_artistsModel );
@@ -76,7 +77,8 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
ui->albums->setWrapping( false ); ui->albums->setWrapping( false );
ui->albums->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 140 ) ); ui->albums->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 140 ) );
// ui->albums->proxyModel()->setHideDupeItems( true ); // ui->albums->proxyModel()->setHideDupeItems( true );
ui->albums->setFixedHeight( 140 + 56 + 38 ); ui->albums->delegate()->setWordWrapping( true );
ui->albums->setFixedHeight( ui->albums->itemSize().height() + ui->albums->spacing() * 2 );
m_albumsModel = new PlayableModel( ui->albums ); m_albumsModel = new PlayableModel( ui->albums );
ui->albums->setPlayableModel( m_albumsModel ); ui->albums->setPlayableModel( m_albumsModel );
@@ -97,7 +99,8 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
ui->tracks->setWrapping( false ); ui->tracks->setWrapping( false );
ui->tracks->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 140 ) ); ui->tracks->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 140 ) );
// ui->tracks->proxyModel()->setHideDupeItems( true ); // ui->tracks->proxyModel()->setHideDupeItems( true );
ui->tracks->setFixedHeight( 140 + 56 + 38 ); ui->tracks->delegate()->setWordWrapping( true );
ui->tracks->setFixedHeight( ui->tracks->itemSize().height() + ui->tracks->spacing() * 2 );
m_resultsModel = new PlayableModel( ui->tracks ); m_resultsModel = new PlayableModel( ui->tracks );
ui->tracks->setPlayableModel( m_resultsModel ); ui->tracks->setPlayableModel( m_resultsModel );

2
src/viewpages/charts/ChartsWidget.cpp
View File

@@ -70,6 +70,8 @@ ChartsWidget::ChartsWidget( QWidget* parent )
ui->artistsView->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 190 ) ); ui->artistsView->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 190 ) );
ui->albumsView->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 190 ) ); ui->albumsView->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 190 ) );
ui->tracksView->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 190 ) ); ui->tracksView->setItemWidth( TomahawkUtils::DpiScaler::scaledX( this, 190 ) );
ui->albumsView->delegate()->setWordWrapping( true );
ui->tracksView->delegate()->setWordWrapping( true );
ui->artistsView->delegate()->setShowPosition( true ); ui->artistsView->delegate()->setShowPosition( true );
ui->albumsView->delegate()->setShowPosition( true ); ui->albumsView->delegate()->setShowPosition( true );
ui->tracksView->delegate()->setShowPosition( true ); ui->tracksView->delegate()->setShowPosition( true );

3
src/viewpages/newreleases/NewReleasesWidget.cpp
View File

@@ -24,6 +24,7 @@
#include "ViewManager.h" #include "ViewManager.h"
#include "audio/AudioEngine.h" #include "audio/AudioEngine.h"
#include "playlist/GridItemDelegate.h"
#include "utils/TomahawkUtilsGui.h" #include "utils/TomahawkUtilsGui.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/AnimatedSpinner.h" #include "utils/AnimatedSpinner.h"
@@ -75,6 +76,8 @@ NewReleasesWidget::NewReleasesWidget( QWidget* parent )
m_spinner = new AnimatedSpinner( ui->albumsView ); m_spinner = new AnimatedSpinner( ui->albumsView );
m_spinner->fadeIn(); m_spinner->fadeIn();
ui->albumsView->delegate()->setWordWrapping( true );
fetchData(); fetchData();
} }