mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

* Adapt Album page to new style.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-06-07 10:31:57 +02:00
parent 7557696d48
commit aa7a69b6cc
2 changed files with 135 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,18 +51,21 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
QWidget* widget = new QWidget; QWidget* widget = new QWidget;
ui->setupUi( widget ); ui->setupUi( widget );
QPalette pal = palette();
pal.setColor( QPalette::Window, TomahawkStyle::PAGE_BACKGROUND );
widget->setPalette( pal );
widget->setAutoFillBackground( true );
m_albumsModel = new PlayableModel( ui->albums ); m_albumsModel = new PlayableModel( ui->albums );
ui->albums->setPlayableModel( m_albumsModel ); ui->albums->setPlayableModel( m_albumsModel );
ui->albums->setEmptyTip( tr( "Sorry, we could not find any other albums for this artist!" ) ); ui->albums->setEmptyTip( tr( "Sorry, we could not find any other albums for this artist!" ) );
m_tracksModel = new TreeModel( ui->tracks ); m_tracksModel = new TreeModel( ui->tracks );
m_tracksModel->setMode( Mixed ); m_tracksModel->setMode( Mixed );
QPalette trackViewPal = ui->tracks->palette();
trackViewPal.setColor( QPalette::Foreground, Qt::white );
trackViewPal.setColor( QPalette::Text, Qt::white );
trackViewPal.setColor( QPalette::Highlight, QColor( "#252020" ) );
trackViewPal.setColor( QPalette::HighlightedText, Qt::white );
ui->tracks->setPalette( trackViewPal );
ui->tracks->setAlternatingRowColors( false );
ui->tracks->setRootIsDecorated( false ); ui->tracks->setRootIsDecorated( false );
ui->tracks->setEmptyTip( tr( "Sorry, we could not find any tracks for this album!" ) ); ui->tracks->setEmptyTip( tr( "Sorry, we could not find any tracks for this album!" ) );
ui->tracks->proxyModel()->setStyle( PlayableProxyModel::Large ); ui->tracks->proxyModel()->setStyle( PlayableProxyModel::Large );
@@ -72,14 +75,14 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
AlbumItemDelegate* del = new AlbumItemDelegate( ui->tracks, ui->tracks->proxyModel() ); AlbumItemDelegate* del = new AlbumItemDelegate( ui->tracks, ui->tracks->proxyModel() );
ui->tracks->setPlaylistItemDelegate( del ); ui->tracks->setPlaylistItemDelegate( del );
ui->albums->setAutoFitItems( false ); /* ui->albums->setAutoFitItems( false );
ui->albums->setWrapping( false ); ui->albums->setWrapping( false );
ui->albums->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); ui->albums->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
ui->albums->setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded ); ui->albums->setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );*/
ui->albums->delegate()->setItemSize( QSize( 170, 170 ) ); ui->albums->delegate()->setItemSize( QSize( 170, 170 ) );
ui->albums->proxyModel()->setHideDupeItems( true ); ui->albums->proxyModel()->setHideDupeItems( true );
ui->tracks->setFrameShape( QFrame::StyledPanel ); ui->tracks->setFrameShape( QFrame::NoFrame );
ui->tracks->setAttribute( Qt::WA_MacShowFocusRect, 0 ); ui->tracks->setAttribute( Qt::WA_MacShowFocusRect, 0 );
m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::Original, QSize( 48, 48 ) ); m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::Original, QSize( 48, 48 ) );
@@ -103,7 +106,10 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
area->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); area->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
area->setWidget( widget ); area->setWidget( widget );
area->setStyleSheet( "QScrollArea { background-color: #454e59; }" ); QPalette pal = palette();
pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND );
area->setPalette( pal );
area->setAutoFillBackground( true );
area->setFrameShape( QFrame::NoFrame ); area->setFrameShape( QFrame::NoFrame );
area->setAttribute( Qt::WA_MacShowFocusRect, 0 ); area->setAttribute( Qt::WA_MacShowFocusRect, 0 );
@@ -123,6 +129,7 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par
"border-image: url(" RESPATH "images/widget-border.png) 3 3 3 3 stretch stretch;" "border-image: url(" RESPATH "images/widget-border.png) 3 3 3 3 stretch stretch;"
"border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" ); "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" );
ui->tracks->setStyleSheet( "QTreeView#tracks { background-color: transparent; }" );
ui->trackFrame->setStyleSheet( "QFrame#trackFrame { background-color: transparent; }" ui->trackFrame->setStyleSheet( "QFrame#trackFrame { background-color: transparent; }"
"QFrame#trackFrame { " "QFrame#trackFrame { "
"border-image: url(" RESPATH "images/widget-border.png) 3 3 3 3 stretch stretch;" "border-image: url(" RESPATH "images/widget-border.png) 3 3 3 3 stretch stretch;"

229
src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui
View File

@@ -13,7 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string notr="true" extracomment="not translatable because not shown to the user">Form</string> <string notr="true" extracomment="not translatable because not shown to the user">Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,1"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1">
<property name="spacing"> <property name="spacing">
<number>16</number> <number>16</number>
</property> </property>
@@ -72,122 +72,129 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QFrame" name="trackFrame"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="frameShape"> <property name="margin">
<enum>QFrame::StyledPanel</enum> <number>0</number>
</property> </property>
<property name="frameShadow"> <item>
<enum>QFrame::Raised</enum> <widget class="QFrame" name="trackFrame">
</property> <property name="frameShape">
<layout class="QVBoxLayout" name="verticalLayout_6"> <enum>QFrame::StyledPanel</enum>
<property name="spacing"> </property>
<number>4</number> <property name="frameShadow">
</property> <enum>QFrame::Raised</enum>
<property name="leftMargin"> </property>
<number>8</number> <layout class="QVBoxLayout" name="verticalLayout_6">
</property> <property name="spacing">
<property name="topMargin"> <number>4</number>
<number>4</number>
</property>
<property name="rightMargin">
<number>8</number>
</property>
<property name="bottomMargin">
<number>8</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="font">
<font>
<pointsize>18</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property> </property>
<property name="text"> <property name="leftMargin">
<string>Tracklist</string> <number>8</number>
</property> </property>
<property name="margin"> <property name="topMargin">
<number>0</number> <number>4</number>
</property> </property>
</widget> <property name="rightMargin">
</item> <number>8</number>
<item>
<widget class="TrackView" name="tracks">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="headerHidden"> <property name="bottomMargin">
<bool>true</bool> <number>8</number>
</property> </property>
</widget> <item>
</item> <widget class="QLabel" name="label">
</layout> <property name="font">
</widget> <font>
</item> <pointsize>18</pointsize>
<item> <weight>75</weight>
<widget class="QFrame" name="albumFrame"> <bold>true</bold>
<property name="frameShape"> </font>
<enum>QFrame::StyledPanel</enum> </property>
</property> <property name="text">
<property name="frameShadow"> <string>Tracklist</string>
<enum>QFrame::Raised</enum> </property>
</property> <property name="margin">
<layout class="QVBoxLayout" name="verticalLayout_4"> <number>0</number>
<property name="spacing"> </property>
<number>4</number> </widget>
</property> </item>
<property name="leftMargin"> <item>
<number>8</number> <widget class="TrackView" name="tracks">
</property> <property name="sizePolicy">
<property name="topMargin"> <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<number>4</number> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
<property name="rightMargin"> </sizepolicy>
<number>8</number> </property>
</property> <property name="headerHidden">
<property name="bottomMargin"> <bool>true</bool>
<number>4</number> </property>
</property> </widget>
<item> </item>
<widget class="QLabel" name="label_2"> </layout>
<property name="font"> </widget>
<font> </item>
<family>Arial</family> <item>
<pointsize>18</pointsize> <widget class="QFrame" name="albumFrame">
<weight>75</weight> <property name="frameShape">
<bold>true</bold> <enum>QFrame::StyledPanel</enum>
</font> </property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>4</number>
</property> </property>
<property name="text"> <property name="leftMargin">
<string>Other Albums</string> <number>8</number>
</property> </property>
<property name="margin"> <property name="topMargin">
<number>0</number> <number>4</number>
</property> </property>
</widget> <property name="rightMargin">
</item> <number>8</number>
<item>
<widget class="GridView" name="albums">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="bottomMargin">
<size> <number>4</number>
<width>0</width>
<height>190</height>
</size>
</property> </property>
</widget> <item>
</item> <widget class="QLabel" name="label_2">
</layout> <property name="font">
</widget> <font>
<family>Arial</family>
<pointsize>18</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Other Albums</string>
</property>
<property name="margin">
<number>0</number>
</property>
</widget>
</item>
<item>
<widget class="GridView" name="albums">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>190</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
@@ -210,16 +217,16 @@
<extends>QListView</extends> <extends>QListView</extends>
<header location="global">playlist/GridView.h</header> <header location="global">playlist/GridView.h</header>
</customwidget> </customwidget>
<customwidget>
<class>TrackView</class>
<extends>QTreeView</extends>
<header>playlist/TrackView.h</header>
</customwidget>
<customwidget> <customwidget>
<class>PlayableCover</class> <class>PlayableCover</class>
<extends>QLabel</extends> <extends>QLabel</extends>
<header>widgets/PlayableCover.h</header> <header>widgets/PlayableCover.h</header>
</customwidget> </customwidget>
<customwidget>
<class>TrackView</class>
<extends>QTreeView</extends>
<header>playlist/TrackView.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections/> <connections/>