Merge branch 'dev/develop' of https://github.com/Librum-Reader/Librum …

…into dev/develop
Librum-Reader · Feb 26, 2024 · 95c8f64 · 95c8f64
2 parents 4db9c69 + e4e91ba
commit 95c8f64
Show file tree

Hide file tree

Showing 30 changed files with 3,672 additions and 1,245 deletions.
diff --git a/scripts/update_translations.sh b/scripts/update_translations.sh
@@ -8,4 +8,3 @@ TRANSLATION_FILES=$(find "$SCRIPT_DIR/../src/presentation/translations" -name "l
 
 # Use lupdate with the list of translation files
 lupdate "$SCRIPT_DIR/../src/presentation" -ts $TRANSLATION_FILES
-
diff --git a/src/adapters/controllers/app_info_controller.cpp b/src/adapters/controllers/app_info_controller.cpp
@@ -153,9 +153,6 @@ bool AppInfoController::switchToLanguage(const QString& language)
         return false;
     }
 
-
-    emit languageChanged();
-
     // Use "English" for all kinds of English variants like American English
     if(QLocale(language).language() == QLocale::Language::English)
         m_language = "English";
@@ -170,6 +167,7 @@ bool AppInfoController::switchToLanguage(const QString& language)
     settings.setValue("language", language);
 
     m_engine->retranslate();
+    emit languageChanged();
     return true;
 }
 

diff --git a/src/presentation/CMakeLists.txt b/src/presentation/CMakeLists.txt
@@ -20,6 +20,7 @@ set(translation_files
     translations/librum_it.ts
     translations/librum_ru.ts
     translations/librum_ko.ts
+    translations/librum_ar.ts
     translations/librum_zh.ts
     translations/librum_uk.ts
     translations/librum_pt.ts

diff --git a/src/presentation/TranslationsModel.qml b/src/presentation/TranslationsModel.qml
@@ -17,6 +17,10 @@ ListModel {
         text: "Italiano"
         code: "it"
     }
+    ListElement {
+        text: "العربية"
+        code: "ar"
+    }
     ListElement {
         text: "Русский"
         code: "ru"

diff --git a/src/presentation/feature/arabic-translation b/src/presentation/feature/arabic-translation
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS/>
diff --git a/src/presentation/freeBooksPage/MFreeBooksPage.qml b/src/presentation/freeBooksPage/MFreeBooksPage.qml
@@ -124,6 +124,9 @@ Page {
                 cellHeight: internal.bookHeight + internal.verticalBookSpacing
                 // Negative margin removes the extra spacing at the right of the grid
                 rightMargin: -internal.horizontalBookSpacing
+                layoutDirection: Qt.LeftToRight
+                LayoutMirroring.enabled: false
+                LayoutMirroring.childrenInherit: true
                 interactive: true
                 boundsBehavior: Flickable.StopAtBounds
                 flickDeceleration: 19500

diff --git a/src/presentation/homePage/MHomePage.qml b/src/presentation/homePage/MHomePage.qml
@@ -18,6 +18,8 @@ Page {
     id: root
     rightPadding: 70
     bottomPadding: 20
+    LayoutMirroring.enabled: baseRoot.rightAlign
+    LayoutMirroring.childrenInherit: true
     background: Rectangle {
         anchors.fill: parent
         color: Style.colorPageBackground
@@ -229,6 +231,9 @@ Page {
                     cellWidth: internal.bookWidth + internal.horizontalBookSpacing
                     cellHeight: internal.bookHeight + internal.verticalBookSpacing
                     rightMargin: -internal.horizontalBookSpacing
+                    layoutDirection: Qt.LeftToRight
+                    LayoutMirroring.enabled: false
+                    LayoutMirroring.childrenInherit: true
                     interactive: true
                     boundsBehavior: Flickable.StopAtBounds
                     flickDeceleration: 15000

diff --git a/src/presentation/main.qml b/src/presentation/main.qml
@@ -23,6 +23,7 @@ ApplicationWindow {
     property int sidebarOpenedMinWidth: 810
     property int readingPageMinWidth: 550
     property bool notifyAboutUpdates: true
+    property bool rightAlign: AppInfoController.language === "العربية"
 
     minimumHeight: 400
     minimumWidth: 650
@@ -39,6 +40,8 @@ ApplicationWindow {
         id: mainlayout
         anchors.fill: parent
         spacing: 0
+        LayoutMirroring.enabled: baseRoot.rightAlign
+        LayoutMirroring.childrenInherit: true
 
         MSidebar {
             id: sidebar

diff --git a/src/presentation/modules/CustomComponents/MBaseListItem.qml b/src/presentation/modules/CustomComponents/MBaseListItem.qml
@@ -29,6 +29,9 @@ Item {
 
     Component.onCompleted: root.completed(model.index, root.actualWidth)
 
+    LayoutMirroring.enabled: baseRoot.rightAlign
+    LayoutMirroring.childrenInherit: true
+
     Pane {
         id: container
         property bool renameable: false

diff --git a/src/presentation/modules/CustomComponents/MConfirmAccountDeletionPopup.qml b/src/presentation/modules/CustomComponents/MConfirmAccountDeletionPopup.qml
@@ -71,7 +71,8 @@ Popup {
             Label {
                 id: infoText
                 Layout.topMargin: 20
-                Layout.leftMargin: 52
+                Layout.leftMargin: baseRoot.rightAlign ? 0 : 52
+                Layout.rightMargin: baseRoot.rightAlign ? 52 : 0
                 Layout.fillWidth: true
                 wrapMode: Text.WordWrap
                 textFormat: Text.RichText

diff --git a/src/presentation/modules/CustomComponents/MLabeledCheckBox.qml b/src/presentation/modules/CustomComponents/MLabeledCheckBox.qml
@@ -34,7 +34,10 @@ Item {
 
     RowLayout {
         id: layout
+        width: parent.width
         spacing: root.spacing
+        LayoutMirroring.enabled: baseRoot.rightAlign
+        LayoutMirroring.childrenInherit: true
 
         MCheckBox {
             id: checkBox

diff --git a/src/presentation/modules/CustomComponents/buttons/MButton.qml b/src/presentation/modules/CustomComponents/buttons/MButton.qml
@@ -30,6 +30,9 @@ Item {
     property bool centerContentVertically: true
     property bool centerContentHorizontally: true
 
+    LayoutMirroring.enabled: baseRoot.rightAlign
+    LayoutMirroring.childrenInherit: true
+
     implicitHeight: 30
     implicitWidth: layout.implicitWidth + 2 * horizontalMargins
 

diff --git a/src/presentation/modules/CustomComponents/rightClickMenu/MRightClickMenuItem.qml b/src/presentation/modules/CustomComponents/rightClickMenu/MRightClickMenuItem.qml
@@ -15,6 +15,9 @@ Item {
     implicitHeight: 32
     implicitWidth: 100
 
+    LayoutMirroring.enabled: baseRoot.rightAlign
+    LayoutMirroring.childrenInherit: true
+
     onVisibleChanged: selected = false
 
     Pane {

diff --git a/src/presentation/readingPage/MReadingPage.qml b/src/presentation/readingPage/MReadingPage.qml
@@ -17,6 +17,10 @@ Page {
         color: Style.colorPageBackground
     }
 
+    // Prevent right-alignment
+    LayoutMirroring.enabled: false
+    LayoutMirroring.childrenInherit: true
+
     Component.onCompleted: root.forceActiveFocus()
     Component.onDestruction: internal.saveCurrentPage()
 

diff --git a/src/presentation/settings/MAboutPage.qml b/src/presentation/settings/MAboutPage.qml
@@ -267,7 +267,7 @@ MFlickWrapper {
                         id: heartRow
                         Layout.fillWidth: true
                         Layout.topMargin: 40
-                        spacing: 0
+                        spacing: 22
 
                         Image {
                             id: heartImage
@@ -278,8 +278,7 @@ MFlickWrapper {
 
                         Label {
                             id: thisAppText
-                            Layout.fillWidth: true
-                            Layout.leftMargin: 22
+                            Layout.alignment: baseRoot.rightAlign ? Qt.AlignRight : Qt.AlignLeft
                             text: qsTr("Librum is here for everyone who just wants to enjoy a good book.\n" + "We hope you have a great time using it! Feel free to leave us a rating and some feedback.")
                             wrapMode: Text.WordWrap
                             color: Style.colorText

diff --git a/src/presentation/settings/MSettings.qml b/src/presentation/settings/MSettings.qml
@@ -20,6 +20,9 @@ Page {
     property alias storagePage: storagePage
     property alias supportUsPage: supportUsPage
 
+    LayoutMirroring.enabled: baseRoot.rightAlign
+    LayoutMirroring.childrenInherit: true
+
     background: Rectangle {
         anchors.fill: parent
         color: Style.colorPageBackground

diff --git a/src/presentation/settings/shortcutsPage/MShortcutsPage.qml b/src/presentation/settings/shortcutsPage/MShortcutsPage.qml
@@ -89,6 +89,10 @@ Page {
                 anchors.fill: parent
                 spacing: 0
 
+                // Prevent right-alignment
+                LayoutMirroring.enabled: false
+                LayoutMirroring.childrenInherit: true
+
 
                 /*
                   The shortcuts header labeling the different columns

diff --git a/src/presentation/settings/updatesPage/MUpToDate.qml b/src/presentation/settings/updatesPage/MUpToDate.qml
@@ -62,6 +62,7 @@ Item {
             Label {
                 Layout.fillWidth: true
                 text: AppInfoController.currentVersion
+                horizontalAlignment: Text.AlignLeft
                 wrapMode: Text.WordWrap
                 color: Style.colorBasePurple
                 font.pointSize: Fonts.size14

diff --git a/src/presentation/settings/updatesPage/MUpdatesAvailable.qml b/src/presentation/settings/updatesPage/MUpdatesAvailable.qml
@@ -75,6 +75,7 @@ Item {
             Label {
                 Layout.fillWidth: true
                 text: AppInfoController.newestVersion
+                horizontalAlignment: Text.AlignLeft
                 wrapMode: Text.WordWrap
                 color: Style.colorLightText
                 font.pointSize: Fonts.size14

diff --git a/src/presentation/sidebar/MSidebar.qml b/src/presentation/sidebar/MSidebar.qml
@@ -219,7 +219,12 @@ Item {
                   */
                 MProfilePopup {
                     id: profilePopup
-                    x: 12
+                    x: {
+                        if (baseRoot.rightAlign)
+                            return -106
+                        else
+                            return 12
+                    }
                     y: profileBox.y - implicitHeight + 6
                 }
             }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,3 @@ TRANSLATION_FILES=$(find "$SCRIPT_DIR/../src/presentation/translations" -name "l

		# Use lupdate with the list of translation files
		lupdate "$SCRIPT_DIR/../src/presentation" -ts $TRANSLATION_FILES