mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add setting to disable the continue reading banner in the grid view

Browse Source
This commit is contained in:
Luis Ángel San Martín 2019-08-11 11:47:14 +02:00
parent 901d0ab03a
commit 4f4c562a33
5 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
YACReaderLibrary/grid_comics_view.cpp
View File

@ -446,7 +446,8 @@ void GridComicsView::setCurrentComicIfNeeded()
bool showCurrentComic = found && bool showCurrentComic = found &&
filterEnabled == false && filterEnabled == false &&
(mode == ComicModel::Mode::Folder || mode == ComicModel::Mode::ReadingList); (mode == ComicModel::Mode::Folder || mode == ComicModel::Mode::ReadingList) &&
settings->value(DISPLAY_CONTINUE_READING_IN_GRID_VIEW, true).toBool();
if (showCurrentComic) { if (showCurrentComic) {
ctxt->setContextProperty("currentComic", &currentComic); ctxt->setContextProperty("currentComic", &currentComic);

19
YACReaderLibrary/options_dialog.cpp
View File

@ -7,6 +7,8 @@
#include "yacreader_flow_config_widget.h" #include "yacreader_flow_config_widget.h"
#include "api_key_dialog.h" #include "api_key_dialog.h"
#include "yacreader_global_gui.h"
#ifndef NO_OPENGL #ifndef NO_OPENGL
FlowType flowType = Strip; FlowType flowType = Strip;
#endif #endif
@ -80,7 +82,16 @@ OptionsDialog::OptionsDialog(QWidget *parent)
auto gridBackgroundGroup = new QGroupBox(tr("Background")); auto gridBackgroundGroup = new QGroupBox(tr("Background"));
gridBackgroundGroup->setLayout(gridBackgroundLayout); gridBackgroundGroup->setLayout(gridBackgroundLayout);
displayContinueReadingBannerCheck = new QCheckBox(tr("Display continue reading banner"));
auto continueReadingLayout = new QVBoxLayout();
continueReadingLayout->addWidget(displayContinueReadingBannerCheck);
auto continueReadingGroup = new QGroupBox(tr("Continue reading"));
continueReadingGroup->setLayout(continueReadingLayout);
gridViewLayout->addWidget(gridBackgroundGroup); gridViewLayout->addWidget(gridBackgroundGroup);
gridViewLayout->addWidget(continueReadingGroup);
gridViewLayout->addStretch(); gridViewLayout->addStretch();
connect(useBackgroundImageCheck, SIGNAL(clicked(bool)), this, SLOT(useBackgroundImageCheckClicked(bool))); connect(useBackgroundImageCheck, SIGNAL(clicked(bool)), this, SLOT(useBackgroundImageCheckClicked(bool)));
@ -90,6 +101,12 @@ OptionsDialog::OptionsDialog(QWidget *parent)
connect(resetButton, &QPushButton::clicked, this, &OptionsDialog::resetToDefaults); connect(resetButton, &QPushButton::clicked, this, &OptionsDialog::resetToDefaults);
//end grid view background config //end grid view background config
connect(displayContinueReadingBannerCheck, &QCheckBox::clicked, this, [this]() {
this->settings->setValue(DISPLAY_CONTINUE_READING_IN_GRID_VIEW, this->displayContinueReadingBannerCheck->isChecked());
emit optionsChanged();
});
auto comicFlowW = new QWidget; auto comicFlowW = new QWidget;
comicFlowW->setLayout(flowLayout); comicFlowW->setLayout(flowLayout);
@ -141,6 +158,8 @@ void OptionsDialog::restoreOptions(QSettings *settings)
opacityLabel->setVisible(useBackgroundImage); opacityLabel->setVisible(useBackgroundImage);
blurLabel->setVisible(useBackgroundImage); blurLabel->setVisible(useBackgroundImage);
useCurrentComicCoverCheck->setVisible(useBackgroundImage); useCurrentComicCoverCheck->setVisible(useBackgroundImage);
displayContinueReadingBannerCheck->setChecked(settings->value(DISPLAY_CONTINUE_READING_IN_GRID_VIEW, true).toBool());
} }
void OptionsDialog::useBackgroundImageCheckClicked(bool checked) void OptionsDialog::useBackgroundImageCheckClicked(bool checked)

2
YACReaderLibrary/options_dialog.h
View File

@ -34,6 +34,8 @@ private:
QLabel *opacityLabel; QLabel *opacityLabel;
QLabel *blurLabel; QLabel *blurLabel;
QPushButton *resetButton; QPushButton *resetButton;
QCheckBox *displayContinueReadingBannerCheck;
}; };
#endif #endif

5
common/yacreader_global.h
View File

@ -5,11 +5,6 @@
#define VERSION "9.5.0" #define VERSION "9.5.0"
#define USE_BACKGROUND_IMAGE_IN_GRID_VIEW "USE_BACKGROUND_IMAGE_IN_GRID_VIEW"
#define OPACITY_BACKGROUND_IMAGE_IN_GRID_VIEW "OPACITY_BACKGROUND_IMAGE_IN_GRID_VIEW"
#define BLUR_RADIUS_BACKGROUND_IMAGE_IN_GRID_VIEW "BLUR_RADIUS_BACKGROUND_IMAGE_IN_GRID_VIEW"
#define USE_SELECTED_COMIC_COVER_AS_BACKGROUND_IMAGE_IN_GRID_VIEW "USE_SELECTED_COMIC_COVER_AS_BACKGROUND_IMAGE_IN_GRID_VIEW"
#define REMOTE_BROWSE_PERFORMANCE_WORKAROUND "REMOTE_BROWSE_PERFORMANCE_WORKAROUND" #define REMOTE_BROWSE_PERFORMANCE_WORKAROUND "REMOTE_BROWSE_PERFORMANCE_WORKAROUND"
#define NUM_DAYS_BETWEEN_VERSION_CHECKS "NUM_DAYS_BETWEEN_VERSION_CHECKS" #define NUM_DAYS_BETWEEN_VERSION_CHECKS "NUM_DAYS_BETWEEN_VERSION_CHECKS"

6
common/yacreader_global_gui.h
View File

@ -61,6 +61,12 @@
#define COMIC_VINE_API_KEY "COMIC_VINE_API_KEY" #define COMIC_VINE_API_KEY "COMIC_VINE_API_KEY"
#define COMIC_VINE_BASE_URL "COMIC_VINE_BASE_URL" #define COMIC_VINE_BASE_URL "COMIC_VINE_BASE_URL"
#define USE_BACKGROUND_IMAGE_IN_GRID_VIEW "USE_BACKGROUND_IMAGE_IN_GRID_VIEW"
#define OPACITY_BACKGROUND_IMAGE_IN_GRID_VIEW "OPACITY_BACKGROUND_IMAGE_IN_GRID_VIEW"
#define BLUR_RADIUS_BACKGROUND_IMAGE_IN_GRID_VIEW "BLUR_RADIUS_BACKGROUND_IMAGE_IN_GRID_VIEW"
#define USE_SELECTED_COMIC_COVER_AS_BACKGROUND_IMAGE_IN_GRID_VIEW "USE_SELECTED_COMIC_COVER_AS_BACKGROUND_IMAGE_IN_GRID_VIEW"
#define DISPLAY_CONTINUE_READING_IN_GRID_VIEW "DISPLAY_CONTINUE_READING_IN_GRID_VIEW"
namespace YACReader { namespace YACReader {
static const QString YACReaderLibrarComiscSelectionMimeDataFormat = "application/yacreaderlibrary-comics-ids"; static const QString YACReaderLibrarComiscSelectionMimeDataFormat = "application/yacreaderlibrary-comics-ids";