Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

More progress

Browse source
This commit is contained in:
Zach Fox 2018-01-10 12:12:02 -08:00
parent e5abdc77d9
commit c5a5bddbc9
4 changed files with 167 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/hifi/commerce/wallet/Wallet.qml
View file

@ -735,6 +735,9 @@ Rectangle {
case 'updateConnections':
sendMoney.updateConnections(message.connections);
break;
case 'selectRecipient':
sendMoney.fromScript(message);
break;
default:
console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
}

158
interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
View file

@ -28,16 +28,15 @@ Item {
property int parentAppTitleBarHeight;
property int parentAppNavBarHeight;
property string activeView: "sendMoneyHome";
property string currentActiveView: "sendMoneyHome";
property string nextActiveView: "";
property bool isCurrentlyFullScreen: chooseRecipientConnection.visible || chooseRecipientNearby.visible;
// This object is always used in a popup or full-screen Wallet section.
// This MouseArea is used to prevent a user from being
// able to click on a button/mouseArea underneath the popup/section.
MouseArea {
anchors.top: parent.top;
anchors.left: parent.left;
anchors.right: parent.right;
x: 0;
y: root.isCurrentlyFullScreen ? root.parentAppTitleBarHeight : 0;
height: root.isCurrentlyFullScreen ? parent.height : parent.height - root.parentAppTitleBarHeight - root.parentAppNavBarHeight;
propagateComposedEvents: false;
@ -59,10 +58,34 @@ Item {
}
}
Component.onCompleted: {
Commerce.balance();
}
onNextActiveViewChanged: {
root.currentActiveView = root.nextActiveView;
if (root.currentActiveView === 'chooseRecipientConnection') {
// Refresh connections model
connectionsLoading.visible = false;
connectionsLoading.visible = true;
sendSignalToWallet({method: 'refreshConnections'});
}
if (root.currentActiveView === 'chooseRecipientNearby') {
sendSignalToWallet({method: 'enable_ChooseRecipientNearbyMode'});
} else {
sendSignalToWallet({method: 'disable_ChooseRecipientNearbyMode'});
}
if (root.currentActiveView === 'sendMoneyHome') {
Commerce.balance();
}
}
// Send Money Home BEGIN
Item {
id: sendMoneyHome;
visible: root.activeView === "sendMoneyHome";
visible: root.currentActiveView === "sendMoneyHome";
anchors.fill: parent;
anchors.topMargin: root.parentAppTitleBarHeight;
anchors.bottomMargin: root.parentAppNavBarHeight;
@ -125,12 +148,6 @@ Item {
color: hifi.colors.white;
// Alignment
verticalAlignment: Text.AlignVCenter;
onVisibleChanged: {
if (visible) {
Commerce.balance();
}
}
}
// "balance" text below field
@ -210,7 +227,7 @@ Item {
MouseArea {
anchors.fill: parent;
onClicked: {
root.activeView = "chooseRecipientConnection";
root.nextActiveView = "chooseRecipientConnection";
}
}
}
@ -251,7 +268,7 @@ Item {
MouseArea {
anchors.fill: parent;
onClicked: {
root.activeView = "chooseRecipientNearby";
root.nextActiveView = "chooseRecipientNearby";
}
}
}
@ -262,18 +279,9 @@ Item {
// Choose Recipient Connection BEGIN
Rectangle {
id: chooseRecipientConnection;
visible: root.activeView === "chooseRecipientConnection";
visible: root.currentActiveView === "chooseRecipientConnection";
anchors.fill: parent;
color: "#AAAAAA";
onVisibleChanged: {
if (visible) {
// Refresh connections model
connectionsLoading.visible = false;
connectionsLoading.visible = true;
sendSignalToWallet({method: 'refreshConnections'});
}
}
ListModel {
id: connectionsModel;
@ -321,7 +329,7 @@ Item {
parent.text = hifi.glyphs.close;
}
onClicked: {
root.activeView = "sendMoneyHome";
root.nextActiveView = "sendMoneyHome";
}
}
}
@ -430,19 +438,10 @@ Item {
property string selectedRecipient;
visible: root.activeView === "chooseRecipientNearby";
visible: root.currentActiveView === "chooseRecipientNearby";
anchors.fill: parent;
color: "#AAAAAA";
onVisibleChanged: {
if (visible) {
sendSignalToWallet({method: 'enable_ChooseRecipientNearbyMode'});
} else {
selectedRecipient = "";
sendSignalToWallet({method: 'disable_ChooseRecipientNearbyMode'});
}
}
Rectangle {
anchors.centerIn: parent;
width: parent.width - 30;
@ -482,7 +481,8 @@ Item {
parent.text = hifi.glyphs.close;
}
onClicked: {
root.activeView = "sendMoneyHome";
root.nextActiveView = "sendMoneyHome";
chooseRecipientNearby.selectedRecipient = "";
}
}
}
@ -493,13 +493,13 @@ Item {
anchors.fill: parent;
RalewaySemiBold {
id: selectionInstructions;
id: selectionInstructions_deselected;
text: "Click/trigger on an avatar nearby to select them...";
// Anchors
anchors.bottom: parent.bottom;
anchors.bottomMargin: 100;
anchors.bottomMargin: 200;
anchors.left: parent.left;
anchors.leftMargin: 50;
anchors.leftMargin: 58;
anchors.right: parent.right;
anchors.rightMargin: anchors.leftMargin;
height: paintedHeight;
@ -508,6 +508,7 @@ Item {
// Style
color: hifi.colors.baseGray;
horizontalAlignment: Text.AlignHCenter;
wrapMode: Text.WordWrap;
}
}
@ -517,13 +518,47 @@ Item {
anchors.fill: parent;
RalewaySemiBold {
id: selectionInstructions;
id: sendToText;
text: "Send To:";
// Anchors
anchors.top: parent.top;
anchors.topMargin: 120;
anchors.left: parent.left;
anchors.leftMargin: 12;
width: paintedWidth;
height: paintedHeight;
// Text size
size: 20;
// Style
color: hifi.colors.baseGray;
}
RalewaySemiBold {
id: avatarNodeID;
text: chooseRecipientNearby.selectedRecipient;
// Anchors
anchors.top: sendToText.bottom;
anchors.topMargin: 60;
anchors.left: parent.left;
anchors.leftMargin: 30;
anchors.right: parent.right;
anchors.rightMargin: 30;
height: paintedHeight;
// Text size
size: 18;
// Style
horizontalAlignment: Text.AlignHCenter;
color: hifi.colors.baseGray;
}
RalewaySemiBold {
id: selectionInstructions_selected;
text: "Click/trigger on another avatar nearby to select them...\n\nor press 'Next' to continue.";
// Anchors
anchors.bottom: parent.bottom;
anchors.bottomMargin: 100;
anchors.bottomMargin: 200;
anchors.left: parent.left;
anchors.leftMargin: 50;
anchors.leftMargin: 58;
anchors.right: parent.right;
anchors.rightMargin: anchors.leftMargin;
height: paintedHeight;
@ -532,6 +567,43 @@ Item {
// Style
color: hifi.colors.baseGray;
horizontalAlignment: Text.AlignHCenter;
wrapMode: Text.WordWrap;
}
}
// "Cancel" button
HifiControlsUit.Button {
id: cancelButton;
color: hifi.buttons.noneBorderless;
colorScheme: hifi.colorSchemes.dark;
anchors.left: parent.left;
anchors.leftMargin: 60;
anchors.bottom: parent.bottom;
anchors.bottomMargin: 80;
height: 50;
width: 120;
text: "Cancel";
onClicked: {
root.nextActiveView = "sendMoneyHome";
chooseRecipientNearby.selectedRecipient = "";
}
}
// "Next" button
HifiControlsUit.Button {
id: nextButton;
enabled: chooseRecipientNearby.selectedRecipient !== "";
color: hifi.buttons.blue;
colorScheme: hifi.colorSchemes.dark;
anchors.right: parent.right;
anchors.rightMargin: 60;
anchors.bottom: parent.bottom;
anchors.bottomMargin: 80;
height: 50;
width: 120;
text: "Next";
onClicked: {
}
}
}
@ -577,13 +649,13 @@ Item {
switch (message.method) {
case 'selectRecipient':
if (message.isSelected) {
chooseRecipientNearby.selectedRecipient = message.id;
chooseRecipientNearby.selectedRecipient = message.id[0];
} else {
chooseRecipientNearby.selectedRecipient = "";
}
break;
default:
console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
console.log('SendMoney: Unrecognized message from wallet.js:', JSON.stringify(message));
}
}
signal sendSignalToWallet(var msg);

54
scripts/system/commerce/wallet.js
View file

@ -392,8 +392,35 @@
//
function handleClick(pickRay) {
ExtendedOverlay.applyPickRay(pickRay, function (overlay) {
var message = { method: 'selectRecipient', id: [overlay.key], isSelected: !overlay.selected };
var nextSelectedStatus = !overlay.selected;
var message = { method: 'selectRecipient', id: [overlay.key], isSelected: nextSelectedStatus };
sendToQml(message);
selectedIds = nextSelectedStatus ? [overlay.key] : [];
ExtendedOverlay.some(function (overlay) {
var id = overlay.key;
var selected = ExtendedOverlay.isSelected(id);
overlay.select(selected);
});
HighlightedEntity.clearOverlays();
if (selectedIds.length) {
Entities.findEntitiesInFrustum(Camera.frustum).forEach(function (id) {
// Because lastEditedBy is per session, the vast majority of entities won't match,
// so it would probably be worth reducing marshalling costs by asking for just we need.
// However, providing property name(s) is advisory and some additional properties are
// included anyway. As it turns out, asking for 'lastEditedBy' gives 'position', 'rotation',
// and 'dimensions', too, so we might as well make use of them instead of making a second
// getEntityProperties call.
// It would be nice if we could harden this against future changes by specifying all
// and only these four in an array, but see
// https://highfidelity.fogbugz.com/f/cases/2728/Entities-getEntityProperties-id-lastEditedBy-name-lastEditedBy-doesn-t-work
var properties = Entities.getEntityProperties(id, 'lastEditedBy');
if (ExtendedOverlay.isSelected(properties.lastEditedBy)) {
new HighlightedEntity(id, properties);
}
});
}
return true;
});
}
@ -595,6 +622,12 @@
if (button) {
button.editProperties({ isActive: onWalletScreen });
}
if (onWalletScreen) {
isWired = true;
} else {
off();
}
}
//
@ -621,6 +654,18 @@
triggerPressMapping.enable();
}
}
var isWired = false;
function off() {
if (isWired) { // It is not ok to disconnect these twice, hence guard.
Script.update.disconnect(updateOverlays);
Controller.mousePressEvent.disconnect(handleMouseEvent);
Controller.mouseMoveEvent.disconnect(handleMouseMoveEvent);
isWired = false;
}
triggerMapping.disable(); // It's ok if we disable twice.
triggerPressMapping.disable(); // see above
removeOverlays();
}
function shutdown() {
button.clicked.disconnect(onButtonClicked);
tablet.removeButton(button);
@ -630,12 +675,7 @@
tablet.gotoHomeScreen();
}
}
Script.update.disconnect(updateOverlays);
Controller.mousePressEvent.disconnect(handleMouseEvent);
Controller.mouseMoveEvent.disconnect(handleMouseMoveEvent);
triggerMapping.disable(); // It's ok if we disable twice.
triggerPressMapping.disable(); // see above
removeOverlays();
off();
}
//

2
scripts/system/marketplaces/marketplaces.js
View file

@ -576,6 +576,8 @@ var selectionDisplay = null; // for gridTool.js to ignore
});
break;
case 'refreshConnections':
case 'enable_ChooseRecipientNearbyMode':
case 'disable_ChooseRecipientNearbyMode':
// NOP
break;
default: