From 55bf7f17e19d644fe49b838d9c8f387b7e6b6251 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 12 Oct 2016 14:27:36 +0200 Subject: Doc: Fix typo in type name Change-Id: Ic5248c0fad4c23bb3b3fbe0c71d315fbdf07f54c Reviewed-by: Nico Vertriest --- src/virtualkeyboard/virtualkeyboardsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp index 1bc87583..2fcbd23a 100644 --- a/src/virtualkeyboard/virtualkeyboardsettings.cpp +++ b/src/virtualkeyboard/virtualkeyboardsettings.cpp @@ -108,7 +108,7 @@ public: \since QtQuick.VirtualKeyboard 1.2 \brief Provides settings for virtual keyboard. - This module provides VirtualKeyboarSettings singleton instance, + This type provides a VirtualKeyboardSettings singleton instance, which can be used to configure the virtual keyboard settings. Please note that the settings have only effect in the current -- cgit v1.2.3 From 1e073078a57c4ec83d111a11a240304af056d940 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 12 Oct 2016 16:04:24 +0200 Subject: Doc: Use standard documentation structure for the module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Link to separate QML types and C++ classes topics from front page (instead of listing the types there) - Turn the \page topic that lists all QML types into the \qmlmodule topic for the module - Add a \module topic to list C++ classes - Add \ingroup, \title, and \brief commands to \qmlmodule topics to display the docs correctly in tables - Add standard content to \qmlmodule topics - Remove unused \qmlmodule topics - Fix \inmodule commands as necessary Change-Id: I6f6538264fff2ad38994114a2fed7212495a18c2 Reviewed-by: Jarkko Koivikko Reviewed-by: Topi Reiniö --- .../doc/src/qtvirtualkeyboard-index.qdoc | 41 +++++++++++-------- .../doc/src/qtvirtualkeyboard-module-cpp.qdoc | 47 ++++++++++++++++++++++ src/virtualkeyboard/inputcontext.cpp | 18 +-------- src/virtualkeyboard/inputengine.cpp | 2 +- src/virtualkeyboard/selectionlistmodel.cpp | 2 +- src/virtualkeyboard/shifthandler.cpp | 2 +- src/virtualkeyboard/styles/styles_plugin.cpp | 11 ++++- src/virtualkeyboard/virtualkeyboardsettings.cpp | 11 ++++- 8 files changed, 96 insertions(+), 38 deletions(-) create mode 100644 src/virtualkeyboard/doc/src/qtvirtualkeyboard-module-cpp.qdoc diff --git a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc index 4874dddd..6a382bdd 100644 --- a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc +++ b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc @@ -98,17 +98,12 @@ \li \l {User Guide} \endlist - \section1 QML Types + \section1 API Reference - \annotatedlist qtvirtualkeyboard-qml - - Styling components: - - \annotatedlist qtvirtualkeyboard-styles-qml - - Settings components: - - \annotatedlist qtvirtualkeyboard-settings-qml + \list + \li \l{Qt Virtual Keyboard QML Types}{QML Types} + \li \l{Qt Virtual Keyboard C++ Classes}{C++ Classes} + \endlist \section1 Examples @@ -118,17 +113,29 @@ */ /*! -\page qt-virtual-keyboard-qmltypes.html +\qmlmodule QtQuick.VirtualKeyboard 2.0 \title Qt Virtual Keyboard QML Types -\inmodule qtvirtualkeyboard +\ingroup qmlmodules +\brief Provides QML types for an input framework and a reference keyboard front +end. + + The QML types can be imported into your application using the following + import statements in your .qml file: + + \badcode + import QtQuick.VirtualKeyboard 2.0 + import QtQuick.VirtualKeyboard.Styles 2.0 + import QtQuick.VirtualKeyboard.Settings 2.0 + \endcode + +Styling: -\annotatedlist qtvirtualkeyboard-qml +\generatelist qmltypesbymodule QtQuick.VirtualKeyboard.Styles -Styling components: +Settings: -\annotatedlist qtvirtualkeyboard-styles-qml +\generatelist qmltypesbymodule QtQuick.VirtualKeyboard.Settings -Settings components: +Input framework and keys: -\annotatedlist qtvirtualkeyboard-settings-qml */ diff --git a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-module-cpp.qdoc b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-module-cpp.qdoc new file mode 100644 index 00000000..a2c3fb1d --- /dev/null +++ b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-module-cpp.qdoc @@ -0,0 +1,47 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \module QtVirtualKeyboard + \title Qt Virtual Keyboard C++ Classes + \brief Provides classes to implement input methods for virtual keyboards. + + \ingroup modules + \qtvariable virtualkeyboard + + To include the definitions of the module's classes, use the following directive: + + \code + #include + \endcode + + To link against the module, add this line to your qmake .pro file: + + \badcode + QT += virtualkeyboard + \endcode +*/ diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp index 070e2908..b5afe780 100644 --- a/src/virtualkeyboard/inputcontext.cpp +++ b/src/virtualkeyboard/inputcontext.cpp @@ -53,23 +53,9 @@ bool operator==(const QInputMethodEvent::Attribute &attribute1, const QInputMeth } QT_END_NAMESPACE -/*! - \qmlmodule QtQuick.VirtualKeyboard 2.0 - - This module provides a collection of QML components for Qt Virtual Keyboard. -*/ - -/*! - \module InputFramework - - \title Input Framework - - \brief Contains classes for integrating input methods. -*/ - /*! \namespace QtVirtualKeyboard - \inmodule InputFramework + \inmodule QtVirtualKeyboard \brief Namespace for the Qt Virtual Keyboard C++ API. */ @@ -158,7 +144,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(InputContextPrivate::StateFlags) /*! \class QtVirtualKeyboard::InputContext - \inmodule InputFramework + \inmodule QtVirtualKeyboard \brief Provides access to an input context. */ diff --git a/src/virtualkeyboard/inputengine.cpp b/src/virtualkeyboard/inputengine.cpp index 9b6b3a5f..c6ae052b 100644 --- a/src/virtualkeyboard/inputengine.cpp +++ b/src/virtualkeyboard/inputengine.cpp @@ -131,7 +131,7 @@ private: /*! \class QtVirtualKeyboard::InputEngine - \inmodule InputFramework + \inmodule QtVirtualKeyboard \brief The InputEngine class provides an input engine that supports C++ and QML integration. diff --git a/src/virtualkeyboard/selectionlistmodel.cpp b/src/virtualkeyboard/selectionlistmodel.cpp index 32e6096f..4db1c7f1 100644 --- a/src/virtualkeyboard/selectionlistmodel.cpp +++ b/src/virtualkeyboard/selectionlistmodel.cpp @@ -83,7 +83,7 @@ public: /*! \class QtVirtualKeyboard::SelectionListModel - \inmodule InputFramework + \inmodule QtVirtualKeyboard \brief List model for selection lists. diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp index cdb6baa9..6d5d1220 100644 --- a/src/virtualkeyboard/shifthandler.cpp +++ b/src/virtualkeyboard/shifthandler.cpp @@ -74,7 +74,7 @@ public: /*! \class QtVirtualKeyboard::ShiftHandler - \inmodule InputFramework + \inmodule QtVirtualKeyboard \brief Manages the shift state. */ diff --git a/src/virtualkeyboard/styles/styles_plugin.cpp b/src/virtualkeyboard/styles/styles_plugin.cpp index e5915b87..975ab401 100644 --- a/src/virtualkeyboard/styles/styles_plugin.cpp +++ b/src/virtualkeyboard/styles/styles_plugin.cpp @@ -35,8 +35,17 @@ /*! \qmlmodule QtQuick.VirtualKeyboard.Styles 2.0 + \title Qt Quick Virtual Keyboard Styles QML Types + \ingroup qmlmodules - This module provides styling components for the Qt Virtual Keyboard. + \brief Provides styling for Qt Virtual Keyboard. + + The QML types can be imported into your application using the following + import statements in your .qml file: + + \badcode + import QtQuick.VirtualKeyboard.Styles 2.0 + \endcode */ void QtVirtualKeyboardStylesPlugin::registerTypes(const char *uri) diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp index 2fcbd23a..bbb16092 100644 --- a/src/virtualkeyboard/virtualkeyboardsettings.cpp +++ b/src/virtualkeyboard/virtualkeyboardsettings.cpp @@ -97,8 +97,17 @@ public: /*! \qmlmodule QtQuick.VirtualKeyboard.Settings 2.0 + \title Qt Quick Virtual Keyboard Settings QML Types + \ingroup qmlmodules - This module provides settings components for Qt Virtual Keyboard. + \brief Provides settings for Qt Virtual Keyboard. + + The QML types can be imported into your application using the following + import statements in your .qml file: + + \badcode + import QtQuick.VirtualKeyboard.Settings 2.0 + \endcode */ /*! -- cgit v1.2.3 From bffc2e5796ed4ebdcf2db4884b1f14b563b371b1 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 14 Oct 2016 10:08:06 +0200 Subject: Doc: Mark the remaining C++ API \internal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Hide the C++ classes entry from the help file (.qdocconf) - Remove link to the C++ classes from the module front page - Mark classes and namespace \internal - Mark the C++ module page \internal Change-Id: I07b04af84b45d048c5cbb133bd5d70f8b38f25dd Reviewed-by: Topi Reiniö --- src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf | 12 ++++++------ src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc | 1 - .../doc/src/qtvirtualkeyboard-module-cpp.qdoc | 3 ++- src/virtualkeyboard/inputcontext.cpp | 2 ++ src/virtualkeyboard/inputengine.cpp | 2 ++ src/virtualkeyboard/selectionlistmodel.cpp | 2 ++ src/virtualkeyboard/shifthandler.cpp | 2 ++ 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf index 57042810..67ac0d82 100644 --- a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf +++ b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf @@ -29,12 +29,12 @@ qhp.QtVirtualKeyboard.filterAttributes = qtvirtualkeyboard $QT_ qhp.QtVirtualKeyboard.customFilters.Qt.name = QtVirtualKeyboard $QT_VERSION qhp.QtVirtualKeyboard.customFilters.Qt.filterAttributes = qtvirtualkeyboard $QT_VERSION -qhp.QtVirtualKeyboard.subprojects = classes qmltypes examples +qhp.QtVirtualKeyboard.subprojects = qmltypes examples # classes -qhp.QtVirtualKeyboard.subprojects.classes.title = C++ Classes -qhp.QtVirtualKeyboard.subprojects.classes.indexTitle = Qt Virtual Keyboard C++ Classes -qhp.QtVirtualKeyboard.subprojects.classes.selectors = class -qhp.QtVirtualKeyboard.subprojects.classes.sortPages = true +# qhp.QtVirtualKeyboard.subprojects.classes.title = C++ Classes +# qhp.QtVirtualKeyboard.subprojects.classes.indexTitle = Qt Virtual Keyboard C++ Classes +# qhp.QtVirtualKeyboard.subprojects.classes.selectors = class +# qhp.QtVirtualKeyboard.subprojects.classes.sortPages = true qhp.QtVirtualKeyboard.subprojects.qmltypes.title = QML Types qhp.QtVirtualKeyboard.subprojects.qmltypes.indexTitle = Qt Virtual Keyboard QML Types @@ -48,4 +48,4 @@ qhp.QtVirtualKeyboard.subprojects.examples.sortPages = true navigation.landingpage = "Qt Virtual Keyboard" navigation.qmltypespage = "Qt Virtual Keyboard QML Types" -navigation.cppclassespage = "Qt Virtual Keyboard C++ Classes" +# navigation.cppclassespage = "Qt Virtual Keyboard C++ Classes" diff --git a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc index 6a382bdd..92ff3541 100644 --- a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc +++ b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc @@ -102,7 +102,6 @@ \list \li \l{Qt Virtual Keyboard QML Types}{QML Types} - \li \l{Qt Virtual Keyboard C++ Classes}{C++ Classes} \endlist \section1 Examples diff --git a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-module-cpp.qdoc b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-module-cpp.qdoc index a2c3fb1d..a0514fe9 100644 --- a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-module-cpp.qdoc +++ b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-module-cpp.qdoc @@ -30,7 +30,8 @@ \title Qt Virtual Keyboard C++ Classes \brief Provides classes to implement input methods for virtual keyboards. - \ingroup modules + \internal + \qtvariable virtualkeyboard To include the definitions of the module's classes, use the following directive: diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp index b5afe780..8e7e0ed2 100644 --- a/src/virtualkeyboard/inputcontext.cpp +++ b/src/virtualkeyboard/inputcontext.cpp @@ -58,6 +58,7 @@ QT_END_NAMESPACE \inmodule QtVirtualKeyboard \brief Namespace for the Qt Virtual Keyboard C++ API. + \internal */ namespace QtVirtualKeyboard { @@ -146,6 +147,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(InputContextPrivate::StateFlags) \class QtVirtualKeyboard::InputContext \inmodule QtVirtualKeyboard \brief Provides access to an input context. + \internal */ /*! diff --git a/src/virtualkeyboard/inputengine.cpp b/src/virtualkeyboard/inputengine.cpp index c6ae052b..f9c447c6 100644 --- a/src/virtualkeyboard/inputengine.cpp +++ b/src/virtualkeyboard/inputengine.cpp @@ -135,6 +135,8 @@ private: \brief The InputEngine class provides an input engine that supports C++ and QML integration. + \internal + The input engine is responsible for routing input events to input methods. The actual input logic is implemented by the input methods. diff --git a/src/virtualkeyboard/selectionlistmodel.cpp b/src/virtualkeyboard/selectionlistmodel.cpp index 4db1c7f1..88f79ff7 100644 --- a/src/virtualkeyboard/selectionlistmodel.cpp +++ b/src/virtualkeyboard/selectionlistmodel.cpp @@ -87,6 +87,8 @@ public: \brief List model for selection lists. + \internal + This class acts as a bridge between the UI and the input method that provides the data for selection lists. diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp index 6d5d1220..4c9f498b 100644 --- a/src/virtualkeyboard/shifthandler.cpp +++ b/src/virtualkeyboard/shifthandler.cpp @@ -76,6 +76,8 @@ public: \class QtVirtualKeyboard::ShiftHandler \inmodule QtVirtualKeyboard \brief Manages the shift state. + + \internal */ ShiftHandler::ShiftHandler(InputContext *parent) : -- cgit v1.2.3 From 4f2e927e0302a4b0f6cf43c3f291a66cda09541b Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 13 Oct 2016 10:41:25 +0200 Subject: Doc: Mark InputContext::setSelectionOnFocusObject() internal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...to suppress a QDoc warning Change-Id: I4a2689a56871566caf0dfb9e0ca66422c7d3a4c0 Reviewed-by: Topi Reiniö Reviewed-by: Mitch Curtis --- src/virtualkeyboard/inputcontext.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp index 8e7e0ed2..df8613ff 100644 --- a/src/virtualkeyboard/inputcontext.cpp +++ b/src/virtualkeyboard/inputcontext.cpp @@ -549,6 +549,9 @@ bool InputContext::hasEnterKeyAction(QObject *item) const return item != 0 && qmlAttachedPropertiesObject(item, false); } +/*! + \internal +*/ void InputContext::setSelectionOnFocusObject(const QPointF &anchorPos, const QPointF &cursorPos) { QPlatformInputContext::setSelectionOnFocusObject(anchorPos, cursorPos); -- cgit v1.2.3 From c0beb0875a3219eea81243b7864133d48471c5de Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 19 Oct 2016 14:17:20 +0200 Subject: Properly namespace documentation pages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1e011c6fb408899a6805f27f96f8be723f3872c4 Reviewed-by: Topi Reiniö --- src/virtualkeyboard/doc/src/build.qdoc | 2 +- src/virtualkeyboard/doc/src/deployment-guide.qdoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/virtualkeyboard/doc/src/build.qdoc b/src/virtualkeyboard/doc/src/build.qdoc index fb65e49b..21b0eb2b 100644 --- a/src/virtualkeyboard/doc/src/build.qdoc +++ b/src/virtualkeyboard/doc/src/build.qdoc @@ -29,7 +29,7 @@ /*! -\page build.html +\page qtvirtualkeyboard-build.html \contentspage {Building Qt Virtual Keyboard} {Contents} \title Building Qt Virtual Keyboard diff --git a/src/virtualkeyboard/doc/src/deployment-guide.qdoc b/src/virtualkeyboard/doc/src/deployment-guide.qdoc index 4e4bfd1a..843d2f38 100644 --- a/src/virtualkeyboard/doc/src/deployment-guide.qdoc +++ b/src/virtualkeyboard/doc/src/deployment-guide.qdoc @@ -29,7 +29,7 @@ /*! -\page deployment-guide.html +\page qtvirtualkeyboard-deployment-guide.html \contentspage {Deployment Guide} {Contents} \title Deployment Guide -- cgit v1.2.3 From 8e40a8c57a92a632cbebbff251cfc58545434520 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 19 Oct 2016 14:42:56 +0200 Subject: Doc: Add dependency to Qt Reference Documentation Needed for generating the correct navigation and global linking. Change-Id: I84e8975e8e8abd6c77c9c75e0b3e6ca0eec623be Reviewed-by: Leena Miettinen --- src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf index 67ac0d82..54b66a00 100644 --- a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf +++ b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf @@ -15,7 +15,7 @@ exampledirs += ../../../examples/virtualkeyboard \ examplesinstallpath = virtualkeyboard imagedirs += images -depends += qtcore qtgui qtquick +depends += qtdoc qtcore qtgui qtquick qhp.projects = QtVirtualKeyboard -- cgit v1.2.3 From c8d177387ead0b01badf7329beaf38a3950be90b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 3 Nov 2016 18:24:49 +0100 Subject: remove dependencies from sync.profile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the CI obtains them from the qt5 super repo nowadays. Change-Id: I888aae793ff2afadc48ff6c9f8ee067476114a3f Reviewed-by: Jędrzej Nowacki --- sync.profile | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/sync.profile b/sync.profile index 68349249..dfc1d5d6 100644 --- a/sync.profile +++ b/sync.profile @@ -2,18 +2,3 @@ ); %moduleheaders = ( # restrict the module headers to those found in relative path ); -# Module dependencies. -# Every module that is required to build this module should have one entry. -# Each of the module version specifiers can take one of the following values: -# - A specific Git revision. -# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) -# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) -# -%dependencies = ( - "qtbase" => "", - "qtdeclarative" => "", - "qtmultimedia" => "", - "qtquickcontrols" => "", - "qtsvg" => "", - "qtxmlpatterns" => "", -); -- cgit v1.2.3 From 1ba0613309439f778b4b4e955131d80936490371 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 18 Nov 2016 15:44:06 +0100 Subject: Use the QLocale's decimal point setting for the digipad Change-Id: I8a42546e1a520886f2dab417d9ae43037f1d7012 Reviewed-by: Mitch Curtis --- src/virtualkeyboard/content/layouts/en_GB/digits.qml | 6 ++++-- tests/auto/inputpanel/data/tst_inputpanel.qml | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/virtualkeyboard/content/layouts/en_GB/digits.qml b/src/virtualkeyboard/content/layouts/en_GB/digits.qml index 16eb1be8..5a59d3f3 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/digits.qml +++ b/src/virtualkeyboard/content/layouts/en_GB/digits.qml @@ -100,8 +100,10 @@ KeyboardLayout { text: "0" } Key { - key: Qt.Key_Period - text: "." + // The decimal key, if it is not "," then we fallback to + // "." in case it is an unhandled different result + key: Qt.locale().decimalPoint === "," ? Qt.Key_Comma : Qt.Key_Period + text: Qt.locale().decimalPoint === "," ? "," : "." } EnterKey {} } diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml index 4c5c8879..335f23e5 100644 --- a/tests/auto/inputpanel/data/tst_inputpanel.qml +++ b/tests/auto/inputpanel/data/tst_inputpanel.qml @@ -327,10 +327,11 @@ Rectangle { } function test_inputMethodHints_data() { + var decmialPoint = Qt.locale().decimalPoint return [ { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhUppercaseOnly, inputSequence: "uppercase text? yes.", outputText: "UPPERCASE TEXT? YES." }, { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhLowercaseOnly, inputSequence: "uppercase text? no.", outputText: "uppercase text? no." }, - { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhDigitsOnly, inputSequence: "1234567890.", outputText: "1234567890." }, + { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhDigitsOnly, inputSequence: "1234567890" + decmialPoint, outputText: "1234567890" + decmialPoint }, { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhFormattedNumbersOnly, inputSequence: "1234567890+-,.()", outputText: "1234567890+-,.()" }, { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhDialableCharactersOnly, inputSequence: "1234567890+*#", outputText: "1234567890+*#" }, ] -- cgit v1.2.3 From 98aa04821f6b851a990f3fc0e1ac29291d28de14 Mon Sep 17 00:00:00 2001 From: Jarkko Koivikko Date: Sat, 12 Nov 2016 22:00:48 +0200 Subject: Fix duplicate shift state change when focus object changes Previously the shift state could be set twice when focus object changed, first in reset() method and then in autoCapitalize() method. This change eliminates the initial shift state in reset() method. Task-number: QTBUG-57082 Change-Id: I4bba5c85aae1d0d631e7e30577d0d4068c9cc582 Reviewed-by: Mitch Curtis --- src/virtualkeyboard/shifthandler.cpp | 8 +++++--- .../auto/inputpanel/data/inputpanel/inputpanel.qml | 7 +++++++ tests/auto/inputpanel/data/tst_inputpanel.qml | 21 +++++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp index 69735665..22302129 100644 --- a/src/virtualkeyboard/shifthandler.cpp +++ b/src/virtualkeyboard/shifthandler.cpp @@ -191,10 +191,13 @@ void ShiftHandler::reset() autoCapitalizationEnabled = false; toggleShiftEnabled = false; } - d->inputContext->setShift(preferUpperCase); - d->inputContext->setCapsLock(preferUpperCase); setToggleShiftEnabled(toggleShiftEnabled); setAutoCapitalizationEnabled(autoCapitalizationEnabled); + d->inputContext->setCapsLock(preferUpperCase); + if (preferUpperCase) + d->inputContext->setShift(preferUpperCase); + else + autoCapitalize(); } } @@ -227,7 +230,6 @@ void ShiftHandler::autoCapitalize() void ShiftHandler::restart() { reset(); - autoCapitalize(); } void ShiftHandler::shiftChanged() diff --git a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml index 5f864445..9586a736 100644 --- a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml +++ b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml @@ -72,6 +72,7 @@ InputPanel { property alias soundEffectSpy: soundEffectSpy property alias inputMethodResultSpy: inputMethodResultSpy property alias wordCandidateListChangedSpy: wordCandidateListChangedSpy + property alias shiftStateSpy: shiftStateSpy signal inputMethodResult(var text) @@ -151,6 +152,12 @@ InputPanel { signalName: "dataChanged" } + SignalSpy { + id: shiftStateSpy + target: InputContext + signalName: "onShiftChanged" + } + function findChildByProperty(parent, propertyName, propertyValue, compareCb) { var obj = null if (parent === null) diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml index 85de31d4..919597a1 100644 --- a/tests/auto/inputpanel/data/tst_inputpanel.qml +++ b/tests/auto/inputpanel/data/tst_inputpanel.qml @@ -363,6 +363,27 @@ Rectangle { compare(textInput.text, data.outputText) } + function test_focusAndShiftState() { + prepareTest() + + // Initial focus is set to textInput, shift state should not change + // when focus is set to container + inputPanel.shiftStateSpy.clear() + container.forceActiveFocus() + compare(inputPanel.shiftStateSpy.count, 0, "Unexpected number of shift state changes after focus change (ImhNone -> ImhNone)") + + // Change to lower case + inputPanel.shiftStateSpy.clear() + inputPanel.toggleShift() + compare(inputPanel.shiftStateSpy.count, 1, "Unexpected number of shift state changes after shift key press") + + // Set focus back to textInput, and expect that shift state is changed + // to auto upper case + inputPanel.shiftStateSpy.clear() + textInput.forceActiveFocus() + compare(inputPanel.shiftStateSpy.count, 1, "Unexpected number of shift state changes after focus change (auto upper case)") + } + function test_symbolMode() { prepareTest({ initInputMethodHints: Qt.ImhNoPredictiveText }) -- cgit v1.2.3 From ea873857fd7c92608bfa64d080dbdf9589ffa4b3 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 25 Nov 2016 10:48:43 +0100 Subject: Doc: fix InputPanel::active documentation Use the correct qdoc syntax and fix the grammar. Task-number: QTBUG-56822 Change-Id: I70f4214df35ed26573f9d26211db39150bb5b5a6 Reviewed-by: Venugopal Shivashankar --- src/virtualkeyboard/content/InputPanel.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/virtualkeyboard/content/InputPanel.qml b/src/virtualkeyboard/content/InputPanel.qml index 84d2832d..9546bf3d 100644 --- a/src/virtualkeyboard/content/InputPanel.qml +++ b/src/virtualkeyboard/content/InputPanel.qml @@ -38,11 +38,13 @@ import QtQuick.Enterprise.VirtualKeyboard 2.0 Item { id: inputPanel - /*! \qmlproperty bool Active state of the input panel + /*! + \qmlproperty bool InputPanel::active \since QtQuick.Enterprise.VirtualKeyboard 2.0 This property reflects the active status of the input panel. - The keyboard should be made visible to user when the active is true. + The keyboard should be made visible to the user when this property is + \c true. */ property alias active: keyboard.active -- cgit v1.2.3