9.16.0

.gitignore

@@ -9,6 +9,7 @@ libp7zip
 YACReader/build
 YACReaderLibrary/build
 YACReaderLibraryServer/build
+build/
 
 # C++ objects and libs
 *.slo
@@ -21,6 +22,7 @@ YACReaderLibraryServer/build
 *.dll
 *.dylib
 *.pch
+*.obj
 
 # Qt-es
 object_script.*.Release

CHANGELOG.md

@@ -2,6 +2,35 @@
 
 Version counting is based on semantic versioning (Major.Feature.Patch)
 
+## 9.16.0
+
+### YACReader
+* Don't use scroll animations on macos by default, it where hdpi scroll is most likely to be used.
+* New toolbar on macos.
+* New mouse modes to turn pages. You can setup the app to use the left/right buttons to turn pages directly or you can click on the left/right part of the screen to turn pages.
+* New setting to control whether the time is shown in the 'current page/total' label.
+
+### YACReaderLibrary
+* Improve flexibility of the open comic in third party app setting so more complex commands can be used. e.g. `open -a "/Applications/My Reader.app" "{comic_file_path}"`.
+* Fix setting the comic rating in the table view.
+* Log libraries validation when the app starts.
+* New toolbar on macos.
+* New setting in Comic Vine scraper to force exact volume matches.
+* Better default search query in the Comic Vine scraper.
+* Improved navigation in Comic Vine scraper, including keeping the current query around to make edits and refined searches easier.
+* Add support for custom covers for any folder using the context menu.
+* The edit cover buttons now support looping through pages, going forward from the last returns to the first, and going backward from the first jumps to the last.
+* Add support for custom covers for comics using the edit metadata dialog, you can use a pick file button or drag&drop an image into the cover view in the dialog.
+* Covers can be set in bulk for various comics at once.
+* New button to reset to the default cover of a comic.
+* Support for storing the new image filters from iOS and Android apps.
+
+### YACReaderLibraryServer
+* Log libraries validation when the app starts.
+
+### All apps
+* PDF libraries have been updated for all Windows builds.
+
 ## 9.15.0
 
 ### YACReader

README.md

@@ -75,3 +75,6 @@ YACReader is free but it needs money to keep being alive, so please, if you like
 
 ## Hacktoberfest
 If you are interested in YACReader, please contact me so we can discuss your next steps.
+
+## Sponsors 
+Free code signing on Windows provided by [SignPath.io](https://signpath.io/), certificate by [SignPath Foundation](https://signpath.org/)

YACReader/YACReader.pro

@@ -80,6 +80,7 @@ HEADERS +=  ../common/comic.h \
             goto_dialog.h \
             magnifying_glass.h \
             main_window_viewer.h \
+            mouse_handler.h \
             viewer.h \
             goto_flow.h \
             options_dialog.h \
@@ -119,6 +120,7 @@ SOURCES +=  ../common/comic.cpp \
             goto_dialog.cpp \
             magnifying_glass.cpp \
             main_window_viewer.cpp \
+            mouse_handler.cpp \
             viewer.cpp \
             goto_flow.cpp \
             options_dialog.cpp \

YACReader/configuration.h

@@ -1,5 +1,6 @@
 #ifndef __CONFIGURATION_H
 #define __CONFIGURATION_H
+
 #include <QByteArray>
 #include <QString>
 #include <QSize>
@@ -15,6 +16,21 @@
 
 using namespace YACReader;
 
+namespace YACReader {
+
+enum FitMode {
+    ToWidth = 0x01,
+    ToHeight = 0x02,
+    FullRes = 0x03,
+    FullPage = 0x04
+};
+
+enum MouseMode {
+    Normal,
+    LeftRightNavigation,
+    HotAreas
+};
+
 class Configuration : public QObject
 {
     Q_OBJECT
@@ -75,6 +91,8 @@ class Configuration : public QObject
     void setShowToolbars(bool b) { settings->setValue(SHOW_TOOLBARS, b); }
     bool getShowInformation() { return settings->value(SHOW_INFO, false).toBool(); }
     void setShowInformation(bool b) { settings->setValue(SHOW_INFO, b); }
+    bool getShowTimeInInformation() { return settings->value(SHOW_TIME_IN_INFO, true).toBool(); }
+    void setShowTimeInInformation(bool b) { settings->setValue(SHOW_TIME_IN_INFO, b); }
     QDate getLastVersionCheck() { return settings->value(LAST_VERSION_CHECK).toDate(); }
     void setLastVersionCheck(const QDate &date) { settings->setValue(LAST_VERSION_CHECK, date); }
     int getNumDaysBetweenVersionChecks() { return settings->value(NUM_DAYS_BETWEEN_VERSION_CHECKS, 1).toInt(); }
@@ -84,7 +102,21 @@ class Configuration : public QObject
     bool getDoNotTurnPageOnScroll() { return settings->value(DO_NOT_TURN_PAGE_ON_SCROLL, false).toBool(); }
     bool getUseSingleScrollStepToTurnPage() { return settings->value(USE_SINGLE_SCROLL_STEP_TO_TURN_PAGE, false).toBool(); }
     void setDisableScrollAnimation(bool b) { settings->setValue(DISABLE_SCROLL_ANIMATION, b); }
-    bool getDisableScrollAnimation() { return settings->value(DISABLE_SCROLL_ANIMATION, false).toBool(); }
+    bool getDisableScrollAnimation()
+    {
+#ifdef Q_OS_MACOS
+        auto defaultValue = true;
+#else
+        auto defaultValue = false;
+#endif
+
+        return settings->value(DISABLE_SCROLL_ANIMATION, defaultValue).toBool();
+    }
+
+    MouseMode getMouseMode() { return static_cast<MouseMode>(settings->value(MOUSE_MODE, MouseMode::Normal).toInt()); }
+    void setMouseMode(MouseMode mouseMode) { settings->setValue(MOUSE_MODE, static_cast<int>(mouseMode)); }
 };
 
+}
+
 #endif

YACReader/main_window_viewer.cpp

@@ -486,7 +486,10 @@ void MainWindowViewer::createToolBars()
 #endif
 
 #ifndef Y_MAC_UI
-    comicToolBar->setStyleSheet("QToolBar{border:none;}");
+    comicToolBar->setStyleSheet(R"(
+        QToolBar { border: none; }
+        QToolButton:checked { background-color: #cccccc; }
+    )");
     comicToolBar->setIconSize(QSize(18, 18));
 #endif
 
@@ -625,7 +628,7 @@ void MainWindowViewer::createToolBars()
 
     viewer->addAction(closeAction);
 
-    viewer->setContextMenuPolicy(Qt::ActionsContextMenu);
+    updateContextMenuPolicy();
 
     // MacOSX app menus
 #ifdef Q_OS_MACOS
@@ -777,9 +780,25 @@ void MainWindowViewer::openComicFromRecentAction(QAction *action)
 
 void MainWindowViewer::reloadOptions()
 {
+    updateContextMenuPolicy();
     viewer->updateConfig(settings);
 }
 
+void MainWindowViewer::updateContextMenuPolicy()
+{
+    auto mouseMode = Configuration::getConfiguration().getMouseMode();
+    switch (mouseMode) {
+
+    case Normal:
+    case HotAreas:
+        viewer->setContextMenuPolicy(Qt::ActionsContextMenu);
+        break;
+    case LeftRightNavigation:
+        viewer->setContextMenuPolicy(Qt::NoContextMenu);
+        break;
+    }
+}
+
 void MainWindowViewer::open()
 {
     QFileDialog openDialog;
@@ -970,9 +989,11 @@ void MainWindowViewer::disablePreviousNextComicActions()
 
 void MainWindowViewer::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    if (event->button() == Qt::LeftButton) {
-        toggleFullScreen();
-        event->accept();
+    if (Configuration::getConfiguration().getMouseMode() == MouseMode::Normal) {
+        if (event->button() == Qt::LeftButton) {
+            toggleFullScreen();
+            event->accept();
+        }
     }
 }
 
@@ -1319,7 +1340,11 @@ void MainWindowViewer::toggleFitToWidthSlider()
     if (zoomSliderAction->isVisible()) {
         zoomSliderAction->hide();
     } else {
+#if defined(Y_MAC_UI) && (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+        zoomSliderAction->move((this->width() - zoomSliderAction->width()) / 2, y);
+#else
         zoomSliderAction->move(250, y);
+#endif
         zoomSliderAction->show();
     }
 }

YACReader/main_window_viewer.h

@@ -67,6 +67,7 @@ public slots:
     void increasePageZoomLevel();
     void decreasePageZoomLevel();
     void reloadOptions();
+    void updateContextMenuPolicy();
     void fitToWidth();
     void fitToHeight();
     void toggleWidthHeight();

YACReader/mouse_handler.cpp

@@ -0,0 +1,149 @@
+#include "mouse_handler.h"
+
+#include <QtWidgets>
+
+#include "configuration.h"
+#include "magnifying_glass.h"
+#include "render.h"
+#include "viewer.h"
+
+#include "goto_flow.h"
+#ifndef NO_OPENGL
+#include "goto_flow_gl.h"
+#else
+#include <QtWidgets>
+#endif
+
+using namespace YACReader;
+
+YACReader::MouseHandler::MouseHandler(Viewer *viewer)
+    : viewer(viewer)
+{
+}
+
+void YACReader::MouseHandler::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton) {
+        viewer->drag = true;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        auto position = event->position();
+#else
+        auto position = QPointF(event->x(), event->y());
+#endif
+        dragOrigin = dragLatestPosition = position;
+        viewer->setCursor(Qt::ClosedHandCursor);
+        event->accept();
+        return;
+    }
+}
+
+void YACReader::MouseHandler::mouseReleaseEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::ForwardButton) {
+        viewer->right();
+        event->accept();
+        return;
+    }
+
+    if (event->button() == Qt::BackButton) {
+        viewer->left();
+        event->accept();
+        return;
+    }
+
+    auto wasDragging = viewer->drag;
+
+    if (event->button() == Qt::LeftButton) {
+        viewer->drag = false;
+        viewer->setCursor(Qt::OpenHandCursor);
+        event->accept();
+    }
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    auto position = event->position();
+#else
+    auto position = QPointF(event->x(), event->y());
+#endif
+    auto dragDistance = QLineF(position, dragOrigin).length();
+
+    auto mouseMode = Configuration::getConfiguration().getMouseMode();
+    switch (mouseMode) {
+    case Normal:
+        return;
+    case LeftRightNavigation:
+        if (wasDragging && (dragDistance > 25)) {
+            return;
+        }
+
+        if (event->button() == Qt::LeftButton) {
+            viewer->left();
+            event->accept();
+            return;
+        }
+
+        if (event->button() == Qt::RightButton) {
+            viewer->right();
+            event->accept();
+            return;
+        }
+
+        break;
+    case HotAreas:
+        if (wasDragging && (dragDistance > 25)) {
+            return;
+        }
+
+        if (event->button() == Qt::LeftButton) {
+            if (position.x() < viewer->width() / 2) {
+                viewer->left();
+            } else {
+                viewer->right();
+            }
+        }
+
+        break;
+    };
+}
+
+void YACReader::MouseHandler::mouseMoveEvent(QMouseEvent *event)
+{
+    viewer->showCursor();
+    viewer->hideCursorTimer->start(2500);
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    auto position = event->position();
+#else
+    auto position = QPointF(event->x(), event->y());
+#endif
+
+    if (viewer->magnifyingGlassShown)
+        viewer->mglass->move(static_cast<int>(position.x() - float(viewer->mglass->width()) / 2), static_cast<int>(position.y() - float(viewer->mglass->height()) / 2));
+
+    if (viewer->render->hasLoadedComic()) {
+        if (viewer->showGoToFlowAnimation->state() != QPropertyAnimation::Running) {
+            if (Configuration::getConfiguration().getDisableShowOnMouseOver() == false) {
+                if (viewer->goToFlow->isVisible()) {
+                    QPoint gtfPos = viewer->goToFlow->mapFrom(this->viewer, event->pos());
+                    if (gtfPos.y() < 0 || gtfPos.x() < 0 || gtfPos.x() > viewer->goToFlow->width()) // TODO this extra check is for Mavericks (mouseMove over goToFlowGL seems to be broken)
+                        viewer->animateHideGoToFlow();
+                    // goToFlow->hide();
+                } else {
+                    int umbral = (viewer->width() - viewer->goToFlow->width()) / 2;
+                    if ((position.y() > viewer->height() - 15) && (position.x() > umbral) && (position.x() < viewer->width() - umbral)) {
+
+                        viewer->animateShowGoToFlow();
+                        viewer->hideCursorTimer->stop();
+                    }
+                }
+            }
+        }
+
+        if (viewer->drag) {
+            int currentPosY = viewer->verticalScrollBar()->sliderPosition();
+            int currentPosX = viewer->horizontalScrollBar()->sliderPosition();
+            viewer->verticalScrollBar()->setSliderPosition(currentPosY + (dragLatestPosition.y() - position.y()));
+            viewer->horizontalScrollBar()->setSliderPosition(currentPosX + (dragLatestPosition.x() - position.x()));
+            dragLatestPosition = position;
+        }
+    }
+}

YACReader/mouse_handler.h

@@ -0,0 +1,25 @@
+#ifndef MOUSE_HANDLER_H
+#define MOUSE_HANDLER_H
+
+#include <QMouseEvent>
+
+class Viewer;
+
+namespace YACReader {
+class MouseHandler
+{
+public:
+    MouseHandler(Viewer *viewer);
+
+    void mousePressEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+
+private:
+    Viewer *viewer;
+    QPointF dragOrigin;
+    QPointF dragLatestPosition;
+};
+}
+
+#endif // MOUSE_HANDLER_H