Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-25 14:13:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small UIT tweaks

Browse source
This commit is contained in:
Zach Fox 2018-02-15 15:14:54 -08:00
parent 811ecf9db8
commit c4e9c76258
4 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/controls-uit/TextField.qml
View file

@ -34,11 +34,10 @@ TextField {
placeholderText: textField.placeholderText placeholderText: textField.placeholderText
FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; } FontLoader { id: firaSansRegular; source: "../../fonts/FiraSans-Regular.ttf"; }
FontLoader { id: hifiGlyphs; source: "../../fonts/hifi-glyphs.ttf"; } FontLoader { id: hifiGlyphs; source: "../../fonts/hifi-glyphs.ttf"; }
font.family: firaSansSemiBold.name font.family: firaSansRegular.name
font.pixelSize: hifi.fontSizes.textFieldInput font.pixelSize: hifi.fontSizes.textFieldInput
font.italic: textField.text == ""
height: implicitHeight + 3 // Make surrounding box higher so that highlight is vertically centered. height: implicitHeight + 3 // Make surrounding box higher so that highlight is vertically centered.
property alias textFieldLabel: textFieldLabel property alias textFieldLabel: textFieldLabel

11
interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
View file

@ -46,6 +46,7 @@ Item {
property var buttonGlyph: [hifi.glyphs.wand, hifi.glyphs.hat, hifi.glyphs.globe, hifi.glyphs.install, hifi.glyphs.avatar]; property var buttonGlyph: [hifi.glyphs.wand, hifi.glyphs.hat, hifi.glyphs.globe, hifi.glyphs.install, hifi.glyphs.avatar];
property bool showConfirmation: false; property bool showConfirmation: false;
property bool hasPermissionToRezThis; property bool hasPermissionToRezThis;
property bool permissionExplanationCardVisible;
property string originalStatusText; property string originalStatusText;
property string originalStatusColor; property string originalStatusColor;
@ -151,7 +152,7 @@ Item {
anchors.topMargin: 4; anchors.topMargin: 4;
anchors.left: itemPreviewImage.right; anchors.left: itemPreviewImage.right;
anchors.leftMargin: 8; anchors.leftMargin: 8;
width: root.hasPermissionToRezThis ? (buttonContainer.x - itemPreviewImage.x - itemPreviewImage.width - anchors.leftMargin) : width: !noPermissionGlyph.visible ? (buttonContainer.x - itemPreviewImage.x - itemPreviewImage.width - anchors.leftMargin) :
Math.min(itemNameTextMetrics.tightBoundingRect.width + 2, Math.min(itemNameTextMetrics.tightBoundingRect.width + 2,
buttonContainer.x - itemPreviewImage.x - itemPreviewImage.width - anchors.leftMargin - noPermissionGlyph.width + 2); buttonContainer.x - itemPreviewImage.x - itemPreviewImage.width - anchors.leftMargin - noPermissionGlyph.width + 2);
height: paintedHeight; height: paintedHeight;
@ -181,7 +182,7 @@ Item {
} }
HiFiGlyphs { HiFiGlyphs {
id: noPermissionGlyph; id: noPermissionGlyph;
visible: !root.hasPermissionToRezThis; visible: true// !root.hasPermissionToRezThis;
anchors.verticalCenter: itemName.verticalCenter; anchors.verticalCenter: itemName.verticalCenter;
anchors.left: itemName.right; anchors.left: itemName.right;
anchors.leftMargin: itemName.truncated ? -14 : -2; anchors.leftMargin: itemName.truncated ? -14 : -2;
@ -203,14 +204,14 @@ Item {
noPermissionGlyph.color = hifi.colors.redAccent; noPermissionGlyph.color = hifi.colors.redAccent;
} }
onClicked: { onClicked: {
permissionExplanationCard.visible = true; root.sendToPurchases({ method: 'openPermissionExplanationCard' });
} }
} }
} }
Rectangle { Rectangle {
id: permissionExplanationCard; id: permissionExplanationCard;
z: 995; z: 995;
visible: false; visible: root.permissionExplanationCardVisible;
anchors.fill: parent; anchors.fill: parent;
color: hifi.colors.white; color: hifi.colors.white;
@ -261,7 +262,7 @@ Item {
parent.text = hifi.glyphs.close; parent.text = hifi.glyphs.close;
} }
onClicked: { onClicked: {
permissionExplanationCard.visible = false; root.sendToPurchases({ method: 'openPermissionExplanationCard', closeAll: true });
} }
} }
} }

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

@ -393,6 +393,7 @@ Rectangle {
numberSold: model.number_sold; numberSold: model.number_sold;
limitedRun: model.limited_run; limitedRun: model.limited_run;
displayedItemCount: model.displayedItemCount; displayedItemCount: model.displayedItemCount;
permissionExplanationCardVisible: model.permissionExplanationCardVisible;
itemType: { itemType: {
if (model.root_file_url.indexOf(".fst") > -1) { if (model.root_file_url.indexOf(".fst") > -1) {
"avatar"; "avatar";
@ -472,6 +473,14 @@ Rectangle {
lightboxPopup.visible = true; lightboxPopup.visible = true;
} else if (msg.method === "setFilterText") { } else if (msg.method === "setFilterText") {
filterBar.text = msg.filterText; filterBar.text = msg.filterText;
} else if (msg.method === "openPermissionExplanationCard") {
for (var i = 0; i < filteredPurchasesModel.count; i++) {
if (i !== index || msg.closeAll) {
filteredPurchasesModel.setProperty(i, "permissionExplanationCardVisible", false);
} else {
filteredPurchasesModel.setProperty(i, "permissionExplanationCardVisible", true);
}
}
} }
} }
} }
@ -673,6 +682,7 @@ Rectangle {
filteredPurchasesModel.clear(); filteredPurchasesModel.clear();
for (var i = 0; i < tempPurchasesModel.count; i++) { for (var i = 0; i < tempPurchasesModel.count; i++) {
filteredPurchasesModel.append(tempPurchasesModel.get(i)); filteredPurchasesModel.append(tempPurchasesModel.get(i));
filteredPurchasesModel.setProperty(i, 'permissionExplanationCardVisible', false);
} }
populateDisplayedItemCounts(); populateDisplayedItemCounts();

2
interface/resources/qml/styles-uit/HifiConstants.qml
View file

@ -218,7 +218,7 @@ Item {
readonly property var colorStart: [ colors.white, colors.primaryHighlight, "#d42043", "#343434", Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0) ] readonly property var colorStart: [ colors.white, colors.primaryHighlight, "#d42043", "#343434", Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0) ]
readonly property var colorFinish: [ colors.lightGrayText, colors.blueAccent, "#94132e", colors.black, Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0) ] readonly property var colorFinish: [ colors.lightGrayText, colors.blueAccent, "#94132e", colors.black, Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0) ]
readonly property var hoveredColor: [ colorStart[white], colorStart[blue], colorStart[red], colorFinish[black], colorStart[none], colorStart[noneBorderless], colorStart[noneBorderlessWhite], colorStart[noneBorderlessGray] ] readonly property var hoveredColor: [ colorStart[white], colorStart[blue], colorStart[red], colorFinish[black], colorStart[none], colorStart[noneBorderless], colorStart[noneBorderlessWhite], colorStart[noneBorderlessGray] ]
readonly property var pressedColor: [ colorFinish[white], colorFinish[blue], colorFinish[red], colorStart[black], colorStart[none], colorStart[noneBorderless], colorStart[noneBorderlessWhite], colorStart[noneBorderlessGray] ] readonly property var pressedColor: [ colorFinish[white], colorFinish[blue], colorFinish[red], colorStart[black], colorStart[none], colorStart[noneBorderless], colorStart[noneBorderlessWhite], colors.lightGrayText ]
readonly property var focusedColor: [ colors.lightGray50, colors.blueAccent, colors.redAccent, colors.darkGray, colorStart[none], colorStart[noneBorderless], colorStart[noneBorderlessWhite], colorStart[noneBorderlessGray] ] readonly property var focusedColor: [ colors.lightGray50, colors.blueAccent, colors.redAccent, colors.darkGray, colorStart[none], colorStart[noneBorderless], colorStart[noneBorderlessWhite], colorStart[noneBorderlessGray] ]
readonly property var disabledColorStart: [ colorStart[white], colors.baseGrayHighlight] readonly property var disabledColorStart: [ colorStart[white], colors.baseGrayHighlight]
readonly property var disabledColorFinish: [ colorFinish[white], colors.baseGrayShadow] readonly property var disabledColorFinish: [ colorFinish[white], colors.baseGrayShadow]