Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-06 00:02:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher

Browse source
This commit is contained in:
Ryan Huffman 2019-09-13 15:44:21 -07:00
commit acee9a130e
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
launchers/qt/resources/qml/Download.qml
View file

@ -5,6 +5,17 @@ Item {
id: root id: root
anchors.fill: parent 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 { Image {
id: logo id: logo
width: 150 width: 150

2
launchers/qt/resources/qml/HFBase/CreateAccountBase.qml
View file

@ -154,6 +154,6 @@ Item {
topMargin: 15 topMargin: 15
} }
onClicked: LauncherState.login(username.text, password.text) onClicked: LauncherState.login(username.text, passwordField.text)
} }
} }

2
launchers/qt/src/LauncherState.cpp
View file

@ -46,7 +46,7 @@ bool LatestBuilds::getBuild(QString tag, Build* outBuild) {
static const std::array<QString, LauncherState::UIState::UI_STATE_NUM> QML_FILE_FOR_UI_STATE = static const std::array<QString, LauncherState::UIState::UI_STATE_NUM> QML_FILE_FOR_UI_STATE =
{ { "SplashScreen.qml", "qml/HFBase/CreateAccountBase.qml", "DisplayName.qml", { { "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) { void LauncherState::ASSERT_STATE(LauncherState::ApplicationState state) {
if (_applicationState != state) { if (_applicationState != state) {