From 376d2fbb78114e746618f14afe7728cf9793630b Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 1 Jun 2013 11:17:42 +0200 Subject: Do something when SortOrder is changed in ArchiveView Actually do something when the sort order is changed. That resulted in various fixes to both model and view, since both had completely untested codepaths. Most notable fix: Only select those seriesparts which are actually mapped to the selected genre or actor. --- archivemodel.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'archivemodel.h') diff --git a/archivemodel.h b/archivemodel.h index f4af14e..b4fdcd5 100644 --- a/archivemodel.h +++ b/archivemodel.h @@ -17,7 +17,7 @@ class ArchiveModel : public SmTreeModel { Q_OBJECT public: enum CustomRoles { NameRole = Qt::UserRole + 1, SeriesIdRole = Qt::UserRole + 2, SeriesPartIdRole = Qt::UserRole + 3, SeriesPartRole = Qt::UserRole + 4, TypeRole = Qt::UserRole + 5, FavoriteRole = Qt::UserRole + 6, SubtitleRole = Qt::UserRole + 7, CountRole = Qt::UserRole + 8 }; - enum Fields { Name = 0, SeriesId = 1, SeriesPartId = 2, SeriesPart = 3, Type = 4, Favorite = 5, Subtitle = 6, Count = 7 }; + enum Fields { Name = 0, GenericId = 1, SeriesPartId = 2, SeriesPart = 3, Type = 4, Favorite = 5, Subtitle = 6, Count = 7 }; enum Order { SeriesName, Actor, Genre }; enum { NumFields = 8 }; enum NodeType { SeriesNode, SeriesPartNode, GenreNode, ActorNode }; @@ -29,6 +29,7 @@ class ArchiveModel : public SmTreeModel { public slots: void setOrder(int order); + void setOrder(const QString &order); private: void populateBySeriesName(); @@ -36,9 +37,9 @@ class ArchiveModel : public SmTreeModel { void populateByActor(); void fetchChildren(SmTreeItem *parent); void fetchSeries(const QVariant &id, SmTreeItem *parent); - void fetchParts(SmTreeItem *parent); + void fetchParts(const QVariant &id, SmTreeItem *parent); QSqlDatabase mDb; - QHash mAvailableOrders; + QHash mAvailableOrders; int mOrder; }; -- cgit v1.2.3-70-g09d2