Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 03:19:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set auto adding for Clara downloads

Browse source
This commit is contained in:
David Rowe 2016-10-30 15:35:20 +13:00 committed by Seth Alves
parent 467741f348
commit a4b2077d5a
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/Browser.qml
View file

@ -46,6 +46,10 @@ ScrollingWindow {
hidePermissionsBar();
}
function setAutoAdd(auto) {
desktop.setAutoAdd(auto);
}
Item {
id:item
width: pane.contentWidth
@ -257,7 +261,7 @@ ScrollingWindow {
}
Component.onCompleted: {
desktop.initWebviewProfileHandlers(webview.profile, false);
desktop.initWebviewProfileHandlers(webview.profile);
}
}

1
interface/resources/qml/Marketplaces.qml
View file

@ -103,6 +103,7 @@ Rectangle {
var newWindow = component.createObject(desktop);
request.openIn(newWindow.webView);
if (File.isZippedFbx(desktop.currentUrl)) {
newWindow.setAutoAdd(true);
runJavaScript(autoCancel);
newWindow.loadingChanged.connect(function(status) {
if (status > 0) {

9
interface/resources/qml/hifi/Desktop.qml
View file

@ -104,10 +104,9 @@ OriginalDesktop.Desktop {
property string tempDir: ""
property bool autoAdd: false
function initWebviewProfileHandlers(profile, auto) {
function initWebviewProfileHandlers(profile) {
console.log("The webview url in desktop is: " + currentUrl);
if (webViewProfileSetup) return;
autoAdd = auto;
webViewProfileSetup = true;
profile.downloadRequested.connect(function(download){
@ -117,6 +116,7 @@ OriginalDesktop.Desktop {
console.log("Temp dir created: " + tempDir);
download.path = tempDir + "/" + adaptedPath;
console.log("Path where object should download: " + download.path);
console.log("Auto add: " + autoAdd);
download.accept();
if (download.state === WebEngineDownloadItem.DownloadInterrupted) {
console.log("download failed to complete");
@ -129,9 +129,14 @@ OriginalDesktop.Desktop {
} else {
console.log("The download was corrupted, state: " + download.state);
}
autoAdd = false;
})
}
function setAutoAdd(auto) {
autoAdd = auto;
}
// Create or fetch a toolbar with the given name
function getToolbar(name) {
var result = toolbars[name];