Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-24 03:53:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

always show edition

Browse source
This commit is contained in:
howard-stearns 2018-06-08 12:57:40 -07:00
parent dd0f3c64ec
commit 3ade31bdf6
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/hifi/Pal.qml
View file

@ -872,14 +872,6 @@ Rectangle {
checked: model && (model.connection === "friend");
boxSize: 24;
onClicked: {
// HRS FIXME: NOTE FROM ZACH: With the line below uncommented, clicking any "FRIEND" checkbox
// in the table will result in the 0th table index FRIEND checkbox to become CHECKED.
// This is because there IS NO "model.userIndex" defined per entry in the connectionsUserModel.
// You could do one of two things here:
// 1. Programatically add a "userIndex" to each entry in the model as you fill it in (then this would work)
// 2. Not care about the model being accurate until its next refresh (at which point the "connection"
// property value will be correct, since the server will give the model the correct value)
//connectionsUserModel.setProperty(model.userIndex, styleData.role, (checked ? "friend" : "connection"));
pal.sendToScript({method: checked ? 'addFriend' : 'removeFriend', params: model.userName});
UserActivityLogger["palAction"](checked ? styleData.role : "un-" + styleData.role, model.sessionId);

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

@ -39,12 +39,10 @@ Rectangle {
property string installedApps;
property bool keyboardRaised: false;
property int numUpdatesAvailable: 0;
property var itemCountDictionary: ({});
// Style
color: hifi.colors.white;
function getPurchases() { // FIXME: use the new purchasesModel.getFirstPage
root.activeView = "purchasesMain";
root.itemCountDictionary = {};
root.installedApps = Commerce.getInstalledApps();
purchasesModel.getFirstPage();
Commerce.getAvailableUpdates();
@ -574,13 +572,8 @@ Rectangle {
item.cardBackVisible = false;
item.isInstalled = root.installedApps.indexOf(item.id) > -1;
item.wornEntityID = '';
item.displayedItemCount = itemCountDictionary[item.id] = (itemCountDictionary[item.id] || 0) + 1;
// HRS FIXME updateable
});
sendToScript({ method: 'purchases_updateWearables' });
for (var i = 0; i < purchasesModel.count; i++) { // Update all the previous counts with possibly new values.
purchasesModel.setProperty(i, "displayedItemCount", itemCountDictionary[purchasesModel.get(i).id])
}
return data.assets;
@ -633,7 +626,7 @@ Rectangle {
itemEdition: model.edition_number;
numberSold: model.number_sold;
limitedRun: model.limited_run;
displayedItemCount: model.displayedItemCount || 0;
displayedItemCount: 999// For now (and maybe longer), we're going to display all the edition numbers.
cardBackVisible: model.cardBackVisible || false;
isInstalled: model.isInstalled || false;
wornEntityID: model.wornEntityID;