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

Merge pull request #14319 from howard-stearns/tabless

Browse source 
Remove tabs from oculus store inventory, and rename to match
This commit is contained in:
Howard Stearns 2018-11-05 18:05:02 -08:00 committed by GitHub
commit 5e01314d85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 53 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/icons/tablet-icons/inventory-a-msg.svg Normal file
View file

@ -0,0 +1,4 @@
<svg width="22" height="26" fill="none" version="1.1" viewBox="0 0 22 26" xmlns="http://www.w3.org/2000/svg">
<path d="M1 7L11 1L21 7M1 7L11 13M1 7V19L11 25M11 13L21 7M11 13V25M21 7V19L11 25" stroke="#000" stroke-linejoin="round" stroke-width="2"/>
<circle class="st1" cx="19.407" cy="2.5881" r="2.5846" fill="#ef3b4e" stroke-width=".24043"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 356 B

3
interface/resources/icons/tablet-icons/inventory-a.svg Normal file
View file

@ -0,0 +1,3 @@
<svg width="22" height="26" viewBox="0 0 22 26" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1 7L11 1L21 7M1 7L11 13M1 7V19L11 25M11 13L21 7M11 13V25M21 7V19L11 25" stroke="black" stroke-width="2" stroke-linejoin="round"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 243 B

4
interface/resources/icons/tablet-icons/inventory-i-msg.svg Normal file
View file

@ -0,0 +1,4 @@
<svg width="22" height="26" fill="none" version="1.1" viewBox="0 0 22 26" xmlns="http://www.w3.org/2000/svg">
<path d="M1 7L11 1L21 7M1 7L11 13M1 7V19L11 25M11 13L21 7M11 13V25M21 7V19L11 25" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
<circle class="st1" cx="19.41" cy="2.5828" r="2.5846" fill="#ef3b4e" stroke-width=".24043"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 355 B

3
interface/resources/icons/tablet-icons/inventory-i.svg Normal file
View file

@ -0,0 +1,3 @@
<svg width="22" height="26" viewBox="0 0 22 26" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1 7L11 1L21 7M1 7L11 13M1 7V19L11 25M11 13L21 7M11 13V25M21 7V19L11 25" stroke="white" stroke-width="2" stroke-linejoin="round"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 243 B

6
interface/resources/icons/tablet-icons/wallet-a-msg.svg
View file

@ -1,6 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 96 96" style="enable-background:new 0 0 96 96;" xml:space="preserve">
<style type="text/css">
.st1{fill:#EF3B4E;}
</style>
<circle class="st1" cx="84.6" cy="11.5" r="10.75"/>
<g><path d="M2.4,70.5c0,6.1,4.9,11,11,11H76c6.1,0,11-4.9,11-11V59.6c3.7-0.7,6.6-3.9,6.6-7.9v-7.5c0-3.9-2.8-7.2-6.6-7.9V25.5 c0-6.1-4.9-11-11-11H13.4c-6.1,0-11,4.9-11,11V70.5z M87.6,51.8c0,1.1-0.9,2-2,2H72.2c-2.8,0-5-2.2-5-5v-1.5c0-2.8,2.2-5,5-5h13.3 c1.1,0,2,0.9,2,2V51.8z M8.4,25.5c0-2.8,2.2-5,5-5H76c2.8,0,5,2.2,5,5v10.7h-8.7c-6.1,0-11,4.9-11,11v1.5c0,6.1,4.9,11,11,11H81 v10.7c0,2.8-2.2,5-5,5H13.4c-2.8,0-5-2.2-5-5V25.5z"></path></g></svg>
Side by side

Before

Width:  |  Height:  |  Size: 755 B

1
interface/resources/icons/tablet-icons/wallet-a.svg
View file

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 96 96" style="enable-background:new 0 0 96 96;" xml:space="preserve"><g><path d="M2.4,70.5c0,6.1,4.9,11,11,11H76c6.1,0,11-4.9,11-11V59.6c3.7-0.7,6.6-3.9,6.6-7.9v-7.5c0-3.9-2.8-7.2-6.6-7.9V25.5 c0-6.1-4.9-11-11-11H13.4c-6.1,0-11,4.9-11,11V70.5z M87.6,51.8c0,1.1-0.9,2-2,2H72.2c-2.8,0-5-2.2-5-5v-1.5c0-2.8,2.2-5,5-5h13.3 c1.1,0,2,0.9,2,2V51.8z M8.4,25.5c0-2.8,2.2-5,5-5H76c2.8,0,5,2.2,5,5v10.7h-8.7c-6.1,0-11,4.9-11,11v1.5c0,6.1,4.9,11,11,11H81 v10.7c0,2.8-2.2,5-5,5H13.4c-2.8,0-5-2.2-5-5V25.5z"></path></g></svg>
Side by side

Before

Width:  |  Height:  |  Size: 643 B

16
interface/resources/icons/tablet-icons/wallet-i-msg.svg
View file

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 96 96" style="enable-background:new 0 0 96 96;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
.st1{fill:#EF3B4E;}
</style>
<circle class="st1" cx="84.6" cy="11.5" r="10.75"/>
<g>
<path class="st0" d="M2.4,70.5c0,6.1,4.9,11,11,11H76c6.1,0,11-4.9,11-11V59.6c3.7-0.7,6.6-3.9,6.6-7.9v-7.5c0-3.9-2.8-7.2-6.6-7.9
V25.5c0-6.1-4.9-11-11-11H13.4c-6.1,0-11,4.9-11,11C2.4,25.5,2.4,70.5,2.4,70.5z M87.6,51.8c0,1.1-0.9,2-2,2H72.2c-2.8,0-5-2.2-5-5
v-1.5c0-2.8,2.2-5,5-5h13.3c1.1,0,2,0.9,2,2L87.6,51.8L87.6,51.8z M8.4,25.5c0-2.8,2.2-5,5-5H76c2.8,0,5,2.2,5,5v10.7h-8.7
c-6.1,0-11,4.9-11,11v1.5c0,6.1,4.9,11,11,11H81v10.7c0,2.8-2.2,5-5,5H13.4c-2.8,0-5-2.2-5-5V25.5z"/>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 984 B

14
interface/resources/icons/tablet-icons/wallet-i.svg
View file

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 96 96" style="enable-background:new 0 0 96 96;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
</style>
<g>
<path class="st0" d="M2.4,70.5c0,6.1,4.9,11,11,11H76c6.1,0,11-4.9,11-11V59.6c3.7-0.7,6.6-3.9,6.6-7.9v-7.5c0-3.9-2.8-7.2-6.6-7.9
V25.5c0-6.1-4.9-11-11-11H13.4c-6.1,0-11,4.9-11,11C2.4,25.5,2.4,70.5,2.4,70.5z M87.6,51.8c0,1.1-0.9,2-2,2H72.2c-2.8,0-5-2.2-5-5
v-1.5c0-2.8,2.2-5,5-5h13.3c1.1,0,2,0.9,2,2L87.6,51.8L87.6,51.8z M8.4,25.5c0-2.8,2.2-5,5-5H76c2.8,0,5,2.2,5,5v10.7h-8.7
c-6.1,0-11,4.9-11,11v1.5c0,6.1,4.9,11,11,11H81v10.7c0,2.8-2.2,5-5,5H13.4c-2.8,0-5-2.2-5-5V25.5z"/>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 909 B

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

@ -451,7 +451,7 @@ Rectangle {
anchors.left: parent.left; anchors.left: parent.left;
anchors.leftMargin: 16; anchors.leftMargin: 16;
width: paintedWidth; width: paintedWidth;
text: "Inventory"; text: "Items";
color: hifi.colors.black; color: hifi.colors.black;
size: 22; size: 22;
} }

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

@ -127,29 +127,32 @@ Rectangle {
anchors.top: parent.top; anchors.top: parent.top;
// Wallet icon // Wallet icon
HiFiGlyphs { Image {
id: walletIcon; id: walletIcon;
text: hifi.glyphs.wallet; source: "../../../../icons/tablet-icons/inventory-a.svg";
// Size height: parent.height * 0.5;
size: parent.height * 0.8; width: walletIcon.height;
// Anchors
anchors.left: parent.left; anchors.left: parent.left;
anchors.leftMargin: 8; anchors.leftMargin: 8;
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter;
// Style visible: false; // When we use a white .svg instead of a glyph with color property, we set to invisible and use the following ColorOverlay.
}
ColorOverlay {
anchors.fill: walletIcon;
source: walletIcon;
color: hifi.colors.blueHighlight; color: hifi.colors.blueHighlight;
} }
// Title Bar text // Title Bar text
RalewaySemiBold { RalewaySemiBold {
id: titleBarText; id: titleBarText;
text: "ASSETS"; text: "INVENTORY";
// Text size // Text size
size: hifi.fontSizes.overlayTitle; size: hifi.fontSizes.overlayTitle;
// Anchors // Anchors
anchors.top: parent.top; anchors.top: parent.top;
anchors.left: walletIcon.right; anchors.left: walletIcon.right;
anchors.leftMargin: 4; anchors.leftMargin: 6;
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
width: paintedWidth; width: paintedWidth;
// Style // Style
@ -355,7 +358,7 @@ Rectangle {
id: walletInventory; id: walletInventory;
visible: root.activeView === "walletInventory"; visible: root.activeView === "walletInventory";
anchors.top: titleBarContainer.bottom; anchors.top: titleBarContainer.bottom;
anchors.bottom: tabButtonsContainer.top; anchors.bottom: !WalletScriptingInterface.limitedCommerce ? tabButtonsContainer.top : parent.bottom;
anchors.left: parent.left; anchors.left: parent.left;
anchors.right: parent.right; anchors.right: parent.right;
Connections { Connections {
@ -413,7 +416,7 @@ Rectangle {
// //
Item { Item {
id: tabButtonsContainer; id: tabButtonsContainer;
visible: !needsLogIn.visible && root.activeView !== "passphraseChange" && sendMoney.currentActiveView !== "sendAssetStep"; visible: !needsLogIn.visible && root.activeView !== "passphraseChange" && sendMoney.currentActiveView !== "sendAssetStep" && !WalletScriptingInterface.limitedCommerce;
property int numTabs: 4; property int numTabs: 4;
// Size // Size
width: root.width; width: root.width;
@ -510,16 +513,19 @@ Rectangle {
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
width: parent.width / tabButtonsContainer.numTabs; width: parent.width / tabButtonsContainer.numTabs;
HiFiGlyphs { Image {
id: exchangeMoneyTabIcon; id: exchangeMoneyTabIcon;
text: hifi.glyphs.home2; source: "images/items-tab-a.svg";
// Size height: 25;
size: 50; width: exchangeMoneyTabIcon.height;
// Anchors
anchors.horizontalCenter: parent.horizontalCenter; anchors.horizontalCenter: parent.horizontalCenter;
anchors.top: parent.top; anchors.top: parent.top;
anchors.topMargin: -2; anchors.topMargin: 10;
// Style visible: false; // When we use a white .svg instead of a glyph with color property, we set to invisible and use the following ColorOverlay.
}
ColorOverlay {
anchors.fill: exchangeMoneyTabIcon;
source: exchangeMoneyTabIcon;
color: root.activeView === "walletInventory" || inventoryTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight; color: root.activeView === "walletInventory" || inventoryTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
} }
@ -529,7 +535,7 @@ Rectangle {
anchors.right: exchangeMoneyTabIcon.left; anchors.right: exchangeMoneyTabIcon.left;
anchors.rightMargin: 9; anchors.rightMargin: 9;
anchors.top: exchangeMoneyTabIcon.top; anchors.top: exchangeMoneyTabIcon.top;
anchors.topMargin: 16; anchors.topMargin: 4;
height: 10; height: 10;
width: height; width: height;
radius: height/2; radius: height/2;
@ -537,7 +543,7 @@ Rectangle {
} }
RalewaySemiBold { RalewaySemiBold {
text: "INVENTORY"; text: "ITEMS";
// Text size // Text size
size: 16; size: 16;
// Anchors // Anchors

8
interface/resources/qml/hifi/commerce/wallet/images/items-tab-a.svg Normal file
View file

@ -0,0 +1,8 @@
<svg width="26" height="24" viewBox="0 0 26 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<line x1="6" y1="2" x2="26" y2="2" stroke="white" stroke-width="4"/>
<line x1="1.74846e-07" y1="2" x2="4" y2="2" stroke="white" stroke-width="4"/>
<line x1="6" y1="12" x2="26" y2="12" stroke="white" stroke-width="4"/>
<line x1="1.74846e-07" y1="12" x2="4" y2="12" stroke="white" stroke-width="4"/>
<line x1="6" y1="22" x2="26" y2="22" stroke="white" stroke-width="4"/>
<line x1="1.74846e-07" y1="22" x2="4" y2="22" stroke="white" stroke-width="4"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 552 B

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

@ -583,7 +583,7 @@ function notificationPollCallbackUpdates(updatesArray) {
if (!ui.notificationInitialCallbackMade[0]) { if (!ui.notificationInitialCallbackMade[0]) {
message = updatesArray.length + " of your purchased items " + message = updatesArray.length + " of your purchased items " +
(updatesArray.length === 1 ? "has an update " : "have updates ") + (updatesArray.length === 1 ? "has an update " : "have updates ") +
"available. Open ASSETS to update."; "available. Open INVENTORY to update.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
ui.notificationPollCaresAboutSince[0] = true; ui.notificationPollCaresAboutSince[0] = true;
@ -591,7 +591,7 @@ function notificationPollCallbackUpdates(updatesArray) {
for (var i = 0; i < updatesArray.length; i++) { for (var i = 0; i < updatesArray.length; i++) {
message = "Update available for \"" + message = "Update available for \"" +
updatesArray[i].base_item_title + "\"." + updatesArray[i].base_item_title + "\"." +
"Open ASSETS to update."; "Open INVENTORY to update.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} }
} }
@ -608,12 +608,12 @@ function notificationPollCallbackHistory(historyArray) {
var message; var message;
if (!ui.notificationInitialCallbackMade[1]) { if (!ui.notificationInitialCallbackMade[1]) {
message = "You have " + notificationCount + " unread recent " + message = "You have " + notificationCount + " unread recent " +
"transaction" + (notificationCount === 1 ? "" : "s") + ". Open ASSETS to see all activity."; "transaction" + (notificationCount === 1 ? "" : "s") + ". Open INVENTORY to see all activity.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} else { } else {
for (var i = 0; i < notificationCount; i++) { for (var i = 0; i < notificationCount; i++) {
message = '"' + (historyArray[i].message) + '" ' + message = '"' + (historyArray[i].message) + '" ' +
"Open ASSETS to see all activity."; "Open INVENTORY to see all activity.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} }
} }
@ -661,7 +661,7 @@ function uninstallMarketplaceItemTester() {
} }
} }
var BUTTON_NAME = "ASSETS"; var BUTTON_NAME = "INVENTORY";
var WALLET_QML_SOURCE = "hifi/commerce/wallet/Wallet.qml"; var WALLET_QML_SOURCE = "hifi/commerce/wallet/Wallet.qml";
var NOTIFICATION_POLL_TIMEOUT = 300000; var NOTIFICATION_POLL_TIMEOUT = 300000;
var ui; var ui;
@ -684,7 +684,6 @@ function startup() {
ui = new AppUi({ ui = new AppUi({
buttonName: BUTTON_NAME, buttonName: BUTTON_NAME,
buttonPrefix: "wallet-",
sortOrder: 10, sortOrder: 10,
home: WALLET_QML_SOURCE, home: WALLET_QML_SOURCE,
onOpened: walletOpened, onOpened: walletOpened,