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

tabless wallet

Browse source
This commit is contained in:
Howard Stearns 2018-10-31 13:58:26 -07:00
parent b5a48d31b6
commit ce0ad48a28
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -452,7 +452,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;
} }

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

@ -135,7 +135,7 @@ Rectangle {
// 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
@ -376,7 +376,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 {
@ -475,7 +475,7 @@ Rectangle {
// //
Item { Item {
id: tabButtonsContainer; id: tabButtonsContainer;
visible: !needsLogIn.visible && root.activeView !== "passphraseChange" && root.activeView !== "securityImageChange" && sendMoney.currentActiveView !== "sendAssetStep"; visible: !needsLogIn.visible && root.activeView !== "passphraseChange" && root.activeView !== "securityImageChange" && sendMoney.currentActiveView !== "sendAssetStep" && !WalletScriptingInterface.limitedCommerce;
property int numTabs: 5; property int numTabs: 5;
// Size // Size
width: root.width; width: root.width;
@ -585,7 +585,7 @@ Rectangle {
} }
RalewaySemiBold { RalewaySemiBold {
text: "INVENTORY"; text: "ITEMS";
// Text size // Text size
size: 16; size: 16;
// Anchors // Anchors

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

@ -644,14 +644,13 @@ 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;
function startup() { 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,