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

Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into tabless

Browse source
This commit is contained in:
Howard Stearns 2018-11-05 15:48:52 -08:00
commit 335947598f
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
View file

@ -213,7 +213,7 @@ Item {
anchors.topMargin: -buttonAndUsernameContainer.anchors.bottomMargin; anchors.topMargin: -buttonAndUsernameContainer.anchors.bottomMargin;
anchors.right: buttonAndUsernameContainer.right; anchors.right: buttonAndUsernameContainer.right;
height: childrenRect.height; height: childrenRect.height;
width: 100; width: 150;
Rectangle { Rectangle {
id: myItemsButton; id: myItemsButton;
@ -225,7 +225,7 @@ Item {
RalewaySemiBold { RalewaySemiBold {
anchors.fill: parent; anchors.fill: parent;
text: "My Items" text: "My Submissions"
color: hifi.colors.baseGray; color: hifi.colors.baseGray;
horizontalAlignment: Text.AlignHCenter; horizontalAlignment: Text.AlignHCenter;
verticalAlignment: Text.AlignVCenter; verticalAlignment: Text.AlignVCenter;

24
interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
View file

@ -103,8 +103,8 @@ Rectangle {
showInMarketplaceButton.visible = false; showInMarketplaceButton.visible = false;
// "Edition" text previously set above in this function // "Edition" text previously set above in this function
// "Owner" text previously set above in this function // "Owner" text previously set above in this function
// "Date Acquired" text previously set above in this function // "Acquisition Date" text previously set above in this function
// "Original Price" text previously set above in this function // "Acquisition Price" text previously set above in this function
if (result.data.invalid_reason) { if (result.data.invalid_reason) {
errorText.text = result.data.invalid_reason; errorText.text = result.data.invalid_reason;
} }
@ -118,8 +118,8 @@ Rectangle {
showInMarketplaceButton.visible = true; showInMarketplaceButton.visible = true;
// "Edition" text previously set above in this function // "Edition" text previously set above in this function
// "Owner" text previously set above in this function // "Owner" text previously set above in this function
// "Date Acquired" text previously set above in this function // "Acquisition Date" text previously set above in this function
// "Original Price" text previously set above in this function // "Acquisition Price" text previously set above in this function
errorText.text = "The status of this item is still pending confirmation. If the purchase is not confirmed, " + errorText.text = "The status of this item is still pending confirmation. If the purchase is not confirmed, " +
"this entity will be cleaned up by the domain."; "this entity will be cleaned up by the domain.";
} }
@ -146,8 +146,8 @@ Rectangle {
// "Item Name" text will be set in "onCertificateInfoResult()" // "Item Name" text will be set in "onCertificateInfoResult()"
// "Edition" text will be set in "onCertificateInfoResult()" // "Edition" text will be set in "onCertificateInfoResult()"
// "Owner" text will be set in "onCertificateInfoResult()" // "Owner" text will be set in "onCertificateInfoResult()"
// "Date Acquired" text will be set in "onCertificateInfoResult()" // "Acquisition Date" text will be set in "onCertificateInfoResult()"
// "Original Price" text will be set in "onCertificateInfoResult()" // "Acquisition Price" text will be set in "onCertificateInfoResult()"
errorText.text = ""; errorText.text = "";
} else if (root.certificateStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT } else if (root.certificateStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT
root.useGoldCert = false; root.useGoldCert = false;
@ -176,8 +176,8 @@ Rectangle {
// "Item Name" text will be set in "onCertificateInfoResult()" // "Item Name" text will be set in "onCertificateInfoResult()"
// "Edition" text will be set in "onCertificateInfoResult()" // "Edition" text will be set in "onCertificateInfoResult()"
// "Owner" text will be set in "onCertificateInfoResult()" // "Owner" text will be set in "onCertificateInfoResult()"
// "Date Acquired" text will be set in "onCertificateInfoResult()" // "Acquisition Date" text will be set in "onCertificateInfoResult()"
// "Original Price" text will be set in "onCertificateInfoResult()" // "Acquisition Price" text will be set in "onCertificateInfoResult()"
errorText.text = "The information associated with this item has been modified and it no longer matches the original certified item."; errorText.text = "The information associated with this item has been modified and it no longer matches the original certified item.";
} else if (root.certificateStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED } else if (root.certificateStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
root.useGoldCert = false; root.useGoldCert = false;
@ -191,8 +191,8 @@ Rectangle {
// "Item Name" text will be set in "onCertificateInfoResult()" // "Item Name" text will be set in "onCertificateInfoResult()"
root.itemEdition = "Uncertified Copy" root.itemEdition = "Uncertified Copy"
// "Owner" text will be set in "onCertificateInfoResult()" // "Owner" text will be set in "onCertificateInfoResult()"
// "Date Acquired" text will be set in "onCertificateInfoResult()" // "Acquisition Date" text will be set in "onCertificateInfoResult()"
// "Original Price" text will be set in "onCertificateInfoResult()" // "Acquisition Price" text will be set in "onCertificateInfoResult()"
// "Error Text" text will be set in "onCertificateInfoResult()" // "Error Text" text will be set in "onCertificateInfoResult()"
} else { } else {
console.log("Unknown certificate status received from ledger signal!"); console.log("Unknown certificate status received from ledger signal!");
@ -487,7 +487,7 @@ Rectangle {
RalewayRegular { RalewayRegular {
id: dateAcquiredHeader; id: dateAcquiredHeader;
text: "DATE ACQUIRED"; text: "ACQUISITION DATE";
// Text size // Text size
size: 16; size: 16;
// Anchors // Anchors
@ -517,7 +517,7 @@ Rectangle {
RalewayRegular { RalewayRegular {
id: priceHeader; id: priceHeader;
text: "ORIGINAL PRICE"; text: "ACQUISITION PRICE";
// Text size // Text size
size: 16; size: 16;
// Anchors // Anchors

2
interface/resources/qml/hifi/commerce/purchases/Purchases.qml
View file

@ -882,7 +882,7 @@ Rectangle {
// Explanitory text // Explanitory text
RalewayRegular { RalewayRegular {
id: noItemsYet; id: noItemsYet;
text: "<b>You haven't submitted anything to the Marketplace yet!</b><br><br>Submit an item to the Marketplace to add it to My Items."; text: "<b>You haven't submitted anything to the Marketplace yet!</b><br><br>Submit an item to the Marketplace to add it to My Submissions.";
// Text size // Text size
size: 22; size: 22;
// Anchors // Anchors

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

@ -533,7 +533,7 @@ Rectangle {
id: exchangeMoneyMessagesWaitingLight; id: exchangeMoneyMessagesWaitingLight;
visible: parent.messagesWaiting; visible: parent.messagesWaiting;
anchors.right: exchangeMoneyTabIcon.left; anchors.right: exchangeMoneyTabIcon.left;
anchors.rightMargin: 10; anchors.rightMargin: 9;
anchors.top: exchangeMoneyTabIcon.top; anchors.top: exchangeMoneyTabIcon.top;
anchors.topMargin: 4; anchors.topMargin: 4;
height: 10; height: 10;