mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-13 17:43:59 +02:00
Code Issues Releases Wiki Activity

fix sorting and a few tweaks

Browse Source
This commit is contained in:
Leo Franchi
2011-02-19 13:01:46 -05:00
parent 65fd1e5548
commit 199d051ab7
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
View File

@@ -429,6 +429,7 @@ QList< dyncontrol_ptr > DynamicPlaylist::variantsToControl( const QList< QVarian
QList<dyncontrol_ptr> realControls; QList<dyncontrol_ptr> realControls;
foreach( QVariantMap controlV, controlsV ) { foreach( QVariantMap controlV, controlsV ) {
dyncontrol_ptr control = GeneratorFactory::createControl( controlV.value( "type" ).toString(), controlV.value( "selectedType" ).toString() ); dyncontrol_ptr control = GeneratorFactory::createControl( controlV.value( "type" ).toString(), controlV.value( "selectedType" ).toString() );
qDebug() << "CReating control with data:" << controlV;
QJson::QObjectHelper::qvariant2qobject( controlV, control.data() ); QJson::QObjectHelper::qvariant2qobject( controlV, control.data() );
realControls << control; realControls << control;
} }

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

@@ -29,7 +29,7 @@ Tomahawk::EchonestControl::EchonestControl( const QString& selectedType, const Q
: DynamicControl ( selectedType.isEmpty() ? "Artist" : selectedType, typeSelectors, parent ) : DynamicControl ( selectedType.isEmpty() ? "Artist" : selectedType, typeSelectors, parent )
{ {
setType( "echonest" ); setType( "echonest" );
m_editingTimer.setInterval( 3000 ); // 3 second timeout to edits m_editingTimer.setInterval( 2000 ); // 2 second timeout to edits
m_editingTimer.setSingleShot( true ); m_editingTimer.setSingleShot( true );
connect( &m_editingTimer, SIGNAL( timeout() ), this, SIGNAL( changed() ) ); connect( &m_editingTimer, SIGNAL( timeout() ), this, SIGNAL( changed() ) );
@@ -245,8 +245,8 @@ Tomahawk::EchonestControl::updateWidgets()
m_matchData = match->text(); m_matchData = match->text();
connect( combo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( updateData() ) ); connect( combo, SIGNAL( activated( int ) ), this, SLOT( updateData() ) );
connect( combo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( editingFinished() ) ); connect( combo, SIGNAL( activated( int ) ), this, SLOT( editingFinished() ) );
match->hide(); match->hide();
combo->hide(); combo->hide();
@@ -274,8 +274,8 @@ Tomahawk::EchonestControl::updateWidgets()
m_matchData = match->text(); m_matchData = match->text();
connect( combo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( updateData() ) ); connect( combo, SIGNAL( activated( int ) ), this, SLOT( updateData() ) );
connect( combo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( editingFinished() ) ); connect( combo, SIGNAL( activated( int ) ), this, SLOT( editingFinished() ) );
match->hide(); match->hide();
combo->hide(); combo->hide();
@@ -291,8 +291,9 @@ Tomahawk::EchonestControl::updateWidgets()
QComboBox* combo = new QComboBox; QComboBox* combo = new QComboBox;
combo->addItem( tr( "Tempo" ), QString::number( Echonest::DynamicPlaylist::SortTempoAscending ) ); combo->addItem( tr( "Tempo" ), QString::number( Echonest::DynamicPlaylist::SortTempoAscending ) );
combo->addItem( tr( "Duration" ), QString::number( Echonest::DynamicPlaylist::SortDurationAscending ) ); combo->addItem( tr( "Duration" ), QString::number( Echonest::DynamicPlaylist::SortDurationAscending ) );
combo->addItem( tr( "Loudness" ), QString::number( Echonest::DynamicPlaylist::SortLoudnessAscending ) ); /// TODO only in trunk libechonest combo->addItem( tr( "Loudness" ), QString::number( Echonest::DynamicPlaylist::SortLoudnessAscending ) );
combo->addItem( tr( "Artist Familiarity" ), QString::number( Echonest::DynamicPlaylist::SortArtistFamiliarityAscending ) ); combo->addItem( tr( "Artist Familiarity" ), QString::number( Echonest::DynamicPlaylist::SortArtistFamiliarityAscending ) );
combo->addItem( tr( "Artist Hotttnesss" ), QString::number( Echonest::DynamicPlaylist::SortArtistHotttnessAscending ) );
combo->addItem( tr( "Song Hotttnesss" ), QString::number( Echonest::DynamicPlaylist::SortSongHotttnesssAscending ) ); combo->addItem( tr( "Song Hotttnesss" ), QString::number( Echonest::DynamicPlaylist::SortSongHotttnesssAscending ) );
combo->addItem( tr( "Latitude" ), QString::number( Echonest::DynamicPlaylist::SortLatitudeAscending ) ); combo->addItem( tr( "Latitude" ), QString::number( Echonest::DynamicPlaylist::SortLatitudeAscending ) );
combo->addItem( tr( "Longitude" ), QString::number( Echonest::DynamicPlaylist::SortLongitudeAscending ) ); combo->addItem( tr( "Longitude" ), QString::number( Echonest::DynamicPlaylist::SortLongitudeAscending ) );
@@ -304,10 +305,10 @@ Tomahawk::EchonestControl::updateWidgets()
m_matchString = "Ascending"; // default m_matchString = "Ascending"; // default
m_matchData = Echonest::DynamicPlaylist::SortTempoAscending; m_matchData = Echonest::DynamicPlaylist::SortTempoAscending;
connect( match, SIGNAL( currentIndexChanged( int ) ), this, SLOT( updateData() ) ); connect( match, SIGNAL( activated( int ) ), this, SLOT( updateData() ) );
connect( match, SIGNAL( currentIndexChanged( int ) ), this, SLOT( editingFinished() ) ); connect( match, SIGNAL( activated( int ) ), this, SLOT( editingFinished() ) );
connect( combo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( updateData() ) ); connect( combo, SIGNAL( activated( int ) ), this, SLOT( updateData() ) );
connect( combo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( editingFinished() ) ); connect( combo, SIGNAL( activated( int ) ), this, SLOT( editingFinished() ) );
match->hide(); match->hide();
combo->hide(); combo->hide();
@@ -336,8 +337,8 @@ Tomahawk::EchonestControl::setupMinMaxWidgets( Echonest::DynamicPlaylist::Playli
m_matchString = match->currentText(); m_matchString = match->currentText();
m_matchData = match->itemData( match->currentIndex() ).toString(); m_matchData = match->itemData( match->currentIndex() ).toString();
connect( match, SIGNAL( currentIndexChanged( int ) ), this, SLOT( updateData() ) ); connect( match, SIGNAL( activated( int ) ), this, SLOT( updateData() ) );
connect( match, SIGNAL( currentIndexChanged( int ) ), this, SLOT( editingFinished() ) ); connect( match, SIGNAL( activated( int ) ), this, SLOT( editingFinished() ) );
connect( input->slider(), SIGNAL( valueChanged( int ) ), this, SLOT( updateData() ) ); connect( input->slider(), SIGNAL( valueChanged( int ) ), this, SLOT( updateData() ) );
connect( input->slider(), SIGNAL( valueChanged( int ) ), this, SLOT( editingFinished() ) ); connect( input->slider(), SIGNAL( valueChanged( int ) ), this, SLOT( editingFinished() ) );
connect( input->slider(), SIGNAL( sliderMoved( int ) ), &m_editingTimer, SLOT( stop() ) ); connect( input->slider(), SIGNAL( sliderMoved( int ) ), &m_editingTimer, SLOT( stop() ) );
@@ -392,7 +393,7 @@ Tomahawk::EchonestControl::updateData()
int enumVal = input->itemData( input->currentIndex() ).toInt() + m_matchData.toInt(); int enumVal = input->itemData( input->currentIndex() ).toInt() + m_matchData.toInt();
m_data.first = Echonest::DynamicPlaylist::Sort; m_data.first = Echonest::DynamicPlaylist::Sort;
m_data.second = enumVal; m_data.second = enumVal;
qDebug() << "SAVING" << input->currentIndex() << "AS" << enumVal; // qDebug() << "SAVING" << input->currentIndex() << "AS" << enumVal << "(" << input->itemData( input->currentIndex() ).toInt() << "+" << m_matchData.toInt() << ")";
} }
} }
@@ -457,9 +458,9 @@ Tomahawk::EchonestControl::updateWidgetsFromData()
match->setCurrentIndex( match->findData( m_matchData )); match->setCurrentIndex( match->findData( m_matchData ));
// HACK alert. if it's odd, subtract 1 // HACK alert. if it's odd, subtract 1
int val = m_data.second.toInt() - ( m_data.second.toInt() % 2 ); int val = ( m_data.second.toInt() - ( m_data.second.toInt() % 2 ) ) / 2;
input->setCurrentIndex( val ); input->setCurrentIndex( val );
qDebug() << "LOADING" << m_data.second.toInt() << "AS" <<val; // qDebug() << "LOADING" << m_data.second.toInt() << "AS" << val;
} }
} }
calculateSummary(); calculateSummary();

2
src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
View File

@@ -44,7 +44,7 @@ public:
virtual void setMatch(const QString& match); virtual void setMatch(const QString& match);
/// DO NOT USE IF YOU ARE NOT A DBCMD /// DO NOT USE IF YOU ARE NOT A DBCMD
explicit EchonestControl( const QString& type, const QStringList& typeSelectors, QObject* parent = 0 ); EchonestControl( const QString& type, const QStringList& typeSelectors, QObject* parent = 0 );
public slots: public slots:
virtual void setSelectedType ( const QString& type ); virtual void setSelectedType ( const QString& type );