Add new property InputContext.uppercase

This property is true when either InputContext.shift or
InputContext.capsLock is true.

[ChangeLog] Add new property InputContext.uppercase, which is set to
true when either InputContext.shift or InputContext.capsLock is true

Change-Id: I06ce14c6f626bfe176e6d914e60417ec2009cd5c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

2 files changed, 27 insertions, 0 deletions

diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp
index 06c95d4d..cc8b9ef8 100644
--- a/src/virtualkeyboard/inputcontext.cpp
+++ b/src/virtualkeyboard/inputcontext.cpp
@@ -197,6 +197,8 @@ void InputContext::setShift(bool enable)
     if (d->shift != enable) {
         d->shift = enable;
         emit shiftChanged();
+        if (!d->capsLock)
+            emit uppercaseChanged();
     }
 }
 
@@ -212,9 +214,17 @@ void InputContext::setCapsLock(bool enable)
     if (d->capsLock != enable) {
         d->capsLock = enable;
         emit capsLockChanged();
+        if (!d->shift)
+            emit uppercaseChanged();
     }
 }
 
+bool InputContext::uppercase() const
+{
+    Q_D(const InputContext);
+    return d->shift || d->capsLock;
+}
+
 int InputContext::cursorPosition() const
 {
     Q_D(const InputContext);
@@ -844,6 +854,20 @@ bool InputContext::filterEvent(const QEvent *event)
 */
 
 /*!
+    \qmlproperty bool InputContext::uppercase
+    \since QtQuick.VirtualKeyboard 2.2
+
+    This property is \c true when either \l shift or \l capsLock is \c true.
+*/
+
+/*!
+    \property QtVirtualKeyboard::InputContext::uppercase
+    \brief the uppercase status.
+
+    This property is \c true when either \l shift or \l capsLock is \c true.
+*/
+
+/*!
     \qmlproperty int InputContext::cursorPosition
 
     This property is changed when the cursor position changes.
diff --git a/src/virtualkeyboard/inputcontext.h b/src/virtualkeyboard/inputcontext.h
index dbcc7ceb..925745bd 100644
--- a/src/virtualkeyboard/inputcontext.h
+++ b/src/virtualkeyboard/inputcontext.h
@@ -51,6 +51,7 @@ class InputContext : public QObject
     Q_PROPERTY(bool focus READ focus NOTIFY focusChanged)
     Q_PROPERTY(bool shift READ shift WRITE setShift NOTIFY shiftChanged)
     Q_PROPERTY(bool capsLock READ capsLock WRITE setCapsLock NOTIFY capsLockChanged)
+    Q_PROPERTY(bool uppercase READ uppercase NOTIFY uppercaseChanged)
     Q_PROPERTY(int cursorPosition READ cursorPosition NOTIFY cursorPositionChanged)
     Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints NOTIFY inputMethodHintsChanged)
     Q_PROPERTY(QString preeditText READ preeditText WRITE setPreeditText NOTIFY preeditTextChanged)
@@ -79,6 +80,7 @@ public:
     void setShift(bool enable);
     bool capsLock() const;
     void setCapsLock(bool enable);
+    bool uppercase() const;
     int cursorPosition() const;
     Qt::InputMethodHints inputMethodHints() const;
     QString preeditText() const;
@@ -130,6 +132,7 @@ signals:
     void cursorRectangleChanged();
     void shiftChanged();
     void capsLockChanged();
+    void uppercaseChanged();
     void keyboardRectangleChanged();
     void previewRectangleChanged();
     void previewVisibleChanged();