summaryrefslogtreecommitdiffstats
path: root/app/wired/ConfigDialog.qml
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-12-30 18:44:05 -0500
committerScott Murray <scott.murray@konsulko.com>2019-12-30 18:44:05 -0500
commitbf3e1fdd2f87d41cc7b7e9973a6e7756ab4d37b2 (patch)
treee1af1b4f40f745d31f6ebe9947a595ace5db22d8 /app/wired/ConfigDialog.qml
parent34ded73e643002cc871a9922599c743956ea9bb4 (diff)
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 <scott.murray@konsulko.com> Change-Id: I75560e3cab393e6efdfb1310f266e5b6bb0534d6
Diffstat (limited to 'app/wired/ConfigDialog.qml')
-rw-r--r--app/wired/ConfigDialog.qml45
1 files changed, 33 insertions, 12 deletions
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'
+ }
}
}
}