mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 19:30:21 +02:00
Code Issues Releases Wiki Activity

* Fixed showing a text-less job item for fulltext search queries.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-09-28 01:06:49 +02:00
parent 17480fd887
commit e57105669c
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libtomahawk/jobview/PipelineStatusItem.cpp
View File

@@ -1,6 +1,7 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> === /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
* *
* Copyright 2010-2011, Leo Franchi <lfranchi@kde.org> * Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
* Christian Muehlhaeuser <muesli@tomahawk-player.org>
* *
* Tomahawk is free software: you can redistribute it and/or modify * Tomahawk is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -24,6 +25,7 @@
#include "JobStatusModel.h" #include "JobStatusModel.h"
#include "JobStatusView.h" #include "JobStatusView.h"
PipelineStatusItem::PipelineStatusItem() PipelineStatusItem::PipelineStatusItem()
: JobStatusItem() : JobStatusItem()
{ {
@@ -33,6 +35,7 @@ PipelineStatusItem::PipelineStatusItem()
connect( Tomahawk::Pipeline::instance(), SIGNAL( idle() ), this, SLOT( idle() ) ); connect( Tomahawk::Pipeline::instance(), SIGNAL( idle() ), this, SLOT( idle() ) );
} }
PipelineStatusItem::~PipelineStatusItem() PipelineStatusItem::~PipelineStatusItem()
{ {
} }
@@ -44,12 +47,14 @@ PipelineStatusItem::rightColumnText() const
return QString( "%1" ).arg( Tomahawk::Pipeline::instance()->activeQueryCount() + Tomahawk::Pipeline::instance()->pendingQueryCount() ); return QString( "%1" ).arg( Tomahawk::Pipeline::instance()->activeQueryCount() + Tomahawk::Pipeline::instance()->pendingQueryCount() );
} }
QString QString
PipelineStatusItem::mainText() const PipelineStatusItem::mainText() const
{ {
return m_latestQuery; return m_latestQuery;
} }
void void
PipelineStatusItem::idle() PipelineStatusItem::idle()
{ {
@@ -57,19 +62,26 @@ PipelineStatusItem::idle()
emit finished(); emit finished();
} }
void void
PipelineStatusItem::resolving( const Tomahawk::query_ptr& query ) PipelineStatusItem::resolving( const Tomahawk::query_ptr& query )
{ {
m_latestQuery = QString( "%1 - %2" ).arg( query->artist() ).arg( query->track() ); if ( query->isFullTextQuery() )
m_latestQuery = query->fullTextQuery();
else
m_latestQuery = QString( "%1 - %2" ).arg( query->artist() ).arg( query->track() );
emit statusChanged(); emit statusChanged();
} }
PipelineStatusManager::PipelineStatusManager( QObject* parent ) PipelineStatusManager::PipelineStatusManager( QObject* parent )
: QObject( parent ) : QObject( parent )
{ {
connect( Tomahawk::Pipeline::instance(), SIGNAL( resolving( Tomahawk::query_ptr ) ), this, SLOT( resolving( Tomahawk::query_ptr ) ) ); connect( Tomahawk::Pipeline::instance(), SIGNAL( resolving( Tomahawk::query_ptr ) ), this, SLOT( resolving( Tomahawk::query_ptr ) ) );
} }
void void
PipelineStatusManager::resolving( const Tomahawk::query_ptr& p ) PipelineStatusManager::resolving( const Tomahawk::query_ptr& p )
{ {