adapted system to support layouts sharing one file

- added hashes for finding the corresponding file and description for one layout, instead of searching by tag - adapted layout files to new description
amarula · Jun 21, 2024 · 14509d3 · 14509d3
1 parent 6fa5e08
commit 14509d3
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 21 deletions.
diff --git a/src/DeclarativeInputEngine.cpp b/src/DeclarativeInputEngine.cpp
@@ -6,12 +6,19 @@
 #include <QMetaEnum>
 #include <QTimer>
 
+#include "DeclarativeInputEngine.h"
+
 /**
  * Private data class
  */
 struct DeclarativeInputEnginePrivate {
     explicit DeclarativeInputEnginePrivate(DeclarativeInputEngine *_public);
 
+    struct LayoutData {
+        QString layoutFile;
+        QString description;
+    };
+
     DeclarativeInputEngine *_this;
     bool Animating;
     QTimer *AnimatingFinishedTimer{nullptr};
@@ -20,6 +27,23 @@ struct DeclarativeInputEnginePrivate {
 
     bool isUppercase{false};
     bool symbolMode{false};
+    QHash<DeclarativeInputEngine::InputLayouts, LayoutData> layoutFiles = {
+        {DeclarativeInputEngine::En, {"EnLayout", "English"}},
+        {DeclarativeInputEngine::Fr, {"FrLayout", "Français"}},
+        {DeclarativeInputEngine::It, {"ItLayout", "Italiano"}},
+        {DeclarativeInputEngine::Es, {"EsLayout", "Español"}},
+        {DeclarativeInputEngine::De, {"DeLayout", "Deutsch"}},
+        {DeclarativeInputEngine::Nl, {"NlLayout", "Nederlands"}},
+        {DeclarativeInputEngine::Pt, {"PtLayout", "Português"}},
+        {DeclarativeInputEngine::Cs, {"CsLayout", "Čeština"}},
+        {DeclarativeInputEngine::El, {"ElLayout", "Ελληνικός"}},
+        {DeclarativeInputEngine::Pl, {"PlLayout", "Polski"}},
+        {DeclarativeInputEngine::Hr, {"LtSrHrBsLayout", "Hrvatski"}},
+        {DeclarativeInputEngine::CyBs, {"CySrBsLayout", "Босански"}},
+        {DeclarativeInputEngine::LtBs, {"LtSrHrBsLayout", "Bosanski"}},
+        {DeclarativeInputEngine::CySr, {"CySrBsLayout", "Српски"}},
+        {DeclarativeInputEngine::LtSr, {"LtSrHrBsLayout", "Srpski"}},
+        {DeclarativeInputEngine::Sv, {"SvLayout", "Svenska"}}};
 };
 
 DeclarativeInputEnginePrivate::DeclarativeInputEnginePrivate(
@@ -113,3 +137,31 @@ bool DeclarativeInputEngine::inputLayoutValid(const QString &layout) const {
                 << "is not supported. Falling back to En!";
     return false;
 }
+
+QString DeclarativeInputEngine::fileOfLayout(QString layout) {
+    if (!inputLayoutValid(layout)) {
+        return "";
+    }
+    bool ok = false;
+    auto layoutVal = static_cast<InputLayouts>(
+        QMetaEnum::fromType<InputLayouts>().keyToValue(layout.toUtf8().data(),
+                                                       &ok));
+    if (!ok) {
+        return "";
+    }
+    return d->layoutFiles.value(layoutVal, {}).layoutFile;
+}
+
+QString DeclarativeInputEngine::descriptionOfLayout(QString layout) {
+    if (!inputLayoutValid(layout)) {
+        return "";
+    }
+    bool ok = false;
+    auto layoutVal = static_cast<InputLayouts>(
+        QMetaEnum::fromType<InputLayouts>().keyToValue(layout.toUtf8().data(),
+                                                       &ok));
+    if (!ok) {
+        return "";
+    }
+    return d->layoutFiles.value(layoutVal, {}).description;
+}
diff --git a/src/qml/CsLayout.qml b/src/qml/CsLayout.qml
@@ -238,7 +238,7 @@ ColumnLayout {
         SpaceKey {
             weight: 1168
             inputPanelRef: inputPanel
-            btnDisplayedText: "Čeština"
+            btnDisplayedText: langDescription
         }
 
         Key {

diff --git a/src/qml/DeLayout.qml b/src/qml/DeLayout.qml
@@ -250,7 +250,7 @@ ColumnLayout {
         SpaceKey {
             weight: 1168
             inputPanelRef: inputPanel
-            btnDisplayedText: "Deutsch"
+            btnDisplayedText: langDescription
         }
 
         Key {

diff --git a/src/qml/ElLayout.qml b/src/qml/ElLayout.qml
@@ -207,7 +207,7 @@ ColumnLayout {
         SpaceKey {
             weight: 1168
             inputPanelRef: inputPanel
-            btnDisplayedText: "Ελληνικός"
+            btnDisplayedText: langDescription
         }
 
         Key {

diff --git a/src/qml/EnLayout.qml b/src/qml/EnLayout.qml
@@ -240,7 +240,7 @@ ColumnLayout {
         SpaceKey {
             weight: 1168
             inputPanelRef: inputPanel
-            btnDisplayedText: "English"
+            btnDisplayedText: langDescription
         }
 
         Key {

diff --git a/src/qml/EsLayout.qml b/src/qml/EsLayout.qml
@@ -241,7 +241,7 @@ ColumnLayout {
         SpaceKey {
             weight: 1168
             inputPanelRef: inputPanel
-            btnDisplayedText: "Español"
+            btnDisplayedText: langDescription
         }
 
         Key {

diff --git a/src/qml/FrLayout.qml b/src/qml/FrLayout.qml
@@ -238,7 +238,7 @@ ColumnLayout {
         SpaceKey {
             weight: 1168
             inputPanelRef: inputPanel
-            btnDisplayedText: "Français"
+            btnDisplayedText: langDescription
         }
 
         Key {

diff --git a/src/qml/InputPanel.qml b/src/qml/InputPanel.qml
@@ -33,15 +33,19 @@ Item {
     }
 
     function loadLettersLayout() {
-        if (InputEngine.inputLayoutValid(languageLayout))
-            layoutLoader.setSource(languageLayout + "Layout.qml", {
-            "inputPanel": root
-        });
-        else
-            layoutLoader.setSource("EnLayout.qml", {
-            "inputPanel": root
-        });
-    }
+            var description = InputEngine.descriptionOfLayout(languageLayout);
+            var source = InputEngine.fileOfLayout(languageLayout);
+            if(description !== "" && source !== ""){
+                layoutLoader.langDescription = description
+                layoutLoader.setSource(source + ".qml", {
+                "inputPanel": root});
+            }
+            else{
+                layoutLoader.langDescription = "English"
+                layoutLoader.setSource("EnLayout.qml", {
+                "inputPanel": root});
+            }
+        }
 
     objectName: "inputPanel"
     width: parent.width
@@ -112,7 +116,8 @@ Item {
 
         Loader {
             id: layoutLoader
-
+            // lang description only needed for layouts that share a file
+            property string langDescription
             anchors {
                 fill: parent
                 margins: 5

diff --git a/src/qml/ItLayout.qml b/src/qml/ItLayout.qml
@@ -230,7 +230,7 @@ ColumnLayout {
         SpaceKey {
             weight: 1168
             inputPanelRef: inputPanel
-            btnDisplayedText: "Italiano"
+            btnDisplayedText: langDescription
         }
 
         Key {

diff --git a/src/qml/NlLayout.qml b/src/qml/NlLayout.qml
@@ -240,7 +240,7 @@ ColumnLayout {
         SpaceKey {
             weight: 1168
             inputPanelRef: inputPanel
-            btnDisplayedText: "Nederlands"
+            btnDisplayedText: langDescription
         }
 
         Key {

diff --git a/src/qml/PlLayout.qml b/src/qml/PlLayout.qml
@@ -234,7 +234,7 @@ ColumnLayout {
         SpaceKey {
             weight: 1168
             inputPanelRef: inputPanel
-            btnDisplayedText: "Polski"
+            btnDisplayedText: langDescription
         }
 
         Key {

diff --git a/src/qml/PtLayout.qml b/src/qml/PtLayout.qml
@@ -243,7 +243,7 @@ ColumnLayout {
         SpaceKey {
             weight: 1168
             inputPanelRef: inputPanel
-            btnDisplayedText: "Português"
+            btnDisplayedText: langDescription
         }
 
         Key {

diff --git a/src/qml/SvLayout.qml b/src/qml/SvLayout.qml
@@ -250,7 +250,7 @@ ColumnLayout {
         SpaceKey {
             weight: 1168
             inputPanelRef: inputPanel
-            btnDisplayedText: "Svenska"
+            btnDisplayedText: langDescription
         }
 
         Key {