Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-07 13:32:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:highfidelity/hifi into ouputMutedOverlay

Browse source
This commit is contained in:
RebeccaStankus 2019-10-14 13:02:54 -07:00
commit 4720c64af8
8 changed files with 67 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hifi_vcpkg.py
View file

@ -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

28
interface/resources/avatar/avatar-animation.json
View file

@ -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,

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

@ -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.<br>' +
'If you have questions, please contact marketplace@highfidelity.com.<br>' +
'Thank you!';
lightboxPopup.button1text = "CLOSE";
lightboxPopup.button1method = function() {
lightboxPopup.visible = false;

1
interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
View file

@ -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

7
libraries/networking/src/AccountManager.cpp
View file

@ -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;
}
qCDebug(networking) << "Account Settings have changed, pushing them to the Metaverse API";
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QUrl lockerURL = _authURL;

10
libraries/ui/src/ui/ToolbarScriptingInterface.h
View file

@ -92,15 +92,19 @@ public:
ToolbarProxy(QObject* qmlObject, QObject* parent = nullptr);
/**jsdoc
* <em>Currently doesn't work.</em>
* @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
* <em>Currently doesn't work.</em>
* @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);

143
scripts/developer/tests/toolbarTest.js
View file

@ -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;
}());

3
scripts/simplifiedUI/ui/simplifiedUI.js
View file

@ -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