From f1f9dc226e5cd8dc6c6b0dcfbf47776b720e92e1 Mon Sep 17 00:00:00 2001
From: Slava Monich <slava.monich@jolla.com>
Date: Mon, 28 Sep 2020 02:54:49 +0300
Subject: [PATCH] [app] Allow to access settings from the book view

... at least in the Jolla store version. Most of those settings are
related to the book view, it may be quite convenient to access them
without closing the book.
---
 app/qml/BooksBookView.qml               | 20 ++++++++++++++++++++
 app/qml/BooksStorageView.qml            |  2 +-
 app/translations/harbour-books-de.ts    | 10 +++++-----
 app/translations/harbour-books-es.ts    | 10 +++++-----
 app/translations/harbour-books-fi.ts    | 10 +++++-----
 app/translations/harbour-books-hu.ts    | 10 +++++-----
 app/translations/harbour-books-nl.ts    | 10 +++++-----
 app/translations/harbour-books-pl.ts    | 10 +++++-----
 app/translations/harbour-books-pt_BR.ts | 10 +++++-----
 app/translations/harbour-books-ru.ts    | 10 +++++-----
 app/translations/harbour-books-sv.ts    | 10 +++++-----
 app/translations/harbour-books-zh_CN.ts | 10 +++++-----
 app/translations/harbour-books.ts       | 10 +++++-----
 13 files changed, 76 insertions(+), 56 deletions(-)

diff --git a/app/qml/BooksBookView.qml b/app/qml/BooksBookView.qml
index 71081ab..260962a 100644
--- a/app/qml/BooksBookView.qml
+++ b/app/qml/BooksBookView.qml
@@ -77,6 +77,7 @@ SilicaFlickable {
     property var linkMenu
     property var imageView
     property var footnoteView
+    property var settingsComponent
 
     function hideViews() {
         if (linkMenu) linkMenu.hide()
@@ -132,6 +133,25 @@ SilicaFlickable {
     }
 
     PullDownMenu {
+        MenuItem {
+            //: Pulley menu item
+            //% "Settings"
+            text: qsTrId("harbour-books-menu-settings")
+            visible: !editMode && BooksSettingsMenu
+            onClicked: {
+                if (!settingsComponent) {
+                    settingsComponent = Qt.createComponent("../settings/BooksSettings.qml")
+                    if (settingsComponent.status !== Component.Ready) {
+                        console.log(settingsComponent.errorString())
+                    }
+                }
+                pageStack.push(settingsComponent, {
+                    "title" : text,
+                    "allowedOrientations": window.allowedOrientations,
+                    "followOrientationChanges": true
+                })
+            }
+        }
         MenuItem {
             //% "Back to library"
             text: qsTrId("harbour-books-book-view-back")
diff --git a/app/qml/BooksStorageView.qml b/app/qml/BooksStorageView.qml
index 7ac1891..a3dd9ef 100644
--- a/app/qml/BooksStorageView.qml
+++ b/app/qml/BooksStorageView.qml
@@ -95,7 +95,7 @@ SilicaFlickable {
         MenuItem {
             //: Pulley menu item
             //% "Settings"
-            text: qsTrId("harbour-books-storage-menu-settings")
+            text: qsTrId("harbour-books-menu-settings")
             visible: !editMode && BooksSettingsMenu
             onClicked: {
                 if (!_settingsComponent) {
diff --git a/app/translations/harbour-books-de.ts b/app/translations/harbour-books-de.ts
index e3bee45..641e9d8 100644
--- a/app/translations/harbour-books-de.ts
+++ b/app/translations/harbour-books-de.ts
@@ -7,6 +7,11 @@
         <source>Books</source>
         <translation>Bücher</translation>
     </message>
+    <message id="harbour-books-menu-settings">
+        <source>Settings</source>
+        <extracomment>Pulley menu item</extracomment>
+        <translation>Einstellungen</translation>
+    </message>
     <message id="harbour-books-book-view-back">
         <source>Back to library</source>
         <translation>Zur Bibliothek</translation>
@@ -67,11 +72,6 @@
             <numerusform>%0 Bücher</numerusform>
         </translation>
     </message>
-    <message id="harbour-books-storage-menu-settings">
-        <source>Settings</source>
-        <extracomment>Pulley menu item</extracomment>
-        <translation>Einstellungen</translation>
-    </message>
     <message id="harbour-books-storage-menu-scan_downloads">
         <source>Scan downloads</source>
         <extracomment>Pulley menu item</extracomment>
diff --git a/app/translations/harbour-books-es.ts b/app/translations/harbour-books-es.ts
index 433fd40..f300edc 100644
--- a/app/translations/harbour-books-es.ts
+++ b/app/translations/harbour-books-es.ts
@@ -7,6 +7,11 @@
         <source>Books</source>
         <translation>Libros</translation>
     </message>
+    <message id="harbour-books-menu-settings">
+        <source>Settings</source>
+        <extracomment>Pulley menu item</extracomment>
+        <translation>Configuración</translation>
+    </message>
     <message id="harbour-books-book-view-back">
         <source>Back to library</source>
         <translation>Regresar a la librería</translation>
@@ -67,11 +72,6 @@
             <numerusform>%0 libros</numerusform>
         </translation>
     </message>
-    <message id="harbour-books-storage-menu-settings">
-        <source>Settings</source>
-        <extracomment>Pulley menu item</extracomment>
-        <translation>Configuración</translation>
-    </message>
     <message id="harbour-books-storage-menu-scan_downloads">
         <source>Scan downloads</source>
         <extracomment>Pulley menu item</extracomment>
diff --git a/app/translations/harbour-books-fi.ts b/app/translations/harbour-books-fi.ts
index cc25c3d..d581f74 100644
--- a/app/translations/harbour-books-fi.ts
+++ b/app/translations/harbour-books-fi.ts
@@ -7,6 +7,11 @@
         <source>Books</source>
         <translation>Kirjat</translation>
     </message>
+    <message id="harbour-books-menu-settings">
+        <source>Settings</source>
+        <extracomment>Pulley menu item</extracomment>
+        <translation>Asetukset</translation>
+    </message>
     <message id="harbour-books-book-view-back">
         <source>Back to library</source>
         <translation>Takaisin kirjalistaan</translation>
@@ -67,11 +72,6 @@
             <numerusform>%0 kirjaa</numerusform>
         </translation>
     </message>
-    <message id="harbour-books-storage-menu-settings">
-        <source>Settings</source>
-        <extracomment>Pulley menu item</extracomment>
-        <translation>Asetukset</translation>
-    </message>
     <message id="harbour-books-storage-menu-scan_downloads">
         <source>Scan downloads</source>
         <extracomment>Pulley menu item</extracomment>
diff --git a/app/translations/harbour-books-hu.ts b/app/translations/harbour-books-hu.ts
index 783de79..95a5fb3 100644
--- a/app/translations/harbour-books-hu.ts
+++ b/app/translations/harbour-books-hu.ts
@@ -7,6 +7,11 @@
         <source>Books</source>
         <translation>Könyvek</translation>
     </message>
+    <message id="harbour-books-menu-settings">
+        <source>Settings</source>
+        <extracomment>Pulley menu item</extracomment>
+        <translation>Beállítások</translation>
+    </message>
     <message id="harbour-books-book-view-back">
         <source>Back to library</source>
         <translation>Vissza a könyvtárhoz</translation>
@@ -66,11 +71,6 @@
             <numerusform>%0 könyv</numerusform>
         </translation>
     </message>
-    <message id="harbour-books-storage-menu-settings">
-        <source>Settings</source>
-        <extracomment>Pulley menu item</extracomment>
-        <translation>Beállítások</translation>
-    </message>
     <message id="harbour-books-storage-menu-scan_downloads">
         <source>Scan downloads</source>
         <extracomment>Pulley menu item</extracomment>
diff --git a/app/translations/harbour-books-nl.ts b/app/translations/harbour-books-nl.ts
index c5ff842..728da71 100644
--- a/app/translations/harbour-books-nl.ts
+++ b/app/translations/harbour-books-nl.ts
@@ -7,6 +7,11 @@
         <source>Books</source>
         <translation>Boeken</translation>
     </message>
+    <message id="harbour-books-menu-settings">
+        <source>Settings</source>
+        <extracomment>Pulley menu item</extracomment>
+        <translation>Instellingen</translation>
+    </message>
     <message id="harbour-books-book-view-back">
         <source>Back to library</source>
         <translation>Terug naar bibliotheek</translation>
@@ -67,11 +72,6 @@
             <numerusform>%0 boeken</numerusform>
         </translation>
     </message>
-    <message id="harbour-books-storage-menu-settings">
-        <source>Settings</source>
-        <extracomment>Pulley menu item</extracomment>
-        <translation>Instellingen</translation>
-    </message>
     <message id="harbour-books-storage-menu-scan_downloads">
         <source>Scan downloads</source>
         <extracomment>Pulley menu item</extracomment>
diff --git a/app/translations/harbour-books-pl.ts b/app/translations/harbour-books-pl.ts
index 96c83dc..4f9231d 100644
--- a/app/translations/harbour-books-pl.ts
+++ b/app/translations/harbour-books-pl.ts
@@ -7,6 +7,11 @@
         <source>Books</source>
         <translation>Książki</translation>
     </message>
+    <message id="harbour-books-menu-settings">
+        <source>Settings</source>
+        <extracomment>Pulley menu item</extracomment>
+        <translation>Ustawienia</translation>
+    </message>
     <message id="harbour-books-book-view-back">
         <source>Back to library</source>
         <translation>Wróć do biblioteki</translation>
@@ -68,11 +73,6 @@
             <numerusform>%0 książek</numerusform>
         </translation>
     </message>
-    <message id="harbour-books-storage-menu-settings">
-        <source>Settings</source>
-        <extracomment>Pulley menu item</extracomment>
-        <translation>Ustawienia</translation>
-    </message>
     <message id="harbour-books-storage-menu-scan_downloads">
         <source>Scan downloads</source>
         <extracomment>Pulley menu item</extracomment>
diff --git a/app/translations/harbour-books-pt_BR.ts b/app/translations/harbour-books-pt_BR.ts
index 5029627..5e43420 100644
--- a/app/translations/harbour-books-pt_BR.ts
+++ b/app/translations/harbour-books-pt_BR.ts
@@ -7,6 +7,11 @@
         <source>Books</source>
         <translation>Livros</translation>
     </message>
+    <message id="harbour-books-menu-settings">
+        <source>Settings</source>
+        <extracomment>Pulley menu item</extracomment>
+        <translation>Configurações</translation>
+    </message>
     <message id="harbour-books-book-view-back">
         <source>Back to library</source>
         <translation>Voltar à biblioteca</translation>
@@ -67,11 +72,6 @@
             <numerusform>%0 Livros</numerusform>
         </translation>
     </message>
-    <message id="harbour-books-storage-menu-settings">
-        <source>Settings</source>
-        <extracomment>Pulley menu item</extracomment>
-        <translation>Configurações</translation>
-    </message>
     <message id="harbour-books-storage-menu-scan_downloads">
         <source>Scan downloads</source>
         <extracomment>Pulley menu item</extracomment>
diff --git a/app/translations/harbour-books-ru.ts b/app/translations/harbour-books-ru.ts
index 0a5f110..d051424 100644
--- a/app/translations/harbour-books-ru.ts
+++ b/app/translations/harbour-books-ru.ts
@@ -7,6 +7,11 @@
         <source>Books</source>
         <translation>Книги</translation>
     </message>
+    <message id="harbour-books-menu-settings">
+        <source>Settings</source>
+        <extracomment>Pulley menu item</extracomment>
+        <translation>Настройки</translation>
+    </message>
     <message id="harbour-books-book-view-back">
         <source>Back to library</source>
         <translation>Вернуться в библиотеку</translation>
@@ -68,11 +73,6 @@
             <numerusform>%0 книг</numerusform>
         </translation>
     </message>
-    <message id="harbour-books-storage-menu-settings">
-        <source>Settings</source>
-        <extracomment>Pulley menu item</extracomment>
-        <translation>Настройки</translation>
-    </message>
     <message id="harbour-books-storage-menu-scan_downloads">
         <source>Scan downloads</source>
         <extracomment>Pulley menu item</extracomment>
diff --git a/app/translations/harbour-books-sv.ts b/app/translations/harbour-books-sv.ts
index cda6354..ce6e212 100644
--- a/app/translations/harbour-books-sv.ts
+++ b/app/translations/harbour-books-sv.ts
@@ -7,6 +7,11 @@
         <source>Books</source>
         <translation>Böcker</translation>
     </message>
+    <message id="harbour-books-menu-settings">
+        <source>Settings</source>
+        <extracomment>Pulley menu item</extracomment>
+        <translation>Inställningar</translation>
+    </message>
     <message id="harbour-books-book-view-back">
         <source>Back to library</source>
         <translation>Tillbaka till biblioteket</translation>
@@ -67,11 +72,6 @@
             <numerusform>%0 böcker</numerusform>
         </translation>
     </message>
-    <message id="harbour-books-storage-menu-settings">
-        <source>Settings</source>
-        <extracomment>Pulley menu item</extracomment>
-        <translation>Inställningar</translation>
-    </message>
     <message id="harbour-books-storage-menu-scan_downloads">
         <source>Scan downloads</source>
         <extracomment>Pulley menu item</extracomment>
diff --git a/app/translations/harbour-books-zh_CN.ts b/app/translations/harbour-books-zh_CN.ts
index f31fa7e..3fe2613 100644
--- a/app/translations/harbour-books-zh_CN.ts
+++ b/app/translations/harbour-books-zh_CN.ts
@@ -7,6 +7,11 @@
         <source>Books</source>
         <translation>书籍</translation>
     </message>
+    <message id="harbour-books-menu-settings">
+        <source>Settings</source>
+        <extracomment>Pulley menu item</extracomment>
+        <translation>设置</translation>
+    </message>
     <message id="harbour-books-book-view-back">
         <source>Back to library</source>
         <translation>返回书库</translation>
@@ -66,11 +71,6 @@
             <numerusform>%0 本书籍</numerusform>
         </translation>
     </message>
-    <message id="harbour-books-storage-menu-settings">
-        <source>Settings</source>
-        <extracomment>Pulley menu item</extracomment>
-        <translation>设置</translation>
-    </message>
     <message id="harbour-books-storage-menu-scan_downloads">
         <source>Scan downloads</source>
         <extracomment>Pulley menu item</extracomment>
diff --git a/app/translations/harbour-books.ts b/app/translations/harbour-books.ts
index 35d9cc5..339f0d8 100644
--- a/app/translations/harbour-books.ts
+++ b/app/translations/harbour-books.ts
@@ -7,6 +7,11 @@
         <source>Books</source>
         <translation>Books</translation>
     </message>
+    <message id="harbour-books-menu-settings">
+        <source>Settings</source>
+        <extracomment>Pulley menu item</extracomment>
+        <translation>Settings</translation>
+    </message>
     <message id="harbour-books-book-view-back">
         <source>Back to library</source>
         <translation>Back to library</translation>
@@ -67,11 +72,6 @@
             <numerusform>%0 books</numerusform>
         </translation>
     </message>
-    <message id="harbour-books-storage-menu-settings">
-        <source>Settings</source>
-        <extracomment>Pulley menu item</extracomment>
-        <translation>Settings</translation>
-    </message>
     <message id="harbour-books-storage-menu-scan_downloads">
         <source>Scan downloads</source>
         <extracomment>Pulley menu item</extracomment>