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

Decouple ui and shared libraries

Browse source
This commit is contained in:
David Rowe 2016-04-22 12:58:47 +12:00
parent 266e4c998b
commit a7b82e8cae
7 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/dialogs/RunningScripts.qml
View file

@ -250,7 +250,7 @@ Window {
icon: hifi.glyphs.script
iconSize: 24
text: "Reveal Scripts Folder"
onClicked: fileDialogHelper.openScriptsDirectory()
onClicked: fileDialogHelper.openDirectory(scripts.defaultScriptsPath)
colorScheme: hifi.colorSchemes.dark
anchors.left: parent.left
visible: !isHMD

4
libraries/script-engine/src/ScriptEngines.cpp
View file

@ -511,3 +511,7 @@ void ScriptEngines::onScriptEngineError(const QString& scriptFilename) {
qCDebug(scriptengine) << "Application::loadScript(), script failed to load...";
emit scriptLoadError(scriptFilename, "");
}
QString ScriptEngines::getDefaultScriptsLocation() const {
return defaultScriptsLocation().toString();
}

4
libraries/script-engine/src/ScriptEngines.h
View file

@ -50,6 +50,8 @@ public:
ScriptsModel* scriptsModel() { return &_scriptsModel; };
ScriptsModelFilter* scriptsModelFilter() { return &_scriptsModelFilter; };
QString getDefaultScriptsLocation() const;
Q_INVOKABLE void loadOneScript(const QString& scriptFilename);
Q_INVOKABLE ScriptEngine* loadScript(const QUrl& scriptFilename = QString(),
bool isUserLoaded = true, bool loadScriptFromEditor = false, bool activateMainWindow = false, bool reload = false);
@ -62,6 +64,8 @@ public:
Q_INVOKABLE QVariantList getPublic();
Q_INVOKABLE QVariantList getLocal();
Q_PROPERTY(QString defaultScriptsPath READ getDefaultScriptsLocation)
// Called at shutdown time
void shutdownScripting();

6
libraries/ui/src/FileDialogHelper.cpp
View file

@ -16,8 +16,6 @@
#include <QtCore/QRegularExpression>
#include <QDesktopServices>
#include "PathUtils.h"
QUrl FileDialogHelper::home() {
return pathToUrl(QStandardPaths::standardLocations(QStandardPaths::HomeLocation)[0]);
@ -107,6 +105,6 @@ QStringList FileDialogHelper::drives() {
return result;
}
void FileDialogHelper::openScriptsDirectory() {
QDesktopServices::openUrl(defaultScriptsLocation());
void FileDialogHelper::openDirectory(const QString& path) {
QDesktopServices::openUrl(path);
}

2
libraries/ui/src/FileDialogHelper.h
View file

@ -59,7 +59,7 @@ public:
Q_INVOKABLE QUrl pathToUrl(const QString& path);
Q_INVOKABLE QUrl saveHelper(const QString& saveText, const QUrl& currentFolder, const QStringList& selectionFilters);
Q_INVOKABLE void openScriptsDirectory();
Q_INVOKABLE void openDirectory(const QString& path);
};

4
tests/ui/qml/Stubs.qml
View file

@ -51,7 +51,11 @@ Item {
function getRunning() {
return _runningScripts;
}
}
Item {
objectName: "HMD"
property bool active: false
}
Item {

1
tests/ui/src/main.cpp
View file

@ -88,6 +88,7 @@ int main(int argc, char *argv[]) {
setChild(engine, "ApplicationCompositor");
setChild(engine, "Desktop");
setChild(engine, "ScriptDiscoveryService");
setChild(engine, "HMD");
setChild(engine, "MenuHelper");
setChild(engine, "Preferences");
setChild(engine, "urlHandler");