Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-06 08:52:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix some fallout from toolbar changes

Browse source
This commit is contained in:
Seth Alves 2017-01-25 16:29:36 -08:00
parent ad5c3f0b44
commit 204652514e
4 changed files with 11 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/resources/qml/AddressBarDialog.qml
View file

@ -187,9 +187,6 @@ Window {
ToolbarButton { ToolbarButton {
id: homeButton id: homeButton
imageURL: "../images/home.svg" imageURL: "../images/home.svg"
buttonState: 1
defaultState: 1
hoverState: 2
onClicked: { onClicked: {
addressBarDialog.loadHome(); addressBarDialog.loadHome();
root.shown = false; root.shown = false;
@ -204,9 +201,6 @@ Window {
ToolbarButton { ToolbarButton {
id: backArrow; id: backArrow;
imageURL: "../images/backward.svg"; imageURL: "../images/backward.svg";
hoverState: addressBarDialog.backEnabled ? 2 : 0;
defaultState: addressBarDialog.backEnabled ? 1 : 0;
buttonState: addressBarDialog.backEnabled ? 1 : 0;
onClicked: addressBarDialog.loadBack(); onClicked: addressBarDialog.loadBack();
anchors { anchors {
left: homeButton.right left: homeButton.right
@ -216,9 +210,6 @@ Window {
ToolbarButton { ToolbarButton {
id: forwardArrow; id: forwardArrow;
imageURL: "../images/forward.svg"; imageURL: "../images/forward.svg";
hoverState: addressBarDialog.forwardEnabled ? 2 : 0;
defaultState: addressBarDialog.forwardEnabled ? 1 : 0;
buttonState: addressBarDialog.forwardEnabled ? 1 : 0;
onClicked: addressBarDialog.loadForward(); onClicked: addressBarDialog.loadForward();
anchors { anchors {
left: backArrow.right left: backArrow.right

26
scripts/system/hmd.js
View file

@ -50,23 +50,17 @@ if (Settings.getValue("HUDUIEnabled")) {
// Disable them in hmd. // Disable them in hmd.
var desktopOnlyViews = ['Mirror', 'Independent Mode', 'Entity Mode']; var desktopOnlyViews = ['Mirror', 'Independent Mode', 'Entity Mode'];
function onHmdChanged(isHmd) { function onHmdChanged(isHmd) {
if (Settings.getValue("HUDUIEnabled")) { //TODO change button icon when the hmd changes
button.writeProperty('buttonState', isHmd ? 0 : 1); if (isHmd) {
button.writeProperty('defaultState', isHmd ? 0 : 1); button.editProperties({
button.writeProperty('hoverState', isHmd ? 2 : 3); icon: "icons/tablet-icons/switch-a.svg",
text: "DESKTOP"
});
} else { } else {
//TODO change button icon when the hmd changes button.editProperties({
if (isHmd) { icon: "icons/tablet-icons/switch-i.svg",
button.editProperties({ text: "VR"
icon: "icons/tablet-icons/switch-a.svg", });
text: "DESKTOP"
});
} else {
button.editProperties({
icon: "icons/tablet-icons/switch-i.svg",
text: "VR"
});
}
} }
desktopOnlyViews.forEach(function (view) { desktopOnlyViews.forEach(function (view) {
Menu.setMenuEnabled("View>" + view, !isHmd); Menu.setMenuEnabled("View>" + view, !isHmd);

3
scripts/system/users.js
View file

@ -26,9 +26,6 @@ if (Settings.getValue("HUDUIEnabled")) {
objectName: buttonName, objectName: buttonName,
imageURL: Script.resolvePath("assets/images/tools/people.svg"), imageURL: Script.resolvePath("assets/images/tools/people.svg"),
visible: true, visible: true,
buttonState: 1,
defaultState: 1,
hoverState: 3,
alpha: 0.9 alpha: 0.9
}); });
} else { } else {

5
unpublishedScripts/steam.js
View file

@ -16,9 +16,6 @@ var steamInviteButton = toolBar.addButton({
objectName: "steamInvite", objectName: "steamInvite",
imageURL: Script.resolvePath("assets/images/tools/steam-invite.svg"), imageURL: Script.resolvePath("assets/images/tools/steam-invite.svg"),
visible: Steam.isRunning, visible: Steam.isRunning,
buttonState: 1,
defaultState: 1,
hoverState: 3,
alpha: 0.9 alpha: 0.9
}); });
@ -28,4 +25,4 @@ steamInviteButton.clicked.connect(function(){
Script.scriptEnding.connect(function () { Script.scriptEnding.connect(function () {
toolBar.removeButton("steamInvite"); toolBar.removeButton("steamInvite");
}); });