diff --git a/src/qml/BackspaceKey.qml b/src/qml/BackspaceKey.qml index e88b451..e7afd99 100644 --- a/src/qml/BackspaceKey.qml +++ b/src/qml/BackspaceKey.qml @@ -2,6 +2,7 @@ import CuteKeyboard 1.0 import QtQuick 2.0 Key { + objectName: inputPanelRef.objectName + "Key_Backspace" btnKey: Qt.Key_Backspace repeatable: true showPreview: false diff --git a/src/qml/CsLayout.qml b/src/qml/CsLayout.qml index 612024b..c157193 100644 --- a/src/qml/CsLayout.qml +++ b/src/qml/CsLayout.qml @@ -84,6 +84,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -158,6 +160,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -218,6 +221,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -228,11 +232,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -248,6 +254,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/CySrBsLayout.qml b/src/qml/CySrBsLayout.qml index b3b2311..64a976d 100644 --- a/src/qml/CySrBsLayout.qml +++ b/src/qml/CySrBsLayout.qml @@ -74,6 +74,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -147,6 +149,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -208,6 +211,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -218,11 +222,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -237,6 +243,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/DeLayout.qml b/src/qml/DeLayout.qml index e04a2fc..3e5cc52 100644 --- a/src/qml/DeLayout.qml +++ b/src/qml/DeLayout.qml @@ -83,6 +83,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -167,6 +169,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -230,6 +233,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -240,11 +244,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -260,6 +266,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/ElLayout.qml b/src/qml/ElLayout.qml index 0d4b176..7cbb5c9 100644 --- a/src/qml/ElLayout.qml +++ b/src/qml/ElLayout.qml @@ -71,6 +71,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -135,6 +137,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -187,6 +190,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -197,11 +201,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -217,6 +223,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/EnLayout.qml b/src/qml/EnLayout.qml index e07aeb1..92803e6 100644 --- a/src/qml/EnLayout.qml +++ b/src/qml/EnLayout.qml @@ -84,6 +84,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -160,6 +162,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -220,6 +223,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -230,11 +234,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -250,6 +256,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/EnterKey.qml b/src/qml/EnterKey.qml index 8d3162c..e363404 100644 --- a/src/qml/EnterKey.qml +++ b/src/qml/EnterKey.qml @@ -2,6 +2,7 @@ import CuteKeyboard 1.0 import QtQuick 2.0 Key { + objectName: inputPanelRef.objectName + "Key_Enter" btnKey: Qt.Key_Enter repeatable: true showPreview: false diff --git a/src/qml/EsLayout.qml b/src/qml/EsLayout.qml index 39e397d..3c2728f 100644 --- a/src/qml/EsLayout.qml +++ b/src/qml/EsLayout.qml @@ -81,6 +81,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -158,6 +160,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -221,6 +224,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -231,11 +235,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -251,6 +257,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/FrLayout.qml b/src/qml/FrLayout.qml index dbe4df5..9c31242 100644 --- a/src/qml/FrLayout.qml +++ b/src/qml/FrLayout.qml @@ -83,6 +83,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -160,6 +162,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -218,6 +221,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -228,11 +232,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -248,6 +254,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/HideKey.qml b/src/qml/HideKey.qml index bb82397..46bc10f 100644 --- a/src/qml/HideKey.qml +++ b/src/qml/HideKey.qml @@ -2,6 +2,7 @@ import CuteKeyboard 1.0 import QtQuick 2.0 Key { + objectName: inputPanelRef.objectName + "Key_Hide" functionKey: true showPreview: false onClicked: Qt.inputMethod.hide() diff --git a/src/qml/ItLayout.qml b/src/qml/ItLayout.qml index a1b9a09..0f0f2b2 100644 --- a/src/qml/ItLayout.qml +++ b/src/qml/ItLayout.qml @@ -81,6 +81,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -153,6 +155,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -210,6 +213,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -220,11 +224,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -240,6 +246,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/Key.qml b/src/qml/Key.qml index 0aaf324..3dd3d2a 100644 --- a/src/qml/Key.qml +++ b/src/qml/Key.qml @@ -6,6 +6,8 @@ import QtQuick.Layouts 1.12 Button { id: key + objectName: inputPanelRef.objectName + "Key_" + (btnDisplayedText ? btnDisplayedText : btnText) + property real weight: parent.keyWeight property string btnText: "" property string btnDisplayedText: text @@ -99,5 +101,4 @@ Button { } } - } diff --git a/src/qml/LanguageKey.qml b/src/qml/LanguageKey.qml index 970328e..0107ee7 100644 --- a/src/qml/LanguageKey.qml +++ b/src/qml/LanguageKey.qml @@ -2,6 +2,7 @@ import CuteKeyboard 1.0 import QtQuick 2.0 Key { + objectName: inputPanelRef.objectName + "Key_Language" weight: 108.5 btnKey: Qt.Key_Context2 btnIcon: InputPanel.languageIcon diff --git a/src/qml/LtSrHrBsLayout.qml b/src/qml/LtSrHrBsLayout.qml index caf8829..2caf4f4 100644 --- a/src/qml/LtSrHrBsLayout.qml +++ b/src/qml/LtSrHrBsLayout.qml @@ -89,6 +89,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -179,6 +181,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -242,6 +245,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -252,11 +256,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -271,6 +277,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/NlLayout.qml b/src/qml/NlLayout.qml index e07aeb1..92803e6 100644 --- a/src/qml/NlLayout.qml +++ b/src/qml/NlLayout.qml @@ -84,6 +84,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -160,6 +162,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -220,6 +223,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -230,11 +234,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -250,6 +256,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/PlLayout.qml b/src/qml/PlLayout.qml index a4a1495..e21354a 100644 --- a/src/qml/PlLayout.qml +++ b/src/qml/PlLayout.qml @@ -79,6 +79,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -153,6 +155,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -214,6 +217,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -224,11 +228,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -244,6 +250,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/PtLayout.qml b/src/qml/PtLayout.qml index d5cc79b..7a7dd50 100644 --- a/src/qml/PtLayout.qml +++ b/src/qml/PtLayout.qml @@ -81,6 +81,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -159,6 +161,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -223,6 +226,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -233,11 +237,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -253,6 +259,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/QwertyLayout.qml b/src/qml/QwertyLayout.qml index 62e68d0..13d0fe7 100644 --- a/src/qml/QwertyLayout.qml +++ b/src/qml/QwertyLayout.qml @@ -77,6 +77,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -148,6 +150,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -205,6 +208,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -215,11 +219,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -236,6 +242,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/RuLayout.qml b/src/qml/RuLayout.qml index 7ba18ae..7458c32 100644 --- a/src/qml/RuLayout.qml +++ b/src/qml/RuLayout.qml @@ -73,6 +73,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -144,6 +146,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -193,6 +196,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -203,11 +207,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -224,6 +230,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/ShiftKey.qml b/src/qml/ShiftKey.qml index cc12a37..26bbbea 100644 --- a/src/qml/ShiftKey.qml +++ b/src/qml/ShiftKey.qml @@ -2,6 +2,7 @@ import CuteKeyboard 1.0 import QtQuick 2.0 Key { + objectName: inputPanelRef.objectName + "Key_Shift" btnKey: Qt.Key_Shift functionKey: true showPreview: false diff --git a/src/qml/SpaceKey.qml b/src/qml/SpaceKey.qml index 5ce88b9..8fabf10 100644 --- a/src/qml/SpaceKey.qml +++ b/src/qml/SpaceKey.qml @@ -1,6 +1,7 @@ import QtQuick 2.0 Key { + objectName: inputPanelRef.objectName + "Key_Space" btnKey: Qt.Key_Space btnText: " " showPreview: false diff --git a/src/qml/SvLayout.qml b/src/qml/SvLayout.qml index 64c03a2..f52254a 100644 --- a/src/qml/SvLayout.qml +++ b/src/qml/SvLayout.qml @@ -83,6 +83,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -167,6 +169,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -230,6 +233,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -240,11 +244,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -260,6 +266,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/SymbolKey.qml b/src/qml/SymbolKey.qml index 77625d2..3cfeff6 100644 --- a/src/qml/SymbolKey.qml +++ b/src/qml/SymbolKey.qml @@ -2,6 +2,7 @@ import CuteKeyboard 1.0 import QtQuick 2.0 Key { + objectName: inputPanelRef.objectName + "Key_Symbol" btnKey: Qt.Key_Context1 btnDisplayedText: !InputEngine.symbolMode ? "&123" : "ABC" functionKey: true diff --git a/src/qml/SymbolLayout.qml b/src/qml/SymbolLayout.qml index daf0036..db622ce 100644 --- a/src/qml/SymbolLayout.qml +++ b/src/qml/SymbolLayout.qml @@ -90,6 +90,8 @@ Item { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -166,6 +168,7 @@ Item { showPreview: false functionKey: true onClicked: secondPage = !secondPage + inputPanelRef: inputPanel } Key { @@ -230,6 +233,7 @@ Item { showPreview: false functionKey: true onClicked: secondPage = !secondPage + inputPanelRef: inputPanel } } @@ -239,6 +243,7 @@ Item { SymbolKey { weight: 217 + inputPanelRef: inputPanel } SpaceKey { @@ -255,6 +260,7 @@ Item { HideKey { weight: 205 + inputPanelRef: inputPanel } } @@ -341,6 +347,8 @@ Item { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -417,6 +425,7 @@ Item { showPreview: false functionKey: true onClicked: secondPage = !secondPage + inputPanelRef: inputPanel } Key { @@ -479,6 +488,7 @@ Item { showPreview: false functionKey: true onClicked: secondPage = !secondPage + inputPanelRef: inputPanel } } @@ -488,6 +498,7 @@ Item { SymbolKey { weight: 217 + inputPanelRef: inputPanel } SpaceKey { @@ -504,6 +515,7 @@ Item { HideKey { weight: 205 + inputPanelRef: inputPanel } } diff --git a/src/qml/UkLayout.qml b/src/qml/UkLayout.qml index 7db555b..e549272 100644 --- a/src/qml/UkLayout.qml +++ b/src/qml/UkLayout.qml @@ -74,6 +74,8 @@ ColumnLayout { property real keyWeight: 160 Key { + objectName: "" // invisible key to align the row + enabled: false weight: 56 functionKey: true showPreview: false @@ -147,6 +149,7 @@ ColumnLayout { property real keyWeight: 156 ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Left" } Key { @@ -196,6 +199,7 @@ ColumnLayout { } ShiftKey { + objectName: inputPanel.objectName + "Key_Shift_Right" weight: 204 } @@ -206,11 +210,13 @@ ColumnLayout { SymbolKey { weight: availableLanguageLayouts.length === 1 ? 217 : 108.5 + inputPanelRef: inputPanel } LanguageKey { visible: availableLanguageLayouts.length > 1 weight: 108.5 + inputPanelRef: inputPanel } SpaceKey { @@ -227,6 +233,7 @@ ColumnLayout { HideKey { weight: 205 + inputPanelRef: inputPanel } }