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

set initial match data when creating the echonest control too

Browse Source
This commit is contained in:
Leo Franchi
2011-01-19 18:29:23 -05:00
parent 64be0a4ea4
commit 8baf952854
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
View File

@@ -114,6 +114,7 @@ Tomahawk::EchonestControl::updateWidgets()
match->addItem( "Limit To", Echonest::DynamicPlaylist::ArtistType ); match->addItem( "Limit To", Echonest::DynamicPlaylist::ArtistType );
match->addItem( "Similar To", Echonest::DynamicPlaylist::ArtistRadioType ); match->addItem( "Similar To", Echonest::DynamicPlaylist::ArtistRadioType );
m_matchString = match->currentText(); m_matchString = match->currentText();
m_matchData = match->itemData( match->currentIndex() ).toString();
input->setPlaceholderText( "Artist name" ); input->setPlaceholderText( "Artist name" );
input->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Fixed ); input->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Fixed );

3
src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp
View File

@@ -163,7 +163,7 @@ DynamicControlList::onShown( QWidget* w )
m_layout->addWidget( control ); m_layout->addWidget( control );
} }
m_layout->addLayout( m_collapseLayout ); m_layout->addItem( m_collapseLayout );
m_layout->setStretchFactor( m_collapseLayout, 1 ); m_layout->setStretchFactor( m_collapseLayout, 1 );
AnimatedWidget::onShown( w ); AnimatedWidget::onShown( w );
@@ -174,7 +174,6 @@ void DynamicControlList::addNewControl()
dyncontrol_ptr control = m_generator->createControl(); dyncontrol_ptr control = m_generator->createControl();
m_controls.append( new DynamicControlWidget( control, m_isLocal, this ) ); m_controls.append( new DynamicControlWidget( control, m_isLocal, this ) );
m_layout->addWidget( m_controls.last() ); m_layout->addWidget( m_controls.last() );
connect( m_controls.last(), SIGNAL( addNewControl() ), this, SLOT( addNewControl() ) );
connect( m_controls.last(), SIGNAL( removeControl() ), this, SLOT( removeControl() ) ); connect( m_controls.last(), SIGNAL( removeControl() ), this, SLOT( removeControl() ) );
connect( m_controls.last(), SIGNAL( changed() ), this, SLOT( controlChanged() ) ); connect( m_controls.last(), SIGNAL( changed() ), this, SLOT( controlChanged() ) );

1
src/libtomahawk/playlist/dynamic/widgets/DynamicControlWidget.cpp
View File

@@ -190,7 +190,6 @@ DynamicControlWidget::mouseMoveEvent(QMouseEvent* ev)
enterEvent( ev ); enterEvent( ev );
} }
void void
DynamicControlWidget::paintEvent(QPaintEvent* ) DynamicControlWidget::paintEvent(QPaintEvent* )
{ {