Added language switching button

Added a button to switch language with an Icon and a property to set a list of available languages as StringList, same Format as languageLayout Reformatted code according to requested changes
amarula · Apr 30, 2024 · 6371090 · 6371090
1 parent 9c45dbb
commit 6371090
Show file tree

Hide file tree

Showing 17 changed files with 390 additions and 588 deletions.
diff --git a/src/InputPanelIface.cpp b/src/InputPanelIface.cpp
@@ -11,6 +11,9 @@ struct InputPanelIface::InputPanelIfacePrivate {
     QString shiftOnIcon{};
     QString shiftOffIcon{};
     QString hideKeyboardIcon{};
+    QString languageIcon{};
+    QStringList availableLanguageLayouts{};
+    QString languageLayout{};
 };
 
 InputPanelIface::InputPanelIface(QObject *parent)
@@ -122,3 +125,35 @@ void InputPanelIface::setHideKeyboardIcon(const QString &hideKeyboardIcon) {
         emit hideKeyboardIconChanged();
     }
 }
+
+QString InputPanelIface::languageIcon() const { return pimpl->languageIcon; }
+
+void InputPanelIface::setLanguageIcon(const QString &languageIcon) {
+    if (pimpl->languageIcon != languageIcon) {
+        pimpl->languageIcon = languageIcon;
+        emit languageIconChanged();
+    }
+}
+
+QStringList InputPanelIface::availableLanguageLayouts() const {
+    return pimpl->availableLanguageLayouts;
+}
+
+void InputPanelIface::setAvailableLanguageLayouts(
+    const QStringList &availableLanguageLayouts) {
+    if (pimpl->availableLanguageLayouts != availableLanguageLayouts) {
+        pimpl->availableLanguageLayouts = availableLanguageLayouts;
+        emit availableLanguageLayoutsChanged();
+    }
+}
+
+QString InputPanelIface::languageLayout() const {
+    return pimpl->languageLayout;
+}
+
+void InputPanelIface::setLanguageLayout(const QString &languageLayout) {
+    if (pimpl->languageLayout != languageLayout) {
+        pimpl->languageLayout = languageLayout;
+        emit languageLayoutChanged();
+    }
+}
diff --git a/src/InputPanelIface.hpp b/src/InputPanelIface.hpp
@@ -22,6 +22,9 @@ class InputPanelIface : public QObject {
     Q_PROPERTY(QString shiftOnIcon READ shiftOnIcon WRITE setShiftOnIcon NOTIFY shiftOnIconChanged)
     Q_PROPERTY(QString shiftOffIcon READ shiftOffIcon WRITE setShiftOffIcon NOTIFY shiftOffIconChanged)
     Q_PROPERTY(QString hideKeyboardIcon READ hideKeyboardIcon WRITE setHideKeyboardIcon NOTIFY hideKeyboardIconChanged)
+    Q_PROPERTY(QString languageIcon READ languageIcon WRITE setLanguageIcon NOTIFY languageIconChanged)
+    Q_PROPERTY(QStringList availableLanguageLayouts READ availableLanguageLayouts WRITE setAvailableLanguageLayouts NOTIFY availableLanguageLayoutsChanged)
+    Q_PROPERTY(QString languageLayout READ languageLayout WRITE setLanguageLayout NOTIFY languageLayoutChanged FINAL)
     // clang-format on
 
    public:
@@ -58,6 +61,15 @@ class InputPanelIface : public QObject {
     QString hideKeyboardIcon() const;
     void setHideKeyboardIcon(const QString &hideKeyboardIcon);
 
+    QString languageIcon() const;
+    void setLanguageIcon(const QString &languageIcon);
+
+    QStringList availableLanguageLayouts() const;
+    void setAvailableLanguageLayouts(const QStringList &availableLanguageLayouts);
+
+    QString languageLayout() const;
+    void setLanguageLayout(const QString &languageIcon);
+
    signals:
     void backgroundColorChanged();
     void btnBackgroundColorChanged();
@@ -69,6 +81,9 @@ class InputPanelIface : public QObject {
     void shiftOnIconChanged();
     void shiftOffIconChanged();
     void hideKeyboardIconChanged();
+    void languageIconChanged();
+    void availableLanguageLayoutsChanged();
+    void languageLayoutChanged();
 
    private:
     struct InputPanelIfacePrivate;

diff --git a/src/icons/language.png b/src/icons/language.png
diff --git a/src/qml/CsLayout.qml b/src/qml/CsLayout.qml
@@ -77,7 +77,6 @@ ColumnLayout {
         BackspaceKey {
             inputPanelRef: inputPanel
         }
-
     }
 
     RowLayout {
@@ -151,14 +150,12 @@ ColumnLayout {
             weight: 283
             inputPanelRef: inputPanel
         }
-
     }
 
     RowLayout {
         property real keyWeight: 156
 
-        ShiftKey {
-        }
+        ShiftKey {}
 
         Key {
             btnKey: Qt.Key_Y
@@ -220,14 +217,18 @@ ColumnLayout {
         ShiftKey {
             weight: 204
         }
-
     }
 
     RowLayout {
         property real keyWeight: 154
 
         SymbolKey {
-            weight: 217
+            weight: availableLanguageLayouts.length === 1 ? 217 : 108.5
+        }
+
+        LanguageKey {
+            visible: availableLanguageLayouts.length > 1
+            weight: 108.5
         }
 
         SpaceKey {
@@ -245,7 +246,5 @@ ColumnLayout {
         HideKey {
             weight: 205
         }
-
     }
-
 }
diff --git a/src/qml/DeLayout.qml b/src/qml/DeLayout.qml
@@ -76,7 +76,6 @@ ColumnLayout {
         BackspaceKey {
             inputPanelRef: inputPanel
         }
-
     }
 
     RowLayout {
@@ -160,14 +159,12 @@ ColumnLayout {
             weight: 283
             inputPanelRef: inputPanel
         }
-
     }
 
     RowLayout {
         property real keyWeight: 156
 
-        ShiftKey {
-        }
+        ShiftKey {}
 
         Key {
             btnKey: Qt.Key_Y
@@ -232,14 +229,18 @@ ColumnLayout {
         ShiftKey {
             weight: 204
         }
-
     }
 
     RowLayout {
         property real keyWeight: 154
 
         SymbolKey {
-            weight: 217
+            weight: availableLanguageLayouts.length === 1 ? 217 : 108.5
+        }
+
+        LanguageKey {
+            visible: availableLanguageLayouts.length > 1
+            weight: 108.5
         }
 
         SpaceKey {
@@ -257,7 +258,5 @@ ColumnLayout {
         HideKey {
             weight: 205
         }
-
     }
-
 }