From 5b2a5b76a4c27dd4f011813a6a54e3e6ac691408 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 22 May 2012 12:01:03 +0200 Subject: [PATCH] * Show current import date. --- src/accounts/lastfm/LastFmConfig.cpp | 13 ++++++++++--- src/accounts/lastfm/LastFmConfig.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/accounts/lastfm/LastFmConfig.cpp b/src/accounts/lastfm/LastFmConfig.cpp index 01c9421ab..170c993ed 100644 --- a/src/accounts/lastfm/LastFmConfig.cpp +++ b/src/accounts/lastfm/LastFmConfig.cpp @@ -35,6 +35,7 @@ LastFmConfig::LastFmConfig( LastFmAccount* account ) : QWidget( 0 ) , m_account( account ) , m_page( 1 ) + , m_lastTimeStamp( 0 ) { m_ui = new Ui_LastFmConfig; m_ui->setupUi( this ); @@ -108,7 +109,13 @@ LastFmConfig::enableButton() void LastFmConfig::loadHistory() { - m_ui->importHistory->setText( tr( "Importing History..." ) ); + if ( m_lastTimeStamp ) + { + m_ui->importHistory->setText( tr( "Importing %1", "e.g. Importing 2012/01/01" ).arg( QDateTime::fromTime_t( m_lastTimeStamp ).toString( "MMMM d yyyy" ) ) ); + } + else + m_ui->importHistory->setText( tr( "Importing History..." ) ); + m_ui->importHistory->setEnabled( false ); m_ui->progressBar->show(); @@ -132,9 +139,9 @@ LastFmConfig::onHistoryLoaded() { // tDebug() << "Found:" << e["artist"].text() << e["name"].text() << e["date"].attribute( "uts" ).toUInt(); Tomahawk::query_ptr query = Query::get( e["artist"].text(), e["name"].text(), QString(), QString(), false ); - uint timeStamp = e["date"].attribute( "uts" ).toUInt(); + m_lastTimeStamp = e["date"].attribute( "uts" ).toUInt(); - DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( query, DatabaseCommand_LogPlayback::Finished, timeStamp ); + DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( query, DatabaseCommand_LogPlayback::Finished, m_lastTimeStamp ); Database::instance()->enqueue( QSharedPointer(cmd) ); } diff --git a/src/accounts/lastfm/LastFmConfig.h b/src/accounts/lastfm/LastFmConfig.h index f50416c22..cc6bfc8fb 100644 --- a/src/accounts/lastfm/LastFmConfig.h +++ b/src/accounts/lastfm/LastFmConfig.h @@ -54,6 +54,7 @@ private: Ui_LastFmConfig* m_ui; unsigned int m_page; + unsigned int m_lastTimeStamp; }; }