Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

starting the zip project

Browse source
This commit is contained in:
elisa-lj11 2016-06-27 17:41:21 -07:00
parent 49ad0951dd
commit 4f33e1502f
3 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
View file

@ -2015,6 +2015,13 @@ bool Application::importSVOFromURL(const QString& urlString) {
return true; return true;
} }
// attempt to start ZIP download project
bool Appplication::importZIPFromURL(const QString& urlString) {
emit zipImportRequested(urlString);
return true;
}
// end attempt
bool Application::event(QEvent* event) { bool Application::event(QEvent* event) {
if (!Menu::getInstance()) { if (!Menu::getInstance()) {

13
interface/src/scripting/WindowScriptingInterface.cpp
View file

@ -59,6 +59,19 @@ WindowScriptingInterface::WindowScriptingInterface() {
OffscreenUi::warning("Import SVO Error", "You need to be running edit.js to import entities."); OffscreenUi::warning("Import SVO Error", "You need to be running edit.js to import entities.");
} }
}); });
// attempt to start ZIP download project
connect(qApp, &Application::zipImportRequested, [this](const QString& urlString) {
static const QMetaMethod zipImportRequestedSignal =
QMetaMethod::fromSignal(&WindowScriptingInterface::zipImportRequested);
if (isSignalConnected(zipImportRequestedSignal)) {
QUrl url(urlString);
emit zipImportRequested(url.url());
} else {
OffscreenUi::warning("Import ZIP Error", "You need to be running edit.js to import entities.");
}
// end attempt
});
} }
WebWindowClass* WindowScriptingInterface::doCreateWebWindow(const QString& title, const QString& url, int width, int height) { WebWindowClass* WindowScriptingInterface::doCreateWebWindow(const QString& title, const QString& url, int width, int height) {

13
scripts/system/edit.js
View file

@ -1205,6 +1205,19 @@ function importSVO(importURL) {
} }
Window.svoImportRequested.connect(importSVO); Window.svoImportRequested.connect(importSVO);
// attempt to start ZIP download project
function importZIP(importURL) {
print("Import ZIP requested: " + importURL);
if (!Entities.canAdjustLocks()) {
Window.alert(INSUFFICIENT_PERMISSIONS_IMPORT_ERROR_MSG);
return;
}
}
Window.zipImportRequested.connect(importZIP);
//end attempt
Menu.menuItemEvent.connect(handeMenuEvent); Menu.menuItemEvent.connect(handeMenuEvent);
Controller.keyPressEvent.connect(function (event) { Controller.keyPressEvent.connect(function (event) {