From ffe30498cb6b2e00b8a808775f927135f986af5a Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Mon, 28 Nov 2011 10:37:55 +0100 Subject: [PATCH] * More natural job view order. --- src/libtomahawk/jobview/JobStatusModel.cpp | 10 ++++++++-- src/libtomahawk/jobview/JobStatusView.cpp | 11 ++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/libtomahawk/jobview/JobStatusModel.cpp b/src/libtomahawk/jobview/JobStatusModel.cpp index 2b7e4aab7..7ce36af9e 100644 --- a/src/libtomahawk/jobview/JobStatusModel.cpp +++ b/src/libtomahawk/jobview/JobStatusModel.cpp @@ -21,18 +21,21 @@ #include "JobStatusItem.h" #include "utils/logger.h" + JobStatusModel::JobStatusModel( QObject* parent ) : QAbstractListModel ( parent ) { } + JobStatusModel::~JobStatusModel() { qDeleteAll( m_items ); m_collapseCount.clear(); } + void JobStatusModel::addJob( JobStatusItem* item ) { @@ -55,11 +58,12 @@ JobStatusModel::addJob( JobStatusItem* item ) } qDebug() << "Adding item:" << item; - beginInsertRows( QModelIndex(), 0, 0 ); - m_items.prepend( item ); + beginInsertRows( QModelIndex(), m_items.count() - 1, m_items.count() ); + m_items.append( item ); endInsertRows(); } + Qt::ItemFlags JobStatusModel::flags( const QModelIndex& index ) const { @@ -101,6 +105,7 @@ JobStatusModel::data( const QModelIndex& index, int role ) const return QVariant(); } + int JobStatusModel::rowCount( const QModelIndex& parent ) const { @@ -165,6 +170,7 @@ JobStatusModel::itemFinished() item->deleteLater(); } + void JobStatusModel::itemUpdated() { diff --git a/src/libtomahawk/jobview/JobStatusView.cpp b/src/libtomahawk/jobview/JobStatusView.cpp index 16b28571a..fa121a1f0 100644 --- a/src/libtomahawk/jobview/JobStatusView.cpp +++ b/src/libtomahawk/jobview/JobStatusView.cpp @@ -19,23 +19,22 @@ #include "JobStatusView.h" - -#include "libtomahawk/pipeline.h" - +#include "pipeline.h" #include "JobStatusModel.h" #include "JobStatusDelegate.h" #include "PipelineStatusItem.h" +#include "TransferStatusItem.h" +#include "LatchedStatusItem.h" #include "utils/logger.h" #include #include #include #include -#include "TransferStatusItem.h" -#include "LatchedStatusItem.h" using namespace Tomahawk; + JobStatusView* JobStatusView::s_instance = 0; JobStatusView::JobStatusView( AnimatedSplitter* parent ) @@ -77,6 +76,7 @@ JobStatusView::JobStatusView( AnimatedSplitter* parent ) new LatchedStatusManager( this ); } + void JobStatusView::setModel( JobStatusModel* m ) { @@ -88,6 +88,7 @@ JobStatusView::setModel( JobStatusModel* m ) connect( m_view->model(), SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SLOT( checkCount() ) ); } + void JobStatusView::checkCount() {