From da807e9b29345a00effd4cc5d4d99571e2efa562 Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Fri, 13 Sep 2019 15:41:14 -0700 Subject: [PATCH] fixing some ui elements --- launchers/qt/resources/qml/Download.qml | 11 +++++++++++ .../qt/resources/qml/HFBase/CreateAccountBase.qml | 2 +- launchers/qt/src/LauncherState.cpp | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/launchers/qt/resources/qml/Download.qml b/launchers/qt/resources/qml/Download.qml index c323d3b505..7393e0129e 100644 --- a/launchers/qt/resources/qml/Download.qml +++ b/launchers/qt/resources/qml/Download.qml @@ -5,6 +5,17 @@ Item { id: root anchors.fill: parent + + Image { + anchors.centerIn: parent + width: parent.width + height: parent.height + mirror: true + source: "qrc:/images/hifi_window@2x.png" + transformOrigin: Item.Center + rotation: 180 + } + Image { id: logo width: 150 diff --git a/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml b/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml index 563e12f924..d330a3d8e7 100644 --- a/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml +++ b/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml @@ -154,6 +154,6 @@ Item { topMargin: 15 } - onClicked: LauncherState.login(username.text, password.text) + onClicked: LauncherState.login(username.text, passwordField.text) } } diff --git a/launchers/qt/src/LauncherState.cpp b/launchers/qt/src/LauncherState.cpp index 58ff31e588..9e1587e755 100644 --- a/launchers/qt/src/LauncherState.cpp +++ b/launchers/qt/src/LauncherState.cpp @@ -41,7 +41,7 @@ bool LatestBuilds::getBuild(QString tag, Build* outBuild) { static const std::array QML_FILE_FOR_UI_STATE = { { "SplashScreen.qml", "qml/HFBase/CreateAccountBase.qml", "DisplayName.qml", - "Download.qml", "DownloadFinished.qml", "qml/HFBase/Error.qml" } }; + "qml/Download.qml", "qml/DownloadFinished.qml", "qml/HFBase/Error.qml" } }; void LauncherState::ASSERT_STATE(LauncherState::ApplicationState state) { if (_applicationState != state) {