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

Merge pull request #10999 from birarda/bug/html-path-on-mac-build

Browse source 
fix create tab load on OS X
This commit is contained in:
Stephen Birarda 2017-07-24 10:12:40 -07:00 committed by GitHub
commit 26be7e1a01
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
interface/resources/qml/hifi/tablet/EditTabView.qml
View file

@ -21,7 +21,7 @@ TabView {
enabled: true enabled: true
property string originalUrl: "" property string originalUrl: ""
Rectangle { Rectangle {
color: "#404040" color: "#404040"
Text { Text {
@ -180,7 +180,7 @@ TabView {
WebView { WebView {
id: entityListToolWebView id: entityListToolWebView
url: "../../../../../scripts/system/html/entityList.html" url: Paths.defaultScripts + "/system/html/entityList.html"
anchors.fill: parent anchors.fill: parent
enabled: true enabled: true
} }
@ -194,7 +194,7 @@ TabView {
WebView { WebView {
id: entityPropertiesWebView id: entityPropertiesWebView
url: "../../../../../scripts/system/html/entityProperties.html" url: Paths.defaultScripts + "/system/html/entityProperties.html"
anchors.fill: parent anchors.fill: parent
enabled: true enabled: true
} }
@ -208,7 +208,7 @@ TabView {
WebView { WebView {
id: gridControlsWebView id: gridControlsWebView
url: "../../../../../scripts/system/html/gridControls.html" url: Paths.defaultScripts + "/system/html/gridControls.html"
anchors.fill: parent anchors.fill: parent
enabled: true enabled: true
} }
@ -222,7 +222,7 @@ TabView {
WebView { WebView {
id: particleExplorerWebView id: particleExplorerWebView
url: "../../../../../scripts/system/particle_explorer/particleExplorer.html" url: Paths.defaultScripts + "/system/particle_explorer/particleExplorer.html"
anchors.fill: parent anchors.fill: parent
enabled: true enabled: true
} }
@ -293,16 +293,16 @@ TabView {
break; break;
case 'list': case 'list':
editTabView.currentIndex = 1; editTabView.currentIndex = 1;
break; break;
case 'properties': case 'properties':
editTabView.currentIndex = 2; editTabView.currentIndex = 2;
break; break;
case 'grid': case 'grid':
editTabView.currentIndex = 3; editTabView.currentIndex = 3;
break; break;
case 'particle': case 'particle':
editTabView.currentIndex = 4; editTabView.currentIndex = 4;
break; break;
default: default:
console.warn('Attempt to switch to invalid tab:', id); console.warn('Attempt to switch to invalid tab:', id);
} }
@ -310,4 +310,4 @@ TabView {
console.warn('Attempt to switch tabs with invalid input:', JSON.stringify(id)); console.warn('Attempt to switch tabs with invalid input:', JSON.stringify(id));
} }
} }
} }

3
libraries/shared/src/PathUtils.h
View file

@ -13,6 +13,8 @@
#define hifi_PathUtils_h #define hifi_PathUtils_h
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QUrl>
#include "DependencyManager.h" #include "DependencyManager.h"
/**jsdoc /**jsdoc
@ -24,6 +26,7 @@ class PathUtils : public QObject, public Dependency {
Q_OBJECT Q_OBJECT
SINGLETON_DEPENDENCY SINGLETON_DEPENDENCY
Q_PROPERTY(QString resources READ resourcesPath) Q_PROPERTY(QString resources READ resourcesPath)
Q_PROPERTY(QUrl defaultScripts READ defaultScriptsLocation)
public: public:
static const QString& resourcesPath(); static const QString& resourcesPath();