summaryrefslogtreecommitdiffstats
path: root/app/main.cpp
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 23:40:38 +0000
commit8170c9280b57c8da5d1d6045e16d5ac14bc5220d (patch)
treef501f7c1f752e704bf08f5c8ce7e5424257d4ce9 /app/main.cpp
parent7f14e2db1011a4ac4e81ad8dcd3a3b2459411a99 (diff)
Enhance voice configurationicefish_8.99.5icefish/8.99.58.99.5
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/main.cpp')
-rw-r--r--app/main.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/main.cpp b/app/main.cpp
index b46029c..20aff96 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -24,6 +24,7 @@
#include <QtQml/QQmlContext>
#include <QtQuickControls2/QQuickStyle>
#include <QQuickWindow>
+#include <QtQrCodeQuickItem.hpp>
#include <libhomescreen.hpp>
#include <bluetooth.h>
#include <network.h>
@@ -115,6 +116,7 @@ int main(int argc, char *argv[])
qWarning() << aglversion.errorString();
}
+ QtQrCodeQuickItem::registerQmlTypes();
engine.rootContext()->setContextProperty("bluetooth", new Bluetooth(bindingAddressWS, context));
engine.rootContext()->setContextProperty("voice", new Voice(bindingAddressWS, context));
engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);