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

tighten up the layout

Browse Source
This commit is contained in:
Leo Franchi
2011-01-29 13:20:27 -05:00
parent b5698e9010
commit f1723a85c0
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
View File

@@ -310,7 +310,7 @@ EchonestGenerator::sentenceSummary()
QString center, suffix; QString center, suffix;
QString summary = artist.dynamicCast< EchonestControl >()->summary(); QString summary = artist.dynamicCast< EchonestControl >()->summary();
if( i == 0 ) { // if it's the first.. special case if( i == 0 ) { // if it's the first.. special casez
center = summary.remove( "~" ); center = summary.remove( "~" );
if( artists.size() == 2 ) // special case for 2, no comma. ( X and Y ) if( artists.size() == 2 ) // special case for 2, no comma. ( X and Y )
suffix = " and "; suffix = " and ";
@@ -332,9 +332,9 @@ EchonestGenerator::sentenceSummary()
} }
sentence += center + suffix; sentence += center + suffix;
} }
qDebug() << "Got artists:" << sentence; /// Add each filter individually
for( int i = 0; i < allcontrols.size(); i++ ) { for( int i = 0; i < allcontrols.size(); i++ ) {
// end case: if this is the last AND there is not a sorting filter (so this is the real last one) /// end case: if this is the last AND there is not a sorting filter (so this is the real last one)
const bool last = ( i == allcontrols.size() - 1 && sorting.isNull() ); const bool last = ( i == allcontrols.size() - 1 && sorting.isNull() );
QString prefix, suffix; QString prefix, suffix;
if( last ) { if( last ) {

4
src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp
View File

@@ -123,8 +123,8 @@ QWidget* DynamicControlWrapper::createDummy( QWidget* fromW, QWidget* parent )
QWidget* dummy = new QWidget( parent ); QWidget* dummy = new QWidget( parent );
dummy->setContentsMargins( 0, 0, 0, 0 ); dummy->setContentsMargins( 0, 0, 0, 0 );
dummy->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); dummy->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
dummy->setMinimumSize( fromW->size() ); dummy->setMinimumSize( fromW->sizeHint() );
dummy->setMaximumSize( fromW->size() ); dummy->setMaximumSize( fromW->sizeHint() );
return dummy; return dummy;
} }

2
src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
View File

@@ -77,7 +77,7 @@ DynamicWidget::DynamicWidget( const Tomahawk::dynplaylist_ptr& playlist, QWidget
m_logo = new QLabel( this ); m_logo = new QLabel( this );
if( !playlist->generator()->logo().isNull() ) { if( !playlist->generator()->logo().isNull() ) {
QPixmap p = playlist->generator()->logo().scaledToHeight( m_headerText->height(), Qt::SmoothTransformation ); QPixmap p = playlist->generator()->logo().scaledToHeight( 16, Qt::SmoothTransformation );
m_logo->setPixmap( p ); m_logo->setPixmap( p );
} }
m_headerLayout->addWidget(m_logo); m_headerLayout->addWidget(m_logo);