From 6a7d0dfd27701518d0b6019b771b89548884b618 Mon Sep 17 00:00:00 2001 From: Thierry Goeckel Date: Fri, 14 Jun 2013 22:38:30 +0200 Subject: [PATCH 1/3] Don't sort alphabetically here. Makes sense as it is in the source code (week->month->year->overall). Now someone make week the default. :p --- src/libtomahawk/widgets/NetworkActivityWidget.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/widgets/NetworkActivityWidget.cpp b/src/libtomahawk/widgets/NetworkActivityWidget.cpp index 74aac66a1..65cef35b3 100644 --- a/src/libtomahawk/widgets/NetworkActivityWidget.cpp +++ b/src/libtomahawk/widgets/NetworkActivityWidget.cpp @@ -49,8 +49,6 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent ) d_func()->crumbModelLeft = new QStandardItemModel( this ); d_func()->sortedProxy = new QSortFilterProxyModel( this ); - d_func()->sortedProxy->setDynamicSortFilter( true ); - d_func()->sortedProxy->setFilterCaseSensitivity( Qt::CaseInsensitive ); d_func()->ui->breadCrumbLeft->setRootIcon( TomahawkUtils::defaultPixmap( TomahawkUtils::NetworkActivity, TomahawkUtils::Original ) ); connect( d_func()->ui->breadCrumbLeft, SIGNAL( activateIndex( QModelIndex ) ), SLOT( leftCrumbIndexChanged( QModelIndex ) ) ); @@ -74,14 +72,14 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent ) monthItem->setData( MonthChart, Breadcrumb::DefaultRole ); chartItem->appendRow( monthItem ); QStandardItem* yearItem = new QStandardItem( tr( "Last Year" ) ); - yearItem->setData( YearChart, Breadcrumb::DefaultRole ); + yearItem->setData( YearChart, Breadcrumb::DefaultRole); chartItem->appendRow( yearItem ); QStandardItem* overallItem = new QStandardItem( tr( "Overall" ) ); overallItem->setData( OverallChart, Breadcrumb::DefaultRole ); chartItem->appendRow( overallItem ); d_func()->sortedProxy->setSourceModel( d_func()->crumbModelLeft ); - d_func()->sortedProxy->sort( 0, Qt::AscendingOrder ); d_func()->ui->breadCrumbLeft->setModel( d_func()->sortedProxy ); + d_func()->ui->breadCrumbLeft->setVisible( true ); } From 5d8eb1911c38ad6f02a45c3b6cbf44ba97950262 Mon Sep 17 00:00:00 2001 From: Thierry Goeckel Date: Fri, 14 Jun 2013 22:42:49 +0200 Subject: [PATCH 2/3] Style fix. --- src/libtomahawk/widgets/NetworkActivityWidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libtomahawk/widgets/NetworkActivityWidget.cpp b/src/libtomahawk/widgets/NetworkActivityWidget.cpp index 65cef35b3..47753bed1 100644 --- a/src/libtomahawk/widgets/NetworkActivityWidget.cpp +++ b/src/libtomahawk/widgets/NetworkActivityWidget.cpp @@ -72,7 +72,7 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent ) monthItem->setData( MonthChart, Breadcrumb::DefaultRole ); chartItem->appendRow( monthItem ); QStandardItem* yearItem = new QStandardItem( tr( "Last Year" ) ); - yearItem->setData( YearChart, Breadcrumb::DefaultRole); + yearItem->setData( YearChart, Breadcrumb::DefaultRole ); chartItem->appendRow( yearItem ); QStandardItem* overallItem = new QStandardItem( tr( "Overall" ) ); overallItem->setData( OverallChart, Breadcrumb::DefaultRole ); From e51161e74ba111ef1ffeeb5acd65fa4a0de7552e Mon Sep 17 00:00:00 2001 From: Thierry Goeckel Date: Fri, 14 Jun 2013 22:43:29 +0200 Subject: [PATCH 3/3] Remove newline. --- src/libtomahawk/widgets/NetworkActivityWidget.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libtomahawk/widgets/NetworkActivityWidget.cpp b/src/libtomahawk/widgets/NetworkActivityWidget.cpp index 47753bed1..603290d2d 100644 --- a/src/libtomahawk/widgets/NetworkActivityWidget.cpp +++ b/src/libtomahawk/widgets/NetworkActivityWidget.cpp @@ -79,7 +79,6 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent ) chartItem->appendRow( overallItem ); d_func()->sortedProxy->setSourceModel( d_func()->crumbModelLeft ); d_func()->ui->breadCrumbLeft->setModel( d_func()->sortedProxy ); - d_func()->ui->breadCrumbLeft->setVisible( true ); }