diff --git a/src/qml/CsLayout.qml b/src/qml/CsLayout.qml index 66a3678..612024b 100644 --- a/src/qml/CsLayout.qml +++ b/src/qml/CsLayout.qml @@ -238,7 +238,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/CySrBsLayout.qml b/src/qml/CySrBsLayout.qml index d33fb82..b3b2311 100644 --- a/src/qml/CySrBsLayout.qml +++ b/src/qml/CySrBsLayout.qml @@ -228,7 +228,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/DeLayout.qml b/src/qml/DeLayout.qml index 73ff00b..e04a2fc 100644 --- a/src/qml/DeLayout.qml +++ b/src/qml/DeLayout.qml @@ -250,7 +250,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/ElLayout.qml b/src/qml/ElLayout.qml index a2e04f8..0d4b176 100644 --- a/src/qml/ElLayout.qml +++ b/src/qml/ElLayout.qml @@ -207,7 +207,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/EnLayout.qml b/src/qml/EnLayout.qml index a665a16..e07aeb1 100644 --- a/src/qml/EnLayout.qml +++ b/src/qml/EnLayout.qml @@ -240,7 +240,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/EsLayout.qml b/src/qml/EsLayout.qml index e52ceff..39e397d 100644 --- a/src/qml/EsLayout.qml +++ b/src/qml/EsLayout.qml @@ -241,7 +241,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/FrLayout.qml b/src/qml/FrLayout.qml index 9795290..dbe4df5 100644 --- a/src/qml/FrLayout.qml +++ b/src/qml/FrLayout.qml @@ -238,7 +238,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/InputPanel.qml b/src/qml/InputPanel.qml index 225ffd9..2dca71f 100644 --- a/src/qml/InputPanel.qml +++ b/src/qml/InputPanel.qml @@ -19,6 +19,7 @@ Item { property string hideKeyboardIcon: "qrc:/icons/hide-arrow.png" property string languageIcon: "qrc:/icons/language.png" property var availableLanguageLayouts: ["En"] + property alias emptySpaceBar: layoutLoader.emptySpaceBar /*! \internal */ readonly property bool __isRootItem: inputPanel.parent !== null && inputPanel.parent.parent === null @@ -127,6 +128,9 @@ Item { Loader { id: layoutLoader + // display empty space bar + property bool emptySpaceBar: false + // lang description only needed for layouts that share a file property string langDescription // space identifier for the correct translation of the word "space" diff --git a/src/qml/ItLayout.qml b/src/qml/ItLayout.qml index 814bc07..a1b9a09 100644 --- a/src/qml/ItLayout.qml +++ b/src/qml/ItLayout.qml @@ -230,7 +230,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/LtSrHrBsLayout.qml b/src/qml/LtSrHrBsLayout.qml index 2a8a183..caf8829 100644 --- a/src/qml/LtSrHrBsLayout.qml +++ b/src/qml/LtSrHrBsLayout.qml @@ -262,7 +262,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/NlLayout.qml b/src/qml/NlLayout.qml index a665a16..e07aeb1 100644 --- a/src/qml/NlLayout.qml +++ b/src/qml/NlLayout.qml @@ -240,7 +240,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/PlLayout.qml b/src/qml/PlLayout.qml index b95e38c..a4a1495 100644 --- a/src/qml/PlLayout.qml +++ b/src/qml/PlLayout.qml @@ -234,7 +234,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/PtLayout.qml b/src/qml/PtLayout.qml index 363bfc5..d5cc79b 100644 --- a/src/qml/PtLayout.qml +++ b/src/qml/PtLayout.qml @@ -243,7 +243,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/QwertyLayout.qml b/src/qml/QwertyLayout.qml index 0b7617e..62e68d0 100644 --- a/src/qml/QwertyLayout.qml +++ b/src/qml/QwertyLayout.qml @@ -225,7 +225,7 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: spaceIdentifier + showLanguageDescription: false } Key { diff --git a/src/qml/RuLayout.qml b/src/qml/RuLayout.qml index 8362473..7ba18ae 100644 --- a/src/qml/RuLayout.qml +++ b/src/qml/RuLayout.qml @@ -213,7 +213,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/SpaceKey.qml b/src/qml/SpaceKey.qml index ed4ed49..5ce88b9 100644 --- a/src/qml/SpaceKey.qml +++ b/src/qml/SpaceKey.qml @@ -3,7 +3,14 @@ import QtQuick 2.0 Key { btnKey: Qt.Key_Space btnText: " " - btnDisplayedText: "Space" showPreview: false repeatable: true + + property bool showLanguageDescription: true + btnDisplayedText: { + if (emptySpaceBar) { + return ""; + } + return showLanguageDescription ? langDescription : spaceIdentifier; + } } diff --git a/src/qml/SvLayout.qml b/src/qml/SvLayout.qml index b0e0fea..64c03a2 100644 --- a/src/qml/SvLayout.qml +++ b/src/qml/SvLayout.qml @@ -250,7 +250,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key { diff --git a/src/qml/SymbolLayout.qml b/src/qml/SymbolLayout.qml index 8a954ea..daf0036 100644 --- a/src/qml/SymbolLayout.qml +++ b/src/qml/SymbolLayout.qml @@ -244,7 +244,7 @@ Item { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: spaceIdentifier + showLanguageDescription: false } Key { @@ -493,7 +493,7 @@ Item { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: spaceIdentifier + showLanguageDescription: false } Key { diff --git a/src/qml/UkLayout.qml b/src/qml/UkLayout.qml index 71afe49..7db555b 100644 --- a/src/qml/UkLayout.qml +++ b/src/qml/UkLayout.qml @@ -216,7 +216,6 @@ ColumnLayout { SpaceKey { weight: 1168 inputPanelRef: inputPanel - btnDisplayedText: langDescription } Key {