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

Merge pull request #366 from YACReader/develop

Browse Source 
9.11
This commit is contained in:
Luis Ángel San Martín 2023-01-07 10:36:38 +01:00 committed by GitHub
commit fa3e5eac14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 1376 additions and 1332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CHANGELOG.md
View File

@ -2,6 +2,22 @@
Version counting is based on semantic versioning (Major.Feature.Patch)
## WIP
### YACReader
* Fix segfault (or worse) when exiting YACReader while processing a comic.
* Fix last read page calculation in double page mode.
### YACReaderLibrary
* Fix drag&drop in the comics grid view.
* Detect back/forward mouse buttons to move back and forward through the browsing history.
* Fix crash when disabling the server.
### All apps
* Run logger in a dedicated thread to avoid segfaults at application shutdown
* Add support for poppler-qt6 pdf backend
* Remove image allocation limit.
## 9.10
### YACReader

19
YACReader/YACReader.pro
View File

@ -214,28 +214,16 @@ win32 {
$(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${DEPLOYMENT_OUT_QM_DIR})
} else {
LRELEASE_DIR = ../release/languages/
QM_FILES_INSTALL_PATH = $$DATADIR/yacreader/languages
}
unix:!macx {
# set install prefix if it's empty
isEmpty(PREFIX) {
PREFIX = /usr
}
isEmpty(BINDIR) {
BINDIR = $$PREFIX/bin
}
isEmpty(LIBDIR) {
LIBDIR = $$PREFIX/lib
}
isEmpty(DATADIR) {
DATADIR = $$PREFIX/share
}
DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\""
#MAKE INSTALL
INSTALLS += bin docs icon desktop translation manpage
INSTALLS += bin docs icon desktop manpage
bin.path = $$BINDIR
isEmpty(DESTDIR) {
@ -256,9 +244,6 @@ icon.files = ../YACReader.svg
desktop.path = $$DATADIR/applications
desktop.files = ../YACReader.desktop
translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreader_*
manpage.path = $$DATADIR/man/man1
manpage.files = ../YACReader.1

5
YACReader/main.cpp
View File

@ -2,6 +2,7 @@
#include <QDir>
#include <QTranslator>
#include <QCommandLineParser>
#include <QImageReader>
#include "main_window_viewer.h"
#include "configuration.h"
@ -97,6 +98,10 @@ int main(int argc, char *argv[])
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QImageReader::setAllocationLimit(0);
#endif
#if defined(_MSC_VER) && defined(_DEBUG)
_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
#endif

21
YACReader/render.cpp
View File

@ -382,21 +382,24 @@ Render::Render()
Render::~Render()
{
if (comic != nullptr) {
comic->moveToThread(QApplication::instance()->thread());
comic->deleteLater();
}
foreach (PageRender *pr, pageRenders)
if (pr != nullptr) {
if (pr->wait())
for (auto *pr : pageRenders) {
if (pr != nullptr && pr->wait()) {
delete pr;
}
}
// TODO move to share_ptr
foreach (ImageFilter *filter, filters)
for (auto *filter : filters) {
delete filter;
}
if (comic != nullptr) {
comic->invalidate();
comic->deleteLater();
comic->thread()->quit();
comic->thread()->wait();
}
}
// Este método se encarga de forzar el renderizado de las páginas.
// Actualiza el buffer según es necesario.
// si la pagina actual no está renderizada, se lanza un hilo que la renderize (double or single page mode) y se emite una señal que indica que se está renderizando.

4
YACReader/viewer.cpp
View File

@ -1128,7 +1128,9 @@ void Viewer::updateComic(ComicDB &comic)
if (!doublePage || (doublePage && render->currentPageIsDoublePage() == false)) {
comic.info.currentPage = render->getIndex() + 1;
} else {
if (!(render->getIndex() + 1 == comic.info.currentPage || render->getIndex() + 2 == comic.info.currentPage)) {
if (doublePage && render->currentPageIsDoublePage() && (render->getIndex() + 2 >= render->numPages())) {
comic.info.currentPage = std::min(render->numPages(), render->getIndex() + 2);
} else {
comic.info.currentPage = std::min(render->numPages(), render->getIndex() + 1);
}
}

19
YACReaderLibrary/YACReaderLibrary.pro
View File

@ -307,6 +307,7 @@ win32 {
$(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${DEPLOYMENT_OUT_QM_DIR})
} else {
LRELEASE_DIR = ../release/languages/
QM_FILES_INSTALL_PATH = $$DATADIR/yacreader/languages
}
#QML/GridView
@ -328,24 +329,11 @@ unix:!macx:RESOURCES += qml_win.qrc
macx:RESOURCES += qml_osx.qrc
unix:!macx {
#set install prefix if it's empty
isEmpty(PREFIX) {
PREFIX = /usr
}
isEmpty(BINDIR) {
BINDIR = $$PREFIX/bin
}
isEmpty(LIBDIR) {
LIBDIR = $$PREFIX/lib
}
isEmpty(DATADIR) {
DATADIR = $$PREFIX/share
}
DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\""
#MAKE INSTALL
INSTALLS += bin icon desktop server translation manpage
INSTALLS += bin icon desktop server manpage
bin.path = $$BINDIR
isEmpty(DESTDIR) {
@ -363,9 +351,6 @@ icon.files = ../YACReaderLibrary.svg
desktop.path = $$DATADIR/applications
desktop.files = ../YACReaderLibrary.desktop
translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreaderlibrary_*
manpage.path = $$DATADIR/man/man1
manpage.files = ../YACReaderLibrary.1
}

1
YACReaderLibrary/comic_vine/comic_vine_dialog.cpp
View File

@ -33,6 +33,7 @@ ComicVineDialog::ComicVineDialog(QWidget *parent)
: QDialog(parent)
{
setWindowFlags(Qt::Window);
setModal(true);
doLayout();
doStackedWidgets();

27
YACReaderLibrary/initial_comic_info_extractor.cpp
View File

@ -27,38 +27,31 @@ void InitialComicInfoExtractor::extract()
#ifndef NO_PDF
if (fi.suffix().compare("pdf", Qt::CaseInsensitive) == 0) {
#if defined Q_OS_MAC && defined USE_PDFKIT
MacOSXPDFComic *pdfComic = new MacOSXPDFComic();
auto pdfComic = std::make_unique<MacOSXPDFComic>();
if (!pdfComic->openComic(_fileSource)) {
delete pdfComic;
// QImage p;
// p.load(":/images/notCover.png");
// p.save(_target);
return;
}
#elif defined USE_PDFIUM
auto pdfComic = new PdfiumComic();
auto pdfComic = std::make_unique<PdfiumComic>();
if (!pdfComic->openComic(_fileSource)) {
delete pdfComic;
return;
}
#else
Poppler::Document *pdfComic = Poppler::Document::load(_fileSource);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
auto pdfComic = Poppler::Document::load(_fileSource);
#else
auto _pdfComic = Poppler::Document::load(_fileSource);
auto pdfComic = std::unique_ptr<Poppler::Document>(_pdfComic);
#endif
#endif
if (!pdfComic) {
QLOG_WARN() << "Extracting cover: unable to open PDF file " << _fileSource;
// delete pdfComic; //TODO check if the delete is needed
pdfComic = 0;
// QImage p;
// p.load(":/images/notCover.png");
// p.save(_target);
return;
}
#if !defined USE_PDFKIT && !defined USE_PDFIUM
// poppler only, not mac
if (pdfComic->isLocked()) {
QLOG_WARN() << "Extracting cover: unable to open PDF file " << _fileSource;
delete pdfComic;
return;
}
#endif
@ -75,11 +68,7 @@ void InitialComicInfoExtractor::extract()
saveCover(_target, p);
} else if (_target != "") {
QLOG_WARN() << "Extracting cover: requested cover index greater than numPages " << _fileSource;
// QImage p;
// p.load(":/images/notCover.png");
// p.save(_target);
}
delete pdfComic;
}
return;
}

23
YACReaderLibrary/library_window.cpp
View File

@ -139,6 +139,29 @@ void LibraryWindow::afterLaunchTasks()
}
}
bool LibraryWindow::eventFilter(QObject *object, QEvent *event)
{
if (this->isActiveWindow()) {
if (event->type() == QEvent::MouseButtonRelease) {
auto mouseEvent = static_cast<QMouseEvent *>(event);
if (mouseEvent->button() == Qt::ForwardButton) {
forwardAction->trigger();
event->accept();
return true;
}
if (mouseEvent->button() == Qt::BackButton) {
backAction->trigger();
event->accept();
return true;
}
}
}
return QMainWindow::eventFilter(object, event);
}
void LibraryWindow::createSettings()
{
settings = new QSettings(YACReader::getSettingsPath() + "/YACReaderLibrary.ini", QSettings::IniFormat); // TODO unificar la creación del fichero de config con el servidor

2
YACReaderLibrary/library_window.h
View File

@ -434,6 +434,8 @@ public slots:
void afterLaunchTasks();
bool eventFilter(QObject *object, QEvent *event) override;
private:
//! @brief Exits search mode if it is active.
//! @return true If the search mode was active when this function was called.

7
YACReaderLibrary/main.cpp
View File

@ -11,6 +11,7 @@
#include <QLibrary>
#endif
#include <QCommandLineParser>
#include <QImageReader>
#include "yacreader_global.h"
#include "yacreader_http_server.h"
@ -130,6 +131,10 @@ int main(int argc, char **argv)
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QImageReader::setAllocationLimit(0);
#endif
QApplication app(argc, argv);
#ifdef FORCE_ANGLE
@ -269,6 +274,8 @@ int main(int argc, char **argv)
}
#endif
app.installEventFilter(mw);
int ret = app.exec();
QLOG_INFO() << "YACReaderLibrary closed with exit code :" << ret;

80
YACReaderLibrary/qml/GridComicsView.qml
View File

@ -413,46 +413,6 @@ Rectangle {
grid.contentX = grid.originX
}
DropArea {
anchors.fill: parent
onEntered: {
if(drag.hasUrls)
{
if(dropManager.canDropUrls(drag.urls, drag.action))
{
drag.accepted = true;
}else
drag.accepted = false;
}
else if (dropManager.canDropFormats(drag.formats)) {
drag.accepted = true;
} else
drag.accepted = false;
}
onDropped: {
if(drop.hasUrls && dropManager.canDropUrls(drop.urls, drop.action))
{
dropManager.droppedFiles(drop.urls, drop.action);
}
else{
if (dropManager.canDropFormats(drop.formats))
{
var destItem = grid.itemAt(drop.x,drop.y + grid.contentY);
var destLocalX = grid.mapToItem(destItem,drop.x,drop.y + grid.contentY).x
var realIndex = grid.indexAt(drop.x,drop.y + grid.contentY);
if(realIndex === -1)
realIndex = grid.count - 1;
var destIndex = destLocalX < (grid.cellWidth / 2) ? realIndex : realIndex + 1;
dropManager.droppedComicsForResortingAt(drop.getDataAsString(), destIndex);
}
}
}
}
property Component currentComicView: Component {
id: currentComicView
Rectangle {
@ -809,6 +769,46 @@ Rectangle {
currentIndexHelper.setCurrentIndex(ci);
grid.currentIndex = ci;
}
DropArea {
anchors.fill: parent
onEntered: drag => {
if(drag.hasUrls)
{
if(dropManager.canDropUrls(drag.urls, drag.action))
{
drag.accepted = true;
}else
drag.accepted = false;
}
else if (dropManager.canDropFormats(drag.formats)) {
drag.accepted = true;
} else
drag.accepted = false;
}
onDropped: drop => {
if(drop.hasUrls && dropManager.canDropUrls(drop.urls, drop.action))
{
dropManager.droppedFiles(drop.urls, drop.action);
}
else{
if (dropManager.canDropFormats(drop.formats))
{
var destItem = grid.itemAt(drop.x,drop.y + grid.contentY);
var destLocalX = grid.mapToItem(destItem,drop.x,drop.y + grid.contentY).x
var realIndex = grid.indexAt(drop.x,drop.y + grid.contentY);
if(realIndex === -1)
realIndex = grid.count - 1;
var destIndex = destLocalX < (grid.cellWidth / 2) ? realIndex : realIndex + 1;
dropManager.droppedComicsForResortingAt("", destIndex);
}
}
}
}
}
}
}

80
YACReaderLibrary/qml/GridComicsView6.qml
View File

@ -416,46 +416,6 @@ Rectangle {
grid.contentX = grid.originX
}
DropArea {
anchors.fill: parent
onEntered: {
if(drag.hasUrls)
{
if(dropManager.canDropUrls(drag.urls, drag.action))
{
drag.accepted = true;
}else
drag.accepted = false;
}
else if (dropManager.canDropFormats(drag.formats)) {
drag.accepted = true;
} else
drag.accepted = false;
}
onDropped: {
if(drop.hasUrls && dropManager.canDropUrls(drop.urls, drop.action))
{
dropManager.droppedFiles(drop.urls, drop.action);
}
else{
if (dropManager.canDropFormats(drop.formats))
{
var destItem = grid.itemAt(drop.x,drop.y + grid.contentY);
var destLocalX = grid.mapToItem(destItem,drop.x,drop.y + grid.contentY).x
var realIndex = grid.indexAt(drop.x,drop.y + grid.contentY);
if(realIndex === -1)
realIndex = grid.count - 1;
var destIndex = destLocalX < (grid.cellWidth / 2) ? realIndex : realIndex + 1;
dropManager.droppedComicsForResortingAt(drop.getDataAsString(), destIndex);
}
}
}
}
property Component currentComicView: Component {
id: currentComicView
Rectangle {
@ -816,6 +776,46 @@ Rectangle {
currentIndexHelper.setCurrentIndex(ci);
grid.currentIndex = ci;
}
DropArea {
anchors.fill: parent
onEntered: drag => {
if(drag.hasUrls)
{
if(dropManager.canDropUrls(drag.urls, drag.action))
{
drag.accepted = true;
}else
drag.accepted = false;
}
else if (dropManager.canDropFormats(drag.formats)) {
drag.accepted = true;
} else
drag.accepted = false;
}
onDropped: drop => {
if(drop.hasUrls && dropManager.canDropUrls(drop.urls, drop.action))
{
dropManager.droppedFiles(drop.urls, drop.action);
}
else{
if (dropManager.canDropFormats(drop.formats))
{
var destItem = grid.itemAt(drop.x,drop.y + grid.contentY);
var destLocalX = grid.mapToItem(destItem,drop.x,drop.y + grid.contentY).x
var realIndex = grid.indexAt(drop.x,drop.y + grid.contentY);
if(realIndex === -1)
realIndex = grid.count - 1;
var destIndex = destLocalX < (grid.cellWidth / 2) ? realIndex : realIndex + 1;
dropManager.droppedComicsForResortingAt("", destIndex);
}
}
}
}
}
}
}

15
YACReaderLibrary/server_config_dialog.cpp
View File

@ -167,8 +167,13 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent)
if (settings->value(SERVER_ON, true).toBool()) {
check->setChecked(true);
generateQR();
} else
} else {
ip->setDisabled(true);
port->setDisabled(true);
accept->setDisabled(true);
check->setChecked(false);
}
performanceWorkaroundCheck->setChecked(settings->value(REMOTE_BROWSE_PERFORMANCE_WORKAROUND, false).toBool());
@ -184,14 +189,18 @@ void ServerConfigDialog::enableServer(int status)
settings->beginGroup("libraryConfig");
if (status == Qt::Checked) {
ip->setDisabled(false);
port->setDisabled(false);
accept->setDisabled(false);
httpServer->start();
this->generateQR();
settings->setValue(SERVER_ON, true);
} else {
httpServer->stop();
qrCode->setPixmap(QPixmap());
ip->clear();
port->setText("");
ip->setDisabled(true);
port->setDisabled(true);
accept->setDisabled(true);
settings->setValue(SERVER_ON, false);
}
settings->endGroup();

12
YACReaderLibraryServer/YACReaderLibraryServer.pro
View File

@ -130,13 +130,6 @@ contains(QMAKE_TARGET.arch, x86_64) {
unix:!macx {
#set install prefix if it's empty
isEmpty(PREFIX) {
PREFIX = /usr
}
BINDIR = $$PREFIX/bin
LIBDIR = $$PREFIX/lib
DATADIR = $$PREFIX/share
DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\""
@ -150,7 +143,7 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$
}
CONFIG(server_standalone) {
INSTALLS += bin server translation systemd
INSTALLS += bin server systemd
}
else:CONFIG(server_bundled) {
INSTALLS += bin systemd
@ -169,9 +162,6 @@ server.files = ../release/server
systemd.path = $$LIBDIR/systemd/user
systemd.files = yacreaderlibraryserver.service
translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreaderlibrary_*
# TODO: We need a manpage for yaclibserver
#manpage.path = $$DATADIR/man/man1
#manpage.files = ../YACReaderLibrary.1

5
YACReaderLibraryServer/main.cpp
View File

@ -3,6 +3,7 @@
#include <QSysInfo>
#include <QDir>
#include <QCommandLineParser>
#include <QImageReader>
#include "comic_db.h"
#include "db_helper.h"
@ -81,6 +82,10 @@ int main(int argc, char **argv)
QCoreApplication app(argc, argv);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QImageReader::setAllocationLimit(0);
#endif
app.setApplicationName("YACReaderLibrary");
app.setOrganizationName("YACReader");

2
azure-pipelines-windows-template-qt6.yml
View File

@ -4,7 +4,7 @@ parameters:
qt_version: '6.2.2'
qt_spec: 'msvc2019_64'
qt_aqt_spec: 'win64_msvc2019_64'
vc_redist_url: 'https://aka.ms/vs/16/release/vc_redist.x64.exe'
vc_redist_url: 'https://aka.ms/vs/17/release/vc_redist.x64.exe'
vc_redist_file_name: 'vc_redist.x64.exe'
vc_vars: 'vcvars64.bat'

2
azure-pipelines-windows-template.yml
View File

@ -4,7 +4,7 @@ parameters:
qt_version: '5.15.2'
qt_spec: 'msvc2019_64'
qt_aqt_spec: 'win64_msvc2019_64'
vc_redist_url: 'https://aka.ms/vs/16/release/vc_redist.x64.exe'
vc_redist_url: 'https://aka.ms/vs/17/release/vc_redist.x64.exe'
vc_redist_file_name: 'vc_redist.x64.exe'
vc_vars: 'vcvars64.bat'

6
azure-pipelines.yml
View File

@ -234,7 +234,7 @@ jobs:
qt_version: '5.15.2'
qt_spec: 'msvc2019_64'
qt_aqt_spec: 'win64_msvc2019_64'
vc_redist_url: 'https://aka.ms/vs/16/release/vc_redist.x64.exe'
vc_redist_url: 'https://aka.ms/vs/17/release/vc_redist.x64.exe'
vc_redist_file_name: 'vc_redist.x64.exe'
vc_vars: 'vcvars64.bat'
@ -249,7 +249,7 @@ jobs:
qt_version: '6.3.1'
qt_spec: 'msvc2019_64'
qt_aqt_spec: 'win64_msvc2019_64'
vc_redist_url: 'https://aka.ms/vs/16/release/vc_redist.x64.exe'
vc_redist_url: 'https://aka.ms/vs/17/release/vc_redist.x64.exe'
vc_redist_file_name: 'vc_redist.x64.exe'
vc_vars: 'vcvars64.bat'
@ -264,7 +264,7 @@ jobs:
qt_version: '5.15.2'
qt_spec: 'msvc2019'
qt_aqt_spec: 'win32_msvc2019'
vc_redist_url: 'https://aka.ms/vs/16/release/vc_redist.x86.exe'
vc_redist_url: 'https://aka.ms/vs/17/release/vc_redist.x86.exe'
vc_redist_file_name: 'vc_redist.x86.exe'
vc_vars: 'vcvars32.bat'

4
ci/win/build_installer.iss
View File

@ -115,10 +115,6 @@ LaunchYACReaderLibrary=Start YACreaderLibrary after finishing installation
LaunchYACReader=Start YACreader after finishing installation
[Run]
Filename: {tmp}\vc_redist.{#PLATFORM}.exe; \
Parameters: "/uninstall /quiet /norestart"; \
StatusMsg: "Uninstalling VC++ Redistributables..."
Filename: {tmp}\vc_redist.{#PLATFORM}.exe; \
Parameters: "/install /quiet /norestart"; \
StatusMsg: "Installing VC++ Redistributables..."

4
ci/win/build_installer_qt6.iss
View File

@ -124,10 +124,6 @@ LaunchYACReaderLibrary=Start YACreaderLibrary after finishing installation
LaunchYACReader=Start YACreader after finishing installation
[Run]
Filename: {tmp}\vc_redist.{#PLATFORM}.exe; \
Parameters: "/uninstall /quiet /norestart"; \
StatusMsg: "Uninstalling VC++ Redistributables..."
Filename: {tmp}\vc_redist.{#PLATFORM}.exe; \
Parameters: "/install /quiet /norestart"; \
StatusMsg: "Installing VC++ Redistributables..."

24
common/comic.cpp
View File

@ -796,24 +796,27 @@ bool PDFComic::load(const QString &path, const ComicDB &comic)
void PDFComic::process()
{
#if defined Q_OS_MAC && defined USE_PDFKIT
pdfComic = new MacOSXPDFComic();
pdfComic = std::make_unique<MacOSXPDFComic>();
if (!pdfComic->openComic(_path)) {
delete pdfComic;
emit errorOpening();
return;
}
#elif defined USE_PDFIUM
pdfComic = new PdfiumComic();
pdfComic = std::make_unique<PdfiumComic>();
if (!pdfComic->openComic(_path)) {
delete pdfComic;
emit errorOpening();
return;
}
#else
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
pdfComic = Poppler::Document::load(_path);
#else
auto _pdfComic = Poppler::Document::load(_path);
pdfComic = std::unique_ptr<Poppler::Document>(_pdfComic);
#endif
if (!pdfComic) {
// delete pdfComic;
// pdfComic = 0;
moveToThread(QCoreApplication::instance()->thread());
emit errorOpening();
return;
@ -824,7 +827,6 @@ void PDFComic::process()
return;
}
// pdfComic->setRenderHint(Poppler::Document::Antialiasing, true);
pdfComic->setRenderHint(Poppler::Document::TextAntialiasing, true);
#endif
@ -853,7 +855,6 @@ void PDFComic::process()
int buffered_index = _index;
for (int i = buffered_index; i < nPages; i++) {
if (_invalidated) {
delete pdfComic;
moveToThread(QCoreApplication::instance()->thread());
return;
}
@ -862,14 +863,12 @@ void PDFComic::process()
}
for (int i = 0; i < buffered_index; i++) {
if (_invalidated) {
delete pdfComic;
moveToThread(QCoreApplication::instance()->thread());
return;
}
renderPage(i);
}
delete pdfComic;
moveToThread(QCoreApplication::instance()->thread());
emit imagesLoaded();
}
@ -883,15 +882,16 @@ void PDFComic::renderPage(int page)
QImage img = pdfComic->getPage(page);
if (!img.isNull()) {
#else
Poppler::Page *pdfpage = pdfComic->page(page);
std::unique_ptr<Poppler::Page> pdfpage(pdfComic->page(page));
if (pdfpage) {
QImage img = pdfpage->renderToImage(150, 150);
delete pdfpage;
#endif
QByteArray ba;
QBuffer buf(&ba);
buf.open(QIODevice::WriteOnly);
img.save(&buf, "jpg", 96);
_pages[page] = ba;
buf.close();
emit imageLoaded(page);
emit imageLoaded(page, _pages[page]);
}

9
common/comic.h
View File

@ -12,7 +12,7 @@
#include "pdf_comic.h"
#endif // NO_PDF
class ComicDB;
//#define EXTENSIONS << "*.jpg" << "*.jpeg" << "*.png" << "*.gif" << "*.tiff" << "*.tif" << "*.bmp" Comic::getSupportedImageFormats()
// #define EXTENSIONS_LITERAL << ".jpg" << ".jpeg" << ".png" << ".gif" << ".tiff" << ".tif" << ".bmp" //Comic::getSupportedImageLiteralFormats()
class Comic : public QObject
{
@ -165,13 +165,14 @@ class PDFComic : public Comic
private:
// pdf
#if defined Q_OS_MAC && defined USE_PDFKIT
MacOSXPDFComic *pdfComic;
std::unique_ptr<MacOSXPDFComic> pdfComic;
#elif defined USE_PDFIUM
PdfiumComic *pdfComic;
std::unique_ptr<PdfiumComic> pdfComic;
#else
Poppler::Document *pdfComic;
std::unique_ptr<Poppler::Document> pdfComic;
#endif
void renderPage(int page);
// void run();
public:

5
common/pdf_comic.h
View File

@ -5,6 +5,7 @@
#include <QImage>
#include <QFile>
#include <QMutex>
#include <QtGlobal>
#if defined Q_OS_MAC && defined USE_PDFKIT
class MacOSXPDFComic
@ -45,6 +46,10 @@ private:
QFile pdfFile;
};
#else
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <poppler-qt6.h>
#else
#include "poppler-qt5.h"
#endif // QT_VERSION
#endif // Q_OS_MAC
#endif // PDF_COMIC_H

2
common/yacreader_global.h
View File

@ -6,7 +6,7 @@
#include <QMetaType>
#include <QAbstractItemModel>
#define VERSION "9.10.0"
#define VERSION "9.11.0"
#define REMOTE_BROWSE_PERFORMANCE_WORKAROUND "REMOTE_BROWSE_PERFORMANCE_WORKAROUND"
#define IMPORT_COMIC_INFO_XML_METADATA "IMPORT_COMIC_INFO_XML_METADATA"

16
config.pri
View File

@ -93,4 +93,20 @@ macx:!CONFIG(pdfkit):!CONFIG(pdfium):!CONFIG(no_pdf) {
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050900
}
unix:!macx {
# set install prefix if it's empty
isEmpty(PREFIX) {
PREFIX = /usr
}
isEmpty(BINDIR) {
BINDIR = $$PREFIX/bin
}
isEmpty(LIBDIR) {
LIBDIR = $$PREFIX/lib
}
isEmpty(DATADIR) {
DATADIR = $$PREFIX/share
}
}
DEFINES += QT_DEPRECATED_WARNINGS

23
custom_widgets/whats_new_dialog.cpp
View File

@ -46,25 +46,20 @@ YACReader::WhatsNewDialog::WhatsNewDialog(QWidget *parent)
"color:#858585;");
auto text = new QLabel();
text->setText("New release with the following updates:<br/>"
text->setText("A small update with a bunch of fixes:<br/>"
"<br/>"
"<span style=\"font-weight:600\">YACReader</span><br/>"
" &#8226; Fixed color selection dialog appearing as a subwindow in macos.<br/>"
" &#8226; Better support for HDPI screens (SVG icons).<br/>"
" &#8226; Fix crash when exiting YACReader while it is processing a comic.<br/>"
" &#8226; Fix last read page calculation in double page mode.<br/>"
"<br/>"
"<span style=\"font-weight:600\">YACReaderLibrary</span><br/>"
" &#8226; New folder content view that replaces the old `subfolders in this folder` view shown when folders don't have direct comics. You may need to update your libraries to make folders display properly.<br/>"
" &#8226; Continue Reading view that it is shown for the root folder.<br/>"
" &#8226; UI gets updated when YACReaderLibrary gets updates from YACReader or YACReader for iOS.<br/>"
" &#8226; Fixed going forward history navigation.<br/>"
" &#8226; Fixed selected folder restoration after folder updates.<br/>"
" &#8226; Add option to delete metadata from comics.<br/>"
" &#8226; Better support for HDPI screens (SVG icons).<br/>"
" &#8226; Importing ComicInfo.XML is now optional, you can change the behavior in Settings -> General.<br/>"
" &#8226; Add option to scan XML metadata from all the comics in a folder.<br/>"
" &#8226; Fix drag&drop in the comics grid view.<br/>"
" &#8226; Detect back/forward mouse buttons to move back and forward through the browsing history.<br/>"
" &#8226; Fix crash when disabling the server.<br/>"
"<br/>"
"<span style=\"font-weight:600\">Server</span><br/>"
" &#8226; New webui status page (reachable by navigating to server::port/webui).<br/>"
"<span style=\"font-weight:600\">All apps</span><br/>"
" &#8226; Add support for poppler-qt6 pdf backend (only relevat if you are building YACReader yourself).<br/>"
" &#8226; Remove image allocation limit in Qt6.<br/>"
"<br/>"
"NOTE: Importing metadata from ComicInfo.XML in now disabled by default, if you want you can enable it Settings -> General.<br/>"
"<br/>"

15
dependencies/pdf_backend.pri vendored
View File

@ -55,6 +55,19 @@ CONFIG(poppler) {
LIBS += -L$$PWD/poppler/dependencies/bin
}
if(unix|mingw):!macx {
greaterThan (QT_MAJOR_VERSION, 5) {
!contains(QT_CONFIG, no-pkg-config):packagesExist(poppler-qt6) {
message("Using system provided installation of poppler-qt6 found by pkg-config.")
CONFIG += link_pkgconfig
PKGCONFIG += poppler-qt6
} else:!macx:exists(/usr/include/poppler/qt6) {
message("Using system provided installation of poppler-qt6.")
INCLUDEPATH += /usr/include/poppler/qt6
LIBS += -lpoppler-qt6
} else {
error("Could not find poppler-qt6")
}
} else {
!contains(QT_CONFIG, no-pkg-config):packagesExist(poppler-qt5) {
message("Using system provided installation of poppler-qt5 found by pkg-config.")
CONFIG += link_pkgconfig
@ -66,7 +79,7 @@ CONFIG(poppler) {
} else {
error("Could not find poppler-qt5")
}
}
}
unix:macx {
error (Poppler backend is currently not supported on macOS)

2
third_party/QsLog/QsLog.pri vendored
View File

@ -1,7 +1,7 @@
INCLUDEPATH += $$PWD
#DEFINES += QS_LOG_LINE_NUMBERS # automatically writes the file and line for each log message
#DEFINES += QS_LOG_DISABLE # logging code is replaced with a no-op
#DEFINES += QS_LOG_SEPARATE_THREAD # messages are queued and written from a separate thread
DEFINES += QS_LOG_SEPARATE_THREAD # messages are queued and written from a separate thread
#DEFINES += QS_LOG_WIN_PRINTF_CONSOLE # Use fprintf instead of OutputDebugString on Windows
#DEFINES += QS_LOG_WINDOW # allows easily showing log messages in a UI