diff --git a/app/qml/BooksPageTools.qml b/app/qml/BooksPageTools.qml index b3c377b..a0fac2c 100644 --- a/app/qml/BooksPageTools.qml +++ b/app/qml/BooksPageTools.qml @@ -1,6 +1,6 @@ /* - Copyright (C) 2015-2021 Jolla Ltd. - Copyright (C) 2015-2021 Slava Monich + Copyright (C) 2015-2022 Jolla Ltd. + Copyright (C) 2015-2022 Slava Monich You may use this file under the terms of BSD license as follows: @@ -35,6 +35,8 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import harbour.books 1.0 +import "harbour" + Item { id: pageTools height: Theme.itemSizeExtraSmall @@ -59,7 +61,7 @@ Item { } onClicked: Settings.nightMode = !Settings.nightMode - Image { + HarbourHighlightIcon { id: dayModeImage source: "images/day-mode.svg" anchors { @@ -68,16 +70,18 @@ Item { verticalCenter: parent.verticalCenter } sourceSize.height: Theme.iconSizeSmall - opacity: Settings.nightMode ? 0.5 : 0 + highlightColor: Settings.primaryPageToolColor + opacity: Settings.nightMode ? 1 : 0 visible: opacity > 0 Behavior on opacity { FadeAnimation {} } } - Image { + HarbourHighlightIcon { source: "images/night-mode.svg" anchors.centerIn: dayModeImage sourceSize.height: Theme.iconSizeSmall - opacity: Settings.nightMode ? 0 : 0.25 + highlightColor: Settings.primaryPageToolColor + opacity: Settings.nightMode ? 0 : 1 visible: opacity > 0 Behavior on opacity { FadeAnimation {} } } @@ -93,7 +97,7 @@ Item { right: parent.right verticalCenter: parent.verticalCenter } - Image { + HarbourHighlightIcon { id: increaseFontSizeButtonImage source: "images/font-larger.svg" anchors { @@ -101,8 +105,7 @@ Item { verticalCenter: parent.verticalCenter } sourceSize.height: Theme.iconSizeSmall - opacity: Settings.nightMode ? 1 : 0.5 - Behavior on opacity { FadeAnimation {} } + highlightColor: Settings.primaryPageToolColor } onClicked: pageTools.increaseFontSize() } @@ -115,7 +118,7 @@ Item { right: increaseFontSizeButton.left verticalCenter: parent.verticalCenter } - Image { + HarbourHighlightIcon { id: decreaseFontSizeButtonImage source: "images/font-smaller.svg" anchors { @@ -123,8 +126,7 @@ Item { verticalCenter: parent.verticalCenter } sourceSize.height: increaseFontSizeButtonImage.height - opacity: Settings.nightMode ? 1 : 0.5 - Behavior on opacity { FadeAnimation {} } + highlightColor: Settings.primaryPageToolColor } onClicked: pageTools.decreaseFontSize() } diff --git a/app/qml/images/font-larger.svg b/app/qml/images/font-larger.svg index c300dcd..39634f4 100644 --- a/app/qml/images/font-larger.svg +++ b/app/qml/images/font-larger.svg @@ -1,57 +1,33 @@ - - - - - - - image/svg+xml - - - - - + + style="fill:#ffffff;fill-opacity:1;stroke:none" + d="m 14,994.18217 h 7.12 v -7.84 h 4.32 v 7.84 h 7.12 v 4.08 h -7.12 v 7.84003 h -4.32 v -7.84003 H 14 v -4.08" + inkscape:connector-curvature="0"/> + transform="matrix(1.7406963,0,0,1.7391304,12.768306,943.23962)"> + style="fill:#ffffff;fill-opacity:1"/> diff --git a/app/qml/images/font-smaller.svg b/app/qml/images/font-smaller.svg index c972133..dcecbf2 100644 --- a/app/qml/images/font-smaller.svg +++ b/app/qml/images/font-smaller.svg @@ -1,57 +1,33 @@ - - - - - - - image/svg+xml - - - - - + + style="fill:#ffffff;fill-opacity:1;stroke:none" + d="m 14,2.7799982 h 10.76 v 4.44 H 14 v -4.44" + inkscape:connector-curvature="0"/> + transform="matrix(1.7673813,0,0,1.7057569,5.0734262,-43.73514)"> + style="fill:#ffffff;fill-opacity:1"/> diff --git a/app/qml/images/night-mode.svg b/app/qml/images/night-mode.svg index f279e5a..b829c1f 100644 --- a/app/qml/images/night-mode.svg +++ b/app/qml/images/night-mode.svg @@ -1,75 +1,27 @@ - - - - - - - image/svg+xml - - - - - + - - - + transform="matrix(0.33942251,-0.33942251,0.33942251,0.33942251,-0.9,1024.6049)"> + sodipodi:nodetypes="ssssscssscsc"/> diff --git a/app/src/BooksSettings.cpp b/app/src/BooksSettings.cpp index 39743d4..8547555 100644 --- a/app/src/BooksSettings.cpp +++ b/app/src/BooksSettings.cpp @@ -75,10 +75,6 @@ #define DEFAULT_VOLUME_DOWN_ACTION (BooksSettings::ActionPreviousPage) #define DEFAULT_ORIENTATION (BooksSettings::OrientationAny) -#define PAGETOOL_COLOR QColor(128,128,128) // any bg -#define NORMAL_PAGETOOL_HIGHLIGHT_COLOR QColor(64,64,64) // on white -#define INVERTED_PAGETOOL_HIGHLIGHT_COLOR QColor(192,192,192) // on black - // ========================================================================== // BooksSettings::TextStyle // ========================================================================== @@ -366,7 +362,6 @@ BooksSettings::Private::onNightModeChanged() if (updateBrightness()) { Q_EMIT settings->brightnessChanged(); } - Q_EMIT settings->highlightPageToolColorChanged(); } void @@ -820,20 +815,6 @@ BooksSettings::orientation() const return DEFAULT_ORIENTATION; } -QColor -BooksSettings::primaryPageToolColor() const -{ - return PAGETOOL_COLOR; -} - -QColor -BooksSettings::highlightPageToolColor() const -{ - return nightMode() ? - INVERTED_PAGETOOL_HIGHLIGHT_COLOR : - NORMAL_PAGETOOL_HIGHLIGHT_COLOR; -} - void BooksSettings::setCurrentBookPath( QString aPath) diff --git a/app/src/BooksSettings.h b/app/src/BooksSettings.h index 272334a..f23fd11 100644 --- a/app/src/BooksSettings.h +++ b/app/src/BooksSettings.h @@ -64,8 +64,6 @@ class BooksSettings : public BooksSettingsBase Q_PROPERTY(QString relativePath READ relativePath NOTIFY relativePathChanged) Q_PROPERTY(QString removableRoot READ removableRoot NOTIFY removableRootChanged) Q_PROPERTY(int orientation READ orientation NOTIFY orientationChanged) - Q_PROPERTY(QColor primaryPageToolColor READ primaryPageToolColor CONSTANT) - Q_PROPERTY(QColor highlightPageToolColor READ highlightPageToolColor NOTIFY highlightPageToolColorChanged) class TextStyle; public: @@ -95,60 +93,57 @@ public: Q_INVOKABLE bool increaseFontSize(); Q_INVOKABLE bool decreaseFontSize(); - shared_ptr textStyle(int aFontSizeAdjust) const; + shared_ptr textStyle(int) const; int fontSize() const; void setFontSize(int aValue); qreal brightness() const; qreal nightModeBrightness() const; - void setNightModeBrightness(qreal aValue); + void setNightModeBrightness(qreal); int pageDetails() const; - void setPageDetails(int aValue); + void setPageDetails(int); bool pageDetailsFixed() const; - void setPageDetailsFixed(bool aValue); + void setPageDetailsFixed(bool); bool turnPageByTap() const; - void setTurnPageByTap(bool aValue); + void setTurnPageByTap(bool); bool keepDisplayOn() const; - void setKeepDisplayOn(bool aValue); + void setKeepDisplayOn(bool); bool bookPullDownMenu() const; - void setBookPullDownMenu(bool aValue); + void setBookPullDownMenu(bool); bool sampleBookCopied() const; void setSampleBookCopied(); Action volumeUpAction() const; - void setVolumeUpAction(int aValue); + void setVolumeUpAction(int); Action volumeDownAction() const; - void setVolumeDownAction(int aValue); + void setVolumeDownAction(int); QObject* currentBook() const; - void setCurrentBook(QObject* aBook); + void setCurrentBook(QObject*); QString relativePath() const; QString removableRoot() const; QString currentFolder() const; - void setCurrentFolder(const QString aValue); + void setCurrentFolder(const QString); QString currentStorage() const; - QColor primaryPageToolColor() const; - QColor highlightPageToolColor() const; Orientation orientation() const; public Q_SLOTS: - void setCurrentBookPath(QString aPath); + void setCurrentBookPath(QString); Q_SIGNALS: void fontSizeChanged(); void nightModeBrightnessChanged(); - void highlightPageToolColorChanged(); void brightnessChanged(); void textStyleChanged(); void pageDetailsChanged(); diff --git a/app/src/BooksSettingsBase.cpp b/app/src/BooksSettingsBase.cpp index e2dbe94..1826600 100644 --- a/app/src/BooksSettingsBase.cpp +++ b/app/src/BooksSettingsBase.cpp @@ -430,6 +430,20 @@ BooksSettingsBase::invertedPageBackgroundColor() const return QColor(HarbourUtil::invertedRgb(iPrivate->iColorScheme.background())); } +QColor +BooksSettingsBase::primaryPageToolColor() const +{ + const QRgb rgb = iPrivate->iColorScheme.foreground(); + return QColor(qRed(rgb), qGreen(rgb), qBlue(rgb), 128); +} + +QColor +BooksSettingsBase::highlightPageToolColor() const +{ + const QRgb rgb = iPrivate->iColorScheme.foreground(); + return QColor(qRed(rgb), qGreen(rgb), qBlue(rgb), 192); +} + BooksColorScheme BooksSettingsBase::colorScheme() const { diff --git a/app/src/BooksSettingsBase.h b/app/src/BooksSettingsBase.h index e0693f4..2dab378 100644 --- a/app/src/BooksSettingsBase.h +++ b/app/src/BooksSettingsBase.h @@ -49,6 +49,8 @@ class BooksSettingsBase : public QObject Q_PROPERTY(bool nightMode READ nightMode WRITE setNightMode NOTIFY nightModeChanged) Q_PROPERTY(QColor pageBackgroundColor READ pageBackgroundColor NOTIFY colorSchemeChanged) Q_PROPERTY(QColor invertedPageBackgroundColor READ invertedPageBackgroundColor NOTIFY colorSchemeChanged) + Q_PROPERTY(QColor primaryPageToolColor READ primaryPageToolColor NOTIFY colorSchemeChanged) + Q_PROPERTY(QColor highlightPageToolColor READ highlightPageToolColor NOTIFY colorSchemeChanged) Q_PROPERTY(BooksColorScheme colorScheme READ colorScheme NOTIFY colorSchemeChanged) Q_PROPERTY(BooksColorScheme customColorScheme READ customColorScheme WRITE setCustomColorScheme NOTIFY customColorSchemeChanged) Q_PROPERTY(BooksColorScheme customNightModeColorScheme READ customNightModeColorScheme NOTIFY customColorSchemeChanged) @@ -69,6 +71,8 @@ public: QColor pageBackgroundColor() const; QColor invertedPageBackgroundColor() const; + QColor primaryPageToolColor() const; + QColor highlightPageToolColor() const; BooksColorScheme colorScheme() const; BooksColorScheme customColorScheme() const; @@ -76,7 +80,7 @@ public: void setCustomColorScheme(const BooksColorScheme); bool useCustomColorScheme() const; - void setUseCustomColorScheme(bool aValue); + void setUseCustomColorScheme(bool); const QStringList defaultColors() const; QStringList availableColors() const;