diff options
Diffstat (limited to 'src/virtualkeyboard/content')
298 files changed, 3110 insertions, 7354 deletions
diff --git a/src/virtualkeyboard/content/HandwritingInputPanel.qml b/src/virtualkeyboard/content/HandwritingInputPanel.qml index b91c59c7..940fe915 100644 --- a/src/virtualkeyboard/content/HandwritingInputPanel.qml +++ b/src/virtualkeyboard/content/HandwritingInputPanel.qml @@ -108,12 +108,12 @@ Item { enabled: handwritingInputPanel.enabled && handwritingInputPanel.available && handwritingInputPanel.active objectName: "hwrInputArea" anchors.fill: parent - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting canvasType: "fullscreen" } Binding { - target: InputContext + target: InputContext.priv property: "keyboardRectangle" value: Qt.rect(hwrInputArea.x, hwrInputArea.y, hwrInputArea.width, hwrInputArea.height) when: handwritingInputPanel.enabled && handwritingInputPanel.available && handwritingInputPanel.active diff --git a/src/virtualkeyboard/content/InputPanel.qml b/src/virtualkeyboard/content/InputPanel.qml index c88cccc2..b32ac340 100644 --- a/src/virtualkeyboard/content/InputPanel.qml +++ b/src/virtualkeyboard/content/InputPanel.qml @@ -114,9 +114,6 @@ Item { /*! \internal */ readonly property bool __isRootItem: inputPanel.parent != null && inputPanel.parent.parent == null - LayoutMirroring.enabled: false - LayoutMirroring.childrenInherit: true - SelectionControl { objectName: "selectionControl" x: -parent.x @@ -138,7 +135,7 @@ Item { } Binding { - target: InputContext + target: InputContext.priv property: "keyboardRectangle" value: mapToItem(null, __isRootItem ? keyboard.x : x, diff --git a/src/virtualkeyboard/content/components/AlternativeKeys.qml b/src/virtualkeyboard/content/components/AlternativeKeys.qml index a1fcfe14..7879f006 100644 --- a/src/virtualkeyboard/content/components/AlternativeKeys.qml +++ b/src/virtualkeyboard/content/components/AlternativeKeys.qml @@ -37,6 +37,8 @@ Item { property int keyCode property point origin signal clicked + LayoutMirroring.enabled: false + LayoutMirroring.childrenInherit: true z: 1 visible: active diff --git a/src/virtualkeyboard/content/components/EnterKey.qml b/src/virtualkeyboard/content/components/EnterKey.qml index 74b3984c..9f7c04da 100644 --- a/src/virtualkeyboard/content/components/EnterKey.qml +++ b/src/virtualkeyboard/content/components/EnterKey.qml @@ -45,13 +45,13 @@ BaseKey { /*! This property holds the action id for the enter key. */ - readonly property int actionId: InputContext.hasEnterKeyAction(InputContext.inputItem) ? InputContext.inputItem.EnterKeyAction.actionId : EnterKeyAction.None + readonly property int actionId: InputContext.priv.hasEnterKeyAction(InputContext.priv.inputItem) ? InputContext.priv.inputItem.EnterKeyAction.actionId : EnterKeyAction.None text: "\n" - displayText: InputContext.hasEnterKeyAction(InputContext.inputItem) ? InputContext.inputItem.EnterKeyAction.label : "" + displayText: InputContext.priv.hasEnterKeyAction(InputContext.priv.inputItem) ? InputContext.priv.inputItem.EnterKeyAction.label : "" key: Qt.Key_Return showPreview: false highlighted: enabled && displayText.length > 0 - enabled: InputContext.hasEnterKeyAction(InputContext.inputItem) ? InputContext.inputItem.EnterKeyAction.enabled : true + enabled: InputContext.priv.hasEnterKeyAction(InputContext.priv.inputItem) ? InputContext.priv.inputItem.EnterKeyAction.enabled : true keyPanelDelegate: keyboard.style ? keyboard.style.enterKeyPanel : undefined } diff --git a/src/virtualkeyboard/content/components/HideKeyboardKey.qml b/src/virtualkeyboard/content/components/HideKeyboardKey.qml index e9de1002..ab38fbc2 100644 --- a/src/virtualkeyboard/content/components/HideKeyboardKey.qml +++ b/src/virtualkeyboard/content/components/HideKeyboardKey.qml @@ -43,6 +43,6 @@ import QtQuick.VirtualKeyboard 2.1 BaseKey { functionKey: true - onClicked: InputContext.hideInputPanel() + onClicked: InputContext.priv.hideInputPanel() keyPanelDelegate: keyboard.style ? keyboard.style.hideKeyPanel : undefined } diff --git a/src/virtualkeyboard/content/components/InputModeKey.qml b/src/virtualkeyboard/content/components/InputModeKey.qml index c4463a8e..6ac04422 100644 --- a/src/virtualkeyboard/content/components/InputModeKey.qml +++ b/src/virtualkeyboard/content/components/InputModeKey.qml @@ -39,7 +39,7 @@ import QtQuick.VirtualKeyboard 2.3 \brief Input mode key for keyboard layouts. - This key toggles between available \l {InputEngine::inputModes} {InputEngine.inputModes}. + This key toggles between available \l {QVirtualKeyboardInputEngine::inputModes} {InputEngine.inputModes}. */ Key { @@ -55,26 +55,26 @@ Key { /*! List of input mode names. - The default list contains all known input modes for \l {InputEngine::inputMode} {InputEngine.inputMode}. + The default list contains all known input modes for \l {QVirtualKeyboardInputEngine::inputMode} {InputEngine.inputMode}. */ property var inputModeNameList: [ - "ABC", // InputEngine.Latin - "123", // InputEngine.Numeric - "123", // InputEngine.Dialable - "拼音", // InputEngine.Pinyin - "倉頡", // InputEngine.Cangjie - "注音", // InputEngine.Zhuyin - "한글", // InputEngine.Hangul - "あ", // InputEngine.Hiragana - "カ", // InputEngine.Katakana - "全角", // InputEngine.FullwidthLatin - "ΑΒΓ", // InputEngine.Greek - "АБВ", // InputEngine.Cyrillic - "\u0623\u200C\u0628\u200C\u062C", // InputEngine.Arabic - "\u05D0\u05D1\u05D2", // InputEngine.Hebrew - "中文", // InputEngine.ChineseHandwriting - "日本語", // InputEngine.JapaneseHandwriting - "한국어", // InputEngine.KoreanHandwriting + "ABC", // InputEngine.InputMode.Latin + "123", // InputEngine.InputMode.Numeric + "123", // InputEngine.InputMode.Dialable + "拼音", // InputEngine.InputMode.Pinyin + "倉頡", // InputEngine.InputMode.Cangjie + "注音", // InputEngine.InputMode.Zhuyin + "한글", // InputEngine.InputMode.Hangul + "あ", // InputEngine.InputMode.Hiragana + "カ", // InputEngine.InputMode.Katakana + "全角", // InputEngine.InputMode.FullwidthLatin + "ΑΒΓ", // InputEngine.InputMode.Greek + "АБВ", // InputEngine.InputMode.Cyrillic + "\u0623\u200C\u0628\u200C\u062C", // InputEngine.InputMode.Arabic + "\u05D0\u05D1\u05D2", // InputEngine.InputMode.Hebrew + "中文", // InputEngine.InputMode.ChineseHandwriting + "日本語", // InputEngine.InputMode.JapaneseHandwriting + "한국어", // InputEngine.InputMode.KoreanHandwriting ] /*! diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml index 47e6d9cb..00c7a926 100644 --- a/src/virtualkeyboard/content/components/Keyboard.qml +++ b/src/virtualkeyboard/content/components/Keyboard.qml @@ -30,9 +30,10 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 import QtQuick.Window 2.2 -import QtQuick.VirtualKeyboard 2.2 +import QtQuick.VirtualKeyboard 2.3 import QtQuick.VirtualKeyboard.Styles 2.1 import QtQuick.VirtualKeyboard.Settings 2.2 +import QtQuick.VirtualKeyboard.Plugins 2.3 import Qt.labs.folderlistmodel 2.0 Item { @@ -73,7 +74,7 @@ Item { property var plainInputMethod: PlainInputMethod {} property var customInputMethod: null property var customInputMethodSharedLayouts: [] - property int defaultInputMode: InputEngine.Latin + property int defaultInputMode: InputEngine.InputMode.Latin property bool inputMethodNeedsReset: true property bool inputModeNeedsReset: true property bool navigationModeActive: false @@ -82,7 +83,7 @@ Item { function initDefaultInputMethod() { try { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HunspellInputMethod {}', keyboard, "defaultInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; DefaultInputMethod {}', keyboard, "defaultInputMethod") } catch (e) { } return plainInputMethod } @@ -126,7 +127,7 @@ Item { } onInputLocaleChanged: { if (Qt.locale(inputLocale).name !== "C") - InputContext.locale = inputLocale + InputContext.priv.locale = inputLocale } onLayoutChanged: hideLanguagePopup() onLayoutTypeChanged: { @@ -150,21 +151,25 @@ Item { Connections { target: InputContext + onInputMethodHintsChanged: { + if (InputContext.priv.focus) + updateInputMethod() + } + } + Connections { + target: InputContext.priv onInputItemChanged: { keyboard.hideLanguagePopup() if (active && symbolMode && !preferNumbers) symbolMode = false } onFocusChanged: { - if (InputContext.focus) - updateInputMethod() - } - onInputMethodHintsChanged: { - if (InputContext.focus) + if (InputContext.priv.focus) updateInputMethod() } onNavigationKeyPressed: { var initialKey + var direction = wordCandidateView.effectiveLayoutDirection == Qt.LeftToRight ? 1 : -1 switch (key) { case Qt.Key_Left: if (keyboard.navigationModeActive && !keyboardInputArea.initialKey) { @@ -184,18 +189,26 @@ Item { } break } + if (wordCandidateContextMenu.active) { + hideWordCandidateContextMenu() + break + } if (wordCandidateView.count) { - if (wordCandidateView.currentIndex > 0) { + if (wordCandidateView.effectiveLayoutDirection == Qt.LeftToRight && + wordCandidateView.currentIndex > 0) { wordCandidateView.decrementCurrentIndex() + } else if (wordCandidateView.effectiveLayoutDirection == Qt.RightToLeft && + wordCandidateView.currentIndex + 1 < wordCandidateView.count) { + wordCandidateView.incrementCurrentIndex() } else { keyboardInputArea.navigateToNextKey(0, 0, false) initialKey = keyboardInputArea.initialKey - if (!keyboardInputArea.navigateToNextKey(-1, -1, false)) { - keyboardInputArea.initialKey = initialKey - keyboardInputArea.navigateToNextKey(-1, -1, true) - } else { - keyboardInputArea.navigateToNextKey(1, 1, false) - } + while (keyboardInputArea.navigateToNextKey(0, 1 * direction, false)) + initialKey = keyboardInputArea.initialKey + while (keyboardInputArea.navigateToNextKey(1, 0, false)) + initialKey = keyboardInputArea.initialKey + keyboardInputArea.initialKey = initialKey + keyboardInputArea.navigateToNextKey(0, 0, false) } break } @@ -203,14 +216,18 @@ Item { initialKey = keyboardInputArea.initialKey if (!keyboardInputArea.navigateToNextKey(-1, 0, false)) { keyboardInputArea.initialKey = initialKey - if (!keyboardInputArea.navigateToNextKey(0, -1, false)) { + if (!keyboardInputArea.navigateToNextKey(0, -1 * direction, false)) { if (wordCandidateView.count) { - if (wordCandidateView.currentIndex === -1) - wordCandidateView.incrementCurrentIndex() + if (wordCandidateView.count) { + wordCandidateView.currentIndex = + wordCandidateView.effectiveLayoutDirection == Qt.LeftToRight ? + (wordCandidateView.count - 1) : 0 + break + } break } keyboardInputArea.initialKey = initialKey - keyboardInputArea.navigateToNextKey(0, -1, true) + keyboardInputArea.navigateToNextKey(0, -1 * direction, true) } keyboardInputArea.navigateToNextKey(-1, 0, true) } @@ -230,6 +247,14 @@ Item { alternativeKeys.close() keyboardInputArea.setActiveKey(null) keyboardInputArea.navigateToNextKey(0, 0, false) + } else if (wordCandidateContextMenu.active) { + if (wordCandidateContextMenuList.currentIndex > 0) { + wordCandidateContextMenuList.decrementCurrentIndex() + } else if (wordCandidateContextMenuList.keyNavigationWraps && wordCandidateContextMenuList.count > 1) { + wordCandidateContextMenuList.currentIndex = wordCandidateContextMenuList.count - 1 + } else { + hideWordCandidateContextMenu() + } } else if (keyboard.navigationModeActive && !keyboardInputArea.initialKey && wordCandidateView.count) { keyboardInputArea.navigateToNextKey(0, 0, false) initialKey = keyboardInputArea.initialKey @@ -262,18 +287,26 @@ Item { } break } + if (wordCandidateContextMenu.active) { + hideWordCandidateContextMenu() + break + } if (wordCandidateView.count) { - if (wordCandidateView.currentIndex + 1 < wordCandidateView.count) { + if (wordCandidateView.effectiveLayoutDirection == Qt.LeftToRight && + wordCandidateView.currentIndex + 1 < wordCandidateView.count) { wordCandidateView.incrementCurrentIndex() + } else if (wordCandidateView.effectiveLayoutDirection == Qt.RightToLeft && + wordCandidateView.currentIndex > 0) { + wordCandidateView.decrementCurrentIndex() } else { keyboardInputArea.navigateToNextKey(0, 0, false) initialKey = keyboardInputArea.initialKey - if (!keyboardInputArea.navigateToNextKey(1, 1, false)) { - keyboardInputArea.initialKey = initialKey - keyboardInputArea.navigateToNextKey(1, 1, true) - } else { - keyboardInputArea.navigateToNextKey(-1, -1, false) - } + while (keyboardInputArea.navigateToNextKey(0, -1 * direction, false)) + initialKey = keyboardInputArea.initialKey; + while (keyboardInputArea.navigateToNextKey(-1, 0, false)) + initialKey = keyboardInputArea.initialKey; + keyboardInputArea.initialKey = initialKey + keyboardInputArea.navigateToNextKey(0, 0, false) } break } @@ -281,14 +314,15 @@ Item { initialKey = keyboardInputArea.initialKey if (!keyboardInputArea.navigateToNextKey(1, 0, false)) { keyboardInputArea.initialKey = initialKey - if (!keyboardInputArea.navigateToNextKey(0, 1, false)) { + if (!keyboardInputArea.navigateToNextKey(0, 1 * direction, false)) { if (wordCandidateView.count) { - if (wordCandidateView.currentIndex === -1) - wordCandidateView.incrementCurrentIndex() + wordCandidateView.currentIndex = + wordCandidateView.effectiveLayoutDirection == Qt.LeftToRight ? + 0 : (wordCandidateView.count - 1) break } keyboardInputArea.initialKey = initialKey - keyboardInputArea.navigateToNextKey(0, 1, true) + keyboardInputArea.navigateToNextKey(0, 1 * direction, true) } keyboardInputArea.navigateToNextKey(1, 0, true) } @@ -308,6 +342,16 @@ Item { alternativeKeys.close() keyboardInputArea.setActiveKey(null) keyboardInputArea.navigateToNextKey(0, 0, false) + } else if (wordCandidateContextMenu.active) { + if (wordCandidateContextMenuList.currentIndex + 1 < wordCandidateContextMenuList.count) { + wordCandidateContextMenuList.incrementCurrentIndex() + } else if (wordCandidateContextMenuList.keyNavigationWraps && wordCandidateContextMenuList.count > 1) { + wordCandidateContextMenuList.currentIndex = 0 + } else { + hideWordCandidateContextMenu() + keyboardInputArea.setActiveKey(null) + keyboardInputArea.navigateToNextKey(0, 0, false) + } } else if (keyboard.navigationModeActive && !keyboardInputArea.initialKey && wordCandidateView.count) { keyboardInputArea.navigateToNextKey(0, 0, false) initialKey = keyboardInputArea.initialKey @@ -331,22 +375,16 @@ Item { keyboardInputArea.reset() keyboardInputArea.navigateToNextKey(0, 0, false) } - } else if (alternativeKeys.active) { - if (!isAutoRepeat) { - alternativeKeys.clicked() - keyboardInputArea.reset() - keyboardInputArea.navigateToNextKey(0, 0, false) - } } else if (keyboardInputArea.initialKey) { if (!isAutoRepeat) { pressAndHoldTimer.restart() keyboardInputArea.setActiveKey(keyboardInputArea.initialKey) keyboardInputArea.press(keyboardInputArea.initialKey, true) } - } else if (wordCandidateView.count > 0) { - wordCandidateView.model.selectItem(wordCandidateView.currentIndex) - if (!InputContext.preeditText.length) - keyboardInputArea.navigateToNextKey(0, 1, true) + } else if (!wordCandidateContextMenu.active && wordCandidateView.count > 0) { + if (!isAutoRepeat) { + pressAndHoldTimer.restart() + } } break default: @@ -361,13 +399,35 @@ Item { languagePopupList.model.selectItem(languagePopupList.currentIndex) break } - if (!languagePopupListActive && !alternativeKeys.active && keyboard.activeKey && !isAutoRepeat) { + if (isAutoRepeat) + break + if (!languagePopupListActive && !alternativeKeys.active && !wordCandidateContextMenu.active && keyboard.activeKey) { keyboardInputArea.release(keyboard.activeKey) pressAndHoldTimer.stop() alternativeKeys.close() keyboardInputArea.setActiveKey(null) if (!languagePopupListActive && keyboardInputArea.navigationCursor !== Qt.point(-1, -1)) keyboardInputArea.navigateToNextKey(0, 0, false) + } else if (wordCandidateContextMenu.active) { + if (!wordCandidateContextMenu.openedByNavigationKeyLongPress) { + wordCandidateContextMenu.selectCurrentItem() + keyboardInputArea.navigateToNextKey(0, 0, false) + } else { + wordCandidateContextMenu.openedByNavigationKeyLongPress = false + } + } else if (alternativeKeys.active) { + if (!alternativeKeys.openedByNavigationKeyLongPress) { + alternativeKeys.clicked() + alternativeKeys.close() + keyboardInputArea.navigateToNextKey(0, 0, false) + keyboardInputArea.reset() + } else { + alternativeKeys.openedByNavigationKeyLongPress = false + } + } else if (!wordCandidateContextMenu.active && wordCandidateView.count > 0) { + wordCandidateView.model.selectItem(wordCandidateView.currentIndex) + if (!InputContext.preeditText.length) + keyboardInputArea.navigateToNextKey(0, 1, true) } break default: @@ -385,7 +445,7 @@ Item { keyboard.symbolMode = false } else if (key === Qt.Key_Space) { var surroundingText = InputContext.surroundingText.trim() - if (InputContext.shiftHandler.sentenceEndingCharacters.indexOf(surroundingText.charAt(surroundingText.length-1)) >= 0) + if (InputContext.priv.shiftHandler.sentenceEndingCharacters.indexOf(surroundingText.charAt(surroundingText.length-1)) >= 0) keyboard.symbolMode = false } } @@ -412,10 +472,13 @@ Item { keyboard.y + alternativeKeys.listView.y - verticalMargin, alternativeKeys.listView.width + horizontalMargin * 2, alternativeKeys.listView.height + verticalMargin * 2) + property bool openedByNavigationKeyLongPress onVisibleChanged: { if (visible) - InputContext.previewRectangle = Qt.binding(function() {return previewRect}) - InputContext.previewVisible = visible + InputContext.priv.previewRectangle = Qt.binding(function() {return previewRect}) + else + openedByNavigationKeyLongPress = false + InputContext.priv.previewVisible = visible } } Timer { @@ -427,6 +490,7 @@ Item { if (alternativeKeys.open(keyboard.activeKey, origin.x, origin.y)) { InputContext.inputEngine.virtualKeyCancel() keyboardInputArea.initialKey = null + alternativeKeys.openedByNavigationKeyLongPress = keyboard.navigationModeActive } else if (keyboard.activeKey.key === Qt.Key_Context1) { InputContext.inputEngine.virtualKeyCancel() keyboardInputArea.dragSymbolMode = true @@ -444,6 +508,9 @@ Item { keyboardInputArea.initialKey = null if (keyboardInputArea.navigationCursor !== Qt.point(-1, -1)) keyboardInputArea.navigateToNextKey(0, 0, false) + } else if (!wordCandidateContextMenu.active) { + wordCandidateContextMenu.show(wordCandidateView.currentIndex) + wordCandidateContextMenu.openedByNavigationKeyLongPress = keyboard.navigationModeActive } } } @@ -471,19 +538,19 @@ Item { characterPreview.height) } Binding { - target: InputContext + target: InputContext.priv property: "previewRectangle" value: characterPreview.previewRect when: characterPreview.visible } Binding { - target: InputContext + target: InputContext.priv property: "previewRectangle" value: languagePopupList.previewRect when: languagePopupListActive } Binding { - target: InputContext + target: InputContext.priv property: "previewVisible" value: characterPreview.visible || languagePopupListActive } @@ -507,6 +574,8 @@ Item { return languagePopupList.highlightItem } else if (alternativeKeys.listView.count > 0) { return alternativeKeys.listView.highlightItem + } else if (wordCandidateContextMenu.active) { + return wordCandidateContextMenuList.highlightItem } else if (wordCandidateView.count > 0) { return wordCandidateView.highlightItem } @@ -578,7 +647,7 @@ Item { SelectionControl { objectName: "fullScreenModeSelectionControl" - inputContext: InputContext.shadow + inputContext: InputContext.priv.shadow anchors.top: shadowInputControl.top anchors.left: shadowInputControl.left enabled: keyboard.enabled && fullScreenMode @@ -622,10 +691,11 @@ Item { else wordCandidateViewAutoHideTimer.stop() wordCandidateView.empty = empty + keyboard.hideWordCandidateContextMenu() } } Connections { - target: InputContext + target: InputContext.priv onInputItemChanged: wordCandidateViewAutoHideTimer.stop() } Connections { @@ -666,6 +736,10 @@ Item { } } } + + function longPressItem(index) { + return keyboard.showWordCandidateContextMenu(index) + } } Item { @@ -728,6 +802,8 @@ Item { width: Math.round(keyboardBackground.width) height: Math.round(style.keyboardDesignHeight * width / style.keyboardDesignWidth) anchors.horizontalCenter: parent.horizontalCenter + LayoutMirroring.enabled: false + LayoutMirroring.childrenInherit: true Loader { id: keyboardLayoutLoader @@ -1014,8 +1090,11 @@ Item { } Item { + id: languagePopup z: 1 anchors.fill: parent + LayoutMirroring.enabled: false + LayoutMirroring.childrenInherit: true MouseArea { onPressed: keyboard.hideLanguagePopup() @@ -1023,13 +1102,19 @@ Item { enabled: languagePopupList.enabled } - LanguagePopupList { + PopupList { id: languagePopupList + objectName: "languagePopupList" z: 2 anchors.left: parent.left anchors.top: parent.top enabled: false model: languageListModel + delegate: keyboard.style ? keyboard.style.languageListDelegate : null + highlight: keyboard.style ? keyboard.style.languageListHighlight : defaultHighlight + add: keyboard.style ? keyboard.style.languageListAdd : null + remove: keyboard.style ? keyboard.style.languageListRemove : null + background: keyboard.style ? keyboard.style.languageListBackground : null property rect previewRect: Qt.rect(keyboard.x + languagePopupList.x, keyboard.y + languagePopupList.y, languagePopupList.width, @@ -1060,48 +1145,173 @@ Item { } } } - } - function showLanguagePopup(parentItem, customLayoutsOnly) { - if (!languagePopupList.enabled) { - var locales = keyboard.listLocales(customLayoutsOnly, parent.externalLanguageSwitchEnabled) - if (parent.externalLanguageSwitchEnabled) { - var currentIndex = 0 + function show(locales, parentItem, customLayoutsOnly) { + if (!languagePopupList.enabled) { + languageListModel.clear() for (var i = 0; i < locales.length; i++) { - if (locales[i] === keyboard.locale) { - currentIndex = i - break - } + languageListModel.append({localeName: locales[i].name, displayName: locales[i].locale.nativeLanguageName, localeIndex: locales[i].index}) + if (locales[i].index === keyboard.localeIndex) + languagePopupList.currentIndex = i } - parent.externalLanguageSwitch(locales, currentIndex) - return + languagePopupList.positionViewAtIndex(languagePopupList.currentIndex, ListView.Center) + languagePopupList.anchors.leftMargin = Qt.binding(function() {return Math.round(keyboard.mapFromItem(parentItem, (parentItem.width - languagePopupList.width) / 2, 0).x)}) + languagePopupList.anchors.topMargin = Qt.binding(function() {return Math.round(keyboard.mapFromItem(parentItem, 0, -languagePopupList.height).y)}) } - languageListModel.clear() - for (i = 0; i < locales.length; i++) { - languageListModel.append({localeName: locales[i].name, displayName: locales[i].locale.nativeLanguageName, localeIndex: locales[i].index}) - if (locales[i].index === keyboard.localeIndex) - languagePopupList.currentIndex = i + languagePopupList.enabled = true + } + + function hide() { + if (languagePopupList.enabled) { + languagePopupList.enabled = false + languagePopupList.anchors.leftMargin = undefined + languagePopupList.anchors.topMargin = undefined + languageListModel.clear() + } + } + } + + function showLanguagePopup(parentItem, customLayoutsOnly) { + var locales = keyboard.listLocales(customLayoutsOnly, parent.externalLanguageSwitchEnabled) + if (parent.externalLanguageSwitchEnabled) { + var currentIndex = 0 + for (var i = 0; i < locales.length; i++) { + if (locales[i] === keyboard.locale) { + currentIndex = i + break + } } - languagePopupList.positionViewAtIndex(languagePopupList.currentIndex, ListView.Center) - languagePopupList.anchors.leftMargin = Qt.binding(function() {return Math.round(keyboard.mapFromItem(parentItem, (parentItem.width - languagePopupList.width) / 2, 0).x)}) - languagePopupList.anchors.topMargin = Qt.binding(function() {return Math.round(keyboard.mapFromItem(parentItem, 0, -languagePopupList.height).y)}) + parent.externalLanguageSwitch(locales, currentIndex) + return } - languagePopupList.enabled = true + languagePopup.show(locales, parentItem, customLayoutsOnly) } function hideLanguagePopup() { - if (languagePopupList.enabled) { - languagePopupList.enabled = false - languagePopupList.anchors.leftMargin = undefined - languagePopupList.anchors.topMargin = undefined - languageListModel.clear() + languagePopup.hide() + } + + MouseArea { + anchors.left: parent.left + anchors.right: parent.right + anchors.bottom: parent.bottom + height: keyboard.parent.parent ? keyboard.parent.parent.height : Screen.height + onPressed: keyboard.hideWordCandidateContextMenu() + enabled: wordCandidateContextMenuList.enabled + } + + Item { + id: wordCandidateContextMenu + objectName: "wordCandidateContextMenu" + z: 1 + anchors.fill: parent + LayoutMirroring.enabled: false + LayoutMirroring.childrenInherit: true + property int previousWordCandidateIndex: -1 + readonly property bool active: wordCandidateContextMenuList.visible + property bool openedByNavigationKeyLongPress + + PopupList { + id: wordCandidateContextMenuList + objectName: "wordCandidateContextMenuList" + z: 2 + anchors.left: parent.left + anchors.top: parent.top + enabled: false + model: wordCandidateContextMenuListModel + property rect previewRect: Qt.rect(keyboard.x + wordCandidateContextMenuList.x, + keyboard.y + wordCandidateContextMenuList.y, + wordCandidateContextMenuList.width, + wordCandidateContextMenuList.height) } + + ListModel { + id: wordCandidateContextMenuListModel + + function selectItem(index) { + wordCandidateContextMenu.previousWordCandidateIndex = -1 + wordCandidateContextMenuList.currentIndex = index + keyboard.soundEffect.play(wordCandidateContextMenuList.currentItem.soundEffect) + switch (get(index).action) { + case "remove": + wordCandidateView.model.removeItem(wordCandidateView.currentIndex) + break + } + keyboard.hideWordCandidateContextMenu() + } + } + + function show(wordCandidateIndex) { + if (wordCandidateContextMenu.enabled) + wordCandidateContextMenu.hide() + + wordCandidateContextMenuListModel.clear() + + var canRemoveSuggestion = wordCandidateView.model.dataAt(wordCandidateIndex, SelectionListModel.Role.CanRemoveSuggestion) + if (canRemoveSuggestion) { + var dictionaryType = wordCandidateView.model.dataAt(wordCandidateIndex, SelectionListModel.Role.Dictionary) + var removeItemText; + switch (dictionaryType) { + case SelectionListModel.DictionaryType.User: + //~ VirtualKeyboard Context menu for word suggestion if it can be removed from the user dictionary. + removeItemText = qsTr("Remove from dictionary") + break + case SelectionListModel.DictionaryType.Default: + // Fallthrough + default: + //~ VirtualKeyboard Context menu for word suggestion if it can be removed from the default dictionary. + removeItemText = qsTr("Block word") + break + } + wordCandidateContextMenuListModel.append({action: "remove", display: removeItemText, wordCompletionLength: 0}) + } + + if (wordCandidateContextMenuListModel.count === 0) + return + + previousWordCandidateIndex = wordCandidateView.currentIndex + wordCandidateView.currentIndex = wordCandidateIndex + + wordCandidateContextMenuList.anchors.leftMargin = Qt.binding(function() { + var leftBorder = Math.round(wordCandidateView.mapFromItem(wordCandidateView.currentItem, (wordCandidateView.currentItem.width - wordCandidateContextMenuList.width) / 2, 0).x) + var rightBorder = Math.round(wordCandidateContextMenuList.parent.width - wordCandidateContextMenuList.width) + return Math.min(leftBorder, rightBorder) + }) + + wordCandidateContextMenuList.enabled = true + } + + function hide() { + if (wordCandidateContextMenuList.enabled) { + if (previousWordCandidateIndex !== -1) { + wordCandidateView.currentIndex = previousWordCandidateIndex + previousWordCandidateIndex = -1 + } + wordCandidateContextMenuList.enabled = false + wordCandidateContextMenuList.anchors.leftMargin = undefined + wordCandidateContextMenuListModel.clear() + } + openedByNavigationKeyLongPress = false + } + + function selectCurrentItem() { + if (active && wordCandidateContextMenuList.currentIndex !== -1) + wordCandidateContextMenuListModel.selectItem(wordCandidateContextMenuList.currentIndex) + } + } + + function showWordCandidateContextMenu(wordCandidateIndex) { + wordCandidateContextMenu.show(wordCandidateIndex) + } + + function hideWordCandidateContextMenu() { + wordCandidateContextMenu.hide() } function updateInputMethod() { if (!keyboardLayoutLoader.item) return - if (!InputContext.focus) + if (!InputContext.priv.focus) return // Reset the custom input method if it is not included in the list of shared layouts @@ -1160,19 +1370,19 @@ Item { // Update input mode automatically in handwriting mode if (keyboard.handwritingMode) { - if (keyboard.dialableCharactersOnly && inputModes.indexOf(InputEngine.Dialable) !== -1) - inputMode = InputEngine.Dialable - else if ((keyboard.formattedNumbersOnly || keyboard.digitsOnly) && inputModes.indexOf(InputEngine.Numeric) !== -1) - inputMode = InputEngine.Numeric + if (keyboard.dialableCharactersOnly && inputModes.indexOf(InputEngine.InputMode.Dialable) !== -1) + inputMode = InputEngine.InputMode.Dialable + else if ((keyboard.formattedNumbersOnly || keyboard.digitsOnly) && inputModes.indexOf(InputEngine.InputMode.Numeric) !== -1) + inputMode = InputEngine.InputMode.Numeric else if (keyboardLayoutLoader.item.inputMode === -1) inputMode = inputModes[0] } // Check the input method hints for input mode overrides if (latinOnly) - inputMode = InputEngine.Latin + inputMode = InputEngine.InputMode.Latin if (preferNumbers) - inputMode = InputEngine.Numeric + inputMode = InputEngine.InputMode.Numeric } // Make sure the input mode is supported by the current input method @@ -1187,7 +1397,7 @@ Item { } // Clear the toggle shift timer - InputContext.shiftHandler.clearToggleShiftTimer() + InputContext.priv.shiftHandler.clearToggleShiftTimer() } function updateLayout() { @@ -1228,48 +1438,49 @@ Item { } } - function updateAvailableLocaleIndices() { - // Update list of all available locales - var baseLayoutIndex = findLocale("en_GB", -1) - var newIndices = [] - var newAvailableLocales = [] + function filterLocaleIndices(filterCb) { + var localeIndices = [] for (var i = 0; i < layoutsModel.count; i++) { - var localeName = layoutsModel.get(i, "fileName") - if (isValidLocale(i) && newIndices.indexOf(i) === -1 && findLayout(localeName, "main")) { - newIndices.push(i) - newAvailableLocales.push(localeName) + if (localeIndices.indexOf(i) === -1) { + var localeName = layoutsModel.get(i, "fileName") + if (filterCb(localeName) && findLayout(localeName, "main")) + localeIndices.push(i) } } + return localeIndices + } + + function updateAvailableLocaleIndices() { + // Update list of all available locales + var fallbackIndex = findFallbackIndex() + var newIndices = filterLocaleIndices(function(localeName) { + return isValidLocale(localeName) + }) // Handle case where the VirtualKeyboardSettings.activeLocales contains no valid entries + // Fetch all locales by ignoring active locales setting if (newIndices.length === 0) { - if (baseLayoutIndex !== -1) { - newIndices.push(baseLayoutIndex) - newAvailableLocales.push("en_GB") - } else { - for (i = 0; i < layoutsModel.count; i++) { - localeName = layoutsModel.get(i, "fileName") - if (Qt.locale(localeName).name !== "C" && findLayout(localeName, "main")) { - newIndices.push(i) - newAvailableLocales.push(localeName) - break - } - } - } + newIndices = filterLocaleIndices(function(localeName) { + return isValidLocale(localeName, true) + }) + } + + // Fetch matching locale names + var newAvailableLocales = [] + for (var i = 0; i < newIndices.length; i++) { + newAvailableLocales.push(layoutsModel.get(newIndices[i], "fileName")) } newIndices.sort(function(a, b) { return a - b }) availableLocaleIndices = newIndices newAvailableLocales.sort() - InputContext.updateAvailableLocales(newAvailableLocales) + InputContext.priv.updateAvailableLocales(newAvailableLocales) // Update list of custom locale indices newIndices = [] for (i = 0; i < availableLocaleIndices.length; i++) { if (availableLocaleIndices[i] === localeIndex || - ((availableLocaleIndices[i] !== baseLayoutIndex || - (layoutType === "handwriting" && availableLocaleIndices.indexOf(baseLayoutIndex) !== -1)) && - layoutExists(layoutsModel.get(availableLocaleIndices[i], "fileName"), layoutType))) + layoutExists(layoutsModel.get(availableLocaleIndices[i], "fileName"), layoutType)) newIndices.push(availableLocaleIndices[i]) } availableCustomLocaleIndices = newIndices @@ -1326,7 +1537,16 @@ Item { return (languageMatch != -1) ? languageMatch : defaultValue } - function isValidLocale(localeNameOrIndex) { + function findFallbackIndex() { + for (var i = 0; i < layoutsModel.count; i++) { + var layoutFolder = layoutsModel.get(i, "fileName") + if (layoutFolder === "fallback") + return i + } + return -1 + } + + function isValidLocale(localeNameOrIndex, ignoreActiveLocales) { var localeName if (typeof localeNameOrIndex == "number") { if (localeNameOrIndex < 0 || localeNameOrIndex >= layoutsModel.count) @@ -1336,10 +1556,18 @@ Item { localeName = localeNameOrIndex } + if (!localeName) + return false + + if (localeName === "fallback") + return false + if (Qt.locale(localeName).name === "C") return false - if (VirtualKeyboardSettings.activeLocales.length > 0 && VirtualKeyboardSettings.activeLocales.indexOf(localeName) === -1) + if (ignoreActiveLocales !== true && + VirtualKeyboardSettings.activeLocales.length > 0 && + VirtualKeyboardSettings.activeLocales.indexOf(localeName) === -1) return false return true @@ -1351,22 +1579,34 @@ Item { return layoutsModel.folder + "/" + localeName + "/" + layoutType + ".qml" } + function getFallbackFile(localeName, layoutType) { + if (localeName === "" || layoutType === "") + return "" + return layoutsModel.folder + "/" + localeName + "/" + layoutType + ".fallback" + } + function layoutExists(localeName, layoutType) { - return InputContext.fileExists(getLayoutFile(localeName, layoutType)) + var result = InputContext.priv.fileExists(getLayoutFile(localeName, layoutType)) + if (!result && layoutType === "handwriting") + result = InputContext.priv.fileExists(getFallbackFile(localeName, layoutType)) + return result } function findLayout(localeName, layoutType) { var layoutFile = getLayoutFile(localeName, layoutType) - if (InputContext.fileExists(layoutFile)) - return layoutFile - layoutFile = getLayoutFile("en_GB", layoutType) - if (InputContext.fileExists(layoutFile)) + if (InputContext.priv.fileExists(layoutFile)) return layoutFile + var fallbackFile = getFallbackFile(localeName, layoutType) + if (InputContext.priv.fileExists(fallbackFile)) { + layoutFile = getLayoutFile("fallback", layoutType) + if (InputContext.priv.fileExists(layoutFile)) + return layoutFile + } return "" } function isHandwritingAvailable() { - return VirtualKeyboardInputMethods.indexOf("HandwritingInputMethod") !== -1 && layoutExists(locale, "handwriting") + return InputContext.priv.inputMethods.indexOf("HandwritingInputMethod") !== -1 && layoutExists(locale, "handwriting") } function setHandwritingMode(enabled, resetInputMode) { diff --git a/src/virtualkeyboard/content/components/MultitapInputMethod.qml b/src/virtualkeyboard/content/components/MultitapInputMethod.qml index b0aa8129..3c14a544 100644 --- a/src/virtualkeyboard/content/components/MultitapInputMethod.qml +++ b/src/virtualkeyboard/content/components/MultitapInputMethod.qml @@ -34,8 +34,8 @@ InputMethod { property string multitapSequence property int multitapIndex: -1 - onMultitapSequenceChanged: selectionListChanged(SelectionListModel.WordCandidateList) - onMultitapIndexChanged: selectionListActiveItemChanged(SelectionListModel.WordCandidateList, multitapIndex) + onMultitapSequenceChanged: selectionListChanged(SelectionListModel.Type.WordCandidateList) + onMultitapIndexChanged: selectionListActiveItemChanged(SelectionListModel.Type.WordCandidateList, multitapIndex) property variant multiTapTimer: Timer { interval: 1200 @@ -45,7 +45,7 @@ InputMethod { } function inputModes(locale) { - return [InputEngine.Latin, InputEngine.Numeric, InputEngine.Dialable]; + return [InputEngine.InputMode.Latin, InputEngine.InputMode.Numeric, InputEngine.InputMode.Dialable]; } function setInputMode(locale, inputMode) { @@ -105,7 +105,7 @@ InputMethod { } function selectionLists() { - return [SelectionListModel.WordCandidateList]; + return [SelectionListModel.Type.WordCandidateList]; } function selectionListItemCount(type) { @@ -115,7 +115,7 @@ InputMethod { function selectionListData(type, index, role) { var result = null switch (role) { - case SelectionListModel.DisplayRole: + case SelectionListModel.Role.Display: result = multitapSequence.charAt(index) break default: diff --git a/src/virtualkeyboard/content/components/LanguagePopupList.qml b/src/virtualkeyboard/content/components/PopupList.qml index 2c8b8c99..dcd02ee1 100644 --- a/src/virtualkeyboard/content/components/LanguagePopupList.qml +++ b/src/virtualkeyboard/content/components/PopupList.qml @@ -28,15 +28,14 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick.VirtualKeyboard 2.3 ListView { - id: languagePopupList - objectName: "languagePopupList" - property int maxVisibleItems: 5 readonly property int preferredVisibleItems: count < maxVisibleItems ? count : maxVisibleItems readonly property real contentWidth: contentItem.childrenRect.width + property alias background: popupListBackground.sourceComponent + property alias defaultHighlight: defaultHighlight clip: true visible: enabled && count > 0 @@ -44,12 +43,12 @@ ListView { height: currentItem ? currentItem.height * preferredVisibleItems + (spacing * preferredVisibleItems - 1) : 0 orientation: ListView.Vertical snapMode: ListView.SnapToItem - delegate: keyboard.style.languageListDelegate - highlight: keyboard.style.languageListHighlight ? keyboard.style.languageListHighlight : defaultHighlight + delegate: keyboard.style.popupListDelegate + highlight: keyboard.style.popupListHighlight ? keyboard.style.popupListHighlight : defaultHighlight highlightMoveDuration: 0 highlightResizeDuration: 0 - add: keyboard.style.languageListAdd - remove: keyboard.style.languageListRemove + add: keyboard.style.popupListAdd + remove: keyboard.style.popupListRemove keyNavigationWraps: true onCurrentItemChanged: if (currentItem) keyboard.soundEffect.register(currentItem.soundEffect) @@ -60,7 +59,8 @@ ListView { } Loader { - sourceComponent: keyboard.style.languageListBackground + id: popupListBackground + sourceComponent: keyboard.style.popupListBackground anchors.fill: parent z: -1 } diff --git a/src/virtualkeyboard/content/components/ShadowInputControl.qml b/src/virtualkeyboard/content/components/ShadowInputControl.qml index b935d5c6..a059c40e 100644 --- a/src/virtualkeyboard/content/components/ShadowInputControl.qml +++ b/src/virtualkeyboard/content/components/ShadowInputControl.qml @@ -40,8 +40,8 @@ Item { anchors.fill: parent } - onXChanged: InputContext.shadow.updateSelectionProperties() - onYChanged: InputContext.shadow.updateSelectionProperties() + onXChanged: InputContext.priv.shadow.updateSelectionProperties() + onYChanged: InputContext.priv.shadow.updateSelectionProperties() Loader { sourceComponent: keyboard.style.fullScreenInputContainerBackground @@ -61,7 +61,7 @@ Item { flickableDirection: Flickable.HorizontalFlick interactive: contentWidth > width contentWidth: shadowInput.width - onContentXChanged: InputContext.shadow.updateSelectionProperties() + onContentXChanged: InputContext.priv.shadow.updateSelectionProperties() function ensureVisible(rectangle) { if (contentX >= rectangle.x) @@ -113,7 +113,7 @@ Item { onTriggered: { var anchorPosition = shadowInput.getAnchorPosition() if (anchorPosition !== InputContext.anchorPosition || shadowInput.cursorPosition !== InputContext.cursorPosition) - InputContext.forceCursorPosition(anchorPosition, shadowInput.cursorPosition) + InputContext.priv.forceCursorPosition(anchorPosition, shadowInput.cursorPosition) } } @@ -130,7 +130,7 @@ Item { } Binding { - target: InputContext.shadow + target: InputContext.priv.shadow property: "inputItem" value: shadowInput when: VirtualKeyboardSettings.fullScreenMode diff --git a/src/virtualkeyboard/content/components/ShiftKey.qml b/src/virtualkeyboard/content/components/ShiftKey.qml index d7705d9f..d31a601a 100644 --- a/src/virtualkeyboard/content/components/ShiftKey.qml +++ b/src/virtualkeyboard/content/components/ShiftKey.qml @@ -44,9 +44,9 @@ import QtQuick.VirtualKeyboard 2.1 BaseKey { id: shiftKey key: Qt.Key_Shift - enabled: InputContext.shiftHandler.toggleShiftEnabled - highlighted: InputContext.capsLock + enabled: InputContext.priv.shiftHandler.toggleShiftEnabled + highlighted: InputContext.capsLockActive functionKey: true keyPanelDelegate: keyboard.style ? keyboard.style.shiftKeyPanel : undefined - onClicked: InputContext.shiftHandler.toggleShift() + onClicked: InputContext.priv.shiftHandler.toggleShift() } diff --git a/src/virtualkeyboard/content/components/TraceInputArea.qml b/src/virtualkeyboard/content/components/TraceInputArea.qml index cdc4ecdd..10527861 100644 --- a/src/virtualkeyboard/content/components/TraceInputArea.qml +++ b/src/virtualkeyboard/content/components/TraceInputArea.qml @@ -52,9 +52,9 @@ MultiPointTouchArea { /*! Pattern recognition mode of this input area. - The default value is \l {QtVirtualKeyboard::InputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}. + The default value is \l {InputEngine::PatternRecognitionMode::None} {InputEngine.PatternRecognitionMode.None}. */ - property int patternRecognitionMode: InputEngine.PatternRecognitionDisabled + property int patternRecognitionMode: InputEngine.PatternRecognitionMode.None /*! List of horizontal rulers in the input area. @@ -127,7 +127,7 @@ MultiPointTouchArea { canvasType: traceInputArea.canvasType }) - enabled: patternRecognitionMode !== InputEngine.PatternRecognitionDisabled && InputContext.inputEngine.patternRecognitionModes.indexOf(patternRecognitionMode) !== -1 + enabled: patternRecognitionMode !== InputEngine.PatternRecognitionMode.None && InputContext.inputEngine.patternRecognitionModes.indexOf(patternRecognitionMode) !== -1 onPressed: { if (!keyboard.style.traceCanvasDelegate) @@ -165,7 +165,7 @@ MultiPointTouchArea { for (var i = 0; i < touchPoints.length; i++) { var traceCanvas = findTraceCanvasById(touchPoints[i].pointId) if (traceCanvas) { - traceCanvas.trace.isFinal = true + traceCanvas.trace.final = true __traceCanvasList.splice(__traceCanvasList.indexOf(traceCanvas), 1) InputContext.inputEngine.traceEnd(traceCanvas.trace) } @@ -176,8 +176,8 @@ MultiPointTouchArea { for (var i = 0; i < touchPoints.length; i++) { var traceCanvas = findTraceCanvasById(touchPoints[i].pointId) if (traceCanvas) { - traceCanvas.trace.isFinal = true - traceCanvas.trace.isCanceled = true + traceCanvas.trace.final = true + traceCanvas.trace.canceled = true __traceCanvasList.splice(__traceCanvasList.indexOf(traceCanvas), 1) InputContext.inputEngine.traceEnd(traceCanvas.trace) } diff --git a/src/virtualkeyboard/content/components/TraceInputKey.qml b/src/virtualkeyboard/content/components/TraceInputKey.qml index 444208e9..f380eb9e 100644 --- a/src/virtualkeyboard/content/components/TraceInputKey.qml +++ b/src/virtualkeyboard/content/components/TraceInputKey.qml @@ -57,7 +57,7 @@ Item { /*! Pattern recognition mode of this input area. - The default value is \l {QtVirtualKeyboard::InputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}. + The default value is \l {InputEngine::PatternRecognitionMode::None} {InputEngine.PatternRecognitionMode.None}. */ property alias patternRecognitionMode: traceInputArea.patternRecognitionMode diff --git a/src/virtualkeyboard/content/components/WordCandidatePopupList.qml b/src/virtualkeyboard/content/components/WordCandidatePopupList.qml index 7740cbf9..e255142a 100644 --- a/src/virtualkeyboard/content/components/WordCandidatePopupList.qml +++ b/src/virtualkeyboard/content/components/WordCandidatePopupList.qml @@ -28,12 +28,11 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick.VirtualKeyboard 2.3 -ListView { +PopupList { id: wordCandidatePopupList - property int maxVisibleItems: 5 readonly property int preferredVisibleItems: { if (!currentItem) return 0 @@ -43,13 +42,10 @@ ListView { --result return result } - readonly property real contentWidth: contentItem.childrenRect.width readonly property bool flipVertical: currentItem && Qt.inputMethod.cursorRectangle.y + (Qt.inputMethod.cursorRectangle.height / 2) > (parent.height / 2) && Qt.inputMethod.cursorRectangle.y + Qt.inputMethod.cursorRectangle.height + (currentItem.height * 2) > parent.height - clip: true - visible: enabled && count > 0 height: currentItem ? currentItem.height * preferredVisibleItems + (spacing * preferredVisibleItems - 1) : 0 Binding { target: wordCandidatePopupList @@ -66,19 +62,9 @@ ListView { value: Math.round(wordCandidatePopupList.flipVertical ? Qt.inputMethod.cursorRectangle.y - wordCandidatePopupList.height : Qt.inputMethod.cursorRectangle.y + Qt.inputMethod.cursorRectangle.height) when: wordCandidatePopupList.visible } - orientation: ListView.Vertical - snapMode: ListView.SnapToItem - delegate: keyboard.style.popupListDelegate - highlight: keyboard.style.popupListHighlight ? keyboard.style.popupListHighlight : null - highlightMoveDuration: 0 - highlightResizeDuration: 0 - add: keyboard.style.popupListAdd - remove: keyboard.style.popupListRemove - keyNavigationWraps: true model: enabled ? InputContext.inputEngine.wordCandidateListModel : null onContentWidthChanged: viewResizeTimer.restart() - onCurrentItemChanged: if (currentItem) keyboard.soundEffect.register(currentItem.soundEffect) Timer { id: viewResizeTimer @@ -92,10 +78,4 @@ ListView { onActiveItemChanged: wordCandidatePopupList.currentIndex = index onItemSelected: if (wordCandidatePopupList.currentItem) keyboard.soundEffect.play(wordCandidatePopupList.currentItem.soundEffect) } - - Loader { - sourceComponent: keyboard.style.popupListBackground - anchors.fill: parent - z: -1 - } } diff --git a/src/virtualkeyboard/content/layouts/ar_AR/dialpad.fallback b/src/virtualkeyboard/content/layouts/ar_AR/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ar_AR/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml index e6c663b0..6d7047f4 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml @@ -30,10 +30,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 import QtQuick.VirtualKeyboard 2.1 +import QtQuick.VirtualKeyboard.Plugins 2.3 KeyboardLayout { inputMethod: PlainInputMethod {} - inputMode: InputEngine.Numeric + inputMode: InputEngine.InputMode.Numeric KeyboardColumn { Layout.fillWidth: false diff --git a/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml b/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml index f84d47dc..f82e4b6c 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/handwriting.qml @@ -33,11 +33,11 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] - inputMode: InputEngine.Arabic - readonly property bool alphabeticInputMode: [InputEngine.Latin, InputEngine.Dialable].indexOf(InputContext.inputEngine.inputMode) !== -1 + inputMode: InputEngine.InputMode.Arabic + readonly property bool alphabeticInputMode: [InputEngine.InputMode.Latin, InputEngine.InputMode.Dialable].indexOf(InputContext.inputEngine.inputMode) !== -1 KeyboardRow { Layout.preferredHeight: 3 @@ -46,7 +46,7 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting horizontalRulers: alphabeticInputMode ? [] : [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3] @@ -73,19 +73,19 @@ KeyboardLayout { InputModeKey { weight: 217 inputModeNameList: [ - "ABC", // InputEngine.Latin - "\u0660\u0661\u0662", // InputEngine.Numeric - "123", // InputEngine.Dialable - "", // InputEngine.Pinyin - "", // InputEngine.Cangjie - "", // InputEngine.Zhuyin - "", // InputEngine.Hangul - "", // InputEngine.Hiragana - "", // InputEngine.Katakana - "", // InputEngine.FullwidthLatin - "", // InputEngine.Greek - "", // InputEngine.Cyrillic - "\u0623\u200C\u0628\u200C\u062C", // InputEngine.Arabic + "ABC", // InputEngine.InputMode.Latin + "\u0660\u0661\u0662", // InputEngine.InputMode.Numeric + "123", // InputEngine.InputMode.Dialable + "", // InputEngine.InputMode.Pinyin + "", // InputEngine.InputMode.Cangjie + "", // InputEngine.InputMode.Zhuyin + "", // InputEngine.InputMode.Hangul + "", // InputEngine.InputMode.Hiragana + "", // InputEngine.InputMode.Katakana + "", // InputEngine.InputMode.FullwidthLatin + "", // InputEngine.InputMode.Greek + "", // InputEngine.InputMode.Cyrillic + "\u0623\u200C\u0628\u200C\u062C", // InputEngine.InputMode.Arabic ] } ChangeLanguageKey { diff --git a/src/virtualkeyboard/content/layouts/ar_AR/main.qml b/src/virtualkeyboard/content/layouts/ar_AR/main.qml index e79847ec..a7f0e5b9 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/main.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/main.qml @@ -31,8 +31,8 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.3 KeyboardLayoutLoader { - inputMode: InputEngine.Arabic - sourceComponent: InputContext.shift ? page2 : page1 + inputMode: InputEngine.InputMode.Arabic + sourceComponent: InputContext.shiftActive ? page2 : page1 Component { id: page1 KeyboardLayout { diff --git a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml b/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml index 62f019d2..fe709489 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml @@ -30,10 +30,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 import QtQuick.VirtualKeyboard 2.1 +import QtQuick.VirtualKeyboard.Plugins 2.3 KeyboardLayout { inputMethod: PlainInputMethod {} - inputMode: InputEngine.Numeric + inputMode: InputEngine.InputMode.Numeric KeyboardRow { Layout.fillWidth: false diff --git a/src/virtualkeyboard/content/layouts/bg_BG/dialpad.fallback b/src/virtualkeyboard/content/layouts/bg_BG/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/bg_BG/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/bg_BG/digits.fallback b/src/virtualkeyboard/content/layouts/bg_BG/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/bg_BG/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml b/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml index 782f3217..16f078cb 100644 --- a/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/bg_BG/handwriting.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] @@ -44,9 +44,9 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting horizontalRulers: - InputContext.inputEngine.inputMode !== InputEngine.Cyrillic ? [] : + InputContext.inputEngine.inputMode !== InputEngine.InputMode.Cyrillic ? [] : [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3] } } diff --git a/src/virtualkeyboard/content/layouts/bg_BG/main.qml b/src/virtualkeyboard/content/layouts/bg_BG/main.qml index f9dad187..2e958aa8 100644 --- a/src/virtualkeyboard/content/layouts/bg_BG/main.qml +++ b/src/virtualkeyboard/content/layouts/bg_BG/main.qml @@ -32,7 +32,7 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayoutLoader { sharedLayouts: ['symbols'] - sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Cyrillic ? cyrillicLayout : latinLayout + sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cyrillic ? cyrillicLayout : latinLayout Component { id: cyrillicLayout KeyboardLayout { @@ -117,7 +117,7 @@ KeyboardLayoutLoader { KeyboardRow { keyWeight: 156 InputModeKey { - inputModes: [InputEngine.Cyrillic, InputEngine.Latin] + inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin] } Key { text: "з" @@ -293,7 +293,7 @@ KeyboardLayoutLoader { keyWeight: 156 InputModeKey { enabled: !(InputContext.inputMethodHints & Qt.ImhLatinOnly) && inputModeCount > 1 - inputModes: [InputEngine.Cyrillic, InputEngine.Latin] + inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin] } Key { key: Qt.Key_Z diff --git a/src/virtualkeyboard/content/layouts/bg_BG/numbers.fallback b/src/virtualkeyboard/content/layouts/bg_BG/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/bg_BG/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/bg_BG/symbols.fallback b/src/virtualkeyboard/content/layouts/bg_BG/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/bg_BG/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/bg_BG/symbols.qml b/src/virtualkeyboard/content/layouts/bg_BG/symbols.qml deleted file mode 100644 index a649017b..00000000 --- a/src/virtualkeyboard/content/layouts/bg_BG/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: InputContext.inputEngine.inputMode === InputEngine.Cyrillic ? "АБВ" : "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: InputContext.inputEngine.inputMode === InputEngine.Cyrillic ? "АБВ" : "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/dialpad.fallback b/src/virtualkeyboard/content/layouts/cs_CZ/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/cs_CZ/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/digits.fallback b/src/virtualkeyboard/content/layouts/cs_CZ/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/cs_CZ/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml b/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml index a8d3b59b..caf820ae 100644 --- a/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/cs_CZ/handwriting.qml @@ -33,10 +33,10 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin KeyboardRow { Layout.preferredHeight: 3 @@ -45,7 +45,7 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting } } } diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/main.qml b/src/virtualkeyboard/content/layouts/cs_CZ/main.qml index 1a4057e8..4d328bff 100644 --- a/src/virtualkeyboard/content/layouts/cs_CZ/main.qml +++ b/src/virtualkeyboard/content/layouts/cs_CZ/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/numbers.fallback b/src/virtualkeyboard/content/layouts/cs_CZ/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/cs_CZ/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/symbols.fallback b/src/virtualkeyboard/content/layouts/cs_CZ/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/cs_CZ/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/cs_CZ/symbols.qml b/src/virtualkeyboard/content/layouts/cs_CZ/symbols.qml deleted file mode 100644 index 76c06493..00000000 --- a/src/virtualkeyboard/content/layouts/cs_CZ/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/da_DK/dialpad.fallback b/src/virtualkeyboard/content/layouts/da_DK/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/da_DK/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/da_DK/digits.fallback b/src/virtualkeyboard/content/layouts/da_DK/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/da_DK/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/da_DK/handwriting.fallback b/src/virtualkeyboard/content/layouts/da_DK/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/da_DK/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/da_DK/main.qml b/src/virtualkeyboard/content/layouts/da_DK/main.qml index d4284387..b03860e6 100644 --- a/src/virtualkeyboard/content/layouts/da_DK/main.qml +++ b/src/virtualkeyboard/content/layouts/da_DK/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/da_DK/numbers.fallback b/src/virtualkeyboard/content/layouts/da_DK/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/da_DK/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/da_DK/symbols.fallback b/src/virtualkeyboard/content/layouts/da_DK/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/da_DK/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/de_DE/dialpad.fallback b/src/virtualkeyboard/content/layouts/de_DE/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/de_DE/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/de_DE/digits.fallback b/src/virtualkeyboard/content/layouts/de_DE/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/de_DE/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/de_DE/handwriting.fallback b/src/virtualkeyboard/content/layouts/de_DE/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/de_DE/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/de_DE/main.qml b/src/virtualkeyboard/content/layouts/de_DE/main.qml index 578fb808..bd91ec50 100644 --- a/src/virtualkeyboard/content/layouts/de_DE/main.qml +++ b/src/virtualkeyboard/content/layouts/de_DE/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/de_DE/numbers.fallback b/src/virtualkeyboard/content/layouts/de_DE/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/de_DE/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/de_DE/symbols.fallback b/src/virtualkeyboard/content/layouts/de_DE/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/de_DE/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/el_GR/dialpad.fallback b/src/virtualkeyboard/content/layouts/el_GR/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/el_GR/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/el_GR/digits.fallback b/src/virtualkeyboard/content/layouts/el_GR/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/el_GR/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml b/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml index 03747a85..b010ecf4 100644 --- a/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/el_GR/handwriting.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] @@ -44,9 +44,9 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting horizontalRulers: - InputContext.inputEngine.inputMode !== InputEngine.Greek ? [] : + InputContext.inputEngine.inputMode !== InputEngine.InputMode.Greek ? [] : [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3] } } diff --git a/src/virtualkeyboard/content/layouts/el_GR/main.qml b/src/virtualkeyboard/content/layouts/el_GR/main.qml index 50b5fec1..d9fbaf9e 100644 --- a/src/virtualkeyboard/content/layouts/el_GR/main.qml +++ b/src/virtualkeyboard/content/layouts/el_GR/main.qml @@ -32,7 +32,7 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayoutLoader { sharedLayouts: ['symbols'] - sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Greek ? greekLayout : latinLayout + sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Greek ? greekLayout : latinLayout Component { id: greekLayout KeyboardLayout { @@ -114,7 +114,7 @@ KeyboardLayoutLoader { KeyboardRow { keyWeight: 156 InputModeKey { - inputModes: [InputEngine.Greek, InputEngine.Latin] + inputModes: [InputEngine.InputMode.Greek, InputEngine.InputMode.Latin] } Key { text: "ζ" @@ -287,7 +287,7 @@ KeyboardLayoutLoader { KeyboardRow { keyWeight: 156 InputModeKey { - inputModes: [InputEngine.Greek, InputEngine.Latin] + inputModes: [InputEngine.InputMode.Greek, InputEngine.InputMode.Latin] } Key { key: Qt.Key_Z diff --git a/src/virtualkeyboard/content/layouts/el_GR/numbers.fallback b/src/virtualkeyboard/content/layouts/el_GR/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/el_GR/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/el_GR/symbols.fallback b/src/virtualkeyboard/content/layouts/el_GR/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/el_GR/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/el_GR/symbols.qml b/src/virtualkeyboard/content/layouts/el_GR/symbols.qml deleted file mode 100644 index b5eda063..00000000 --- a/src/virtualkeyboard/content/layouts/el_GR/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: InputContext.inputEngine.inputMode === InputEngine.Greek ? "ΑΒΓ" : "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: InputContext.inputEngine.inputMode === InputEngine.Greek ? "ΑΒΓ" : "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/en_GB/dialpad.fallback b/src/virtualkeyboard/content/layouts/en_GB/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/en_GB/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/en_GB/digits.fallback b/src/virtualkeyboard/content/layouts/en_GB/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/en_GB/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/en_GB/handwriting.fallback b/src/virtualkeyboard/content/layouts/en_GB/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/en_GB/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/en_GB/main.fallback b/src/virtualkeyboard/content/layouts/en_GB/main.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/en_GB/main.fallback diff --git a/src/virtualkeyboard/content/layouts/en_GB/numbers.fallback b/src/virtualkeyboard/content/layouts/en_GB/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/en_GB/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/en_GB/symbols.fallback b/src/virtualkeyboard/content/layouts/en_GB/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/en_GB/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/en_GB/symbols.qml b/src/virtualkeyboard/content/layouts/en_GB/symbols.qml deleted file mode 100644 index 06d815d8..00000000 --- a/src/virtualkeyboard/content/layouts/en_GB/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/en_US/dialpad.fallback b/src/virtualkeyboard/content/layouts/en_US/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/en_US/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/en_US/digits.fallback b/src/virtualkeyboard/content/layouts/en_US/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/en_US/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/en_US/handwriting.fallback b/src/virtualkeyboard/content/layouts/en_US/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/en_US/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/en_US/main.fallback b/src/virtualkeyboard/content/layouts/en_US/main.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/en_US/main.fallback diff --git a/src/virtualkeyboard/content/layouts/en_US/numbers.fallback b/src/virtualkeyboard/content/layouts/en_US/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/en_US/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/en_US/symbols.fallback b/src/virtualkeyboard/content/layouts/en_US/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/en_US/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/es_ES/dialpad.fallback b/src/virtualkeyboard/content/layouts/es_ES/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/es_ES/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/es_ES/digits.fallback b/src/virtualkeyboard/content/layouts/es_ES/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/es_ES/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml b/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml index 0b929162..d4896408 100644 --- a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml @@ -33,10 +33,10 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin KeyboardRow { Layout.preferredHeight: 3 @@ -45,7 +45,7 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting } } } diff --git a/src/virtualkeyboard/content/layouts/es_ES/main.qml b/src/virtualkeyboard/content/layouts/es_ES/main.qml index 528d1f18..b98980bb 100644 --- a/src/virtualkeyboard/content/layouts/es_ES/main.qml +++ b/src/virtualkeyboard/content/layouts/es_ES/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/es_ES/numbers.fallback b/src/virtualkeyboard/content/layouts/es_ES/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/es_ES/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/es_MX/dialpad.fallback b/src/virtualkeyboard/content/layouts/es_MX/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/es_MX/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/es_MX/digits.fallback b/src/virtualkeyboard/content/layouts/es_MX/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/es_MX/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml b/src/virtualkeyboard/content/layouts/es_MX/handwriting.qml index d42de535..d4896408 100644 --- a/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/es_MX/handwriting.qml @@ -33,10 +33,10 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin KeyboardRow { Layout.preferredHeight: 3 @@ -45,7 +45,7 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting } } } @@ -87,7 +87,7 @@ KeyboardLayout { Key { key: Qt.Key_Period text: "." - alternativeKeys: ":;,.?!" + alternativeKeys: ":;,.¿?¡!" } HideKeyboardKey { id: hideKeyboardKey diff --git a/src/virtualkeyboard/content/layouts/es_MX/main.qml b/src/virtualkeyboard/content/layouts/es_MX/main.qml new file mode 100644 index 00000000..b98980bb --- /dev/null +++ b/src/virtualkeyboard/content/layouts/es_MX/main.qml @@ -0,0 +1,211 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.VirtualKeyboard 2.1 + +KeyboardLayout { + inputMode: InputEngine.InputMode.Latin + keyWeight: 160 + KeyboardRow { + Key { + key: Qt.Key_Q + text: "q" + } + Key { + key: Qt.Key_W + text: "w" + } + Key { + key: Qt.Key_E + text: "e" + alternativeKeys: "ēęėëeêèé" + } + Key { + key: Qt.Key_R + text: "r" + } + Key { + key: Qt.Key_T + text: "t" + } + Key { + key: Qt.Key_Y + text: "y" + } + Key { + key: Qt.Key_U + text: "u" + alternativeKeys: "üûuùú" + } + Key { + key: Qt.Key_I + text: "i" + alternativeKeys: "ïįîiìí" + } + Key { + key: Qt.Key_O + text: "o" + alternativeKeys: "öõôoòóº" + } + Key { + key: Qt.Key_P + text: "p" + } + BackspaceKey { + weight: 180 + } + } + KeyboardRow { + keyWeight: 156 + FillerKey { + weight: 56 + } + Key { + key: Qt.Key_A + text: "a" + alternativeKeys: "äãaâàáª" + } + Key { + key: Qt.Key_S + text: "s" + } + Key { + key: Qt.Key_D + text: "d" + } + Key { + key: Qt.Key_F + text: "f" + } + Key { + key: Qt.Key_G + text: "g" + } + Key { + key: Qt.Key_H + text: "h" + } + Key { + key: Qt.Key_J + text: "j" + } + Key { + key: Qt.Key_K + text: "k" + } + Key { + key: Qt.Key_L + text: "l" + } + Key { + key: Qt.Key_Ntilde + text: "ñ" + } + EnterKey { + weight: 246 + } + } + KeyboardRow { + keyWeight: 156 + ShiftKey {} + Key { + key: Qt.Key_Z + text: "z" + } + Key { + key: Qt.Key_X + text: "x" + } + Key { + key: Qt.Key_C + text: "c" + alternativeKeys: "čcçć" + } + Key { + key: Qt.Key_V + text: "v" + } + Key { + key: Qt.Key_B + text: "b" + } + Key { + key: Qt.Key_N + text: "n" + } + Key { + key: Qt.Key_M + text: "m" + } + Key { + key: Qt.Key_Comma + text: "," + } + Key { + key: Qt.Key_Period + text: "." + } + Key { + key: Qt.Key_Minus + text: "-" + } + ShiftKey { + weight: 264 + } + } + KeyboardRow { + keyWeight: 154 + SymbolModeKey { + weight: 217 + } + ChangeLanguageKey { + weight: 154 + } + HandwritingModeKey { + weight: 154 + } + SpaceKey { + weight: 864 + } + Key { + key: Qt.Key_Question + text: "?" + alternativeKeys: "¿?¡!" + } + Key { + key: 0xE000 + text: ":-)" + alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] + } + HideKeyboardKey { + weight: 204 + } + } +} diff --git a/src/virtualkeyboard/content/layouts/es_MX/numbers.fallback b/src/virtualkeyboard/content/layouts/es_MX/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/es_MX/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/de_DE/symbols.qml b/src/virtualkeyboard/content/layouts/es_MX/symbols.qml index 06d815d8..17bd3c36 100644 --- a/src/virtualkeyboard/content/layouts/de_DE/symbols.qml +++ b/src/virtualkeyboard/content/layouts/es_MX/symbols.qml @@ -134,8 +134,9 @@ KeyboardLayoutLoader { onClicked: secondPage = !secondPage } Key { - key: Qt.Key_Exclam - text: "!" + key: Qt.Key_exclamdown + text: "¡" + alternativeKeys: "¡!" } Key { key: Qt.Key_QuoteDbl @@ -166,8 +167,9 @@ KeyboardLayoutLoader { text: "/" } Key { - key: Qt.Key_Question - text: "?" + key: Qt.Key_questiondown + text: "¿" + alternativeKeys: "¿?" } Key { weight: 204 diff --git a/src/virtualkeyboard/content/layouts/et_EE/dialpad.fallback b/src/virtualkeyboard/content/layouts/et_EE/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/et_EE/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/et_EE/digits.fallback b/src/virtualkeyboard/content/layouts/et_EE/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/et_EE/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/et_EE/handwriting.fallback b/src/virtualkeyboard/content/layouts/et_EE/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/et_EE/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/et_EE/handwriting.qml b/src/virtualkeyboard/content/layouts/et_EE/handwriting.qml deleted file mode 100644 index d42de535..00000000 --- a/src/virtualkeyboard/content/layouts/et_EE/handwriting.qml +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 - -KeyboardLayout { - function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) - } - sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin - - KeyboardRow { - Layout.preferredHeight: 3 - KeyboardColumn { - Layout.preferredWidth: bottomRow.width - hideKeyboardKey.width - KeyboardRow { - TraceInputKey { - objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition - } - } - } - KeyboardColumn { - Layout.preferredWidth: hideKeyboardKey.width - KeyboardRow { - BackspaceKey {} - } - KeyboardRow { - EnterKey {} - } - KeyboardRow { - ShiftKey { } - } - } - } - KeyboardRow { - id: bottomRow - Layout.preferredHeight: 1 - keyWeight: 154 - InputModeKey { - weight: 217 - } - ChangeLanguageKey { - weight: 154 - customLayoutsOnly: true - } - HandwritingModeKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Apostrophe - text: "'" - alternativeKeys: "<>()#%&*/\\\"'=+-_" - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ":;,.?!" - } - HideKeyboardKey { - id: hideKeyboardKey - weight: 204 - } - } -} diff --git a/src/virtualkeyboard/content/layouts/et_EE/main.qml b/src/virtualkeyboard/content/layouts/et_EE/main.qml index 0deff352..4d62e93e 100644 --- a/src/virtualkeyboard/content/layouts/et_EE/main.qml +++ b/src/virtualkeyboard/content/layouts/et_EE/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/et_EE/numbers.fallback b/src/virtualkeyboard/content/layouts/et_EE/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/et_EE/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/et_EE/symbols.fallback b/src/virtualkeyboard/content/layouts/et_EE/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/et_EE/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/et_EE/symbols.qml b/src/virtualkeyboard/content/layouts/et_EE/symbols.qml deleted file mode 100644 index 49f6e709..00000000 --- a/src/virtualkeyboard/content/layouts/et_EE/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/fa_FA/dialpad.fallback b/src/virtualkeyboard/content/layouts/fa_FA/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fa_FA/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml b/src/virtualkeyboard/content/layouts/fa_FA/digits.qml index d001c2db..ed92201f 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/digits.qml @@ -30,10 +30,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 import QtQuick.VirtualKeyboard 2.1 +import QtQuick.VirtualKeyboard.Plugins 2.3 KeyboardLayout { inputMethod: PlainInputMethod {} - inputMode: InputEngine.Numeric + inputMode: InputEngine.InputMode.Numeric KeyboardColumn { Layout.fillWidth: false diff --git a/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml b/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml index 006df195..1a43b05e 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/handwriting.qml @@ -33,11 +33,11 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] - inputMode: InputEngine.Arabic - readonly property bool alphabeticInputMode: [InputEngine.Latin, InputEngine.Dialable].indexOf(InputContext.inputEngine.inputMode) !== -1 + inputMode: InputEngine.InputMode.Arabic + readonly property bool alphabeticInputMode: [InputEngine.InputMode.Latin, InputEngine.InputMode.Dialable].indexOf(InputContext.inputEngine.inputMode) !== -1 KeyboardRow { Layout.preferredHeight: 3 @@ -46,7 +46,7 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting horizontalRulers: alphabeticInputMode ? [] : [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3] @@ -73,19 +73,19 @@ KeyboardLayout { InputModeKey { weight: 217 inputModeNameList: [ - "ABC", // InputEngine.Latin - "\u0660\u0661\u0662", // InputEngine.Numeric - "123", // InputEngine.Dialable - "", // InputEngine.Pinyin - "", // InputEngine.Cangjie - "", // InputEngine.Zhuyin - "", // InputEngine.Hangul - "", // InputEngine.Hiragana - "", // InputEngine.Katakana - "", // InputEngine.FullwidthLatin - "", // InputEngine.Greek - "", // InputEngine.Cyrillic - "\u0627\u200C\u0628\u200C\u067E", // InputEngine.Arabic + "ABC", // InputEngine.InputMode.Latin + "\u0660\u0661\u0662", // InputEngine.InputMode.Numeric + "123", // InputEngine.InputMode.Dialable + "", // InputEngine.InputMode.Pinyin + "", // InputEngine.InputMode.Cangjie + "", // InputEngine.InputMode.Zhuyin + "", // InputEngine.InputMode.Hangul + "", // InputEngine.InputMode.Hiragana + "", // InputEngine.InputMode.Katakana + "", // InputEngine.InputMode.FullwidthLatin + "", // InputEngine.InputMode.Greek + "", // InputEngine.InputMode.Cyrillic + "\u0627\u200C\u0628\u200C\u067E", // InputEngine.InputMode.Arabic ] } ChangeLanguageKey { diff --git a/src/virtualkeyboard/content/layouts/fa_FA/main.qml b/src/virtualkeyboard/content/layouts/fa_FA/main.qml index e73665a8..0450c772 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/main.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/main.qml @@ -31,8 +31,8 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.3 KeyboardLayoutLoader { - inputMode: InputEngine.Arabic - sourceComponent: InputContext.shift ? page2 : page1 + inputMode: InputEngine.InputMode.Arabic + sourceComponent: InputContext.shiftActive ? page2 : page1 Component { id: page1 KeyboardLayout { diff --git a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml b/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml index 79228726..e32a1e71 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml @@ -30,10 +30,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 import QtQuick.VirtualKeyboard 2.1 +import QtQuick.VirtualKeyboard.Plugins 2.3 KeyboardLayout { inputMethod: PlainInputMethod {} - inputMode: InputEngine.Numeric + inputMode: InputEngine.InputMode.Numeric KeyboardRow { Layout.fillWidth: false diff --git a/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml b/src/virtualkeyboard/content/layouts/fallback/dialpad.qml index 95a40db9..89f6873a 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml +++ b/src/virtualkeyboard/content/layouts/fallback/dialpad.qml @@ -30,10 +30,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 import QtQuick.VirtualKeyboard 2.1 +import QtQuick.VirtualKeyboard.Plugins 2.3 KeyboardLayout { inputMethod: PlainInputMethod {} - inputMode: InputEngine.Numeric + inputMode: InputEngine.InputMode.Numeric KeyboardColumn { Layout.fillWidth: false diff --git a/src/virtualkeyboard/content/layouts/en_GB/digits.qml b/src/virtualkeyboard/content/layouts/fallback/digits.qml index 5a59d3f3..432984a1 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/digits.qml +++ b/src/virtualkeyboard/content/layouts/fallback/digits.qml @@ -30,10 +30,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 import QtQuick.VirtualKeyboard 2.1 +import QtQuick.VirtualKeyboard.Plugins 2.3 KeyboardLayout { inputMethod: PlainInputMethod {} - inputMode: InputEngine.Numeric + inputMode: InputEngine.InputMode.Numeric KeyboardColumn { Layout.fillWidth: false diff --git a/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml b/src/virtualkeyboard/content/layouts/fallback/handwriting.qml index d42de535..1da3fc8e 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/fallback/handwriting.qml @@ -33,10 +33,9 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin KeyboardRow { Layout.preferredHeight: 3 @@ -45,7 +44,7 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting } } } diff --git a/src/virtualkeyboard/content/layouts/en_GB/main.qml b/src/virtualkeyboard/content/layouts/fallback/main.qml index 0c6370ae..c9a736f2 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/main.qml +++ b/src/virtualkeyboard/content/layouts/fallback/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/en_GB/numbers.qml b/src/virtualkeyboard/content/layouts/fallback/numbers.qml index 88491ac5..7fd0a2ab 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/numbers.qml +++ b/src/virtualkeyboard/content/layouts/fallback/numbers.qml @@ -30,10 +30,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 import QtQuick.VirtualKeyboard 2.1 +import QtQuick.VirtualKeyboard.Plugins 2.3 KeyboardLayout { inputMethod: PlainInputMethod {} - inputMode: InputEngine.Numeric + inputMode: InputEngine.InputMode.Numeric KeyboardRow { Layout.fillWidth: false diff --git a/src/virtualkeyboard/content/layouts/sr_SP/symbols.qml b/src/virtualkeyboard/content/layouts/fallback/symbols.qml index 42f8f3b6..26d62951 100644 --- a/src/virtualkeyboard/content/layouts/sr_SP/symbols.qml +++ b/src/virtualkeyboard/content/layouts/fallback/symbols.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. @@ -29,7 +29,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage @@ -142,10 +142,6 @@ KeyboardLayoutLoader { text: '"' } Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { key: Qt.Key_Less text: "<" } @@ -154,6 +150,10 @@ KeyboardLayoutLoader { text: ">" } Key { + key: Qt.Key_Apostrophe + text: "'" + } + Key { key: Qt.Key_Colon text: ":" } @@ -180,7 +180,7 @@ KeyboardLayoutLoader { keyWeight: 154 SymbolModeKey { weight: 217 - displayText: InputContext.inputEngine.inputMode === InputEngine.Cyrillic ? "АБВ" : "ABC" + displayText: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cyrillic ? "АБВ" : "ABC" } ChangeLanguageKey { weight: 154 @@ -350,7 +350,7 @@ KeyboardLayoutLoader { keyWeight: 154 SymbolModeKey { weight: 217 - displayText: InputContext.inputEngine.inputMode === InputEngine.Cyrillic ? "АБВ" : "ABC" + displayText: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cyrillic ? "АБВ" : "ABC" } ChangeLanguageKey { weight: 154 diff --git a/src/virtualkeyboard/content/layouts/fi_FI/dialpad.fallback b/src/virtualkeyboard/content/layouts/fi_FI/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fi_FI/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/fi_FI/digits.fallback b/src/virtualkeyboard/content/layouts/fi_FI/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fi_FI/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/fi_FI/handwriting.fallback b/src/virtualkeyboard/content/layouts/fi_FI/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fi_FI/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml b/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml deleted file mode 100644 index d42de535..00000000 --- a/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 - -KeyboardLayout { - function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) - } - sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin - - KeyboardRow { - Layout.preferredHeight: 3 - KeyboardColumn { - Layout.preferredWidth: bottomRow.width - hideKeyboardKey.width - KeyboardRow { - TraceInputKey { - objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition - } - } - } - KeyboardColumn { - Layout.preferredWidth: hideKeyboardKey.width - KeyboardRow { - BackspaceKey {} - } - KeyboardRow { - EnterKey {} - } - KeyboardRow { - ShiftKey { } - } - } - } - KeyboardRow { - id: bottomRow - Layout.preferredHeight: 1 - keyWeight: 154 - InputModeKey { - weight: 217 - } - ChangeLanguageKey { - weight: 154 - customLayoutsOnly: true - } - HandwritingModeKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Apostrophe - text: "'" - alternativeKeys: "<>()#%&*/\\\"'=+-_" - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ":;,.?!" - } - HideKeyboardKey { - id: hideKeyboardKey - weight: 204 - } - } -} diff --git a/src/virtualkeyboard/content/layouts/fi_FI/main.qml b/src/virtualkeyboard/content/layouts/fi_FI/main.qml index b90a43cf..a3a8a86f 100644 --- a/src/virtualkeyboard/content/layouts/fi_FI/main.qml +++ b/src/virtualkeyboard/content/layouts/fi_FI/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/fi_FI/numbers.fallback b/src/virtualkeyboard/content/layouts/fi_FI/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fi_FI/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/fi_FI/symbols.fallback b/src/virtualkeyboard/content/layouts/fi_FI/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fi_FI/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml b/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml deleted file mode 100644 index 06d815d8..00000000 --- a/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/fr_CA/dialpad.fallback b/src/virtualkeyboard/content/layouts/fr_CA/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fr_CA/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/fr_CA/digits.fallback b/src/virtualkeyboard/content/layouts/fr_CA/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fr_CA/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/fr_CA/handwriting.fallback b/src/virtualkeyboard/content/layouts/fr_CA/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fr_CA/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/nl_NL/main.qml b/src/virtualkeyboard/content/layouts/fr_CA/main.qml index 1deb766a..8866dfd7 100644 --- a/src/virtualkeyboard/content/layouts/nl_NL/main.qml +++ b/src/virtualkeyboard/content/layouts/fr_CA/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { @@ -45,7 +45,7 @@ KeyboardLayout { Key { key: Qt.Key_E text: "e" - alternativeKeys: "êeëèé" + alternativeKeys: "éèeêë" } Key { key: Qt.Key_R @@ -58,22 +58,22 @@ KeyboardLayout { Key { key: Qt.Key_Y text: "y" - alternativeKeys: "yijÿýŷ" + alternativeKeys: "yÿ" } Key { key: Qt.Key_U text: "u" - alternativeKeys: "űūũûüuùú" + alternativeKeys: "ùuûü" } Key { key: Qt.Key_I text: "i" - alternativeKeys: "îïīĩiìí" + alternativeKeys: "îiï" } Key { key: Qt.Key_O text: "o" - alternativeKeys: "œøõôöòóo" + alternativeKeys: "ôoœ" } Key { key: Qt.Key_P @@ -88,7 +88,7 @@ KeyboardLayout { Key { key: Qt.Key_A text: "a" - alternativeKeys: "aäåãâàá" + alternativeKeys: "aàâæ" } Key { key: Qt.Key_S @@ -140,6 +140,7 @@ KeyboardLayout { Key { key: Qt.Key_C text: "c" + alternativeKeys: "cç" } Key { key: Qt.Key_V diff --git a/src/virtualkeyboard/content/layouts/fr_CA/numbers.fallback b/src/virtualkeyboard/content/layouts/fr_CA/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fr_CA/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/fr_CA/symbols.fallback b/src/virtualkeyboard/content/layouts/fr_CA/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fr_CA/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/fr_FR/dialpad.fallback b/src/virtualkeyboard/content/layouts/fr_FR/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fr_FR/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/fr_FR/digits.fallback b/src/virtualkeyboard/content/layouts/fr_FR/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fr_FR/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/fr_FR/handwriting.fallback b/src/virtualkeyboard/content/layouts/fr_FR/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fr_FR/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml b/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml deleted file mode 100644 index d42de535..00000000 --- a/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 - -KeyboardLayout { - function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) - } - sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin - - KeyboardRow { - Layout.preferredHeight: 3 - KeyboardColumn { - Layout.preferredWidth: bottomRow.width - hideKeyboardKey.width - KeyboardRow { - TraceInputKey { - objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition - } - } - } - KeyboardColumn { - Layout.preferredWidth: hideKeyboardKey.width - KeyboardRow { - BackspaceKey {} - } - KeyboardRow { - EnterKey {} - } - KeyboardRow { - ShiftKey { } - } - } - } - KeyboardRow { - id: bottomRow - Layout.preferredHeight: 1 - keyWeight: 154 - InputModeKey { - weight: 217 - } - ChangeLanguageKey { - weight: 154 - customLayoutsOnly: true - } - HandwritingModeKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Apostrophe - text: "'" - alternativeKeys: "<>()#%&*/\\\"'=+-_" - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ":;,.?!" - } - HideKeyboardKey { - id: hideKeyboardKey - weight: 204 - } - } -} diff --git a/src/virtualkeyboard/content/layouts/fr_FR/main.qml b/src/virtualkeyboard/content/layouts/fr_FR/main.qml index 375b589f..753d8e67 100644 --- a/src/virtualkeyboard/content/layouts/fr_FR/main.qml +++ b/src/virtualkeyboard/content/layouts/fr_FR/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/fr_FR/numbers.fallback b/src/virtualkeyboard/content/layouts/fr_FR/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fr_FR/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/fr_FR/symbols.fallback b/src/virtualkeyboard/content/layouts/fr_FR/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/fr_FR/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml b/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml deleted file mode 100644 index 06d815d8..00000000 --- a/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/he_IL/dialpad.fallback b/src/virtualkeyboard/content/layouts/he_IL/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/he_IL/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/he_IL/digits.fallback b/src/virtualkeyboard/content/layouts/he_IL/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/he_IL/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml b/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml index 321fbd42..66914c71 100644 --- a/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/he_IL/handwriting.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] @@ -44,9 +44,9 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting horizontalRulers: - InputContext.inputEngine.inputMode !== InputEngine.Hebrew ? [] : + InputContext.inputEngine.inputMode !== InputEngine.InputMode.Hebrew ? [] : [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3] } } diff --git a/src/virtualkeyboard/content/layouts/he_IL/main.qml b/src/virtualkeyboard/content/layouts/he_IL/main.qml index fde3cb4b..4c47fc56 100644 --- a/src/virtualkeyboard/content/layouts/he_IL/main.qml +++ b/src/virtualkeyboard/content/layouts/he_IL/main.qml @@ -32,7 +32,7 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayoutLoader { sharedLayouts: ['symbols'] - sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Hebrew ? hebrewLayout : latinLayout + sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Hebrew ? hebrewLayout : latinLayout Component { id: hebrewLayout KeyboardLayout { @@ -122,7 +122,7 @@ KeyboardLayoutLoader { KeyboardRow { keyWeight: 156 InputModeKey { - inputModes: [InputEngine.Hebrew, InputEngine.Latin] + inputModes: [InputEngine.InputMode.Hebrew, InputEngine.InputMode.Latin] } Key { text: "\u05D6" @@ -302,7 +302,7 @@ KeyboardLayoutLoader { KeyboardRow { keyWeight: 156 InputModeKey { - inputModes: [InputEngine.Hebrew, InputEngine.Latin] + inputModes: [InputEngine.InputMode.Hebrew, InputEngine.InputMode.Latin] } Key { key: Qt.Key_Z diff --git a/src/virtualkeyboard/content/layouts/he_IL/numbers.fallback b/src/virtualkeyboard/content/layouts/he_IL/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/he_IL/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/he_IL/symbols.qml b/src/virtualkeyboard/content/layouts/he_IL/symbols.qml index 866a91a7..f4e58652 100644 --- a/src/virtualkeyboard/content/layouts/he_IL/symbols.qml +++ b/src/virtualkeyboard/content/layouts/he_IL/symbols.qml @@ -180,7 +180,7 @@ KeyboardLayoutLoader { keyWeight: 154 SymbolModeKey { weight: 217 - displayText: InputContext.inputEngine.inputMode === InputEngine.Hebrew ? "\u05D0\u05D1\u05D2" : "ABC" + displayText: InputContext.inputEngine.inputMode === InputEngine.InputMode.Hebrew ? "\u05D0\u05D1\u05D2" : "ABC" } ChangeLanguageKey { weight: 154 @@ -350,7 +350,7 @@ KeyboardLayoutLoader { keyWeight: 154 SymbolModeKey { weight: 217 - displayText: InputContext.inputEngine.inputMode === InputEngine.Hebrew ? "\u05D0\u05D1\u05D2" : "ABC" + displayText: InputContext.inputEngine.inputMode === InputEngine.InputMode.Hebrew ? "\u05D0\u05D1\u05D2" : "ABC" } ChangeLanguageKey { weight: 154 diff --git a/src/virtualkeyboard/content/layouts/hi_IN/dialpad.fallback b/src/virtualkeyboard/content/layouts/hi_IN/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/hi_IN/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/hi_IN/digits.fallback b/src/virtualkeyboard/content/layouts/hi_IN/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/hi_IN/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml b/src/virtualkeyboard/content/layouts/hi_IN/handwriting.qml index d42de535..1ae1fa4f 100644 --- a/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/hi_IN/handwriting.qml @@ -29,14 +29,13 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin KeyboardRow { Layout.preferredHeight: 3 @@ -45,7 +44,7 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting } } } @@ -66,8 +65,15 @@ KeyboardLayout { id: bottomRow Layout.preferredHeight: 1 keyWeight: 154 - InputModeKey { + Key { weight: 217 + key: Qt.Key_Mode_switch + noKeyEvent: true + functionKey: true + text: InputContext.inputEngine.inputMode === InputEngine.InputMode.Latin ? "123" : "ABC" + onClicked: InputContext.inputEngine.inputMode = InputContext.inputEngine.inputMode === InputEngine.InputMode.Latin ? InputEngine.InputMode.Numeric : InputEngine.InputMode.Latin + enabled: !(InputContext.inputMethodHints & (Qt.ImhDialableCharactersOnly | Qt.ImhFormattedNumbersOnly | Qt.ImhDigitsOnly)) + keyPanelDelegate: keyboard.style ? keyboard.style.symbolKeyPanel : undefined } ChangeLanguageKey { weight: 154 diff --git a/src/virtualkeyboard/content/layouts/hi_IN/main.qml b/src/virtualkeyboard/content/layouts/hi_IN/main.qml index 3d71adb0..aac186eb 100644 --- a/src/virtualkeyboard/content/layouts/hi_IN/main.qml +++ b/src/virtualkeyboard/content/layouts/hi_IN/main.qml @@ -31,8 +31,8 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { - inputMode: InputEngine.Latin - sourceComponent: InputContext.shift ? page2 : page1 + inputMode: InputEngine.InputMode.Latin + sourceComponent: InputContext.shiftActive ? page2 : page1 Component { id: page1 KeyboardLayout { @@ -164,6 +164,9 @@ KeyboardLayoutLoader { ChangeLanguageKey { weight: 154 } + HandwritingModeKey { + weight: 154 + } SpaceKey { weight: 864 } @@ -312,6 +315,9 @@ KeyboardLayoutLoader { ChangeLanguageKey { weight: 154 } + HandwritingModeKey { + weight: 154 + } SpaceKey { weight: 864 } diff --git a/src/virtualkeyboard/content/layouts/hi_IN/numbers.fallback b/src/virtualkeyboard/content/layouts/hi_IN/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/hi_IN/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/hr_HR/dialpad.fallback b/src/virtualkeyboard/content/layouts/hr_HR/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/hr_HR/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/hr_HR/digits.fallback b/src/virtualkeyboard/content/layouts/hr_HR/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/hr_HR/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml b/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml index 6f43e6de..968bae8e 100644 --- a/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/hr_HR/handwriting.qml @@ -33,10 +33,10 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin KeyboardRow { Layout.preferredHeight: 3 @@ -45,7 +45,7 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting } } } diff --git a/src/virtualkeyboard/content/layouts/hr_HR/main.qml b/src/virtualkeyboard/content/layouts/hr_HR/main.qml index 6c4c306c..4b4c46d9 100644 --- a/src/virtualkeyboard/content/layouts/hr_HR/main.qml +++ b/src/virtualkeyboard/content/layouts/hr_HR/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/hr_HR/numbers.fallback b/src/virtualkeyboard/content/layouts/hr_HR/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/hr_HR/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/hr_HR/symbols.fallback b/src/virtualkeyboard/content/layouts/hr_HR/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/hr_HR/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/hu_HU/dialpad.fallback b/src/virtualkeyboard/content/layouts/hu_HU/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/hu_HU/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/hu_HU/digits.fallback b/src/virtualkeyboard/content/layouts/hu_HU/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/hu_HU/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml b/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml index a8d3b59b..caf820ae 100644 --- a/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/hu_HU/handwriting.qml @@ -33,10 +33,10 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin KeyboardRow { Layout.preferredHeight: 3 @@ -45,7 +45,7 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting } } } diff --git a/src/virtualkeyboard/content/layouts/hu_HU/main.qml b/src/virtualkeyboard/content/layouts/hu_HU/main.qml index 21a513a3..0834dc04 100644 --- a/src/virtualkeyboard/content/layouts/hu_HU/main.qml +++ b/src/virtualkeyboard/content/layouts/hu_HU/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/hu_HU/numbers.fallback b/src/virtualkeyboard/content/layouts/hu_HU/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/hu_HU/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/hu_HU/symbols.fallback b/src/virtualkeyboard/content/layouts/hu_HU/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/hu_HU/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/id_ID/dialpad.fallback b/src/virtualkeyboard/content/layouts/id_ID/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/id_ID/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/id_ID/digits.fallback b/src/virtualkeyboard/content/layouts/id_ID/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/id_ID/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/id_ID/handwriting.fallback b/src/virtualkeyboard/content/layouts/id_ID/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/id_ID/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/id_ID/main.fallback b/src/virtualkeyboard/content/layouts/id_ID/main.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/id_ID/main.fallback diff --git a/src/virtualkeyboard/content/layouts/id_ID/numbers.fallback b/src/virtualkeyboard/content/layouts/id_ID/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/id_ID/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/id_ID/symbols.fallback b/src/virtualkeyboard/content/layouts/id_ID/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/id_ID/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/it_IT/dialpad.fallback b/src/virtualkeyboard/content/layouts/it_IT/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/it_IT/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/it_IT/digits.fallback b/src/virtualkeyboard/content/layouts/it_IT/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/it_IT/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/it_IT/handwriting.fallback b/src/virtualkeyboard/content/layouts/it_IT/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/it_IT/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml b/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml deleted file mode 100644 index d42de535..00000000 --- a/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 - -KeyboardLayout { - function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) - } - sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin - - KeyboardRow { - Layout.preferredHeight: 3 - KeyboardColumn { - Layout.preferredWidth: bottomRow.width - hideKeyboardKey.width - KeyboardRow { - TraceInputKey { - objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition - } - } - } - KeyboardColumn { - Layout.preferredWidth: hideKeyboardKey.width - KeyboardRow { - BackspaceKey {} - } - KeyboardRow { - EnterKey {} - } - KeyboardRow { - ShiftKey { } - } - } - } - KeyboardRow { - id: bottomRow - Layout.preferredHeight: 1 - keyWeight: 154 - InputModeKey { - weight: 217 - } - ChangeLanguageKey { - weight: 154 - customLayoutsOnly: true - } - HandwritingModeKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Apostrophe - text: "'" - alternativeKeys: "<>()#%&*/\\\"'=+-_" - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ":;,.?!" - } - HideKeyboardKey { - id: hideKeyboardKey - weight: 204 - } - } -} diff --git a/src/virtualkeyboard/content/layouts/it_IT/main.qml b/src/virtualkeyboard/content/layouts/it_IT/main.qml index c051e08f..72d7c03c 100644 --- a/src/virtualkeyboard/content/layouts/it_IT/main.qml +++ b/src/virtualkeyboard/content/layouts/it_IT/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/it_IT/numbers.fallback b/src/virtualkeyboard/content/layouts/it_IT/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/it_IT/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/it_IT/symbols.fallback b/src/virtualkeyboard/content/layouts/it_IT/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/it_IT/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/it_IT/symbols.qml b/src/virtualkeyboard/content/layouts/it_IT/symbols.qml deleted file mode 100644 index 06d815d8..00000000 --- a/src/virtualkeyboard/content/layouts/it_IT/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/ja_JP/dialpad.fallback b/src/virtualkeyboard/content/layouts/ja_JP/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ja_JP/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/ja_JP/digits.fallback b/src/virtualkeyboard/content/layouts/ja_JP/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ja_JP/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml b/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml index 9fe3b191..08a74384 100644 --- a/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/ja_JP/handwriting.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] KeyboardRow { @@ -43,9 +43,9 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting horizontalRulers: - InputContext.inputEngine.inputMode !== InputEngine.JapaneseHandwriting ? [] : + InputContext.inputEngine.inputMode !== InputEngine.InputMode.JapaneseHandwriting ? [] : [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3] } diff --git a/src/virtualkeyboard/content/layouts/ja_JP/main.qml b/src/virtualkeyboard/content/layouts/ja_JP/main.qml index 2d765d36..d3fb6ae1 100644 --- a/src/virtualkeyboard/content/layouts/ja_JP/main.qml +++ b/src/virtualkeyboard/content/layouts/ja_JP/main.qml @@ -32,10 +32,10 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; JapaneseInputMethod {}', parent, "japaneseInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; JapaneseInputMethod {}', parent, "japaneseInputMethod") } sharedLayouts: ['symbols'] - sourceComponent: InputContext.inputEngine.inputMode === InputEngine.FullwidthLatin ? page2 : page1 + sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.FullwidthLatin ? page2 : page1 Component { id: page1 KeyboardLayout { @@ -132,16 +132,16 @@ KeyboardLayoutLoader { InputModeKey { enabled: !(InputContext.inputMethodHints & Qt.ImhLatinOnly) && inputModeCount > 1 inputModeNameList: [ - "半角", // InputEngine.Latin - "", // InputEngine.Numeric - "", // InputEngine.Dialable - "", // InputEngine.Pinyin - "", // InputEngine.Cangjie - "", // InputEngine.Zhuyin - "", // InputEngine.Hangul - "あ", // InputEngine.Hiragana - "カ", // InputEngine.Katakana - "全角", // InputEngine.FullwidthLatin + "半角", // InputEngine.InputMode.Latin + "", // InputEngine.InputMode.Numeric + "", // InputEngine.InputMode.Dialable + "", // InputEngine.InputMode.Pinyin + "", // InputEngine.InputMode.Cangjie + "", // InputEngine.InputMode.Zhuyin + "", // InputEngine.InputMode.Hangul + "あ", // InputEngine.InputMode.Hiragana + "カ", // InputEngine.InputMode.Katakana + "全角", // InputEngine.InputMode.FullwidthLatin ] } Key { @@ -211,7 +211,7 @@ KeyboardLayoutLoader { } SpaceKey { weight: 556 - text: InputContext.inputEngine.inputMode != InputEngine.Latin ? "\u3000" : " " + text: InputContext.inputEngine.inputMode != InputEngine.InputMode.Latin ? "\u3000" : " " } Key { key: Qt.Key_Slash diff --git a/src/virtualkeyboard/content/layouts/ja_JP/numbers.fallback b/src/virtualkeyboard/content/layouts/ja_JP/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ja_JP/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml b/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml index bec30ada..66a4985b 100644 --- a/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml +++ b/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; JapaneseInputMethod {}', parent, "japaneseInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; JapaneseInputMethod {}', parent, "japaneseInputMethod") } sharedLayouts: ['main'] property int page diff --git a/src/virtualkeyboard/content/layouts/ko_KR/dialpad.fallback b/src/virtualkeyboard/content/layouts/ko_KR/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ko_KR/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/ko_KR/digits.fallback b/src/virtualkeyboard/content/layouts/ko_KR/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ko_KR/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml b/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml index 58fb566b..563239a4 100644 --- a/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/ko_KR/handwriting.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: preferredInputMode() @@ -50,7 +50,7 @@ KeyboardLayout { function preferredInputMode() { return InputContext.inputMethodHints & (Qt.ImhPreferLatin | Qt.ImhEmailCharactersOnly | Qt.ImhUrlCharactersOnly | - Qt.ImhLatinOnly) ? InputEngine.Latin : InputEngine.KoreanHandwriting + Qt.ImhLatinOnly) ? InputEngine.InputMode.Latin : InputEngine.InputMode.KoreanHandwriting } KeyboardRow { @@ -60,9 +60,9 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting horizontalRulers: - InputContext.inputEngine.inputMode !== InputEngine.KoreanHandwriting ? [] : + InputContext.inputEngine.inputMode !== InputEngine.InputMode.KoreanHandwriting ? [] : [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3] } @@ -78,7 +78,7 @@ KeyboardLayout { } KeyboardRow { ShiftKey { - enabled: InputContext.inputEngine.inputMode !== InputEngine.KoreanHandwriting + enabled: InputContext.inputEngine.inputMode !== InputEngine.InputMode.KoreanHandwriting } } } diff --git a/src/virtualkeyboard/content/layouts/ko_KR/main.qml b/src/virtualkeyboard/content/layouts/ko_KR/main.qml index 525a0392..54e6ec57 100644 --- a/src/virtualkeyboard/content/layouts/ko_KR/main.qml +++ b/src/virtualkeyboard/content/layouts/ko_KR/main.qml @@ -32,9 +32,9 @@ import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HangulInputMethod {}', parent, "hangulInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; HangulInputMethod {}', parent, "hangulInputMethod") } - sourceComponent: InputContext.shift ? page2 : page1 + sourceComponent: InputContext.shiftActive ? page2 : page1 sharedLayouts: ['symbols'] Component { id: page1 diff --git a/src/virtualkeyboard/content/layouts/ko_KR/numbers.fallback b/src/virtualkeyboard/content/layouts/ko_KR/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ko_KR/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml b/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml index 201810ec..352a69e1 100644 --- a/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml +++ b/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HangulInputMethod {}', parent, "hangulInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; HangulInputMethod {}', parent, "hangulInputMethod") } sharedLayouts: ['main'] property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/ms_MY/dialpad.fallback b/src/virtualkeyboard/content/layouts/ms_MY/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ms_MY/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/ms_MY/digits.fallback b/src/virtualkeyboard/content/layouts/ms_MY/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ms_MY/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/ms_MY/handwriting.fallback b/src/virtualkeyboard/content/layouts/ms_MY/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ms_MY/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/ms_MY/main.fallback b/src/virtualkeyboard/content/layouts/ms_MY/main.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ms_MY/main.fallback diff --git a/src/virtualkeyboard/content/layouts/ms_MY/numbers.fallback b/src/virtualkeyboard/content/layouts/ms_MY/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ms_MY/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/ms_MY/symbols.fallback b/src/virtualkeyboard/content/layouts/ms_MY/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ms_MY/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/nb_NO/dialpad.fallback b/src/virtualkeyboard/content/layouts/nb_NO/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/nb_NO/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/nb_NO/digits.fallback b/src/virtualkeyboard/content/layouts/nb_NO/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/nb_NO/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/nb_NO/handwriting.fallback b/src/virtualkeyboard/content/layouts/nb_NO/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/nb_NO/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml b/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml deleted file mode 100644 index d42de535..00000000 --- a/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 - -KeyboardLayout { - function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) - } - sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin - - KeyboardRow { - Layout.preferredHeight: 3 - KeyboardColumn { - Layout.preferredWidth: bottomRow.width - hideKeyboardKey.width - KeyboardRow { - TraceInputKey { - objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition - } - } - } - KeyboardColumn { - Layout.preferredWidth: hideKeyboardKey.width - KeyboardRow { - BackspaceKey {} - } - KeyboardRow { - EnterKey {} - } - KeyboardRow { - ShiftKey { } - } - } - } - KeyboardRow { - id: bottomRow - Layout.preferredHeight: 1 - keyWeight: 154 - InputModeKey { - weight: 217 - } - ChangeLanguageKey { - weight: 154 - customLayoutsOnly: true - } - HandwritingModeKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Apostrophe - text: "'" - alternativeKeys: "<>()#%&*/\\\"'=+-_" - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ":;,.?!" - } - HideKeyboardKey { - id: hideKeyboardKey - weight: 204 - } - } -} diff --git a/src/virtualkeyboard/content/layouts/nb_NO/main.qml b/src/virtualkeyboard/content/layouts/nb_NO/main.qml index 647f88e0..8580045b 100644 --- a/src/virtualkeyboard/content/layouts/nb_NO/main.qml +++ b/src/virtualkeyboard/content/layouts/nb_NO/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/nb_NO/numbers.fallback b/src/virtualkeyboard/content/layouts/nb_NO/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/nb_NO/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/nb_NO/symbols.fallback b/src/virtualkeyboard/content/layouts/nb_NO/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/nb_NO/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml b/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml deleted file mode 100644 index 06d815d8..00000000 --- a/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/nl_NL/dialpad.fallback b/src/virtualkeyboard/content/layouts/nl_NL/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/nl_NL/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/nl_NL/digits.fallback b/src/virtualkeyboard/content/layouts/nl_NL/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/nl_NL/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/nl_NL/handwriting.fallback b/src/virtualkeyboard/content/layouts/nl_NL/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/nl_NL/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/nl_NL/handwriting.qml b/src/virtualkeyboard/content/layouts/nl_NL/handwriting.qml deleted file mode 100644 index d42de535..00000000 --- a/src/virtualkeyboard/content/layouts/nl_NL/handwriting.qml +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 - -KeyboardLayout { - function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) - } - sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin - - KeyboardRow { - Layout.preferredHeight: 3 - KeyboardColumn { - Layout.preferredWidth: bottomRow.width - hideKeyboardKey.width - KeyboardRow { - TraceInputKey { - objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition - } - } - } - KeyboardColumn { - Layout.preferredWidth: hideKeyboardKey.width - KeyboardRow { - BackspaceKey {} - } - KeyboardRow { - EnterKey {} - } - KeyboardRow { - ShiftKey { } - } - } - } - KeyboardRow { - id: bottomRow - Layout.preferredHeight: 1 - keyWeight: 154 - InputModeKey { - weight: 217 - } - ChangeLanguageKey { - weight: 154 - customLayoutsOnly: true - } - HandwritingModeKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Apostrophe - text: "'" - alternativeKeys: "<>()#%&*/\\\"'=+-_" - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ":;,.?!" - } - HideKeyboardKey { - id: hideKeyboardKey - weight: 204 - } - } -} diff --git a/src/virtualkeyboard/content/layouts/nl_NL/main.fallback b/src/virtualkeyboard/content/layouts/nl_NL/main.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/nl_NL/main.fallback diff --git a/src/virtualkeyboard/content/layouts/nl_NL/numbers.fallback b/src/virtualkeyboard/content/layouts/nl_NL/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/nl_NL/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/nl_NL/symbols.fallback b/src/virtualkeyboard/content/layouts/nl_NL/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/nl_NL/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/nl_NL/symbols.qml b/src/virtualkeyboard/content/layouts/nl_NL/symbols.qml deleted file mode 100644 index 49f6e709..00000000 --- a/src/virtualkeyboard/content/layouts/nl_NL/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/pl_PL/dialpad.fallback b/src/virtualkeyboard/content/layouts/pl_PL/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pl_PL/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/pl_PL/digits.fallback b/src/virtualkeyboard/content/layouts/pl_PL/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pl_PL/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/pl_PL/handwriting.fallback b/src/virtualkeyboard/content/layouts/pl_PL/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pl_PL/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml b/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml deleted file mode 100644 index d42de535..00000000 --- a/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 - -KeyboardLayout { - function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) - } - sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin - - KeyboardRow { - Layout.preferredHeight: 3 - KeyboardColumn { - Layout.preferredWidth: bottomRow.width - hideKeyboardKey.width - KeyboardRow { - TraceInputKey { - objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition - } - } - } - KeyboardColumn { - Layout.preferredWidth: hideKeyboardKey.width - KeyboardRow { - BackspaceKey {} - } - KeyboardRow { - EnterKey {} - } - KeyboardRow { - ShiftKey { } - } - } - } - KeyboardRow { - id: bottomRow - Layout.preferredHeight: 1 - keyWeight: 154 - InputModeKey { - weight: 217 - } - ChangeLanguageKey { - weight: 154 - customLayoutsOnly: true - } - HandwritingModeKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Apostrophe - text: "'" - alternativeKeys: "<>()#%&*/\\\"'=+-_" - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ":;,.?!" - } - HideKeyboardKey { - id: hideKeyboardKey - weight: 204 - } - } -} diff --git a/src/virtualkeyboard/content/layouts/pl_PL/main.qml b/src/virtualkeyboard/content/layouts/pl_PL/main.qml index 72a7b89d..2a7ebfd0 100644 --- a/src/virtualkeyboard/content/layouts/pl_PL/main.qml +++ b/src/virtualkeyboard/content/layouts/pl_PL/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/pl_PL/numbers.fallback b/src/virtualkeyboard/content/layouts/pl_PL/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pl_PL/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/pl_PL/symbols.fallback b/src/virtualkeyboard/content/layouts/pl_PL/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pl_PL/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml b/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml deleted file mode 100644 index 06d815d8..00000000 --- a/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/pt_BR/dialpad.fallback b/src/virtualkeyboard/content/layouts/pt_BR/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pt_BR/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/pt_BR/digits.fallback b/src/virtualkeyboard/content/layouts/pt_BR/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pt_BR/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/pt_BR/handwriting.fallback b/src/virtualkeyboard/content/layouts/pt_BR/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pt_BR/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/pt_BR/main.qml b/src/virtualkeyboard/content/layouts/pt_BR/main.qml new file mode 100644 index 00000000..53ed462f --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pt_BR/main.qml @@ -0,0 +1,207 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.VirtualKeyboard 2.1 + +KeyboardLayout { + inputMode: InputEngine.InputMode.Latin + keyWeight: 160 + KeyboardRow { + Key { + key: Qt.Key_Q + text: "q" + } + Key { + key: Qt.Key_W + text: "w" + } + Key { + key: Qt.Key_E + text: "e" + alternativeKeys: "ēęėëeêèé" + } + Key { + key: Qt.Key_R + text: "r" + } + Key { + key: Qt.Key_T + text: "t" + } + Key { + key: Qt.Key_Y + text: "y" + } + Key { + key: Qt.Key_U + text: "u" + alternativeKeys: "üûuùú" + } + Key { + key: Qt.Key_I + text: "i" + alternativeKeys: "ïįîiìí" + } + Key { + key: Qt.Key_O + text: "o" + alternativeKeys: "öõôoòó" + } + Key { + key: Qt.Key_P + text: "p" + } + BackspaceKey {} + } + KeyboardRow { + FillerKey { + weight: 56 + } + Key { + key: Qt.Key_A + text: "a" + alternativeKeys: "äãaâàá" + } + Key { + key: Qt.Key_S + text: "s" + } + Key { + key: Qt.Key_D + text: "d" + } + Key { + key: Qt.Key_F + text: "f" + } + Key { + key: Qt.Key_G + text: "g" + } + Key { + key: Qt.Key_H + text: "h" + } + Key { + key: Qt.Key_J + text: "j" + } + Key { + key: Qt.Key_K + text: "k" + } + Key { + key: Qt.Key_L + text: "l" + } + Key { + key: Qt.Key_Ccedilla + text: "ç" + } + EnterKey { + weight: 283 + } + } + KeyboardRow { + keyWeight: 156 + ShiftKey {} + Key { + key: Qt.Key_Z + text: "z" + } + Key { + key: Qt.Key_X + text: "x" + } + Key { + key: Qt.Key_C + text: "c" + alternativeKeys: "čcć" + } + Key { + key: Qt.Key_V + text: "v" + } + Key { + key: Qt.Key_B + text: "b" + } + Key { + key: Qt.Key_N + text: "n" + } + Key { + key: Qt.Key_M + text: "m" + } + Key { + key: Qt.Key_Comma + text: "," + } + Key { + key: Qt.Key_Period + text: "." + } + Key { + key: Qt.Key_Minus + text: "-" + } + ShiftKey { + weight: 244 + } + } + KeyboardRow { + keyWeight: 154 + SymbolModeKey { + weight: 217 + } + ChangeLanguageKey { + weight: 154 + } + HandwritingModeKey { + weight: 154 + } + SpaceKey { + weight: 864 + } + Key { + key: Qt.Key_Apostrophe + text: "'" + } + Key { + key: 0xE000 + text: ":-)" + alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] + } + HideKeyboardKey { + weight: 204 + } + } +} diff --git a/src/virtualkeyboard/content/layouts/pt_BR/numbers.fallback b/src/virtualkeyboard/content/layouts/pt_BR/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pt_BR/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/pt_BR/symbols.fallback b/src/virtualkeyboard/content/layouts/pt_BR/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pt_BR/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/pt_PT/dialpad.fallback b/src/virtualkeyboard/content/layouts/pt_PT/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pt_PT/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/pt_PT/digits.fallback b/src/virtualkeyboard/content/layouts/pt_PT/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pt_PT/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/pt_PT/handwriting.fallback b/src/virtualkeyboard/content/layouts/pt_PT/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pt_PT/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml b/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml deleted file mode 100644 index d42de535..00000000 --- a/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 - -KeyboardLayout { - function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) - } - sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin - - KeyboardRow { - Layout.preferredHeight: 3 - KeyboardColumn { - Layout.preferredWidth: bottomRow.width - hideKeyboardKey.width - KeyboardRow { - TraceInputKey { - objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition - } - } - } - KeyboardColumn { - Layout.preferredWidth: hideKeyboardKey.width - KeyboardRow { - BackspaceKey {} - } - KeyboardRow { - EnterKey {} - } - KeyboardRow { - ShiftKey { } - } - } - } - KeyboardRow { - id: bottomRow - Layout.preferredHeight: 1 - keyWeight: 154 - InputModeKey { - weight: 217 - } - ChangeLanguageKey { - weight: 154 - customLayoutsOnly: true - } - HandwritingModeKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Apostrophe - text: "'" - alternativeKeys: "<>()#%&*/\\\"'=+-_" - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ":;,.?!" - } - HideKeyboardKey { - id: hideKeyboardKey - weight: 204 - } - } -} diff --git a/src/virtualkeyboard/content/layouts/pt_PT/main.qml b/src/virtualkeyboard/content/layouts/pt_PT/main.qml index 21cbf640..53ed462f 100644 --- a/src/virtualkeyboard/content/layouts/pt_PT/main.qml +++ b/src/virtualkeyboard/content/layouts/pt_PT/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/pt_PT/numbers.fallback b/src/virtualkeyboard/content/layouts/pt_PT/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pt_PT/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/pt_PT/symbols.fallback b/src/virtualkeyboard/content/layouts/pt_PT/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/pt_PT/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml b/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml deleted file mode 100644 index 06d815d8..00000000 --- a/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/ro_RO/dialpad.fallback b/src/virtualkeyboard/content/layouts/ro_RO/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ro_RO/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/ro_RO/digits.fallback b/src/virtualkeyboard/content/layouts/ro_RO/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ro_RO/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml b/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml index 7826b542..1d5dedb9 100644 --- a/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/ro_RO/handwriting.qml @@ -33,10 +33,10 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin KeyboardRow { Layout.preferredHeight: 3 @@ -45,7 +45,7 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting } } } diff --git a/src/virtualkeyboard/content/layouts/ro_RO/main.qml b/src/virtualkeyboard/content/layouts/ro_RO/main.qml index 3524e572..ea3865eb 100644 --- a/src/virtualkeyboard/content/layouts/ro_RO/main.qml +++ b/src/virtualkeyboard/content/layouts/ro_RO/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/ro_RO/numbers.fallback b/src/virtualkeyboard/content/layouts/ro_RO/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ro_RO/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/ro_RO/symbols.fallback b/src/virtualkeyboard/content/layouts/ro_RO/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ro_RO/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/ro_RO/symbols.qml b/src/virtualkeyboard/content/layouts/ro_RO/symbols.qml deleted file mode 100644 index 0196a478..00000000 --- a/src/virtualkeyboard/content/layouts/ro_RO/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/ru_RU/dialpad.fallback b/src/virtualkeyboard/content/layouts/ru_RU/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ru_RU/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/ru_RU/digits.fallback b/src/virtualkeyboard/content/layouts/ru_RU/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ru_RU/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/ru_RU/handwriting.fallback b/src/virtualkeyboard/content/layouts/ru_RU/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ru_RU/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml b/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml deleted file mode 100644 index d42de535..00000000 --- a/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 - -KeyboardLayout { - function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) - } - sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin - - KeyboardRow { - Layout.preferredHeight: 3 - KeyboardColumn { - Layout.preferredWidth: bottomRow.width - hideKeyboardKey.width - KeyboardRow { - TraceInputKey { - objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition - } - } - } - KeyboardColumn { - Layout.preferredWidth: hideKeyboardKey.width - KeyboardRow { - BackspaceKey {} - } - KeyboardRow { - EnterKey {} - } - KeyboardRow { - ShiftKey { } - } - } - } - KeyboardRow { - id: bottomRow - Layout.preferredHeight: 1 - keyWeight: 154 - InputModeKey { - weight: 217 - } - ChangeLanguageKey { - weight: 154 - customLayoutsOnly: true - } - HandwritingModeKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Apostrophe - text: "'" - alternativeKeys: "<>()#%&*/\\\"'=+-_" - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ":;,.?!" - } - HideKeyboardKey { - id: hideKeyboardKey - weight: 204 - } - } -} diff --git a/src/virtualkeyboard/content/layouts/ru_RU/main.qml b/src/virtualkeyboard/content/layouts/ru_RU/main.qml index 435a4757..87eb2382 100644 --- a/src/virtualkeyboard/content/layouts/ru_RU/main.qml +++ b/src/virtualkeyboard/content/layouts/ru_RU/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. @@ -27,188 +27,368 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.VirtualKeyboard 2.1 +import QtQuick 2.10 +import QtQuick.VirtualKeyboard 2.3 -KeyboardLayout { - inputMode: InputEngine.Latin - keyWeight: 160 - KeyboardRow { - Key { - key: 0x0419 - text: "й" - } - Key { - key: 0x0426 - text: "ц" - } - Key { - key: 0x0423 - text: "у" - } - Key { - key: 0x041A - text: "к" - } - Key { - key: 0x0415 - text: "е" - alternativeKeys: "её" - } - Key { - key: 0x041D - text: "н" - } - Key { - key: 0x0413 - text: "г" - } - Key { - key: 0x0428 - text: "ш" - } - Key { - key: 0x0429 - text: "щ" - } - Key { - key: 0x0417 - text: "з" - } - Key { - key: 0x0425 - text: "х" - } - BackspaceKey { - weight: 180 +KeyboardLayoutLoader { + sharedLayouts: ['symbols'] + sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cyrillic ? cyrillicLayout : latinLayout + Component { + id: cyrillicLayout + KeyboardLayout { + keyWeight: 160 + KeyboardRow { + Key { + key: 0x0419 + text: "й" + } + Key { + key: 0x0426 + text: "ц" + } + Key { + key: 0x0423 + text: "у" + } + Key { + key: 0x041A + text: "к" + } + Key { + key: 0x0415 + text: "е" + alternativeKeys: "её" + } + Key { + key: 0x041D + text: "н" + } + Key { + key: 0x0413 + text: "г" + } + Key { + key: 0x0428 + text: "ш" + } + Key { + key: 0x0429 + text: "щ" + } + Key { + key: 0x0417 + text: "з" + } + Key { + key: 0x0425 + text: "х" + } + BackspaceKey { + weight: 180 + } + } + KeyboardRow { + FillerKey { + weight: 40 + } + Key { + key: 0x0424 + text: "ф" + } + Key { + key: 0x042B + text: "ы" + } + Key { + key: 0x0412 + text: "в" + } + Key { + key: 0x0410 + text: "а" + } + Key { + key: 0x041F + text: "п" + } + Key { + key: 0x0420 + text: "р" + } + Key { + key: 0x041E + text: "о" + } + Key { + key: 0x041B + text: "л" + } + Key { + key: 0x0414 + text: "д" + } + Key { + key: 0x0416 + text: "ж" + } + Key { + key: 0x042D + text: "э" + } + EnterKey { + weight: 280 + } + } + KeyboardRow { + InputModeKey { + inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin] + } + Key { + key: 0x042F + text: "я" + } + Key { + key: 0x0427 + text: "ч" + } + Key { + key: 0x0421 + text: "с" + } + Key { + key: 0x041C + text: "м" + } + Key { + key: 0x0418 + text: "и" + } + Key { + key: 0x0422 + text: "т" + } + Key { + key: 0x042C + text: "ь" + alternativeKeys: "ьъ" + } + Key { + key: 0x0411 + text: "б" + } + Key { + key: 0x042E + text: "ю" + } + Key { + key: Qt.Key_Minus + text: "-" + alternativeKeys: "—" + } + ShiftKey { + weight: 272 + } + } + KeyboardRow { + keyWeight: 154 + SymbolModeKey { + weight: 217 + } + ChangeLanguageKey { + weight: 154 + } + HandwritingModeKey { + weight: 154 + } + SpaceKey { + weight: 864 + } + Key { + key: Qt.Key_Period + text: "." + alternativeKeys: ";:!?,." + } + Key { + key: 0xE000 + text: ":-)" + alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] + } + HideKeyboardKey { + weight: 204 + } + } } } - KeyboardRow { - FillerKey { - weight: 40 - } - Key { - key: 0x0424 - text: "ф" - } - Key { - key: 0x042B - text: "ы" - } - Key { - key: 0x0412 - text: "в" - } - Key { - key: 0x0410 - text: "а" - } - Key { - key: 0x041F - text: "п" - } - Key { - key: 0x0420 - text: "р" - } - Key { - key: 0x041E - text: "о" - } - Key { - key: 0x041B - text: "л" - } - Key { - key: 0x0414 - text: "д" - } - Key { - key: 0x0416 - text: "ж" - } - Key { - key: 0x042D - text: "э" - } - EnterKey { - weight: 280 - } - } - KeyboardRow { - ShiftKey { } - Key { - key: 0x042F - text: "я" - } - Key { - key: 0x0427 - text: "ч" - } - Key { - key: 0x0421 - text: "с" - } - Key { - key: 0x041C - text: "м" - } - Key { - key: 0x0418 - text: "и" - } - Key { - key: 0x0422 - text: "т" - } - Key { - key: 0x042C - text: "ь" - alternativeKeys: "ьъ" - } - Key { - key: 0x0411 - text: "б" - } - Key { - key: 0x042E - text: "ю" - } - Key { - key: Qt.Key_Minus - text: "-" - alternativeKeys: "—" - } - ShiftKey { - weight: 272 - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - } - ChangeLanguageKey { - weight: 154 - } - HandwritingModeKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ";:!?,." - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 + Component { + id: latinLayout + KeyboardLayout { + keyWeight: 160 + KeyboardRow { + Key { + key: Qt.Key_Q + text: "q" + } + Key { + key: Qt.Key_W + text: "w" + } + Key { + key: Qt.Key_E + text: "e" + } + Key { + key: Qt.Key_R + text: "r" + } + Key { + key: Qt.Key_T + text: "t" + } + Key { + key: Qt.Key_Z + text: "z" + alternativeKeys: "zž" + } + Key { + key: Qt.Key_U + text: "u" + } + Key { + key: Qt.Key_I + text: "i" + } + Key { + key: Qt.Key_O + text: "o" + alternativeKeys: "oö" + } + Key { + key: Qt.Key_P + text: "p" + } + BackspaceKey {} + } + KeyboardRow { + FillerKey { + weight: 56 + } + Key { + key: Qt.Key_A + text: "a" + alternativeKeys: "aåä" + } + Key { + key: Qt.Key_S + text: "s" + alternativeKeys: "sš" + } + Key { + key: Qt.Key_D + text: "d" + alternativeKeys: "dđ" + } + Key { + key: Qt.Key_F + text: "f" + } + Key { + key: Qt.Key_G + text: "g" + } + Key { + key: Qt.Key_H + text: "h" + } + Key { + key: Qt.Key_J + text: "j" + } + Key { + key: Qt.Key_K + text: "k" + } + Key { + key: Qt.Key_L + text: "l" + } + EnterKey { + weight: 283 + } + } + KeyboardRow { + keyWeight: 156 + InputModeKey { + inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin] + } + Key { + key: Qt.Key_Y + text: "y" + } + Key { + key: Qt.Key_X + text: "x" + } + Key { + key: Qt.Key_C + text: "c" + alternativeKeys: "ćcč" + } + Key { + key: Qt.Key_V + text: "v" + } + Key { + key: Qt.Key_B + text: "b" + } + Key { + key: Qt.Key_N + text: "n" + } + Key { + key: Qt.Key_M + text: "m" + } + Key { + key: Qt.Key_Comma + text: "," + } + Key { + key: Qt.Key_Period + text: "." + } + ShiftKey { + weight: 204 + } + } + KeyboardRow { + keyWeight: 154 + SymbolModeKey { + weight: 217 + } + ChangeLanguageKey { + weight: 154 + } + HandwritingModeKey { + weight: 154 + } + SpaceKey { + weight: 864 + } + Key { + key: Qt.Key_Minus + text: "-" + alternativeKeys: "-\"'" + } + Key { + key: 0xE000 + text: ":-)" + alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] + } + HideKeyboardKey { + weight: 204 + } + } } } } diff --git a/src/virtualkeyboard/content/layouts/ru_RU/numbers.fallback b/src/virtualkeyboard/content/layouts/ru_RU/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ru_RU/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/ru_RU/symbols.fallback b/src/virtualkeyboard/content/layouts/ru_RU/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/ru_RU/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml b/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml deleted file mode 100644 index 43b4d088..00000000 --- a/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "АБВ" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "АБВ" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/sk_SK/dialpad.fallback b/src/virtualkeyboard/content/layouts/sk_SK/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sk_SK/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/sk_SK/digits.fallback b/src/virtualkeyboard/content/layouts/sk_SK/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sk_SK/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/sk_SK/handwriting.fallback b/src/virtualkeyboard/content/layouts/sk_SK/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sk_SK/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/sk_SK/main.qml b/src/virtualkeyboard/content/layouts/sk_SK/main.qml new file mode 100644 index 00000000..1f739d31 --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sk_SK/main.qml @@ -0,0 +1,208 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.VirtualKeyboard 2.3 + +KeyboardLayout { + inputMode: InputEngine.InputMode.Latin + keyWeight: 160 + KeyboardRow { + Key { + key: Qt.Key_Q + text: "q" + } + Key { + key: Qt.Key_W + text: "w" + } + Key { + key: Qt.Key_E + text: "e" + alternativeKeys: "eé" + } + Key { + key: Qt.Key_R + text: "r" + alternativeKeys: "rŕ" + } + Key { + key: Qt.Key_T + text: "t" + alternativeKeys: "tť" + } + Key { + key: Qt.Key_Z + text: "z" + alternativeKeys: "zž" + } + Key { + key: Qt.Key_U + text: "u" + alternativeKeys: "uú" + } + Key { + key: Qt.Key_I + text: "i" + alternativeKeys: "ií" + } + Key { + key: Qt.Key_O + text: "o" + alternativeKeys: "oóöô" + } + Key { + key: Qt.Key_P + text: "p" + } + BackspaceKey {} + } + KeyboardRow { + FillerKey { + weight: 56 + } + Key { + key: Qt.Key_A + text: "a" + alternativeKeys: "aåäá" + } + Key { + key: Qt.Key_S + text: "s" + alternativeKeys: "sš" + } + Key { + key: Qt.Key_D + text: "d" + alternativeKeys: "dď" + } + Key { + key: Qt.Key_F + text: "f" + } + Key { + key: Qt.Key_G + text: "g" + } + Key { + key: Qt.Key_H + text: "h" + } + Key { + key: Qt.Key_J + text: "j" + } + Key { + key: Qt.Key_K + text: "k" + } + Key { + key: Qt.Key_L + text: "l" + alternativeKeys: "lĺľ" + } + EnterKey { + weight: 283 + } + } + KeyboardRow { + keyWeight: 156 + ShiftKey {} + Key { + key: Qt.Key_Y + text: "y" + alternativeKeys: "yý" + } + Key { + key: Qt.Key_X + text: "x" + } + Key { + key: Qt.Key_C + text: "c" + alternativeKeys: "cč" + } + Key { + key: Qt.Key_V + text: "v" + } + Key { + key: Qt.Key_B + text: "b" + } + Key { + key: Qt.Key_N + text: "n" + alternativeKeys: "nň" + } + Key { + key: Qt.Key_M + text: "m" + } + Key { + key: Qt.Key_Comma + text: "," + } + Key { + key: Qt.Key_Period + text: "." + } + ShiftKey { + weight: 204 + } + } + KeyboardRow { + keyWeight: 154 + SymbolModeKey { + weight: 217 + } + ChangeLanguageKey { + weight: 154 + } + HandwritingModeKey { + weight: 154 + } + SpaceKey { + weight: 864 + } + Key { + key: Qt.Key_Minus + text: "-" + alternativeKeys: "-\"'" + } + Key { + key: 0xE000 + text: ":-)" + alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] + } + HideKeyboardKey { + weight: 204 + } + } +} diff --git a/src/virtualkeyboard/content/layouts/sk_SK/numbers.fallback b/src/virtualkeyboard/content/layouts/sk_SK/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sk_SK/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/sk_SK/symbols.fallback b/src/virtualkeyboard/content/layouts/sk_SK/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sk_SK/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/sl_SI/dialpad.fallback b/src/virtualkeyboard/content/layouts/sl_SI/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sl_SI/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/sl_SI/digits.fallback b/src/virtualkeyboard/content/layouts/sl_SI/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sl_SI/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/sl_SI/handwriting.fallback b/src/virtualkeyboard/content/layouts/sl_SI/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sl_SI/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/sl_SI/main.qml b/src/virtualkeyboard/content/layouts/sl_SI/main.qml new file mode 100644 index 00000000..76293626 --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sl_SI/main.qml @@ -0,0 +1,203 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.VirtualKeyboard 2.3 + +KeyboardLayout { + inputMode: InputEngine.InputMode.Latin + keyWeight: 160 + KeyboardRow { + Key { + key: Qt.Key_Q + text: "q" + } + Key { + key: Qt.Key_W + text: "w" + } + Key { + key: Qt.Key_E + text: "e" + alternativeKeys: "eèêëé" + } + Key { + key: Qt.Key_R + text: "r" + } + Key { + key: Qt.Key_T + text: "t" + } + Key { + key: Qt.Key_Z + text: "z" + alternativeKeys: "zž" + } + Key { + key: Qt.Key_U + text: "u" + alternativeKeys: "uúü" + } + Key { + key: Qt.Key_I + text: "i" + alternativeKeys: "ií" + } + Key { + key: Qt.Key_O + text: "o" + alternativeKeys: "òôöoó" + } + Key { + key: Qt.Key_P + text: "p" + } + BackspaceKey {} + } + KeyboardRow { + FillerKey { + weight: 56 + } + Key { + key: Qt.Key_A + text: "a" + alternativeKeys: "aåäáà" + } + Key { + key: Qt.Key_S + text: "s" + alternativeKeys: "sš" + } + Key { + key: Qt.Key_D + text: "d" + alternativeKeys: "dđ" + } + Key { + key: Qt.Key_F + text: "f" + } + Key { + key: Qt.Key_G + text: "g" + } + Key { + key: Qt.Key_H + text: "h" + } + Key { + key: Qt.Key_J + text: "j" + } + Key { + key: Qt.Key_K + text: "k" + } + Key { + key: Qt.Key_L + text: "l" + } + EnterKey { + weight: 283 + } + } + KeyboardRow { + keyWeight: 156 + ShiftKey {} + Key { + key: Qt.Key_Y + text: "y" + } + Key { + key: Qt.Key_X + text: "x" + } + Key { + key: Qt.Key_C + text: "c" + alternativeKeys: "cćč" + } + Key { + key: Qt.Key_V + text: "v" + } + Key { + key: Qt.Key_B + text: "b" + } + Key { + key: Qt.Key_N + text: "n" + } + Key { + key: Qt.Key_M + text: "m" + } + Key { + key: Qt.Key_Comma + text: "," + } + Key { + key: Qt.Key_Period + text: "." + } + ShiftKey { + weight: 204 + } + } + KeyboardRow { + keyWeight: 154 + SymbolModeKey { + weight: 217 + } + ChangeLanguageKey { + weight: 154 + } + HandwritingModeKey { + weight: 154 + } + SpaceKey { + weight: 864 + } + Key { + key: Qt.Key_Minus + text: "-" + alternativeKeys: "-\"'" + } + Key { + key: 0xE000 + text: ":-)" + alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] + } + HideKeyboardKey { + weight: 204 + } + } +} diff --git a/src/virtualkeyboard/content/layouts/sl_SI/numbers.fallback b/src/virtualkeyboard/content/layouts/sl_SI/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sl_SI/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/sl_SI/symbols.fallback b/src/virtualkeyboard/content/layouts/sl_SI/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sl_SI/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/sq_AL/dialpad.fallback b/src/virtualkeyboard/content/layouts/sq_AL/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sq_AL/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/sq_AL/digits.fallback b/src/virtualkeyboard/content/layouts/sq_AL/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sq_AL/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/sq_AL/handwriting.fallback b/src/virtualkeyboard/content/layouts/sq_AL/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sq_AL/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/sq_AL/main.qml b/src/virtualkeyboard/content/layouts/sq_AL/main.qml new file mode 100644 index 00000000..4b50e883 --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sq_AL/main.qml @@ -0,0 +1,205 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.VirtualKeyboard 2.3 + +KeyboardLayout { + inputMode: InputEngine.InputMode.Latin + keyWeight: 160 + KeyboardRow { + Key { + key: Qt.Key_Q + text: "q" + } + Key { + key: Qt.Key_W + text: "w" + } + Key { + key: Qt.Key_E + text: "e" + } + Key { + key: Qt.Key_R + text: "r" + } + Key { + key: Qt.Key_T + text: "t" + } + Key { + key: Qt.Key_Z + text: "z" + } + Key { + key: Qt.Key_U + text: "u" + } + Key { + key: Qt.Key_I + text: "i" + } + Key { + key: Qt.Key_O + text: "o" + } + Key { + key: Qt.Key_P + text: "p" + } + Key { + key: Qt.Key_Ccedilla + text: "ç" + } + BackspaceKey {} + } + KeyboardRow { + FillerKey { + weight: 56 + } + Key { + key: Qt.Key_A + text: "a" + } + Key { + key: Qt.Key_S + text: "s" + } + Key { + key: Qt.Key_D + text: "d" + } + Key { + key: Qt.Key_F + text: "f" + } + Key { + key: Qt.Key_G + text: "g" + } + Key { + key: Qt.Key_H + text: "h" + } + Key { + key: Qt.Key_J + text: "j" + } + Key { + key: Qt.Key_K + text: "k" + } + Key { + key: Qt.Key_L + text: "l" + } + Key { + key: Qt.Key_Ediaeresis + text: "ë" + } + EnterKey { + weight: 283 + } + } + KeyboardRow { + keyWeight: 156 + ShiftKey {} + Key { + key: Qt.Key_Y + text: "y" + } + Key { + key: Qt.Key_X + text: "x" + } + Key { + key: Qt.Key_C + text: "c" + } + Key { + key: Qt.Key_V + text: "v" + } + Key { + key: Qt.Key_B + text: "b" + } + Key { + key: Qt.Key_N + text: "n" + } + Key { + key: Qt.Key_M + text: "m" + } + Key { + key: Qt.Key_Comma + text: "," + } + Key { + key: Qt.Key_Period + text: "." + } + Key { + key: Qt.Key_Minus + text: "-" + } + ShiftKey { + weight: 244 + } + } + KeyboardRow { + keyWeight: 154 + SymbolModeKey { + weight: 217 + } + ChangeLanguageKey { + weight: 154 + } + HandwritingModeKey { + weight: 154 + } + SpaceKey { + weight: 864 + } + Key { + key: Qt.Key_Apostrophe + text: "'" + } + Key { + key: 0xE000 + text: ":-)" + alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] + } + HideKeyboardKey { + weight: 204 + } + } +} diff --git a/src/virtualkeyboard/content/layouts/sq_AL/numbers.fallback b/src/virtualkeyboard/content/layouts/sq_AL/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sq_AL/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/sq_AL/symbols.fallback b/src/virtualkeyboard/content/layouts/sq_AL/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sq_AL/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/sr_SP/dialpad.fallback b/src/virtualkeyboard/content/layouts/sr_SP/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sr_SP/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/sr_SP/digits.fallback b/src/virtualkeyboard/content/layouts/sr_SP/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sr_SP/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml b/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml index 7781e455..6f9cbb98 100644 --- a/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/sr_SP/handwriting.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] @@ -44,9 +44,9 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting horizontalRulers: - InputContext.inputEngine.inputMode !== InputEngine.Cyrillic ? [] : + InputContext.inputEngine.inputMode !== InputEngine.InputMode.Cyrillic ? [] : [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3] } } diff --git a/src/virtualkeyboard/content/layouts/sr_SP/main.qml b/src/virtualkeyboard/content/layouts/sr_SP/main.qml index d739e79c..acd381ae 100644 --- a/src/virtualkeyboard/content/layouts/sr_SP/main.qml +++ b/src/virtualkeyboard/content/layouts/sr_SP/main.qml @@ -32,7 +32,7 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayoutLoader { sharedLayouts: ['symbols'] - sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Cyrillic ? cyrillicLayout : latinLayout + sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cyrillic ? cyrillicLayout : latinLayout Component { id: cyrillicLayout KeyboardLayout { @@ -117,7 +117,7 @@ KeyboardLayoutLoader { KeyboardRow { keyWeight: 156 InputModeKey { - inputModes: [InputEngine.Cyrillic, InputEngine.Latin] + inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin] } Key { text: "ѕ" @@ -287,7 +287,7 @@ KeyboardLayoutLoader { KeyboardRow { keyWeight: 156 InputModeKey { - inputModes: [InputEngine.Cyrillic, InputEngine.Latin] + inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin] } Key { key: Qt.Key_Y diff --git a/src/virtualkeyboard/content/layouts/sr_SP/numbers.fallback b/src/virtualkeyboard/content/layouts/sr_SP/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sr_SP/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/sr_SP/symbols.fallback b/src/virtualkeyboard/content/layouts/sr_SP/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sr_SP/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/sv_SE/dialpad.fallback b/src/virtualkeyboard/content/layouts/sv_SE/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sv_SE/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/sv_SE/digits.fallback b/src/virtualkeyboard/content/layouts/sv_SE/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sv_SE/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/sv_SE/handwriting.fallback b/src/virtualkeyboard/content/layouts/sv_SE/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sv_SE/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml b/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml deleted file mode 100644 index d42de535..00000000 --- a/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.3 - -KeyboardLayout { - function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) - } - sharedLayouts: ['symbols'] - inputMode: InputEngine.Latin - - KeyboardRow { - Layout.preferredHeight: 3 - KeyboardColumn { - Layout.preferredWidth: bottomRow.width - hideKeyboardKey.width - KeyboardRow { - TraceInputKey { - objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition - } - } - } - KeyboardColumn { - Layout.preferredWidth: hideKeyboardKey.width - KeyboardRow { - BackspaceKey {} - } - KeyboardRow { - EnterKey {} - } - KeyboardRow { - ShiftKey { } - } - } - } - KeyboardRow { - id: bottomRow - Layout.preferredHeight: 1 - keyWeight: 154 - InputModeKey { - weight: 217 - } - ChangeLanguageKey { - weight: 154 - customLayoutsOnly: true - } - HandwritingModeKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Apostrophe - text: "'" - alternativeKeys: "<>()#%&*/\\\"'=+-_" - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ":;,.?!" - } - HideKeyboardKey { - id: hideKeyboardKey - weight: 204 - } - } -} diff --git a/src/virtualkeyboard/content/layouts/sv_SE/main.qml b/src/virtualkeyboard/content/layouts/sv_SE/main.qml index b90a43cf..a3a8a86f 100644 --- a/src/virtualkeyboard/content/layouts/sv_SE/main.qml +++ b/src/virtualkeyboard/content/layouts/sv_SE/main.qml @@ -31,7 +31,7 @@ import QtQuick 2.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { - inputMode: InputEngine.Latin + inputMode: InputEngine.InputMode.Latin keyWeight: 160 KeyboardRow { Key { diff --git a/src/virtualkeyboard/content/layouts/sv_SE/numbers.fallback b/src/virtualkeyboard/content/layouts/sv_SE/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sv_SE/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/sv_SE/symbols.fallback b/src/virtualkeyboard/content/layouts/sv_SE/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/sv_SE/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml b/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml deleted file mode 100644 index 06d815d8..00000000 --- a/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml +++ /dev/null @@ -1,376 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.VirtualKeyboard 2.1 - -KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 - Component { - id: page1 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_1 - text: "1" - } - Key { - key: Qt.Key_2 - text: "2" - } - Key { - key: Qt.Key_3 - text: "3" - } - Key { - key: Qt.Key_4 - text: "4" - } - Key { - key: Qt.Key_5 - text: "5" - } - Key { - key: Qt.Key_6 - text: "6" - } - Key { - key: Qt.Key_7 - text: "7" - } - Key { - key: Qt.Key_8 - text: "8" - } - Key { - key: Qt.Key_9 - text: "9" - } - Key { - key: Qt.Key_0 - text: "0" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_At - text: "@" - } - Key { - key: Qt.Key_NumberSign - text: "#" - } - Key { - key: Qt.Key_Percent - text: "%" - } - Key { - key: Qt.Key_Ampersand - text: "&" - } - Key { - key: Qt.Key_Asterisk - text: "*" - } - Key { - key: Qt.Key_Minus - text: "-" - } - Key { - key: Qt.Key_Plus - text: "+" - } - Key { - key: Qt.Key_ParenLeft - text: "(" - } - Key { - key: Qt.Key_ParenRight - text: ")" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Exclam - text: "!" - } - Key { - key: Qt.Key_QuoteDbl - text: '"' - } - Key { - key: Qt.Key_Less - text: "<" - } - Key { - key: Qt.Key_Greater - text: ">" - } - Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { - key: Qt.Key_Colon - text: ":" - } - Key { - key: Qt.Key_Semicolon - text: ";" - } - Key { - key: Qt.Key_Slash - text: "/" - } - Key { - key: Qt.Key_Question - text: "?" - } - Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: Qt.Key_Period - text: "." - alternativeKeys: ".," - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } - Component { - id: page2 - KeyboardLayout { - keyWeight: 160 - KeyboardRow { - Key { - key: Qt.Key_AsciiTilde - text: "~" - } - Key { - key: Qt.Key_Agrave - text: "`" - } - Key { - key: Qt.Key_Bar - text: "|" - } - Key { - key: 0x7B - text: "·" - } - Key { - key: 0x221A - text: "√" - } - Key { - key: Qt.Key_division - text: "÷" - } - Key { - key: Qt.Key_multiply - text: "×" - } - Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" - } - Key { - key: Qt.Key_BraceLeft - text: "{" - } - Key { - key: Qt.Key_BraceRight - text: "}" - } - BackspaceKey {} - } - KeyboardRow { - FillerKey { - weight: 56 - } - Key { - key: Qt.Key_Dollar - text: "$" - } - Key { - key: 0x20AC - text: "€" - } - Key { - key: 0xC2 - text: "£" - } - Key { - key: 0xA2 - text: "¢" - } - Key { - key: 0xA5 - text: "¥" - } - Key { - key: Qt.Key_Equal - text: "=" - } - Key { - key: Qt.Key_section - text: "§" - } - Key { - key: Qt.Key_BracketLeft - text: "[" - } - Key { - key: Qt.Key_BracketRight - text: "]" - } - EnterKey { - weight: 283 - } - } - KeyboardRow { - keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - Key { - key: Qt.Key_Underscore - text: "_" - } - Key { - key: 0x2122 - text: '™' - } - Key { - key: 0x00AE - text: '®' - } - Key { - key: Qt.Key_guillemotleft - text: '«' - } - Key { - key: Qt.Key_guillemotright - text: '»' - } - Key { - key: 0x201C - text: '“' - } - Key { - key: 0x201D - text: '”' - } - Key { - key: Qt.Key_Backslash - text: "\\" - } - Key { - key: Qt.Key_AsciiCircum - text: "^" - } - Key { - weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage - } - } - KeyboardRow { - keyWeight: 154 - SymbolModeKey { - weight: 217 - displayText: "ABC" - } - ChangeLanguageKey { - weight: 154 - } - SpaceKey { - weight: 864 - } - Key { - key: 0x2026 - text: "\u2026" - } - Key { - key: 0xE000 - text: ":-)" - alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] - } - HideKeyboardKey { - weight: 204 - } - } - } - } -} diff --git a/src/virtualkeyboard/content/layouts/th_TH/dialpad.fallback b/src/virtualkeyboard/content/layouts/th_TH/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/th_TH/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/th_TH/digits.fallback b/src/virtualkeyboard/content/layouts/th_TH/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/th_TH/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/th_TH/handwriting.fallback b/src/virtualkeyboard/content/layouts/th_TH/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/th_TH/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/th_TH/main.qml b/src/virtualkeyboard/content/layouts/th_TH/main.qml new file mode 100644 index 00000000..60a8ebc0 --- /dev/null +++ b/src/virtualkeyboard/content/layouts/th_TH/main.qml @@ -0,0 +1,489 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Layouts 1.0 +import QtQuick.VirtualKeyboard 2.3 + +KeyboardLayoutLoader { + inputMode: InputEngine.InputMode.Latin + function createInputMethod() { + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; ThaiInputMethod {}', parent, "thaiInputMethod") + } + sharedLayouts: [ "symbols" ] + sourceComponent: InputContext.shiftActive ? page2 : page1 + Component { + id: page1 + KeyboardLayout { + keyWeight: 160 + KeyboardRow { + Layout.preferredHeight: 3 + smallTextVisible: true + KeyboardColumn { + Layout.preferredWidth: bottomRow.width - hideKeyboardKey.width + KeyboardRow { + Key { + text: "ๆ" + alternativeKeys: "ๆ๑" + } + Key { + text: "ๅ" + alternativeKeys: "ๅ๒" + } + Key { + text: "ภ" + alternativeKeys: "ภ๓" + } + Key { + text: "ถ" + alternativeKeys: "ถ๔" + } + Key { + text: "\u0E38" + displayText: " \u0E38" + alternativeKeys: [ "\u0E38", " \u0E39" ] + } + Key { + text: "\u0E36" + displayText: " \u0E36" + } + Key { + text: "ค" + alternativeKeys: "ค๕" + } + Key { + text: "ต" + alternativeKeys: "ต๖" + } + Key { + text: "จ" + alternativeKeys: "จ๗" + } + Key { + text: "ข" + alternativeKeys: "ข๘" + } + Key { + text: "ช" + alternativeKeys: "ช๙" + } + } + KeyboardRow { + Key { + text: "ไ" + alternativeKeys: "ไ฿" + } + Key { + text: " ำ" + alternativeKeys: " ำฎ" + } + Key { + text: "พ" + alternativeKeys: "พฑ" + } + Key { + text: "ะ" + alternativeKeys: "ะธ" + } + Key { + text: "\u0E31" + displayText: " \u0E31" + alternativeKeys: "\u0E31。" + } + Key { + text: "\u0E35" + displayText: " \u0E35" + alternativeKeys: [ "\u0E35", " \u0E4A" ] + } + Key { + text: "ร" + alternativeKeys: "รณ" + } + Key { + text: "น" + alternativeKeys: "นฯ" + } + Key { + text: "ย" + alternativeKeys: "ยญ" + } + Key { + text: "บ" + alternativeKeys: "บฐ" + } + Key { + text: "ล" + } + } + KeyboardRow { + Key { + text: "ฟ" + alternativeKeys: "ฟฤ" + } + Key { + text: "ห" + alternativeKeys: "หฆ" + } + Key { + text: "ก" + alternativeKeys: "กฏ" + } + Key { + text: "ด" + alternativeKeys: "ดโ" + } + Key { + text: "เ" + alternativeKeys: "เฌ" + } + Key { + text: "\u0E49" + displayText: " \u0E49" + alternativeKeys: [ "\u0E49", " \u0E47" ] + } + Key { + text: "\u0E48" + displayText: " \u0E48" + alternativeKeys: [ "\u0E48", " \u0E4B" ] + } + Key { + text: "า" + alternativeKeys: "าษ" + } + Key { + text: "ส" + alternativeKeys: "สศ" + } + Key { + text: "ว" + alternativeKeys: "วซ" + } + Key { + text: "ง" + } + } + KeyboardRow { + FillerKey { + weight: 80 + } + Key { + text: "ผ" + } + Key { + text: "ป" + } + Key { + text: "แ" + alternativeKeys: "แฉ" + } + Key { + text: "อ" + alternativeKeys: "อฮ" + } + Key { + text: "\u0E34" + displayText: " \u0E34" + alternativeKeys: [ "\u0E34", " \u0E3A" ] + } + Key { + text: "\u0E37" + displayText: " \u0E37" + alternativeKeys: [ "\u0E37", " \u0E4C" ] + } + Key { + text: "ท" + } + Key { + text: "ม" + alternativeKeys: "มฒ" + } + Key { + text: "ใ" + alternativeKeys: "ใฬ" + } + Key { + text: "ฝ" + alternativeKeys: "ฝฦ" + } + FillerKey { + weight: 80 + } + } + } + KeyboardColumn { + Layout.preferredWidth: hideKeyboardKey.width + KeyboardRow { + BackspaceKey {} + } + KeyboardRow { + EnterKey {} + } + KeyboardRow { + ShiftKey { } + } + } + } + KeyboardRow { + id: bottomRow + keyWeight: 154 + SymbolModeKey { + weight: 217 + } + ChangeLanguageKey { + weight: 154 + } + HandwritingModeKey { + weight: 154 + } + SpaceKey { + weight: 864 + } + Key { + key: Qt.Key_Period + text: "." + alternativeKeys: "!?.," + smallTextVisible: true + } + Key { + key: 0xE000 + text: ":-)" + alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] + } + HideKeyboardKey { + id: hideKeyboardKey + weight: 204 + } + } + } + } + Component { + id: page2 + KeyboardLayout { + keyWeight: 160 + KeyboardRow { + Layout.preferredHeight: 3 + smallTextVisible: true + KeyboardColumn { + Layout.preferredWidth: bottomRow.width - hideKeyboardKey.width + KeyboardRow { + Key { + text: "๑" + } + Key { + text: "๒" + } + Key { + text: "๓" + } + Key { + text: "๔" + } + Key { + text: "\u0E39" + displayText: " \u0E39" + } + Key { + enabled: false + } + Key { + text: "๕" + } + Key { + text: "๖" + } + Key { + text: "๗" + } + Key { + text: "๘" + } + Key { + text: "๙" + } + } + KeyboardRow { + Key { + text: "฿" + } + Key { + text: "ฎ" + } + Key { + text: "ฑ" + } + Key { + text: "ธ" + } + Key { + text: "。" + } + Key { + text: "\u0E4A" + displayText: " \u0E4A" + } + Key { + text: "ณ" + } + Key { + text: "ฯ" + } + Key { + text: "ญ" + } + Key { + text: "ฐ" + } + Key { + enabled: false + } + } + KeyboardRow { + Key { + text: "ฤ" + } + Key { + text: "ฆ" + } + Key { + text: "ฏ" + } + Key { + text: "โ" + } + Key { + text: "ฌ" + } + Key { + text: "\u0E47" + displayText: " \u0E47" + } + Key { + text: "\u0E4B" + displayText: " \u0E4B" + } + Key { + text: "ษ" + } + Key { + text: "ศ" + } + Key { + text: "ซ" + } + Key { + enabled: false + } + } + KeyboardRow { + FillerKey { + weight: 80 + } + Key { + enabled: false + } + Key { + enabled: false + } + Key { + text: "ฉ" + } + Key { + text: "ฮ" + } + Key { + text: "\u0E3A" + displayText: " \u0E3A" + } + Key { + text: "\u0E4C" + displayText: " \u0E4C" + } + Key { + enabled: false + } + Key { + text: "ฒ" + } + Key { + text: "ฬ" + } + Key { + text: "ฦ" + } + FillerKey { + weight: 80 + } + } + } + KeyboardColumn { + Layout.preferredWidth: hideKeyboardKey.width + KeyboardRow { + BackspaceKey {} + } + KeyboardRow { + EnterKey {} + } + KeyboardRow { + ShiftKey { } + } + } + } + KeyboardRow { + id: bottomRow + keyWeight: 154 + SymbolModeKey { + weight: 217 + } + ChangeLanguageKey { + weight: 154 + } + HandwritingModeKey { + weight: 154 + } + SpaceKey { + weight: 864 + } + Key { + key: Qt.Key_Comma + text: "," + alternativeKeys: "!?," + } + Key { + key: 0xE000 + text: ":-)" + alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] + } + HideKeyboardKey { + id: hideKeyboardKey + weight: 204 + } + } + } + } +} diff --git a/src/virtualkeyboard/content/layouts/th_TH/numbers.fallback b/src/virtualkeyboard/content/layouts/th_TH/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/th_TH/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/da_DK/symbols.qml b/src/virtualkeyboard/content/layouts/th_TH/symbols.qml index 06d815d8..53fdcd6e 100644 --- a/src/virtualkeyboard/content/layouts/da_DK/symbols.qml +++ b/src/virtualkeyboard/content/layouts/th_TH/symbols.qml @@ -180,7 +180,7 @@ KeyboardLayoutLoader { keyWeight: 154 SymbolModeKey { weight: 217 - displayText: "ABC" + displayText: "กขค" } ChangeLanguageKey { weight: 154 @@ -191,7 +191,7 @@ KeyboardLayoutLoader { Key { key: Qt.Key_Period text: "." - alternativeKeys: ".," + alternativeKeys: "!?.," } Key { key: 0xE000 @@ -350,7 +350,7 @@ KeyboardLayoutLoader { keyWeight: 154 SymbolModeKey { weight: 217 - displayText: "ABC" + displayText: "กขค" } ChangeLanguageKey { weight: 154 diff --git a/src/virtualkeyboard/content/layouts/tr_TR/dialpad.fallback b/src/virtualkeyboard/content/layouts/tr_TR/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/tr_TR/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/tr_TR/digits.fallback b/src/virtualkeyboard/content/layouts/tr_TR/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/tr_TR/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/tr_TR/handwriting.fallback b/src/virtualkeyboard/content/layouts/tr_TR/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/tr_TR/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/tr_TR/main.qml b/src/virtualkeyboard/content/layouts/tr_TR/main.qml new file mode 100644 index 00000000..31bf0dc1 --- /dev/null +++ b/src/virtualkeyboard/content/layouts/tr_TR/main.qml @@ -0,0 +1,221 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.VirtualKeyboard 2.3 + +KeyboardLayout { + inputMode: InputEngine.InputMode.Latin + keyWeight: 160 + KeyboardRow { + Key { + key: Qt.Key_Q + text: "q" + } + Key { + key: Qt.Key_W + text: "w" + } + Key { + key: Qt.Key_E + text: "e" + } + Key { + key: Qt.Key_R + text: "r" + } + Key { + key: Qt.Key_T + text: "t" + } + Key { + key: Qt.Key_Y + text: "y" + } + Key { + key: Qt.Key_U + text: "u" + } + Key { + text: "\u0131" + } + Key { + key: Qt.Key_O + text: "o" + } + Key { + key: Qt.Key_P + text: "p" + } + Key { + text: "\u011F" + } + Key { + key: Qt.Key_Udiaeresis + text: "ü" + } + BackspaceKey {} + } + KeyboardRow { + FillerKey { + weight: 66 + } + Key { + key: Qt.Key_A + text: "a" + alternativeKeys: "aåä" + } + Key { + key: Qt.Key_S + text: "s" + alternativeKeys: "sš" + } + Key { + key: Qt.Key_D + text: "d" + } + Key { + key: Qt.Key_F + text: "f" + } + Key { + key: Qt.Key_G + text: "g" + } + Key { + key: Qt.Key_H + text: "h" + } + Key { + key: Qt.Key_J + text: "j" + } + Key { + key: Qt.Key_K + text: "k" + } + Key { + key: Qt.Key_L + text: "l" + } + Key { + text: "ş" + } + Key { + key: Qt.Key_I + text: "i" + } + EnterKey { + weight: 283 + } + } + KeyboardRow { + keyWeight: 156 + ShiftKey { } + Key { + key: Qt.Key_Z + text: "z" + alternativeKeys: "zž" + } + Key { + key: Qt.Key_X + text: "x" + alternativeKeys: "$¢x₺€¥£" + smallTextVisible: true + } + Key { + key: Qt.Key_C + text: "c" + } + Key { + key: Qt.Key_V + text: "v" + } + Key { + key: Qt.Key_B + text: "b" + } + Key { + key: Qt.Key_N + text: "n" + } + Key { + key: Qt.Key_M + text: "m" + } + Key { + key: Qt.Key_Odiaeresis + text: "ö" + } + Key { + key: Qt.Key_Ccedilla + text: "ç" + } + Key { + key: Qt.Key_Comma + text: "," + } + Key { + key: Qt.Key_Period + text: "." + alternativeKeys: "!?." + smallTextVisible: true + } + ShiftKey { + weight: 264 + } + } + KeyboardRow { + keyWeight: 154 + SymbolModeKey { + weight: 217 + } + ChangeLanguageKey { + weight: 154 + } + HandwritingModeKey { + weight: 154 + } + SpaceKey { + weight: 864 + } + Key { + key: Qt.Key_Apostrophe + text: "'" + } + Key { + key: 0xE000 + text: ":-)" + alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] + } + HideKeyboardKey { + weight: 204 + } + } +} diff --git a/src/virtualkeyboard/content/layouts/tr_TR/numbers.fallback b/src/virtualkeyboard/content/layouts/tr_TR/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/tr_TR/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/tr_TR/symbols.fallback b/src/virtualkeyboard/content/layouts/tr_TR/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/tr_TR/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/uk_UA/dialpad.fallback b/src/virtualkeyboard/content/layouts/uk_UA/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/uk_UA/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/uk_UA/digits.fallback b/src/virtualkeyboard/content/layouts/uk_UA/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/uk_UA/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/uk_UA/handwriting.fallback b/src/virtualkeyboard/content/layouts/uk_UA/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/uk_UA/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/hu_HU/symbols.qml b/src/virtualkeyboard/content/layouts/uk_UA/main.qml index 76c06493..c2731452 100644 --- a/src/virtualkeyboard/content/layouts/hu_HU/symbols.qml +++ b/src/virtualkeyboard/content/layouts/uk_UA/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. @@ -28,170 +28,160 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Layouts 1.0 import QtQuick.VirtualKeyboard 2.3 KeyboardLayoutLoader { - property bool secondPage - onVisibleChanged: if (!visible) secondPage = false - sourceComponent: secondPage ? page2 : page1 + sharedLayouts: ['symbols'] + sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cyrillic ? cyrillicLayout : latinLayout Component { - id: page1 + id: cyrillicLayout KeyboardLayout { keyWeight: 160 KeyboardRow { Key { - key: Qt.Key_1 - text: "1" + text: "й" } Key { - key: Qt.Key_2 - text: "2" + text: "ц" } Key { - key: Qt.Key_3 - text: "3" + text: "у" } Key { - key: Qt.Key_4 - text: "4" + text: "к" } Key { - key: Qt.Key_5 - text: "5" + text: "е" } Key { - key: Qt.Key_6 - text: "6" + text: "н" } Key { - key: Qt.Key_7 - text: "7" + text: "г" } Key { - key: Qt.Key_8 - text: "8" + text: "ш" } Key { - key: Qt.Key_9 - text: "9" + text: "щ" } Key { - key: Qt.Key_0 - text: "0" + text: "з" + } + Key { + text: "х" + } + Key { + text: "ї" + } + BackspaceKey { + weight: 180 } - BackspaceKey {} } KeyboardRow { FillerKey { - weight: 56 + weight: 40 } Key { - key: Qt.Key_At - text: "@" + text: "ф" } Key { - key: Qt.Key_NumberSign - text: "#" + text: "і" } Key { - key: Qt.Key_Percent - text: "%" + text: "в" } Key { - key: Qt.Key_Ampersand - text: "&" + text: "а" } Key { - key: Qt.Key_Asterisk - text: "*" + text: "п" } Key { - key: Qt.Key_Minus - text: "-" + text: "р" } Key { - key: Qt.Key_Plus - text: "+" + text: "о" } Key { - key: Qt.Key_ParenLeft - text: "(" + text: "л" } Key { - key: Qt.Key_ParenRight - text: ")" + text: "д" + } + Key { + text: "ж" + } + Key { + text: "є" } EnterKey { - weight: 283 + weight: 280 } } KeyboardRow { - keyWeight: 156 + InputModeKey { + inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin] + } Key { - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage + text: "ґ" } Key { - key: Qt.Key_Exclam - text: "!" + text: "я" + alternativeKeys: "$¢я₴€¥£" + smallTextVisible: true } Key { - key: Qt.Key_QuoteDbl - text: '"' + text: "ч" } Key { - key: Qt.Key_Apostrophe - text: "'" + text: "с" } Key { - key: Qt.Key_Less - text: "<" + text: "м" } Key { - key: Qt.Key_Greater - text: ">" + text: "и" } Key { - key: Qt.Key_Colon - text: ":" + text: "т" } Key { - key: Qt.Key_Semicolon - text: ";" + text: "ь" } Key { - key: Qt.Key_Slash - text: "/" + text: "б" } Key { - key: Qt.Key_Question - text: "?" + text: "ю" } Key { - weight: 204 - displayText: "1/2" - functionKey: true - onClicked: secondPage = !secondPage + key: Qt.Key_Apostrophe + text: "'" + } + ShiftKey { + weight: 272 } } KeyboardRow { keyWeight: 154 SymbolModeKey { weight: 217 - displayText: "ABC" } ChangeLanguageKey { weight: 154 } + HandwritingModeKey { + weight: 154 + } SpaceKey { weight: 864 } Key { key: Qt.Key_Period text: "." - alternativeKeys: ".," + alternativeKeys: ";:!?.," + smallTextVisible: true } Key { key: 0xE000 @@ -205,50 +195,50 @@ KeyboardLayoutLoader { } } Component { - id: page2 + id: latinLayout KeyboardLayout { keyWeight: 160 KeyboardRow { Key { - key: Qt.Key_AsciiTilde - text: "~" + key: Qt.Key_Q + text: "q" } Key { - key: Qt.Key_Agrave - text: "`" + key: Qt.Key_W + text: "w" } Key { - key: Qt.Key_Bar - text: "|" + key: Qt.Key_E + text: "e" } Key { - key: 0x7B - text: "·" + key: Qt.Key_R + text: "r" } Key { - key: 0x221A - text: "√" + key: Qt.Key_T + text: "t" } Key { - key: Qt.Key_division - text: "÷" + key: Qt.Key_Y + text: "y" } Key { - key: Qt.Key_multiply - text: "×" + key: Qt.Key_U + text: "u" } Key { - key: Qt.Key_onehalf - text: "½" - alternativeKeys: "¼⅓½¾⅞" + key: Qt.Key_I + text: "i" } Key { - key: Qt.Key_BraceLeft - text: "{" + key: Qt.Key_O + text: "o" + alternativeKeys: "oö" } Key { - key: Qt.Key_BraceRight - text: "}" + key: Qt.Key_P + text: "p" } BackspaceKey {} } @@ -257,40 +247,43 @@ KeyboardLayoutLoader { weight: 56 } Key { - key: Qt.Key_Dollar - text: "$" + key: Qt.Key_A + text: "a" + alternativeKeys: "aåä" } Key { - key: 0x20AC - text: "€" + key: Qt.Key_S + text: "s" + alternativeKeys: "sš" } Key { - key: 0xC2 - text: "£" + key: Qt.Key_D + text: "d" + alternativeKeys: "dđ" } Key { - key: 0xA2 - text: "¢" + key: Qt.Key_F + text: "f" } Key { - key: 0xA5 - text: "¥" + key: Qt.Key_G + text: "g" } Key { - key: Qt.Key_Equal - text: "=" + key: Qt.Key_H + text: "h" } Key { - key: Qt.Key_section - text: "§" + key: Qt.Key_J + text: "j" } Key { - key: Qt.Key_BracketLeft - text: "[" + key: Qt.Key_K + text: "k" } Key { - key: Qt.Key_BracketRight - text: "]" + key: Qt.Key_L + text: "l" } EnterKey { weight: 283 @@ -298,69 +291,73 @@ KeyboardLayoutLoader { } KeyboardRow { keyWeight: 156 - Key { - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage + InputModeKey { + inputModes: [InputEngine.InputMode.Cyrillic, InputEngine.InputMode.Latin] } Key { - key: Qt.Key_Underscore - text: "_" + key: Qt.Key_Z + text: "z" + alternativeKeys: "zž" } Key { - key: 0x2122 - text: '™' + key: Qt.Key_X + text: "x" + alternativeKeys: "$¢x₴€¥£" + smallTextVisible: true } Key { - key: 0x00AE - text: '®' + key: Qt.Key_C + text: "c" + alternativeKeys: "ćcč" } Key { - key: Qt.Key_guillemotleft - text: '«' + key: Qt.Key_V + text: "v" } Key { - key: Qt.Key_guillemotright - text: '»' + key: Qt.Key_B + text: "b" } Key { - key: 0x201C - text: '“' + key: Qt.Key_N + text: "n" } Key { - key: 0x201D - text: '”' + key: Qt.Key_M + text: "m" } Key { - key: Qt.Key_Backslash - text: "\\" + key: Qt.Key_Minus + text: "-" + alternativeKeys: "-\"'" } Key { - key: Qt.Key_AsciiCircum - text: "^" + key: Qt.Key_Apostrophe + text: "'" } - Key { + ShiftKey { weight: 204 - displayText: "2/2" - functionKey: true - onClicked: secondPage = !secondPage } } KeyboardRow { keyWeight: 154 SymbolModeKey { weight: 217 - displayText: "ABC" } ChangeLanguageKey { weight: 154 } + HandwritingModeKey { + weight: 154 + } SpaceKey { weight: 864 } Key { - key: 0x2026 - text: "\u2026" + key: Qt.Key_Period + text: "." + alternativeKeys: ";:!?.," + smallTextVisible: true } Key { key: 0xE000 diff --git a/src/virtualkeyboard/content/layouts/uk_UA/numbers.fallback b/src/virtualkeyboard/content/layouts/uk_UA/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/uk_UA/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/uk_UA/symbols.fallback b/src/virtualkeyboard/content/layouts/uk_UA/symbols.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/uk_UA/symbols.fallback diff --git a/src/virtualkeyboard/content/layouts/vi_VN/dialpad.fallback b/src/virtualkeyboard/content/layouts/vi_VN/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/vi_VN/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/vi_VN/digits.fallback b/src/virtualkeyboard/content/layouts/vi_VN/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/vi_VN/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/vi_VN/handwriting.fallback b/src/virtualkeyboard/content/layouts/vi_VN/handwriting.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/vi_VN/handwriting.fallback diff --git a/src/virtualkeyboard/content/layouts/vi_VN/main.qml b/src/virtualkeyboard/content/layouts/vi_VN/main.qml new file mode 100644 index 00000000..9a5c7e37 --- /dev/null +++ b/src/virtualkeyboard/content/layouts/vi_VN/main.qml @@ -0,0 +1,205 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.VirtualKeyboard 2.3 + +KeyboardLayout { + inputMode: InputEngine.InputMode.Latin + sharedLayouts: ["numbers", "digits"] + keyWeight: 160 + KeyboardRow { + Key { + key: Qt.Key_Q + text: "q" + } + Key { + key: Qt.Key_W + text: "w" + } + Key { + key: Qt.Key_E + text: "e" + alternativeKeys: "eèéẻẽẹêềếểễệ" + } + Key { + key: Qt.Key_R + text: "r" + } + Key { + key: Qt.Key_T + text: "t" + } + Key { + key: Qt.Key_Y + text: "y" + alternativeKeys: "yỳýỷỹỵ" + } + Key { + key: Qt.Key_U + text: "u" + alternativeKeys: "ưừứửữựuùúủũụ" + } + Key { + key: Qt.Key_I + text: "i" + alternativeKeys: "iìíỉĩị" + } + Key { + key: Qt.Key_O + text: "o" + alternativeKeys: "ơờớởỡợòóỏõọoôồốổỗộ" + } + Key { + key: Qt.Key_P + text: "p" + } + BackspaceKey {} + } + KeyboardRow { + FillerKey { + weight: 56 + } + Key { + key: Qt.Key_A + text: "a" + alternativeKeys: "aàáảãạăằắẳẵặâầấẩẫậ" + } + Key { + key: Qt.Key_S + text: "s" + alternativeKeys: "sš" + } + Key { + key: Qt.Key_D + text: "d" + alternativeKeys: "dđ" + } + Key { + key: Qt.Key_F + text: "f" + } + Key { + key: Qt.Key_G + text: "g" + } + Key { + key: Qt.Key_H + text: "h" + } + Key { + key: Qt.Key_J + text: "j" + } + Key { + key: Qt.Key_K + text: "k" + } + Key { + key: Qt.Key_L + text: "l" + } + EnterKey { + weight: 283 + } + } + KeyboardRow { + keyWeight: 156 + ShiftKey {} + Key { + key: Qt.Key_Z + text: "z" + alternativeKeys: "zž" + } + Key { + key: Qt.Key_X + text: "x" + } + Key { + key: Qt.Key_C + text: "c" + } + Key { + key: Qt.Key_V + text: "v" + } + Key { + key: Qt.Key_B + text: "b" + } + Key { + key: Qt.Key_N + text: "n" + alternativeKeys: "nñ" + } + Key { + key: Qt.Key_M + text: "m" + } + Key { + key: Qt.Key_Comma + text: "," + } + Key { + key: Qt.Key_Period + text: "." + alternativeKeys: "!,.?" + } + ShiftKey { + weight: 204 + } + } + KeyboardRow { + keyWeight: 154 + SymbolModeKey { + weight: 217 + } + ChangeLanguageKey { + weight: 154 + } + HandwritingModeKey { + weight: 154 + } + SpaceKey { + weight: 864 + } + Key { + key: Qt.Key_Apostrophe + text: "'" + } + Key { + key: 0xE000 + text: ":-)" + alternativeKeys: [ ";-)", ":-)", ":-D", ":-(", "<3" ] + } + HideKeyboardKey { + weight: 204 + } + } +} diff --git a/src/virtualkeyboard/content/layouts/vi_VN/numbers.fallback b/src/virtualkeyboard/content/layouts/vi_VN/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/vi_VN/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/hr_HR/symbols.qml b/src/virtualkeyboard/content/layouts/vi_VN/symbols.qml index 76c06493..da5281b3 100644 --- a/src/virtualkeyboard/content/layouts/hr_HR/symbols.qml +++ b/src/virtualkeyboard/content/layouts/vi_VN/symbols.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. @@ -142,10 +142,6 @@ KeyboardLayoutLoader { text: '"' } Key { - key: Qt.Key_Apostrophe - text: "'" - } - Key { key: Qt.Key_Less text: "<" } @@ -154,6 +150,10 @@ KeyboardLayoutLoader { text: ">" } Key { + key: Qt.Key_Apostrophe + text: "'" + } + Key { key: Qt.Key_Colon text: ":" } @@ -273,8 +273,8 @@ KeyboardLayoutLoader { text: "¢" } Key { - key: 0xA5 - text: "¥" + key: 0x20AB + text: "₫" } Key { key: Qt.Key_Equal diff --git a/src/virtualkeyboard/content/layouts/zh_CN/dialpad.fallback b/src/virtualkeyboard/content/layouts/zh_CN/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/zh_CN/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/zh_CN/digits.fallback b/src/virtualkeyboard/content/layouts/zh_CN/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/zh_CN/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml b/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml index 598980d1..fee04320 100644 --- a/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/zh_CN/handwriting.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: preferredInputMode() @@ -50,7 +50,7 @@ KeyboardLayout { function preferredInputMode() { return InputContext.inputMethodHints & (Qt.ImhPreferLatin | Qt.ImhEmailCharactersOnly | Qt.ImhUrlCharactersOnly | - Qt.ImhLatinOnly) ? InputEngine.Latin : InputEngine.ChineseHandwriting + Qt.ImhLatinOnly) ? InputEngine.InputMode.Latin : InputEngine.InputMode.ChineseHandwriting } KeyboardRow { @@ -60,9 +60,9 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting horizontalRulers: - InputContext.inputEngine.inputMode !== InputEngine.ChineseHandwriting ? [] : + InputContext.inputEngine.inputMode !== InputEngine.InputMode.ChineseHandwriting ? [] : [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3] } diff --git a/src/virtualkeyboard/content/layouts/zh_CN/main.qml b/src/virtualkeyboard/content/layouts/zh_CN/main.qml index 44b0ceb7..349a14c8 100644 --- a/src/virtualkeyboard/content/layouts/zh_CN/main.qml +++ b/src/virtualkeyboard/content/layouts/zh_CN/main.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; PinyinInputMethod {}', parent, "pinyinInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; PinyinInputMethod {}', parent, "pinyinInputMethod") } sharedLayouts: ['symbols'] keyWeight: 160 diff --git a/src/virtualkeyboard/content/layouts/zh_CN/numbers.fallback b/src/virtualkeyboard/content/layouts/zh_CN/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/zh_CN/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml b/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml index 0133387b..4ad06baf 100644 --- a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml +++ b/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; PinyinInputMethod {}', parent, "pinyinInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; PinyinInputMethod {}', parent, "pinyinInputMethod") } sharedLayouts: ['main'] property int page diff --git a/src/virtualkeyboard/content/layouts/zh_TW/dialpad.fallback b/src/virtualkeyboard/content/layouts/zh_TW/dialpad.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/zh_TW/dialpad.fallback diff --git a/src/virtualkeyboard/content/layouts/zh_TW/digits.fallback b/src/virtualkeyboard/content/layouts/zh_TW/digits.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/zh_TW/digits.fallback diff --git a/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml b/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml index 598980d1..fee04320 100644 --- a/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/zh_TW/handwriting.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: preferredInputMode() @@ -50,7 +50,7 @@ KeyboardLayout { function preferredInputMode() { return InputContext.inputMethodHints & (Qt.ImhPreferLatin | Qt.ImhEmailCharactersOnly | Qt.ImhUrlCharactersOnly | - Qt.ImhLatinOnly) ? InputEngine.Latin : InputEngine.ChineseHandwriting + Qt.ImhLatinOnly) ? InputEngine.InputMode.Latin : InputEngine.InputMode.ChineseHandwriting } KeyboardRow { @@ -60,9 +60,9 @@ KeyboardLayout { KeyboardRow { TraceInputKey { objectName: "hwrInputArea" - patternRecognitionMode: InputEngine.HandwritingRecoginition + patternRecognitionMode: InputEngine.PatternRecognitionMode.Handwriting horizontalRulers: - InputContext.inputEngine.inputMode !== InputEngine.ChineseHandwriting ? [] : + InputContext.inputEngine.inputMode !== InputEngine.InputMode.ChineseHandwriting ? [] : [Math.round(boundingBox.height / 4), Math.round(boundingBox.height / 4) * 2, Math.round(boundingBox.height / 4) * 3] } diff --git a/src/virtualkeyboard/content/layouts/zh_TW/main.qml b/src/virtualkeyboard/content/layouts/zh_TW/main.qml index 7c5728c7..bd9c1451 100644 --- a/src/virtualkeyboard/content/layouts/zh_TW/main.qml +++ b/src/virtualkeyboard/content/layouts/zh_TW/main.qml @@ -33,10 +33,10 @@ import QtQuick.VirtualKeyboard 2.3 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.3; TCInputMethod {}', parent, "tcInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; TCInputMethod {}', parent, "tcInputMethod") } sharedLayouts: ['symbols'] - sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Cangjie ? pageCangjie : pageZhuyin + sourceComponent: InputContext.inputEngine.inputMode === InputEngine.InputMode.Cangjie ? pageCangjie : pageZhuyin Component { id: pageCangjie KeyboardLayout { @@ -201,7 +201,7 @@ KeyboardLayoutLoader { weight: 154 } InputModeKey { - visible: InputContext.inputEngine.inputModes.indexOf(InputEngine.Zhuyin) !== -1 + visible: InputContext.inputEngine.inputModes.indexOf(InputEngine.InputMode.Zhuyin) !== -1 } SpaceKey { weight: 864 @@ -429,7 +429,7 @@ KeyboardLayoutLoader { weight: 154 } InputModeKey { - visible: InputContext.inputEngine.inputModes.indexOf(InputEngine.Cangjie) !== -1 + visible: InputContext.inputEngine.inputModes.indexOf(InputEngine.InputMode.Cangjie) !== -1 } SpaceKey { weight: 864 diff --git a/src/virtualkeyboard/content/layouts/zh_TW/numbers.fallback b/src/virtualkeyboard/content/layouts/zh_TW/numbers.fallback new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/virtualkeyboard/content/layouts/zh_TW/numbers.fallback diff --git a/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml b/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml index 60d63e3a..3d43ae69 100644 --- a/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml +++ b/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; TCInputMethod {}', parent, "tcInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; TCInputMethod {}', parent, "tcInputMethod") } sharedLayouts: ['main'] property int page diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml index d4b6c119..d561ac28 100644 --- a/src/virtualkeyboard/content/styles/default/style.qml +++ b/src/virtualkeyboard/content/styles/default/style.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard.Styles 2.1 KeyboardStyle { id: currentStyle - readonly property bool compactSelectionList: [InputEngine.Pinyin, InputEngine.Cangjie, InputEngine.Zhuyin].indexOf(InputContext.inputEngine.inputMode) !== -1 + readonly property bool compactSelectionList: [InputEngine.InputMode.Pinyin, InputEngine.InputMode.Cangjie, InputEngine.InputMode.Zhuyin].indexOf(InputContext.inputEngine.inputMode) !== -1 readonly property string fontFamily: "Sans" readonly property real keyBackgroundMargin: Math.round(13 * scaleHint) readonly property real keyContentMargin: Math.round(45 * scaleHint) @@ -382,8 +382,8 @@ KeyboardStyle { } states: [ State { - name: "capslock" - when: InputContext.capsLock + name: "capsLockActive" + when: InputContext.capsLockActive PropertyChanges { target: shiftKeyBackground color: "#5a892e" @@ -394,8 +394,8 @@ KeyboardStyle { } }, State { - name: "shift" - when: InputContext.shift + name: "shiftActive" + when: InputContext.shiftActive PropertyChanges { target: shiftKeyIcon source: resourcePrefix + "images/shift-80c342.svg" @@ -767,30 +767,30 @@ KeyboardStyle { anchors.margins: keyBackgroundMargin Text { id: hwrInputModeIndicator - visible: control.patternRecognitionMode === InputEngine.HandwritingRecoginition + visible: control.patternRecognitionMode === InputEngine.PatternRecognitionMode.Handwriting text: { switch (InputContext.inputEngine.inputMode) { - case InputEngine.Numeric: + case InputEngine.InputMode.Numeric: if (["ar", "fa"].indexOf(InputContext.locale.substring(0, 2)) !== -1) return "\u0660\u0661\u0662" // Fallthrough - case InputEngine.Dialable: + case InputEngine.InputMode.Dialable: return "123" - case InputEngine.Greek: + case InputEngine.InputMode.Greek: return "ΑΒΓ" - case InputEngine.Cyrillic: + case InputEngine.InputMode.Cyrillic: return "АБВ" - case InputEngine.Arabic: + case InputEngine.InputMode.Arabic: if (InputContext.locale.substring(0, 2) === "fa") return "\u0627\u200C\u0628\u200C\u067E" return "\u0623\u200C\u0628\u200C\u062C" - case InputEngine.Hebrew: + case InputEngine.InputMode.Hebrew: return "\u05D0\u05D1\u05D2" - case InputEngine.ChineseHandwriting: + case InputEngine.InputMode.ChineseHandwriting: return "中文" - case InputEngine.JapaneseHandwriting: + case InputEngine.InputMode.JapaneseHandwriting: return "日本語" - case InputEngine.KoreanHandwriting: + case InputEngine.InputMode.KoreanHandwriting: return "한국어" default: return "Abc" @@ -805,9 +805,9 @@ KeyboardStyle { weight: Font.Normal pixelSize: 44 * scaleHint capitalization: { - if (InputContext.capsLock) + if (InputContext.capsLockActive) return Font.AllUppercase - if (InputContext.shift) + if (InputContext.shiftActive) return Font.MixedCase return Font.AllLowercase } diff --git a/src/virtualkeyboard/content/styles/default/default_style.qrc b/src/virtualkeyboard/content/styles/default/virtualkeyboard_default_style.qrc index 277e8cde..277e8cde 100644 --- a/src/virtualkeyboard/content/styles/default/default_style.qrc +++ b/src/virtualkeyboard/content/styles/default/virtualkeyboard_default_style.qrc diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml index 53d09399..eb640783 100644 --- a/src/virtualkeyboard/content/styles/retro/style.qml +++ b/src/virtualkeyboard/content/styles/retro/style.qml @@ -33,7 +33,7 @@ import QtQuick.VirtualKeyboard.Styles 2.1 KeyboardStyle { id: currentStyle - readonly property bool compactSelectionList: [InputEngine.Pinyin, InputEngine.Cangjie, InputEngine.Zhuyin].indexOf(InputContext.inputEngine.inputMode) !== -1 + readonly property bool compactSelectionList: [InputEngine.InputMode.Pinyin, InputEngine.InputMode.Cangjie, InputEngine.InputMode.Zhuyin].indexOf(InputContext.inputEngine.inputMode) !== -1 readonly property string fontFamily: "Courier" readonly property real keyBackgroundMargin: Math.round(9 * scaleHint) readonly property real keyContentMargin: Math.round(30 * scaleHint) @@ -420,8 +420,8 @@ KeyboardStyle { scale: (parent.height - 2 * keyBackgroundMargin) / sourceSize.height states: [ State { - name: "capslock" - when: InputContext.capsLock + name: "capsLockActive" + when: InputContext.capsLockActive PropertyChanges { target: shiftKeyBackground source: resourcePrefix + "images/key154px_capslock.png" @@ -432,8 +432,8 @@ KeyboardStyle { } }, State { - name: "shift" - when: InputContext.shift + name: "shiftActive" + when: InputContext.shiftActive PropertyChanges { target: shiftKeyBackground source: resourcePrefix + "images/key154px_shiftcase.png" @@ -880,30 +880,30 @@ KeyboardStyle { } Text { id: hwrInputModeIndicator - visible: control.patternRecognitionMode === InputEngine.HandwritingRecoginition + visible: control.patternRecognitionMode === InputEngine.PatternRecognitionMode.Handwriting text: { switch (InputContext.inputEngine.inputMode) { - case InputEngine.Numeric: + case InputEngine.InputMode.Numeric: if (["ar", "fa"].indexOf(InputContext.locale.substring(0, 2)) !== -1) return "\u0660\u0661\u0662" // Fallthrough - case InputEngine.Dialable: + case InputEngine.InputMode.Dialable: return "123" - case InputEngine.Greek: + case InputEngine.InputMode.Greek: return "ΑΒΓ" - case InputEngine.Cyrillic: + case InputEngine.InputMode.Cyrillic: return "АБВ" - case InputEngine.Arabic: + case InputEngine.InputMode.Arabic: if (InputContext.locale.substring(0, 2) === "fa") return "\u0627\u200C\u0628\u200C\u067E" return "\u0623\u200C\u0628\u200C\u062C" - case InputEngine.Hebrew: + case InputEngine.InputMode.Hebrew: return "\u05D0\u05D1\u05D2" - case InputEngine.ChineseHandwriting: + case InputEngine.InputMode.ChineseHandwriting: return "中文" - case InputEngine.JapaneseHandwriting: + case InputEngine.InputMode.JapaneseHandwriting: return "日本語" - case InputEngine.KoreanHandwriting: + case InputEngine.InputMode.KoreanHandwriting: return "한국어" default: return "Abc" @@ -918,9 +918,9 @@ KeyboardStyle { weight: Font.Bold pixelSize: 72 * scaleHint capitalization: { - if (InputContext.capsLock) + if (InputContext.capsLockActive) return Font.AllUppercase - if (InputContext.shift) + if (InputContext.shiftActive) return Font.MixedCase return Font.AllLowercase } diff --git a/src/virtualkeyboard/content/styles/retro/retro_style.qrc b/src/virtualkeyboard/content/styles/retro/virtualkeyboard_retro_style.qrc index 881755ef..881755ef 100644 --- a/src/virtualkeyboard/content/styles/retro/retro_style.qrc +++ b/src/virtualkeyboard/content/styles/retro/virtualkeyboard_retro_style.qrc diff --git a/src/virtualkeyboard/content/content.qrc b/src/virtualkeyboard/content/virtualkeyboard_content.qrc index d29dbe33..1e6392f4 100644 --- a/src/virtualkeyboard/content/content.qrc +++ b/src/virtualkeyboard/content/virtualkeyboard_content.qrc @@ -27,7 +27,7 @@ <file>components/TraceInputArea.qml</file> <file>components/HandwritingModeKey.qml</file> <file>components/WordCandidatePopupList.qml</file> - <file>components/LanguagePopupList.qml</file> + <file>components/PopupList.qml</file> <file>components/SelectionControl.qml</file> <file>components/ShadowInputControl.qml</file> <file>components/InputModeKey.qml</file> |