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

More more more

Browse source
This commit is contained in:
Zach Fox 2018-01-09 15:38:54 -08:00
parent 530df5447d
commit 5469025113
4 changed files with 62 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
View file

@ -28,6 +28,16 @@ Item {
property bool historyReceived: false;
property int pendingCount: 0;
onVisibleChanged: {
if (visible) {
historyReceived = false;
Commerce.balance();
Commerce.history();
} else {
refreshTimer.stop();
}
}
Connections {
target: Commerce;
@ -131,16 +141,6 @@ Item {
color: hifi.colors.white;
// Alignment
verticalAlignment: Text.AlignVCenter;
onVisibleChanged: {
if (visible) {
historyReceived = false;
Commerce.balance();
Commerce.history();
} else {
refreshTimer.stop();
}
}
}
// "balance" text below field

24
interface/resources/qml/hifi/commerce/wallet/sendMoney/ConnectionItem.qml
View file

@ -85,12 +85,13 @@ Item {
RalewaySemiBold {
id: userName;
anchors.left: avatarImage.right;
anchors.leftMargin: 14;
anchors.leftMargin: 16;
anchors.top: parent.top;
anchors.bottom: parent.bottom;
anchors.right: parent.right;
anchors.right: chooseButton.visible ? chooseButton.left : parent.right;
anchors.rightMargin: chooseButton.visible ? 10 : 0;
// Text size
size: 24;
size: 20;
// Style
color: hifi.colors.baseGray;
text: root.userName;
@ -99,6 +100,23 @@ Item {
horizontalAlignment: Text.AlignLeft;
verticalAlignment: Text.AlignVCenter;
}
// "Choose" button
HifiControlsUit.Button {
id: chooseButton;
visible: root.isSelected;
color: hifi.buttons.blue;
colorScheme: hifi.colorSchemes.dark;
anchors.verticalCenter: parent.verticalCenter;
anchors.right: parent.right;
anchors.rightMargin: 24;
height: root.height - 20;
width: 110;
text: "CHOOSE";
onClicked: {
}
}
}
//

38
interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
View file

@ -13,7 +13,7 @@
import Hifi 1.0 as Hifi
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls 2.2
import "../../../../styles-uit"
import "../../../../controls-uit" as HifiControlsUit
import "../../../../controls" as HifiControls
@ -29,12 +29,17 @@ Item {
property int parentAppTitleBarHeight;
property int parentAppNavBarHeight;
property string activeView: "sendMoneyHome";
property bool isCurrentlyFullScreen: chooseRecipientConnection.visible;
// This object is always used in a popup or full-screen Wallet section.
// This MouseArea is used to prevent a user from being
// able to click on a button/mouseArea underneath the popup/section.
MouseArea {
anchors.fill: parent;
anchors.top: parent.top;
anchors.left: parent.left;
anchors.right: parent.right;
y: root.isCurrentlyFullScreen ? root.parentAppTitleBarHeight : 0;
height: root.isCurrentlyFullScreen ? parent.height : parent.height - root.parentAppTitleBarHeight - root.parentAppNavBarHeight;
propagateComposedEvents: false;
}
@ -59,8 +64,8 @@ Item {
id: sendMoneyHome;
visible: root.activeView === "sendMoneyHome";
anchors.fill: parent;
anchors.topMargin: parentAppTitleBarHeight;
anchors.bottomMargin: parentAppNavBarHeight;
anchors.topMargin: root.parentAppTitleBarHeight;
anchors.bottomMargin: root.parentAppNavBarHeight;
// Username Text
RalewayRegular {
@ -364,15 +369,27 @@ Item {
anchors.left: parent.left;
anchors.right: parent.right;
anchors.bottom: parent.bottom;
Rectangle {
AnimatedImage {
id: connectionsLoading;
anchors.fill: parent;
color: "red";
source: "../../../../../icons/profilePicLoading.gif"
width: 120;
height: width;
anchors.top: parent.top;
anchors.topMargin: 185;
anchors.horizontalCenter: parent.horizontalCenter;
}
ListView {
id: connectionsList;
ScrollBar.vertical: ScrollBar {
policy: connectionsList.contentHeight > parent.parent.height ? ScrollBar.AlwaysOn : ScrollBar.AsNeeded;
parent: connectionsList.parent;
anchors.top: connectionsList.top;
anchors.right: connectionsList.right;
anchors.bottom: connectionsList.bottom;
width: 20;
}
visible: !connectionsLoading.visible;
clip: true;
model: filteredConnectionsModel;
@ -381,8 +398,8 @@ Item {
anchors.fill: parent;
delegate: ConnectionItem {
isSelected: connectionsList.currentIndex === index;
userName: userName;
profilePicUrl: profileUrl;
userName: model.userName;
profilePicUrl: model.profileUrl;
anchors.topMargin: 6;
anchors.bottomMargin: 6;
@ -393,6 +410,7 @@ Item {
}
MouseArea {
enabled: connectionsList.currentIndex !== index;
anchors.fill: parent;
propagateComposedEvents: false;
onClicked: {

3
scripts/system/marketplaces/marketplaces.js
View file

@ -565,6 +565,9 @@ var selectionDisplay = null; // for gridTool.js to ignore
method: 'purchases_showMyItems'
});
break;
case 'refreshConnections':
// NOP
break;
default:
print('Unrecognized message from Checkout.qml or Purchases.qml: ' + JSON.stringify(message));
}