summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArno <am@disconnect.de>2011-01-22 12:06:00 +0100
committerArno <am@disconnect.de>2011-01-22 12:06:00 +0100
commit3b4e57cb0bd13681a426907dda36d6d213b0a2e8 (patch)
tree47694d107678422b981e92eb3d5cb6e093fac7ee
parentafd74157ef705fa2b0323727b3a37e2806bb0730 (diff)
downloadSheMov-3b4e57cb0bd13681a426907dda36d6d213b0a2e8.tar.gz
SheMov-3b4e57cb0bd13681a426907dda36d6d213b0a2e8.tar.bz2
SheMov-3b4e57cb0bd13681a426907dda36d6d213b0a2e8.zip
Bugfix for favorites
Fix bug in SeriesTreeWidget when filtering. Take into account new column Favorite when filtering, so it will be hidden in SeriesTree.
-rw-r--r--seriestreemodel.cpp4
-rw-r--r--seriestreemodel.h2
-rw-r--r--seriestreewidget.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/seriestreemodel.cpp b/seriestreemodel.cpp
index fcc993f..7cc578a 100644
--- a/seriestreemodel.cpp
+++ b/seriestreemodel.cpp
@@ -359,7 +359,7 @@ void SeriesTreeModel::setMappingFilter(const QString &filter, const QString &tab
if(tableIdQuery.exec()){
mSeriesPartSeriesMap.clear();
QStringList ids;
- SmTreeItem *rootItem = new SmTreeItem(5);
+ SmTreeItem *rootItem = new SmTreeItem(6);
while(tableIdQuery.next()){
ids << QString::number(tableIdQuery.value(0).toInt());
}
@@ -417,7 +417,7 @@ void SeriesTreeModel::setFileFilter(const QString &filter, const QString &column
}
if(seriesIdQuery.exec()){
mSeriesPartSeriesMap.clear();
- SmTreeItem *rootItem = new SmTreeItem(5);
+ SmTreeItem *rootItem = new SmTreeItem(6);
while(seriesIdQuery.next()){
QList<QVariant> seriesData;
seriesData << seriesIdQuery.value(1) << seriesIdQuery.value(0) << QVariant() << QVariant() << Series << false;
diff --git a/seriestreemodel.h b/seriestreemodel.h
index c20014d..9c1d2d1 100644
--- a/seriestreemodel.h
+++ b/seriestreemodel.h
@@ -20,7 +20,7 @@ class QSqlQuery;
class SeriesTreeModel : 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 };
+ 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 };
enum Fields { Name = 0, SeriesId = 1, SeriesPartId = 2, SeriesPart = 3, Type = 4, Favorite = 5 };
enum Types { Series, Part, NewSeries };
enum QueryType { NumericQuery, TextQuery };
diff --git a/seriestreewidget.cpp b/seriestreewidget.cpp
index 518cac1..976d55a 100644
--- a/seriestreewidget.cpp
+++ b/seriestreewidget.cpp
@@ -64,7 +64,7 @@ SeriesTreeWidget::SeriesTreeWidget(QWidget *parent) : QWidget(parent){
mProxy->setSourceModel(mModel);
mView->setModel(mProxy);
mView->setSortingEnabled(true);
- for(int i = 1; i < 6 ;++i){
+ for(int i = 1; i < 6; ++i){
mView->setColumnHidden(i, true);
}
mView->resizeColumnToContents(0);