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

* Use new PlaylistInterface in MetadataEditor.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-11-28 08:03:40 +01:00
parent 94a5cd0007
commit 0580ad7050
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/libtomahawk/filemetadata/MetadataEditor.cpp
View File

@@ -73,8 +73,8 @@ MetadataEditor::init( const Tomahawk::playlistinterface_ptr& interface )
NewClosure( ui->buttonBox, SIGNAL( accepted() ), this, SLOT( writeMetadata( bool ) ), true )->setAutoDelete( false ); NewClosure( ui->buttonBox, SIGNAL( accepted() ), this, SLOT( writeMetadata( bool ) ), true )->setAutoDelete( false );
connect( ui->buttonBox, SIGNAL( rejected() ), SLOT( close() ) ); connect( ui->buttonBox, SIGNAL( rejected() ), SLOT( close() ) );
connect( ui->forwardPushButton, SIGNAL( clicked() ), SLOT( loadNextResult() ) ); connect( ui->forwardPushButton, SIGNAL( clicked() ), SLOT( loadNextQuery() ) );
connect( ui->previousPushButton, SIGNAL( clicked() ), SLOT( loadPreviousResult() ) ); connect( ui->previousPushButton, SIGNAL( clicked() ), SLOT( loadPreviousQuery() ) );
} }
@@ -216,7 +216,7 @@ MetadataEditor::loadResult( const Tomahawk::result_ptr& result )
return; return;
m_result = result; m_result = result;
setEditable( result->collection()->source()->isLocal() ); setEditable( result->collection() && result->collection()->source()->isLocal() );
setTitle( result->track() ); setTitle( result->track() );
setArtist( result->artist()->name() ); setArtist( result->artist()->name() );
@@ -226,7 +226,7 @@ MetadataEditor::loadResult( const Tomahawk::result_ptr& result )
setYear( result->year() ); setYear( result->year() );
setBitrate( result->bitrate() ); setBitrate( result->bitrate() );
if ( result->collection()->source()->isLocal() ) if ( result->collection() && result->collection()->source()->isLocal() )
{ {
QFileInfo fi( QUrl( m_result->url() ).toLocalFile() ); QFileInfo fi( QUrl( m_result->url() ).toLocalFile() );
setFileName( fi.absoluteFilePath() ); setFileName( fi.absoluteFilePath() );
@@ -248,12 +248,12 @@ MetadataEditor::loadResult( const Tomahawk::result_ptr& result )
void void
MetadataEditor::enablePushButtons() MetadataEditor::enablePushButtons()
{ {
if ( m_interface->queryAt( m_index + 1 ) ) if ( m_interface->siblingIndex( 1, m_index ) > 0 )
ui->forwardPushButton->setEnabled( true ); ui->forwardPushButton->setEnabled( true );
else else
ui->forwardPushButton->setEnabled( false ); ui->forwardPushButton->setEnabled( false );
if ( m_interface->queryAt( m_index - 1 ) ) if ( m_interface->siblingIndex( -1, m_index ) > 0 )
ui->previousPushButton->setEnabled( true ); ui->previousPushButton->setEnabled( true );
else else
ui->previousPushButton->setEnabled( false ); ui->previousPushButton->setEnabled( false );
@@ -261,27 +261,29 @@ MetadataEditor::enablePushButtons()
void void
MetadataEditor::loadNextResult() MetadataEditor::loadNextQuery()
{ {
writeMetadata(); writeMetadata();
m_index++; if ( m_interface->siblingIndex( 1, m_index ) > 0 )
{
if ( m_interface->queryAt( m_index ) ) m_index = m_interface->siblingIndex( 1, m_index );
loadQuery( m_interface->queryAt( m_index ) ); loadQuery( m_interface->queryAt( m_index ) );
} }
}
void void
MetadataEditor::loadPreviousResult() MetadataEditor::loadPreviousQuery()
{ {
writeMetadata(); writeMetadata();
m_index--; if ( m_interface->siblingIndex( -1, m_index ) > 0 )
{
if ( m_interface->queryAt( m_index ) ) m_index = m_interface->siblingIndex( -1, m_index );
loadQuery( m_interface->queryAt( m_index ) ); loadQuery( m_interface->queryAt( m_index ) );
} }
}
void void

6
src/libtomahawk/filemetadata/MetadataEditor.h
View File

@@ -56,8 +56,8 @@ protected:
private slots: private slots:
void writeMetadata( bool closeDlg = false ); void writeMetadata( bool closeDlg = false );
void enablePushButtons(); void enablePushButtons();
void loadNextResult(); void loadNextQuery();
void loadPreviousResult(); void loadPreviousQuery();
/* tag attributes */ /* tag attributes */
void setTitle( const QString& title ); void setTitle( const QString& title );
@@ -85,7 +85,7 @@ private:
Tomahawk::playlistinterface_ptr m_interface; Tomahawk::playlistinterface_ptr m_interface;
QStringList m_editFiles; QStringList m_editFiles;
int m_index; qint64 m_index;
bool m_editable; bool m_editable;
}; };