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

'improve' UI slightly

Browse source
This commit is contained in:
Zach Fox 2018-11-26 16:03:07 -08:00
parent 31f7d747c8
commit a9fd443f28
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/resources/qml/hifi/commerce/common/sendAsset/RecipientDisplay.qml
View file

@ -25,14 +25,15 @@ Item {
id: root; id: root;
property bool isDisplayingNearby; // as opposed to 'connections' // true when sending to 'nearby' or when a script raises the send asset dialog
property bool multiLineDisplay;
property string displayName; property string displayName;
property string userName; property string userName;
property string profilePic; property string profilePic;
property string textColor: hifi.colors.white; property string textColor: hifi.colors.white;
Item { Item {
visible: root.isDisplayingNearby; visible: root.multiLineDisplay;
anchors.fill: parent; anchors.fill: parent;
RalewaySemiBold { RalewaySemiBold {
@ -71,7 +72,7 @@ Item {
} }
Item { Item {
visible: !root.isDisplayingNearby; visible: !root.multiLineDisplay;
anchors.fill: parent; anchors.fill: parent;
Image { Image {

8
interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
View file

@ -918,7 +918,7 @@ Item {
userName: sendAssetStep.selectedRecipientUserName; userName: sendAssetStep.selectedRecipientUserName;
profilePic: sendAssetStep.selectedRecipientProfilePic !== "" ? ((0 === sendAssetStep.selectedRecipientProfilePic.indexOf("http")) ? profilePic: sendAssetStep.selectedRecipientProfilePic !== "" ? ((0 === sendAssetStep.selectedRecipientProfilePic.indexOf("http")) ?
sendAssetStep.selectedRecipientProfilePic : (Account.metaverseServerURL + sendAssetStep.selectedRecipientProfilePic)) : ""; sendAssetStep.selectedRecipientProfilePic : (Account.metaverseServerURL + sendAssetStep.selectedRecipientProfilePic)) : "";
isDisplayingNearby: sendAssetStep.referrer === "nearby"; multiLineDisplay: sendAssetStep.referrer === "nearby" || sendAssetStep.referrer === "payIn";
} }
// "CHANGE" button // "CHANGE" button
@ -1422,7 +1422,7 @@ Item {
userName: sendAssetStep.selectedRecipientUserName; userName: sendAssetStep.selectedRecipientUserName;
profilePic: sendAssetStep.selectedRecipientProfilePic !== "" ? ((0 === sendAssetStep.selectedRecipientProfilePic.indexOf("http")) ? profilePic: sendAssetStep.selectedRecipientProfilePic !== "" ? ((0 === sendAssetStep.selectedRecipientProfilePic.indexOf("http")) ?
sendAssetStep.selectedRecipientProfilePic : (Account.metaverseServerURL + sendAssetStep.selectedRecipientProfilePic)) : ""; sendAssetStep.selectedRecipientProfilePic : (Account.metaverseServerURL + sendAssetStep.selectedRecipientProfilePic)) : "";
isDisplayingNearby: sendAssetStep.referrer === "nearby"; multiLineDisplay: sendAssetStep.referrer === "nearby" || sendAssetStep.referrer === "payIn";
} }
} }
@ -1703,7 +1703,7 @@ Item {
userName: sendAssetStep.selectedRecipientUserName; userName: sendAssetStep.selectedRecipientUserName;
profilePic: sendAssetStep.selectedRecipientProfilePic !== "" ? ((0 === sendAssetStep.selectedRecipientProfilePic.indexOf("http")) ? profilePic: sendAssetStep.selectedRecipientProfilePic !== "" ? ((0 === sendAssetStep.selectedRecipientProfilePic.indexOf("http")) ?
sendAssetStep.selectedRecipientProfilePic : (Account.metaverseServerURL + sendAssetStep.selectedRecipientProfilePic)) : ""; sendAssetStep.selectedRecipientProfilePic : (Account.metaverseServerURL + sendAssetStep.selectedRecipientProfilePic)) : "";
isDisplayingNearby: sendAssetStep.referrer === "nearby"; multiLineDisplay: sendAssetStep.referrer === "nearby" || sendAssetStep.referrer === "payIn";
} }
} }
@ -1898,7 +1898,7 @@ Item {
} }
sendAssetStep.referrer = "payIn"; sendAssetStep.referrer = "payIn";
sendAssetStep.selectedRecipientNodeID = ""; sendAssetStep.selectedRecipientNodeID = "";
sendAssetStep.selectedRecipientDisplayName = 'Secure Payment'; sendAssetStep.selectedRecipientDisplayName = "Determined by script:";
sendAssetStep.selectedRecipientUserName = message.username; sendAssetStep.selectedRecipientUserName = message.username;
optionalMessage.text = message.message || "No Message Provided"; optionalMessage.text = message.message || "No Message Provided";