From f6e78f4b47f2bdc3e618c30deb4e4d11f71d30a0 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 28 Feb 2017 18:47:07 -0500 Subject: Update to latest CES2017 Chinook changes Update a couple of files to latest Chinook changes from CES2017 repo, and move the homescreen library tests to where they are in all the other app repositories. Change-Id: Ib626897bea3504f6e2fc1ab0ff38953b62ff4268 Signed-off-by: Scott Murray --- app/Controls.qml | 142 ++++++++++++----------- app/config.tests/libhomescreen.cpp | 7 -- app/config.tests/libhomescreen.pro | 5 - app/config.tests/libhomescreen/libhomescreen.cpp | 7 ++ app/config.tests/libhomescreen/libhomescreen.pro | 5 + app/main.cpp | 2 +- 6 files changed, 85 insertions(+), 83 deletions(-) delete mode 100644 app/config.tests/libhomescreen.cpp delete mode 100644 app/config.tests/libhomescreen.pro create mode 100644 app/config.tests/libhomescreen/libhomescreen.cpp create mode 100644 app/config.tests/libhomescreen/libhomescreen.pro diff --git a/app/Controls.qml b/app/Controls.qml index 211c86f..08e6c5d 100644 --- a/app/Controls.qml +++ b/app/Controls.qml @@ -17,94 +17,96 @@ import QtQuick 2.6 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.0 -import QtQuick.Window 2.0 -import QtQuick.VirtualKeyboard 2.1 import AGL.Demo.Controls 1.0 ApplicationWindow { id: root - Item { - anchors.fill: parent - anchors.bottom: inputPanel.top - GridLayout { - anchors.fill: parent - anchors.margins: root.width / 20 - columns: 2 - rowSpacing: 20 - Label { text: 'Label:' } - Label { - text: 'This is a label' - } + ColumnLayout { + anchors.fill: parent + Item { + Layout.fillWidth: true + Layout.fillHeight: true + GridLayout { + anchors.fill: parent + anchors.margins: root.width / 20 + columns: 2 + rowSpacing: 20 - Label { text: 'Button:' } - Row { - spacing: 20 - Button { - text: 'Normal' - } - Button { - text: 'Highlighted' - highlighted: true + Label { text: 'Label:' } + Label { + text: 'This is a label' } - } - - Label { text: 'Switch:' } - Switch {} - Label { text: 'ProgressBar:' } - ProgressBar { - Layout.fillWidth: true - NumberAnimation on value { - from: 0 - to: 1 - duration: 5000 - loops: Animation.Infinite - easing.type: Easing.SineCurve + Label { text: 'Button:' } + Row { + spacing: 20 + Button { + text: 'Normal' + } + Button { + text: 'Highlighted' + highlighted: true + } } - } - Label { text: 'Slider:' } - Slider { - Layout.fillWidth: true - } + Label { text: 'Switch:' } + Switch {} - Label { text: 'TextField:' } - TextField {} + Label { text: 'ProgressBar:' } + ProgressBar { + Layout.fillWidth: true + NumberAnimation on value { + from: 0 + to: 1 + duration: 5000 + loops: Animation.Infinite + easing.type: Easing.SineCurve + } + } - Label { text: 'Password:' } - TextField { - echoMode: TextInput.Password - inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhSensitiveData | Qt.ImhNoPredictiveText - } + Label { text: 'Slider:' } + Slider { + Layout.fillWidth: true + } - Label { text: 'ToggleButton:' } - ToggleButton { - onImage: './images/HMI_HVAC_AC_Active.svg' - offImage: './images/HMI_HVAC_AC_Inactive.svg' - } + Label { text: 'TextField:' } + TextField {} - Label { text: 'Tumbler:' } - RowLayout { - Tumbler { - model: 12 + Label { text: 'Password:' } + TextField { + echoMode: TextInput.Password + inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhSensitiveData | Qt.ImhNoPredictiveText } - Label { text: ':' } - Tumbler { - model: 60 + + Label { text: 'ToggleButton:' } + ToggleButton { + onImage: './images/HMI_HVAC_AC_Active.svg' + offImage: './images/HMI_HVAC_AC_Inactive.svg' } - Tumbler { - model: ['AM', 'PM'] + + Label { text: 'Tumbler:' } + RowLayout { + Tumbler { + model: 12 + } + Label { text: ':' } + Tumbler { + model: 60 + } + Tumbler { + model: ['AM', 'PM'] + } } + Item { Layout.fillHeight: true } } - Item { Layout.fillHeight: true } } - } - InputPanel { - id: inputPanel - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - visible: active + Keyboard { + id: keyboard + Layout.fillWidth: true + Layout.fillHeight: true + z: 99 + target: root.activeFocusControl + } } } diff --git a/app/config.tests/libhomescreen.cpp b/app/config.tests/libhomescreen.cpp deleted file mode 100644 index e0fd460..0000000 --- a/app/config.tests/libhomescreen.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(int argc,char **argv) -{ - LibHomeScreen libHomeScreen; - return 0; -} diff --git a/app/config.tests/libhomescreen.pro b/app/config.tests/libhomescreen.pro deleted file mode 100644 index eb4e8f3..0000000 --- a/app/config.tests/libhomescreen.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES = libhomescreen.cpp - -CONFIG -= qt -CONFIG += link_pkgconfig -PKGCONFIG += homescreen diff --git a/app/config.tests/libhomescreen/libhomescreen.cpp b/app/config.tests/libhomescreen/libhomescreen.cpp new file mode 100644 index 0000000..e0fd460 --- /dev/null +++ b/app/config.tests/libhomescreen/libhomescreen.cpp @@ -0,0 +1,7 @@ +#include + +int main(int argc,char **argv) +{ + LibHomeScreen libHomeScreen; + return 0; +} diff --git a/app/config.tests/libhomescreen/libhomescreen.pro b/app/config.tests/libhomescreen/libhomescreen.pro new file mode 100644 index 0000000..eb4e8f3 --- /dev/null +++ b/app/config.tests/libhomescreen/libhomescreen.pro @@ -0,0 +1,5 @@ +SOURCES = libhomescreen.cpp + +CONFIG -= qt +CONFIG += link_pkgconfig +PKGCONFIG += homescreen diff --git a/app/main.cpp b/app/main.cpp index 2f19da1..61eb023 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) } #endif - qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard")); +// setenv("QT_IM_MODULE", "qtvirtualkeyboard", 1); QGuiApplication app(argc, argv); -- cgit 1.2.3-korg