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

* Fixed TWK-380: Added & cleaned up splitters on a few pages.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-09-06 07:26:26 +02:00
parent 98aa2a447e
commit 06bd6edc8c
7 changed files with 93 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@
#include "widgets/overlaywidget.h" #include "widgets/overlaywidget.h"
using namespace Tomahawk; using namespace Tomahawk;
QString SocialPlaylistWidget::s_popularAlbumsQuery = "SELECT * from album"; QString SocialPlaylistWidget::s_popularAlbumsQuery = "SELECT * from album";
QString SocialPlaylistWidget::s_mostPlayedPlaylistsQuery = "asd"; 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"; 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";
@@ -41,9 +42,6 @@ SocialPlaylistWidget::SocialPlaylistWidget ( QWidget* parent )
{ {
ui->setupUi( this ); ui->setupUi( this );
ui->splitter->setHandleWidth( 1 );
ui->splitter_2->setHandleWidth( 1 );
ui->splitter_2->setStretchFactor( 0, 2 ); ui->splitter_2->setStretchFactor( 0, 2 );
ui->splitter_2->setStretchFactor( 0, 1 ); ui->splitter_2->setStretchFactor( 0, 1 );
@@ -92,11 +90,13 @@ SocialPlaylistWidget::SocialPlaylistWidget ( QWidget* parent )
fetchFromDB(); fetchFromDB();
} }
SocialPlaylistWidget::~SocialPlaylistWidget() SocialPlaylistWidget::~SocialPlaylistWidget()
{ {
} }
void void
SocialPlaylistWidget::fetchFromDB() SocialPlaylistWidget::fetchFromDB()
{ {
@@ -120,6 +120,8 @@ SocialPlaylistWidget::playlistInterface() const
{ {
return 0; return 0;
} }
/* /*
void void
SocialPlaylistWidget::createPlaylist() SocialPlaylistWidget::createPlaylist()
@@ -135,6 +137,7 @@ SocialPlaylistWidget::createPlaylist()
connect( m_coolQuery1.data(), SIGNAL( created() ), this, SLOT( playlist1Created() ) ); connect( m_coolQuery1.data(), SIGNAL( created() ), this, SLOT( playlist1Created() ) );
}*/ }*/
void void
SocialPlaylistWidget::popularAlbumsFetched( QList< album_ptr > albums ) SocialPlaylistWidget::popularAlbumsFetched( QList< album_ptr > albums )
{ {
@@ -143,6 +146,7 @@ SocialPlaylistWidget::popularAlbumsFetched( QList< album_ptr > albums )
m_popularNewAlbumsModel->addAlbums( albums ); m_popularNewAlbumsModel->addAlbums( albums );
} }
void void
SocialPlaylistWidget::topForeignTracksFetched( QList< query_ptr > tracks ) SocialPlaylistWidget::topForeignTracksFetched( QList< query_ptr > tracks )
{ {

6
src/libtomahawk/widgets/SocialPlaylistWidget.ui
View File

@@ -16,10 +16,16 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="handleWidth">
<number>1</number>
</property>
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="handleWidth">
<number>1</number>
</property>
<widget class="QWidget" name="layoutWidget1"> <widget class="QWidget" name="layoutWidget1">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>

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

@@ -15,21 +15,29 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="ArtistView" name="tracksView"/> <widget class="QSplitter" name="splitter">
</item> <property name="orientation">
<item> <enum>Qt::Vertical</enum>
<layout class="QVBoxLayout" name="verticalLayout"> </property>
<item> <property name="handleWidth">
<widget class="HeaderLabel" name="albumsLabel"> <number>1</number>
<property name="text"> </property>
<string>Other Albums by Artist</string> <widget class="ArtistView" name="tracksView"/>
</property> <widget class="QWidget" name="">
</widget> <layout class="QVBoxLayout" name="verticalLayout">
</item> <item>
<item> <widget class="HeaderLabel" name="albumsLabel">
<widget class="AlbumView" name="albumsView"/> <property name="text">
</item> <string>Other Albums by Artist</string>
</layout> </property>
</widget>
</item>
<item>
<widget class="AlbumView" name="albumsView"/>
</item>
</layout>
</widget>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

97
src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui
View File

@@ -13,70 +13,75 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4" stretch="3,3"> <layout class="QVBoxLayout" name="verticalLayout_4">
<property name="margin">
<number>4</number>
</property>
<item> <item>
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="handleWidth"> <property name="handleWidth">
<number>1</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="layoutWidget"> <widget class="QSplitter" name="splitter">
<layout class="QVBoxLayout" name="verticalLayout_2"> <property name="orientation">
<item> <enum>Qt::Horizontal</enum>
<widget class="HeaderLabel" name="label"> </property>
<property name="text"> <property name="handleWidth">
<string>Top Hits</string> <number>1</number>
</property> </property>
</widget> <widget class="QWidget" name="layoutWidget">
</item> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="PlaylistView" name="topHits"> <widget class="HeaderLabel" name="label">
<property name="headerHidden"> <property name="text">
<bool>true</bool> <string>Top Hits</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
<widget class="PlaylistView" name="topHits">
<property name="headerHidden">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget1">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="HeaderLabel" name="label_2">
<property name="text">
<string>Related Artists</string>
</property>
</widget>
</item>
<item>
<widget class="ArtistView" name="relatedArtists">
<property name="headerHidden">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
<widget class="QWidget" name="layoutWidget1"> <widget class="QWidget" name="">
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="HeaderLabel" name="label_2"> <widget class="HeaderLabel" name="label_3">
<property name="text"> <property name="text">
<string>Related Artists</string> <string>Albums</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="ArtistView" name="relatedArtists"> <widget class="ArtistView" name="albums"/>
<property name="headerHidden">
<bool>true</bool>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
</item> </item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="HeaderLabel" name="label_3">
<property name="text">
<string>Albums</string>
</property>
</widget>
</item>
<item>
<widget class="ArtistView" name="albums"/>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

2
src/libtomahawk/widgets/welcomewidget.cpp
View File

@@ -48,8 +48,6 @@ WelcomeWidget::WelcomeWidget( QWidget* parent )
{ {
ui->setupUi( this ); ui->setupUi( this );
ui->splitter->setHandleWidth( 1 );
ui->splitter_2->setHandleWidth( 1 );
ui->splitter_2->setStretchFactor( 0, 2 ); ui->splitter_2->setStretchFactor( 0, 2 );
ui->splitter_2->setStretchFactor( 0, 1 ); ui->splitter_2->setStretchFactor( 0, 1 );

6
src/libtomahawk/widgets/welcomewidget.ui
View File

@@ -16,10 +16,16 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="handleWidth">
<number>1</number>
</property>
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="handleWidth">
<number>1</number>
</property>
<widget class="QWidget" name="layoutWidget1"> <widget class="QWidget" name="layoutWidget1">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>

1
src/tomahawkwindow.cpp
View File

@@ -234,7 +234,6 @@ TomahawkWindow::setupSideBar()
ui->splitter->setStretchFactor( 0, 1 ); ui->splitter->setStretchFactor( 0, 1 );
ui->splitter->setStretchFactor( 1, 3 ); ui->splitter->setStretchFactor( 1, 3 );
ui->splitter->setCollapsible( 1, false ); ui->splitter->setCollapsible( 1, false );
ui->splitter->setHandleWidth( 1 );
ui->actionShowOfflineSources->setChecked( TomahawkSettings::instance()->showOfflineSources() ); ui->actionShowOfflineSources->setChecked( TomahawkSettings::instance()->showOfflineSources() );
} }