Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 20:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

reverting header in qml

Browse source
This commit is contained in:
Wayne Chen 2018-11-27 14:34:58 -08:00
parent d5e16ae920
commit d8a1c4e956
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/LoginDialog/CompleteProfileBody.qml
View file

@ -1,8 +1,8 @@
// //
// CompleteProfileBody.qml // CompleteProfileBody.qml
// //
// Created by Wayne Chen on 10/18/18 // Created by Clement on 7/18/16
// Copyright 2018 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

13
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -1,8 +1,8 @@
// //
// linkAccountBody.qml // LinkAccountBody.qml
// //
// Created by Wayne Chen on 10/18/18 // Created by Clement on 7/18/16
// Copyright 2018 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -20,6 +20,7 @@ import TabletScriptingInterface 1.0
Item { Item {
id: linkAccountBody id: linkAccountBody
clip: true clip: true
focus: true
height: root.height height: root.height
width: root.width width: root.width
property int textFieldHeight: 31 property int textFieldHeight: 31
@ -477,7 +478,7 @@ Item {
root.text = ""; root.text = "";
d.resize(); d.resize();
init(); init();
emailField.focus = true; emailField.forceActiveFocus();
} }
Keys.onPressed: { Keys.onPressed: {
@ -492,6 +493,10 @@ Item {
Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text); Settings.setValue("keepMeLoggedIn/savedUsername", emailField.text);
linkAccountBody.login(); linkAccountBody.login();
break; break;
case Qt.Key_Escape:
event.accepted = true;
root.tryDestroy();
break;
} }
} }
} }

4
interface/resources/qml/LoginDialog/SignUpBody.qml
View file

@ -1,8 +1,8 @@
// //
// SignInBody.qml // SignInBody.qml
// //
// Created by Wayne Chen on 10/18/18 // Created by Stephen Birarda on 7 Dec 2016
// Copyright 2018 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

4
interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
View file

@ -1,8 +1,8 @@
// //
// UsernameCollisionBody.qml // UsernameCollisionBody.qml
// //
// Created by Wayne Chen on 10/18/18 // Created by Clement on 7/18/16
// Copyright 2018 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html