mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-23 01:09:42 +01:00
Code Issues Releases Wiki Activity

* DRY and style cleanups.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2012-05-24 14:08:42 +02:00
parent ca7db4ff99
commit a150697f49
16 changed files with 12 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libtomahawk/ViewManager.cpp
View File

@ -97,16 +97,12 @@ ViewManager::ViewManager( QObject* parent )
m_superCollectionView = new ArtistView();
m_superCollectionModel = new TreeModel( m_superCollectionView );
m_superCollectionView->setTreeModel( m_superCollectionModel );
m_superCollectionView->setFrameShape( QFrame::NoFrame );
m_superCollectionView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
m_superCollectionView->setShowModes( false );
// m_superCollectionView->proxyModel()->setShowOfflineResults( false );
m_superAlbumView = new AlbumView();
m_superAlbumModel = new AlbumModel( m_superAlbumView );
m_superAlbumView->setAlbumModel( m_superAlbumModel );
m_superAlbumView->setFrameShape( QFrame::NoFrame );
m_superAlbumView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
m_stack->setContentsMargins( 0, 0, 0, 0 );
m_widget->setContentsMargins( 0, 0, 0, 0 );
@ -149,8 +145,6 @@ ViewManager::createPageForPlaylist( const playlist_ptr& pl )
PlaylistModel* model = new PlaylistModel();
view->setPlaylistModel( model );
model->loadPlaylist( pl );
view->setFrameShape( QFrame::NoFrame );
view->setAttribute( Qt::WA_MacShowFocusRect, 0 );
pl->resolve();
m_playlistViews.insert( pl, view );
@ -290,8 +284,6 @@ ViewManager::show( const Tomahawk::collection_ptr& collection )
view = new CollectionView();
CollectionFlatModel* model = new CollectionFlatModel();
view->setPlayableModel( model );
view->setFrameShape( QFrame::NoFrame );
view->setAttribute( Qt::WA_MacShowFocusRect, 0 );
model->addCollection( collection );
@ -314,8 +306,6 @@ ViewManager::show( const Tomahawk::collection_ptr& collection )
view = new ArtistView();
TreeModel* model = new TreeModel();
view->setTreeModel( model );
view->setFrameShape( QFrame::NoFrame );
view->setAttribute( Qt::WA_MacShowFocusRect, 0 );
model->addCollection( collection );
@ -338,8 +328,6 @@ ViewManager::show( const Tomahawk::collection_ptr& collection )
aview = new AlbumView();
AlbumModel* amodel = new AlbumModel( aview );
aview->setAlbumModel( amodel );
aview->setFrameShape( QFrame::NoFrame );
aview->setAttribute( Qt::WA_MacShowFocusRect, 0 );
amodel->addCollection( collection );
m_collectionAlbumViews.insert( collection, aview );
@ -490,8 +478,6 @@ ViewManager::showRecentPlaysPage()
if ( !m_recentPlaysWidget )
{
PlaylistView* pv = new PlaylistView( m_widget );
pv->setFrameShape( QFrame::NoFrame );
pv->setAttribute( Qt::WA_MacShowFocusRect, 0 );
RecentlyPlayedModel* raModel = new RecentlyPlayedModel( source_ptr(), pv );
raModel->setTitle( tr( "Recently Played Tracks" ) );

3
src/libtomahawk/playlist/AlbumView.cpp
View File

@ -52,6 +52,9 @@ AlbumView::AlbumView( QWidget* parent )
, m_contextMenu( new ContextMenu( this ) )
, m_inited( false )
{
setFrameShape( QFrame::NoFrame );
setAttribute( Qt::WA_MacShowFocusRect, 0 );
setDragEnabled( true );
setDropIndicatorShown( false );
setDragDropOverwriteMode( false );

4
src/libtomahawk/playlist/ArtistView.cpp
View File

@ -55,6 +55,10 @@ ArtistView::ArtistView( QWidget* parent )
, m_contextMenu( new ContextMenu( this ) )
, m_showModes( true )
{
setFrameShape( QFrame::NoFrame );
setAttribute( Qt::WA_MacShowFocusRect, 0 );
setContentsMargins( 0, 0, 0, 0 );
setAlternatingRowColors( true );
setDragEnabled( true );
setDropIndicatorShown( false );

3
src/libtomahawk/playlist/CustomPlaylistView.cpp
View File

@ -34,9 +34,6 @@ CustomPlaylistView::CustomPlaylistView( CustomPlaylistView::PlaylistType type, c
, m_model( new PlaylistModel( this ) )
{
// Generate the tracks, add them to the playlist
setFrameShape( QFrame::NoFrame );
setAttribute( Qt::WA_MacShowFocusRect, 0 );
m_model->setStyle( PlayableModel::Large );
setPlaylistModel( m_model );
generateTracks();

2
src/libtomahawk/playlist/QueueView.cpp
View File

@ -45,8 +45,6 @@ QueueView::QueueView( AnimatedSplitter* parent )
ui->queue->setProxyModel( new QueueProxyModel( ui->queue ) );
ui->queue->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored );
ui->queue->setFrameShape( QFrame::NoFrame );
ui->queue->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->queue->overlay()->setEnabled( false );
connect( ui->toggleButton, SIGNAL( clicked() ), SLOT( show() ) );

4
src/libtomahawk/playlist/TrackView.cpp
View File

@ -57,6 +57,10 @@ TrackView::TrackView( QWidget* parent )
, m_updateContextView( true )
, m_contextMenu( new ContextMenu( this ) )
{
setFrameShape( QFrame::NoFrame );
setAttribute( Qt::WA_MacShowFocusRect, 0 );
setContentsMargins( 0, 0, 0, 0 );
setMouseTracking( true );
setAlternatingRowColors( true );
setSelectionMode( QAbstractItemView::ExtendedSelection );

5
src/libtomahawk/playlist/dynamic/DynamicView.cpp
View File

@ -49,10 +49,6 @@ DynamicView::DynamicView( QWidget* parent )
, m_fadebg( false )
, m_fadeOnly( false )
{
setContentsMargins( 0, 0, 0, 0 );
setFrameShape( QFrame::NoFrame );
setAttribute( Qt::WA_MacShowFocusRect, 0 );
m_fadeOutAnim.setDuration( FADE_LENGTH );
m_fadeOutAnim.setCurveShape( QTimeLine::LinearCurve );
m_fadeOutAnim.setFrameRange( 100, 0 );
@ -71,7 +67,6 @@ DynamicView::DynamicView( QWidget* parent )
DynamicView::~DynamicView()
{
}

4
src/libtomahawk/widgets/NewReleasesWidget.cpp
View File

@ -60,9 +60,6 @@ NewReleasesWidget::NewReleasesWidget( QWidget* parent )
{
ui->setupUi( this );
ui->albumsView->setFrameShape( QFrame::NoFrame );
ui->albumsView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
TomahawkUtils::unmarginLayout( layout() );
TomahawkUtils::unmarginLayout( ui->verticalLayout_2 );
TomahawkUtils::unmarginLayout( ui->breadCrumbLeft->layout() );
@ -76,7 +73,6 @@ NewReleasesWidget::NewReleasesWidget( QWidget* parent )
connect( ui->breadCrumbLeft, SIGNAL( activateIndex( QModelIndex ) ), SLOT( leftCrumbIndexChanged(QModelIndex) ) );
//m_playlistInterface = Tomahawk::playlistinterface_ptr( new ChartsPlaylistInterface( this ) );
m_workerThread = new QThread( this );

12
src/libtomahawk/widgets/SearchWidget.cpp
View File

@ -58,18 +58,6 @@ SearchWidget::SearchWidget( const QString& search, QWidget* parent )
TomahawkUtils::unmarginLayout( ui->verticalLayout );
ui->artistView->setContentsMargins( 0, 0, 0, 0 );
ui->artistView->setFrameShape( QFrame::NoFrame );
ui->artistView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->albumView->setContentsMargins( 0, 0, 0, 0 );
ui->albumView->setFrameShape( QFrame::NoFrame );
ui->albumView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->resultsView->setContentsMargins( 0, 0, 0, 0 );
ui->resultsView->setFrameShape( QFrame::NoFrame );
ui->resultsView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->resultsView->loadingSpinner()->fadeIn();
m_queries << Tomahawk::Query::get( search, uuid() );

7
src/libtomahawk/widgets/SocialPlaylistWidget.cpp
View File

@ -36,7 +36,7 @@ QString SocialPlaylistWidget::s_mostPlayedPlaylistsQuery = "asd";
QString SocialPlaylistWidget::s_topForeignTracksQuery = "select track.name, artist.name, count(*) as counter from (select track from playback_log group by track, source), track, artist where track not in (select track from playback_log where source is null group by track) and track.id = track and artist.id = track.artist group by track order by counter desc";
SocialPlaylistWidget::SocialPlaylistWidget ( QWidget* parent )
: QWidget ( parent )
: QWidget( parent )
, ui( new Ui_SocialPlaylistWidget )
, m_topForeignTracksModel( 0 )
, m_popularNewAlbumsModel( 0 )
@ -53,10 +53,6 @@ SocialPlaylistWidget::SocialPlaylistWidget ( QWidget* parent )
ui->mostPlayedPlaylists->setFrameShape( QFrame::NoFrame );
ui->mostPlayedPlaylists->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->newTracksView->setFrameShape( QFrame::NoFrame );
ui->newTracksView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->newAlbumsView->setFrameShape( QFrame::NoFrame );
ui->newAlbumsView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
TomahawkUtils::unmarginLayout( layout() );
TomahawkUtils::unmarginLayout( ui->verticalLayout->layout() );
@ -94,7 +90,6 @@ SocialPlaylistWidget::SocialPlaylistWidget ( QWidget* parent )
SocialPlaylistWidget::~SocialPlaylistWidget()
{
}

4
src/libtomahawk/widgets/WelcomeWidget.cpp
View File

@ -54,10 +54,6 @@ WelcomeWidget::WelcomeWidget( QWidget* parent )
ui->playlistWidget->setFrameShape( QFrame::NoFrame );
ui->playlistWidget->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->tracksView->setFrameShape( QFrame::NoFrame );
ui->tracksView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->additionsView->setFrameShape( QFrame::NoFrame );
ui->additionsView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
TomahawkUtils::unmarginLayout( layout() );
TomahawkUtils::unmarginLayout( ui->verticalLayout->layout() );

7
src/libtomahawk/widgets/WhatsHotWidget.cpp
View File

@ -59,9 +59,6 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent )
{
ui->setupUi( this );
ui->albumsView->setFrameShape( QFrame::NoFrame );
ui->albumsView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
TomahawkUtils::unmarginLayout( layout() );
TomahawkUtils::unmarginLayout( ui->stackLeft->layout() );
TomahawkUtils::unmarginLayout( ui->horizontalLayout->layout() );
@ -78,8 +75,6 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent )
connect( ui->breadCrumbLeft, SIGNAL( activateIndex( QModelIndex ) ), SLOT( leftCrumbIndexChanged(QModelIndex) ) );
ui->tracksViewLeft->setFrameShape( QFrame::NoFrame );
ui->tracksViewLeft->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->tracksViewLeft->overlay()->setEnabled( false );
ui->tracksViewLeft->setHeaderHidden( true );
ui->tracksViewLeft->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
@ -93,8 +88,6 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent )
artistsProxy->setDynamicSortFilter( true );
ui->artistsViewLeft->setProxyModel( artistsProxy );
ui->artistsViewLeft->setFrameShape( QFrame::NoFrame );
ui->artistsViewLeft->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->artistsViewLeft->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
ui->artistsViewLeft->header()->setVisible( true );

5
src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
View File

@ -46,11 +46,6 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
{
ui->setupUi( this );
ui->albumsView->setFrameShape( QFrame::NoFrame );
ui->albumsView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->tracksView->setFrameShape( QFrame::NoFrame );
ui->tracksView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
TomahawkUtils::unmarginLayout( layout() );
TomahawkUtils::unmarginLayout( ui->verticalLayout );
TomahawkUtils::unmarginLayout( ui->verticalLayout_2 );

7
src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
View File

@ -53,13 +53,6 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
m_plInterface = Tomahawk::playlistinterface_ptr( new MetaPlaylistInterface( this ) );
ui->albums->setFrameShape( QFrame::NoFrame );
ui->albums->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->relatedArtists->setFrameShape( QFrame::NoFrame );
ui->relatedArtists->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->topHits->setFrameShape( QFrame::NoFrame );
ui->topHits->setAttribute( Qt::WA_MacShowFocusRect, 0 );
TomahawkUtils::unmarginLayout( layout() );
TomahawkUtils::unmarginLayout( ui->layoutWidget->layout() );
TomahawkUtils::unmarginLayout( ui->layoutWidget1->layout() );

7
src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp
View File

@ -43,13 +43,6 @@ SourceInfoWidget::SourceInfoWidget( const Tomahawk::source_ptr& source, QWidget*
{
ui->setupUi( this );
ui->historyView->setFrameShape( QFrame::NoFrame );
ui->historyView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->recentAlbumView->setFrameShape( QFrame::NoFrame );
ui->recentAlbumView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->recentCollectionView->setFrameShape( QFrame::NoFrame );
ui->recentCollectionView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
TomahawkUtils::unmarginLayout( layout() );
TomahawkUtils::unmarginLayout( ui->horizontalLayout );
TomahawkUtils::unmarginLayout( ui->verticalLayout );

4
src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
View File

@ -67,10 +67,6 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
f.setPixelSize( 12 );
ui->statsLabel->setFont( f );
ui->similarTracksView->setFrameShape( QFrame::NoFrame );
ui->similarTracksView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
ui->lyricsView->setFrameShape( QFrame::NoFrame );
ui->lyricsView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
// ui->similarTracksView->setStyleSheet( "QListView { background-color: transparent; } QListView::item { background-color: transparent; }" );
QPalette p = ui->trackLabel->palette();