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

V1 done

Browse source
This commit is contained in:
Zach Fox 2017-08-15 15:42:53 -07:00
parent 29a9ae28e9
commit ccf2d71036
3 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
interface/resources/qml/hifi/commerce/Checkout.qml
View file

@ -66,6 +66,9 @@ Rectangle {
} }
} }
} }
onSecurityImageResult: {
securityImage.source = securityImageSelection.getImagePathFromImageID(imageID);
}
} }
SecurityImageSelection { SecurityImageSelection {
@ -92,8 +95,11 @@ Rectangle {
// Text size // Text size
size: hifi.fontSizes.overlayTitle; size: hifi.fontSizes.overlayTitle;
// Anchors // Anchors
anchors.fill: parent; anchors.top: parent.top;
anchors.left: parent.left;
anchors.leftMargin: 16; anchors.leftMargin: 16;
anchors.bottom: parent.bottom;
width: paintedWidth;
// Style // Style
color: hifi.colors.lightGrayText; color: hifi.colors.lightGrayText;
// Alignment // Alignment
@ -101,6 +107,19 @@ Rectangle {
verticalAlignment: Text.AlignVCenter; verticalAlignment: Text.AlignVCenter;
} }
// Security Image
Image {
id: securityImage;
// Anchors
anchors.top: parent.top;
anchors.left: titleBarText.right;
anchors.leftMargin: 16;
height: parent.height - 5;
width: height;
anchors.verticalCenter: parent.verticalCenter;
fillMode: Image.PreserveAspectFit;
}
// Separator // Separator
HifiControlsUit.Separator { HifiControlsUit.Separator {
anchors.left: parent.left; anchors.left: parent.left;
@ -432,6 +451,7 @@ Rectangle {
itemHref = message.params.itemHref; itemHref = message.params.itemHref;
commerce.balance(); commerce.balance();
commerce.inventory(); commerce.inventory();
commerce.getSecurityImage();
break; break;
default: default:
console.log('Unrecognized message from marketplaces.js:', JSON.stringify(message)); console.log('Unrecognized message from marketplaces.js:', JSON.stringify(message));

1
interface/resources/qml/hifi/commerce/Inventory.qml
View file

@ -93,7 +93,6 @@ Rectangle {
anchors.leftMargin: 16; anchors.leftMargin: 16;
height: parent.height - 5; height: parent.height - 5;
width: height; width: height;
anchors.horizontalCenter: parent.horizontalCenter;
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter;
fillMode: Image.PreserveAspectFit; fillMode: Image.PreserveAspectFit;
} }

4
interface/resources/qml/hifi/commerce/SecurityImageSelection.qml
View file

@ -161,8 +161,8 @@ Rectangle {
// Anchors // Anchors
anchors.fill: parent; anchors.fill: parent;
currentIndex: -1; currentIndex: -1;
cellWidth: width/2; cellWidth: width / 2;
cellHeight: height/3; cellHeight: height / 3;
model: gridModel; model: gridModel;
delegate: Item { delegate: Item {
width: securityImageGrid.cellWidth; width: securityImageGrid.cellWidth;