From 390c7b14c902552862e089273097cb72147d61ed Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 10 Oct 2019 15:53:05 -0700 Subject: [PATCH 1/9] Don't post account settings after pull Account settings would always get pushed after a pull even if they hadn't changed --- libraries/networking/src/AccountManager.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp index 5edbc5261d..4aac9e76fb 100644 --- a/libraries/networking/src/AccountManager.cpp +++ b/libraries/networking/src/AccountManager.cpp @@ -808,6 +808,8 @@ void AccountManager::requestAccountSettings() { return; } + qCDebug(networking) << "Requesting the Account Settings from the Metaverse API"; + QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QUrl lockerURL = _authURL; @@ -834,6 +836,9 @@ void AccountManager::requestAccountSettingsFinished() { if (rootObject.contains("status") && rootObject["status"].toString() == "success") { if (rootObject.contains("data") && rootObject["data"].isObject()) { _settings.unpack(rootObject["data"].toObject()); + _lastSuccessfulSyncTimestamp = _settings.lastChangeTimestamp(); + + qCDebug(networking) << "Received the Account Settings from the Metaverse API"; emit accountSettingsLoaded(); } else { @@ -874,6 +879,8 @@ void AccountManager::postAccountSettings() { return; } + qDebug() << "Account Settings have changed, pushing them to the Metaverse API"; + QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QUrl lockerURL = _authURL; From 3b21dfcd0a9bca762fa23b7c5b123a5930a24134 Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 10 Oct 2019 17:49:51 -0700 Subject: [PATCH 2/9] CR --- libraries/networking/src/AccountManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp index 4aac9e76fb..5473f1a010 100644 --- a/libraries/networking/src/AccountManager.cpp +++ b/libraries/networking/src/AccountManager.cpp @@ -879,7 +879,7 @@ void AccountManager::postAccountSettings() { return; } - qDebug() << "Account Settings have changed, pushing them to the Metaverse API"; + qCDebug(networking) << "Account Settings have changed, pushing them to the Metaverse API"; QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); From 96510429ba57056ac68dcaaf57200cf637ffdb46 Mon Sep 17 00:00:00 2001 From: dooglifeSF <41022919+dooglifeSF@users.noreply.github.com> Date: Fri, 11 Oct 2019 10:44:50 -0700 Subject: [PATCH 3/9] Fix stand talking pops --- .../resources/avatar/avatar-animation.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/interface/resources/avatar/avatar-animation.json b/interface/resources/avatar/avatar-animation.json index ec490e1c38..671e55adf2 100644 --- a/interface/resources/avatar/avatar-animation.json +++ b/interface/resources/avatar/avatar-animation.json @@ -2478,8 +2478,8 @@ { "easingType": "easeInOutQuad", "id": "talk", - "interpDuration": 1, - "interpTarget": 1, + "interpDuration": 20, + "interpTarget": 20, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, @@ -2489,8 +2489,8 @@ { "easingType": "easeInOutQuad", "id": "talk02", - "interpDuration": 1, - "interpTarget": 1, + "interpDuration": 20, + "interpTarget": 20, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, @@ -2500,8 +2500,8 @@ { "easingType": "easeInOutQuad", "id": "talk03", - "interpDuration": 1, - "interpTarget": 1, + "interpDuration": 20, + "interpTarget": 20, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, @@ -2511,8 +2511,8 @@ { "easingType": "easeInOutQuad", "id": "talk04", - "interpDuration": 1, - "interpTarget": 1, + "interpDuration": 20, + "interpTarget": 20, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, @@ -2522,8 +2522,8 @@ { "easingType": "easeInOutQuad", "id": "talk_armsdown", - "interpDuration": 1, - "interpTarget": 1, + "interpDuration": 20, + "interpTarget": 20, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, @@ -2533,8 +2533,8 @@ { "easingType": "easeInOutQuad", "id": "talk_lefthand", - "interpDuration": 1, - "interpTarget": 1, + "interpDuration": 20, + "interpTarget": 20, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, @@ -2544,8 +2544,8 @@ { "easingType": "easeInOutQuad", "id": "talk_righthand", - "interpDuration": 1, - "interpTarget": 1, + "interpDuration": 20, + "interpTarget": 20, "interpType": "evaluateBoth", "priority": 0.33, "resume": true, From f9446041205f52a6d9b74d4308d698e5ebc276b3 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 12 Oct 2019 10:10:27 +1300 Subject: [PATCH 4/9] Deprecate Toolbar API's addButton() and removeButton() methods --- libraries/ui/src/ui/ToolbarScriptingInterface.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libraries/ui/src/ui/ToolbarScriptingInterface.h b/libraries/ui/src/ui/ToolbarScriptingInterface.h index 952d3cce95..3d38aa296b 100644 --- a/libraries/ui/src/ui/ToolbarScriptingInterface.h +++ b/libraries/ui/src/ui/ToolbarScriptingInterface.h @@ -92,15 +92,19 @@ public: ToolbarProxy(QObject* qmlObject, QObject* parent = nullptr); /**jsdoc + * Currently doesn't work. * @function ToolbarProxy#addButton - * @param {object} properties - * @returns {ToolbarButtonProxy} + * @param {object} properties - Button properties + * @returns {object} The button added. + * @deprecated This method is deprecated and will be removed. */ Q_INVOKABLE ToolbarButtonProxy* addButton(const QVariant& properties); /**jsdoc + * Currently doesn't work. * @function ToolbarProxy#removeButton - * @param {string} name + * @param {string} name - Button name. + * @deprecated This method is deprecated and will be removed. */ Q_INVOKABLE void removeButton(const QVariant& name); From 5292dddc391c11315733f79ab7e508fd12605506 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 12 Oct 2019 10:10:41 +1300 Subject: [PATCH 5/9] Rewrite toolbarTest.js --- scripts/developer/tests/toolbarTest.js | 143 ++++++------------------- 1 file changed, 32 insertions(+), 111 deletions(-) diff --git a/scripts/developer/tests/toolbarTest.js b/scripts/developer/tests/toolbarTest.js index 89609e610d..9e82f814ac 100644 --- a/scripts/developer/tests/toolbarTest.js +++ b/scripts/developer/tests/toolbarTest.js @@ -1,117 +1,38 @@ -var isActive = false; +(function () { -var toolBar = (function() { - var that = {}, - toolBar, - activeButton, - newModelButton, - newShapeButton, - newLightButton, - newTextButton, - newWebButton, - newZoneButton, - newParticleButton, - newMaterialButton - - var toolIconUrl = Script.resolvePath("../../system/assets/images/tools/"); - - function initialize() { - print("Toolbars: " + Toolbars); - toolBar = Toolbars.getToolbar("highfidelity.edit.toolbar"); - print("Toolbar: " + toolBar); - activeButton = toolBar.addButton({ - objectName: "activeButton", - imageURL: toolIconUrl + "edit-01.svg", - visible: true, - alpha: 0.9, - }); - - print("Button " + activeButton); - print("Button signal " + activeButton.clicked); - activeButton.clicked.connect(function(){ - print("Clicked on button " + isActive); - that.setActive(!isActive); - }); - - newModelButton = toolBar.addButton({ - objectName: "newModelButton", - imageURL: toolIconUrl + "model-01.svg", - alpha: 0.9, - visible: false - }); - - newShapeButton = toolBar.addButton({ - objectName: "newShapeButton", - imageURL: toolIconUrl + "cube-01.svg", - alpha: 0.9, - visible: false - }); - - newLightButton = toolBar.addButton({ - objectName: "newLightButton", - imageURL: toolIconUrl + "light-01.svg", - alpha: 0.9, - visible: false - }); - - newTextButton = toolBar.addButton({ - objectName: "newTextButton", - imageURL: toolIconUrl + "text-01.svg", - alpha: 0.9, - visible: false - }); - - newWebButton = toolBar.addButton({ - objectName: "newWebButton", - imageURL: toolIconUrl + "web-01.svg", - alpha: 0.9, - visible: false - }); - - newZoneButton = toolBar.addButton({ - objectName: "newZoneButton", - imageURL: toolIconUrl + "zone-01.svg", - alpha: 0.9, - visible: false - }); - - newParticleButton = toolBar.addButton({ - objectName: "newParticleButton", - imageURL: toolIconUrl + "particle-01.svg", - alpha: 0.9, - visible: false - }); - - newMaterialButton = toolBar.addButton({ - objectName: "newMaterialButton", - imageURL: toolIconUrl + "material-01.svg", - alpha: 0.9, - visible: false - }); - - that.setActive(false); - newModelButton.clicked(); + // Get the system toolbar. + var toolbar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system"); + if (!toolbar) { + print("ERROR: Couldn't get system toolbar."); + return; } - that.setActive = function(active) { - if (active != isActive) { - isActive = active; - that.showTools(isActive); - } - }; + Script.setTimeout(function () { + // Report the system toolbar visibility. + var isToolbarVisible = toolbar.readProperty("visible"); + print("Toolbar visible: " + isToolbarVisible); - // Sets visibility of tool buttons, excluding the power button - that.showTools = function(doShow) { - newModelButton.writeProperty('visible', doShow); - newShapeButton.writeProperty('visible', doShow); - newLightButton.writeProperty('visible', doShow); - newTextButton.writeProperty('visible', doShow); - newWebButton.writeProperty('visible', doShow); - newZoneButton.writeProperty('visible', doShow); - newParticleButton.writeProperty('visible', doShow); - newMaterialButton.writeProperty('visible', doShow); - }; + // Briefly toggle the system toolbar visibility. + print("Toggle toolbar"); + toolbar.writeProperty("visible", !isToolbarVisible); + Script.setTimeout(function () { + print("Toggle toolbar"); + toolbar.writeProperty("visible", isToolbarVisible); + }, 2000); + }, 2000); + + Script.setTimeout(function () { + // Report the system toolbar visibility alternative method. + isToolbarVisible = toolbar.readProperties(["visible"]).visible; + print("Toolbar visible: " + isToolbarVisible); + + // Briefly toggle the system toolbar visibility. + print("Toggle toolbar"); + toolbar.writeProperties({ visible: !isToolbarVisible }); + Script.setTimeout(function () { + print("Toggle toolbar"); + toolbar.writeProperties({ visible: isToolbarVisible }); + }, 2000); + }, 6000); - initialize(); - return that; }()); From 21503137d49d43fe99f8f97b82e2506613dca280 Mon Sep 17 00:00:00 2001 From: Rebecca Stankus Date: Fri, 11 Oct 2019 14:42:39 -0700 Subject: [PATCH 6/9] Added blank placeholder text on focus to text field --- .../resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml index c92da7e6e5..4919077dc3 100644 --- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml +++ b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml @@ -384,6 +384,7 @@ Rectangle { placeholderTextColor: "#8E8E8E" font.pixelSize: 14 placeholderText: width - leftPadding - rightPadding < goToTextFieldMetrics.width ? shortPlaceholderText : longPlaceholderText + blankPlaceholderTextOnFocus: false clip: true selectByMouse: true autoScroll: true From 4ac87ef50358f0fc434a30805de14982c38af972 Mon Sep 17 00:00:00 2001 From: Rebecca Stankus Date: Fri, 11 Oct 2019 16:20:37 -0700 Subject: [PATCH 7/9] Moved position of settings app --- scripts/simplifiedUI/ui/simplifiedUI.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 1154e386ea..3c14fdb1d2 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -160,6 +160,7 @@ var SETTINGS_APP_WINDOW_FLAGS = 0x00000001 | // Qt::Window 0x08000000 | // Qt::WindowCloseButtonHint 0x00008000 | // Qt::WindowMaximizeButtonHint 0x00004000; // Qt::WindowMinimizeButtonHint +var SETTINGS_APP_RIGHT_MARGIN = 48; var settingsAppWindow = false; function toggleSettingsApp() { if (settingsAppWindow) { @@ -179,7 +180,7 @@ function toggleSettingsApp() { y: SETTINGS_APP_HEIGHT_PX }, position: { - x: Math.max(Window.x + POPOUT_SAFE_MARGIN_X, Window.x + Window.innerWidth / 2 - SETTINGS_APP_WIDTH_PX / 2), + x: Window.x + Window.innerWidth - SETTINGS_APP_WIDTH_PX - SETTINGS_APP_RIGHT_MARGIN, y: Math.max(Window.y + POPOUT_SAFE_MARGIN_Y, Window.y + Window.innerHeight / 2 - SETTINGS_APP_HEIGHT_PX / 2) }, overrideFlags: SETTINGS_APP_WINDOW_FLAGS From 0a01c3ceabf56dcbf957e50fc9ded66d2ef525fd Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 13 Oct 2019 17:36:32 -0700 Subject: [PATCH 8/9] boostrapping, not even once. --- hifi_vcpkg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py index 821d9ae0b7..7bb261faa0 100644 --- a/hifi_vcpkg.py +++ b/hifi_vcpkg.py @@ -134,7 +134,7 @@ endif() downloadVcpkg = True if not downloadVcpkg and not os.path.isfile(self.exe): - print("Missing executable, boostrapping") + print("Missing executable, boot-strapping") downloadVcpkg = True # Make sure we have a vcpkg executable From 7bd550e37bde7621f005d2c037b9204ce869bded Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Mon, 14 Oct 2019 09:30:44 -0700 Subject: [PATCH 9/9] DEV-2334: New 'Item Invalidated' language in Inventory --- .../resources/qml/hifi/commerce/purchases/Purchases.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml index 03fbbb178e..85e5211649 100644 --- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml +++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml @@ -580,8 +580,9 @@ Rectangle { sendToScript(msg); } else if (msg.method === "showInvalidatedLightbox") { lightboxPopup.titleText = "Item Invalidated"; - lightboxPopup.bodyText = 'Your item is marked "invalidated" because this item has been suspended ' + - "from the Marketplace due to a claim against its author."; + lightboxPopup.bodyText = 'This item has been invalidated and is no longer available.
' + + 'If you have questions, please contact marketplace@highfidelity.com.
' + + 'Thank you!'; lightboxPopup.button1text = "CLOSE"; lightboxPopup.button1method = function() { lightboxPopup.visible = false;