diff options
author | Scott Murray <scott.murray@konsulko.com> | 2017-02-28 18:47:07 -0500 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2017-03-01 00:08:18 +0000 |
commit | db047b4eb444d02937eaae06833a8c65ce85c974 (patch) | |
tree | 0015543ecbc93d5c7e760eff0f09efcf19cccc37 /app | |
parent | 924f0de39b8be10f29470e6b4ba2c8d0de28c38b (diff) |
Update to latest CES2017 Chinook changesicefish_8.99.5icefish_8.99.4icefish_8.99.3icefish_8.99.2icefish_8.99.1icefish/8.99.5icefish/8.99.4icefish/8.99.3icefish/8.99.2icefish/8.99.1halibut_8.0.6halibut_8.0.5halibut_8.0.4halibut_8.0.3halibut_8.0.2halibut_8.0.1halibut_8.0.0halibut_7.99.3halibut_7.99.2halibut_7.99.1halibut_7.90.0halibut/8.0.6halibut/8.0.5halibut/8.0.4halibut/8.0.3halibut/8.0.2halibut/8.0.1halibut/8.0.0halibut/7.99.3halibut/7.99.2halibut/7.99.1halibut/7.90.0guppy_6.99.4guppy_6.99.3guppy_6.99.2guppy_6.99.1guppy_6.90.0guppy/6.99.4guppy/6.99.3guppy/6.99.2guppy/6.99.1guppy/6.90.0flounder_5.99.6flounder_5.99.5flounder_5.99.4flounder_5.99.3flounder_5.99.2flounder_5.99.1flounder/5.99.6flounder/5.99.5flounder/5.99.4flounder/5.99.3flounder/5.99.2flounder/5.99.1eel_4.99.3eel_4.99.2eel_4.99.1eel/4.99.3eel/4.99.2eel/4.99.1dab_3.99.1dab/3.99.18.99.58.99.48.99.38.99.28.99.18.0.68.0.58.0.48.0.38.0.28.0.18.0.07.99.37.99.27.99.17.90.06.99.46.99.36.99.26.99.16.90.05.99.65.99.55.99.45.99.35.99.25.99.14.99.34.99.24.99.13.99.1halibut
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 <scott.murray@konsulko.com>
Diffstat (limited to 'app')
-rw-r--r-- | app/Controls.qml | 142 | ||||
-rw-r--r-- | app/config.tests/libhomescreen/libhomescreen.cpp (renamed from app/config.tests/libhomescreen.cpp) | 0 | ||||
-rw-r--r-- | app/config.tests/libhomescreen/libhomescreen.pro (renamed from app/config.tests/libhomescreen.pro) | 0 | ||||
-rw-r--r-- | app/main.cpp | 2 |
4 files changed, 73 insertions, 71 deletions
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/libhomescreen.cpp index e0fd460..e0fd460 100644 --- a/app/config.tests/libhomescreen.cpp +++ b/app/config.tests/libhomescreen/libhomescreen.cpp diff --git a/app/config.tests/libhomescreen.pro b/app/config.tests/libhomescreen/libhomescreen.pro index eb4e8f3..eb4e8f3 100644 --- a/app/config.tests/libhomescreen.pro +++ b/app/config.tests/libhomescreen/libhomescreen.pro 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); |