From 8170c9280b57c8da5d1d6045e16d5ac14bc5220d Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 30 Dec 2019 18:44:05 -0500 Subject: Enhance voice configuration Various tweaks to the new voice configuration support: - Moved "Version" choice on the main menu back down to the last choice, since it's less likely to be used. - Pull in qt-qrcode library's quickitem support and use it to display a QR code when Alexa authorization is required. - Reworked layout of voice configuration dialog to tighten up spacing and make more room for the QR code. - Tweaked voice configuration dialog logic to only show the login prompting when in not-authorized state. Ideally, a deauth button would be shown in the authorized state, but the voiceagent API currently does not enable that AFAICT. - Replace voiceagent ID with vendor in voiceagent configuration dialog, as the ID is more of an internal thing that's not useful to users. - Tweaked some text colors in voiceagent configuration dialog for better consistency with the other settings pages. - Switched voiceagent configuration dialog positioning to center it on-screen, as that seems more consistent with the look of the other settings pages. - Made the previous two changes to the wired settings configuration dialog as well for consistency. - Updated the voice settings icon with a microphone icon to match the default icon shown for the homescreen PTT button. - Updated the wired settings icon with a more typical network icon to avoid confusion. Bug-AGL: SPEC-2981 Signed-off-by: Scott Murray Change-Id: I75560e3cab393e6efdfb1310f266e5b6bb0534d6 --- app/wired/ConfigDialog.qml | 45 ++++++++---- app/wired/Wired.qml | 11 ++- app/wired/images/HMI_Settings_WiredIcon.svg | 106 ++++++++++++++++++++-------- 3 files changed, 112 insertions(+), 50 deletions(-) (limited to 'app/wired') diff --git a/app/wired/ConfigDialog.qml b/app/wired/ConfigDialog.qml index 4d8632f..0cb77e1 100644 --- a/app/wired/ConfigDialog.qml +++ b/app/wired/ConfigDialog.qml @@ -69,7 +69,8 @@ Dialog { background: Rectangle { border.color : '#00ADDC' - color: 'transparent' + color: 'black' + opacity: 0.5 } function setDefaultValues() { @@ -141,7 +142,7 @@ Dialog { Label { id: nwLabel font.pixelSize: 28 - color: '#080C0F' + color: 'white' text: "Network:" Layout.preferredWidth: 200 } @@ -161,7 +162,7 @@ Dialog { Label { id: ipvlabel font.pixelSize: 28 - color: '#080C0F' + color: 'white' text: "IP version:" Layout.preferredWidth: 200 } @@ -206,7 +207,7 @@ Dialog { Label { id: modelabel font.pixelSize: 28 - color: '#080C0F' + color: 'white' text: "Addressing:" Layout.preferredWidth: 200 } @@ -241,15 +242,20 @@ Dialog { Label { id: address font.pixelSize: 28 - color: '#080C0F' - text: "address:" + color: 'white' + text: "Address:" } TextArea { id: m_customAddress font.pixelSize: 28 + color: 'black' Layout.fillWidth: true Layout.alignment: Qt.AlignLeft placeholderText: activeAddress + background: Rectangle { + color: 'white' + border.color: '#848286' + } } } ColumnLayout { @@ -257,15 +263,20 @@ Dialog { Label { id: netmask font.pixelSize: 28 - color: '#080C0F' - text: "netmask:" + color: 'white' + text: "Netmask:" } TextArea { id: m_customNetmask font.pixelSize: 28 + color: 'black' Layout.fillWidth: true Layout.alignment: Qt.AlignLeft placeholderText: activeNetmask + background: Rectangle { + color: 'white' + border.color: '#848286' + } } } ColumnLayout { @@ -273,15 +284,20 @@ Dialog { Label { id: gateway font.pixelSize: 28 - color: '#080C0F' - text: "gateway:" + color: 'white' + text: "Gateway:" } TextArea { id: m_customGateway font.pixelSize: 28 + color: 'black' Layout.fillWidth: true Layout.alignment: Qt.AlignLeft placeholderText: activeGateway + background: Rectangle { + color: 'white' + border.color: '#848286' + } } } } @@ -294,7 +310,7 @@ Dialog { Label { id: dnslabel font.pixelSize: 28 - color: '#080C0F' + color: 'white' text: "DNS address:" Layout.preferredWidth: 200 } @@ -329,15 +345,20 @@ Dialog { Label { id: dnsList font.pixelSize: 28 - color: '#080C0F' + color: 'white' text: "DNS list:" } TextArea { id: m_customNSlist font.pixelSize: 28 + color: 'black' Layout.fillWidth: true Layout.alignment: Qt.AlignLeft placeholderText: activeNSList + background: Rectangle { + color: 'white' + border.color: '#848286' + } } } } diff --git a/app/wired/Wired.qml b/app/wired/Wired.qml index 52d24cd..0a3e312 100644 --- a/app/wired/Wired.qml +++ b/app/wired/Wired.qml @@ -41,12 +41,10 @@ SettingPage { text: service color: '#66FF99' font.pixelSize: 38 - font.bold: sstate === "ready" - || sstate === "online" + font.bold: sstate === "ready" || sstate === "online" } Label { - visible: sstate === "ready" - || sstate === "online" + visible: sstate === "ready" || sstate === "online" text: "connected, " + address font.pixelSize: 18 color: "white" @@ -56,8 +54,7 @@ SettingPage { anchors.left: networkName.right anchors.leftMargin: 50 Button { - visible: sstate === "ready" - || sstate === "online" + visible: sstate === "ready" || sstate === "online" font.pixelSize: 18 text: "CONFIGURE" onClicked: { @@ -76,7 +73,7 @@ SettingPage { maxpwidth: 744 maxpheight: 744 xpos: (parent.width - maxpwidth)/2 - ypos: (parent.height - maxpheight) + ypos: (parent.height - maxpheight)/2 serviceName: service activeAddress: address activeNetmask: sroute[2] diff --git a/app/wired/images/HMI_Settings_WiredIcon.svg b/app/wired/images/HMI_Settings_WiredIcon.svg index 4314729..57ef45b 100644 --- a/app/wired/images/HMI_Settings_WiredIcon.svg +++ b/app/wired/images/HMI_Settings_WiredIcon.svg @@ -1,8 +1,8 @@ - + image/svg+xml \ No newline at end of file + id="g5196"> \ No newline at end of file -- cgit 1.2.3-korg