Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/qml/CsLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
1 change: 0 additions & 1 deletion src/qml/CySrBsLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
1 change: 0 additions & 1 deletion src/qml/DeLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
1 change: 0 additions & 1 deletion src/qml/ElLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
1 change: 0 additions & 1 deletion src/qml/EnLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
1 change: 0 additions & 1 deletion src/qml/EsLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
1 change: 0 additions & 1 deletion src/qml/FrLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
4 changes: 4 additions & 0 deletions src/qml/InputPanel.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/qml/ItLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
1 change: 0 additions & 1 deletion src/qml/LtSrHrBsLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
1 change: 0 additions & 1 deletion src/qml/NlLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
1 change: 0 additions & 1 deletion src/qml/PlLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
1 change: 0 additions & 1 deletion src/qml/PtLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
2 changes: 1 addition & 1 deletion src/qml/QwertyLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: spaceIdentifier
showLanguageDescription: false
}

Key {
Expand Down
1 change: 0 additions & 1 deletion src/qml/RuLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
9 changes: 8 additions & 1 deletion src/qml/SpaceKey.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
1 change: 0 additions & 1 deletion src/qml/SvLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down
4 changes: 2 additions & 2 deletions src/qml/SymbolLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ Item {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: spaceIdentifier
showLanguageDescription: false
}

Key {
Expand Down Expand Up @@ -493,7 +493,7 @@ Item {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: spaceIdentifier
showLanguageDescription: false
}

Key {
Expand Down
1 change: 0 additions & 1 deletion src/qml/UkLayout.qml
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ ColumnLayout {
SpaceKey {
weight: 1168
inputPanelRef: inputPanel
btnDisplayedText: langDescription
}

Key {
Expand Down