From ac3b3a8a85a3110b8632ec31faaf4c006b481984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 2 Nov 2014 09:59:51 +0100 Subject: [PATCH] fixed regression on comics' actions when no comic is selected --- YACReaderLibrary/classic_comics_view.cpp | 5 +++++ YACReaderLibrary/classic_comics_view.h | 1 + YACReaderLibrary/comics_view.h | 1 + YACReaderLibrary/grid_comics_view.h | 2 +- YACReaderLibrary/library_window.cpp | 6 +++--- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/YACReaderLibrary/classic_comics_view.cpp b/YACReaderLibrary/classic_comics_view.cpp index e2197d30..ae7b2115 100644 --- a/YACReaderLibrary/classic_comics_view.cpp +++ b/YACReaderLibrary/classic_comics_view.cpp @@ -222,6 +222,11 @@ void ClassicComicsView::enableFilterMode(bool enabled) searching = enabled; } +void ClassicComicsView::selectIndex(int index) +{ + tableView->selectRow(index); +} + void ClassicComicsView::selectAll() { tableView->selectAll(); diff --git a/YACReaderLibrary/classic_comics_view.h b/YACReaderLibrary/classic_comics_view.h index 8d58f901..600f2e22 100644 --- a/YACReaderLibrary/classic_comics_view.h +++ b/YACReaderLibrary/classic_comics_view.h @@ -30,6 +30,7 @@ public: void setItemActions(const QList & actions); void setViewActions(const QList & actions); void enableFilterMode(bool enabled); + void selectIndex(int index); public slots: void centerComicFlow(const QModelIndex & mi); diff --git a/YACReaderLibrary/comics_view.h b/YACReaderLibrary/comics_view.h index 9910d22d..d3cff85a 100644 --- a/YACReaderLibrary/comics_view.h +++ b/YACReaderLibrary/comics_view.h @@ -29,6 +29,7 @@ public: //actions for visual-oriented views virtual void setViewActions(const QList & actions) = 0; virtual void enableFilterMode(bool enabled) = 0; + virtual void selectIndex(int index) = 0; signals: void selected(unsigned int); diff --git a/YACReaderLibrary/grid_comics_view.h b/YACReaderLibrary/grid_comics_view.h index 1811c015..a8008e74 100644 --- a/YACReaderLibrary/grid_comics_view.h +++ b/YACReaderLibrary/grid_comics_view.h @@ -30,7 +30,7 @@ public: void setViewActions(const QList & actions); void enableFilterMode(bool enabled); QSize sizeHint(); -signals: + signals: void comicRated(int,QModelIndex); void doubleClicked(QModelIndex); diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 7f5b0534..dd428d49 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -2372,11 +2372,11 @@ QModelIndexList LibraryWindow::getSelectedComics() QLOG_INFO() << "selection count " << selection.length(); qSort(selection.begin(),selection.end(),lessThanModelIndexRow); - /*if(selection.count()==0) + if(selection.count()==0) { - comicsView->selectRow(comicFlow->centerIndex()); + comicsView->selectIndex(0); selection = comicsView->selectionModel()->selectedRows(); - }*/ + } return selection; }