mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix opening a comic from the current/next comic banner in the grid view

Browse Source
This commit is contained in:
Luis Ángel San Martín 2021-06-19 07:24:29 +02:00
parent ad036ec6ae
commit 91c9375dc1
5 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
YACReaderLibrary/comics_view.h
View File

@ -38,7 +38,7 @@ public slots:
signals: signals:
void selected(unsigned int); void selected(unsigned int);
void openComic(); void openComic(const ComicDB &comic, const ComicModel::Mode mode);
void comicRated(int, QModelIndex); void comicRated(int, QModelIndex);
//Context menus //Context menus

6
YACReaderLibrary/grid_comics_view.cpp
View File

@ -398,7 +398,11 @@ void GridComicsView::selectIndex(int index)
void GridComicsView::triggerOpenCurrentComic() void GridComicsView::triggerOpenCurrentComic()
{ {
emit openComic(); if (model == nullptr) {
return;
}
emit openComic(currentComic, model->getMode());
} }
void GridComicsView::rate(int index, int rating) void GridComicsView::rate(int index, int rating)

10
YACReaderLibrary/library_window.cpp
View File

@ -1840,11 +1840,18 @@ void LibraryWindow::checkEmptyFolder()
void LibraryWindow::openComic() void LibraryWindow::openComic()
{ {
if (!importedCovers) { if (!importedCovers) {
auto libraryId = libraries.getId(selectedLibrary->currentText());
auto comic = comicsModel->getComic(comicsViewsManager->comicsView->currentIndex()); auto comic = comicsModel->getComic(comicsViewsManager->comicsView->currentIndex());
auto mode = comicsModel->getMode(); auto mode = comicsModel->getMode();
openComic(comic, mode);
}
}
void LibraryWindow::openComic(const ComicDB &comic, const ComicModel::Mode mode)
{
auto libraryId = libraries.getId(selectedLibrary->currentText());
OpenComicSource::Source source; OpenComicSource::Source source;
if (mode == ComicModel::ReadingList) { if (mode == ComicModel::ReadingList) {
@ -1866,7 +1873,6 @@ void LibraryWindow::openComic()
#endif #endif
} }
} }
}
void LibraryWindow::setCurrentComicsStatusReaded(YACReaderComicReadStatus readStatus) void LibraryWindow::setCurrentComicsStatusReaded(YACReaderComicReadStatus readStatus)
{ {

4
YACReaderLibrary/library_window.h
View File

@ -13,6 +13,8 @@
#include "comic_query_result_processor.h" #include "comic_query_result_processor.h"
#include "folder_query_result_processor.h" #include "folder_query_result_processor.h"
#include "comic_model.h"
#include <future> #include <future>
#include <memory> #include <memory>
@ -77,7 +79,6 @@ class YACReaderHistoryController;
class EmptyLabelWidget; class EmptyLabelWidget;
class EmptySpecialListWidget; class EmptySpecialListWidget;
class EmptyReadingListWidget; class EmptyReadingListWidget;
class YACReaderComicsViewsManager;
namespace YACReader { namespace YACReader {
class TrayIconController; class TrayIconController;
@ -315,6 +316,7 @@ public slots:
void selectSubfolder(const QModelIndex &mi, int child); void selectSubfolder(const QModelIndex &mi, int child);
void checkEmptyFolder(); void checkEmptyFolder();
void openComic(); void openComic();
void openComic(const ComicDB &comic, const ComicModel::Mode mode);
void createLibrary(); void createLibrary();
void create(QString source, QString dest, QString name); void create(QString source, QString dest, QString name);
void showAddLibrary(); void showAddLibrary();

2
YACReaderLibrary/yacreader_comics_views_manager.cpp
View File

@ -146,7 +146,7 @@ void YACReaderComicsViewsManager::doComicsViewConnections()
connect(comicsView, SIGNAL(comicRated(int, QModelIndex)), libraryWindow->comicsModel, SLOT(updateRating(int, QModelIndex))); connect(comicsView, SIGNAL(comicRated(int, QModelIndex)), libraryWindow->comicsModel, SLOT(updateRating(int, QModelIndex)));
connect(libraryWindow->showHideMarksAction, SIGNAL(toggled(bool)), comicsView, SLOT(setShowMarks(bool))); connect(libraryWindow->showHideMarksAction, SIGNAL(toggled(bool)), comicsView, SLOT(setShowMarks(bool)));
connect(comicsView, SIGNAL(selected(unsigned int)), libraryWindow, SLOT(openComic())); connect(comicsView, SIGNAL(selected(unsigned int)), libraryWindow, SLOT(openComic()));
connect(comicsView, SIGNAL(openComic()), libraryWindow, SLOT(openComic())); connect(comicsView, SIGNAL(openComic(const ComicDB &, const ComicModel::Mode)), libraryWindow, SLOT(openComic(const ComicDB &, const ComicModel::Mode)));
connect(libraryWindow->selectAllComicsAction, SIGNAL(triggered()), comicsView, SLOT(selectAll())); connect(libraryWindow->selectAllComicsAction, SIGNAL(triggered()), comicsView, SLOT(selectAll()));