From c66892ef24ade4c20225ae2fb3edac33dea9651a Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@theqtcompany.com>
Date: Fri, 18 Dec 2015 15:50:21 +0200
Subject: Use example from VKB2.0

Task-Id: QTRD-3778
Change-Id: I3bcb850dfd42068b0419b6b143a962a6f7214121
Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
---
 basicsuite/textinput/TextField.qml | 57 ++++++++++++--------------------------
 1 file changed, 18 insertions(+), 39 deletions(-)

(limited to 'basicsuite/textinput/TextField.qml')

diff --git a/basicsuite/textinput/TextField.qml b/basicsuite/textinput/TextField.qml
index f09d851..65998c5 100644
--- a/basicsuite/textinput/TextField.qml
+++ b/basicsuite/textinput/TextField.qml
@@ -1,46 +1,26 @@
-/****************************************************************************
+/******************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: For any questions to Digia, please use the contact form at
-** http://www.qt.io
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
-** This file is part of the examples of the Qt Enterprise Embedded.
+** This file is part of the Qt Enterprise Embedded.
 **
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** $QT_BEGIN_LICENSE:COMM$
 **
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** $QT_END_LICENSE$
 **
-****************************************************************************/
+******************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 1.1
+import QtQuick.Enterprise.VirtualKeyboard 2.0
 
 TextBase {
     id: textField
@@ -55,7 +35,6 @@ TextBase {
     property int passwordMaskDelay: 1000
 
     editor: textInput
-    mouseParent: flickable
 
     Flickable {
         id: flickable
@@ -78,14 +57,14 @@ TextBase {
 
             y: 6
             focus: true
-            color: "#EEEEEE"
+            color: "#2B2C2E"
             cursorVisible: activeFocus
             passwordCharacter: "\u2022"
             font.pixelSize: textField.fontPixelSize
-            selectionColor: Qt.rgba(1.0, 1.0, 1.0, 0.5)
-            selectedTextColor: Qt.rgba(0.0, 0.0, 0.0, 0.8)
+            selectionColor: Qt.rgba(0.0, 0.0, 0.0, 0.15)
+            selectedTextColor: color
+            selectByMouse: true
             width: Math.max(flickable.width, implicitWidth)-2
-            onActiveFocusChanged: if (!activeFocus) deselect()
 
             Binding {
                 target: textInput
-- 
cgit v1.2.3