mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 23:17:02 +02:00
Merge branch 'log-resource-requests-2' of github.com:kkurian/hifi into log-resource-requests-2
This commit is contained in:
commit
55c1a88404
2 changed files with 3 additions and 12 deletions
|
@ -52,7 +52,7 @@ Rectangle {
|
||||||
}
|
}
|
||||||
sendToScript({
|
sendToScript({
|
||||||
method: "tester_deleteResourceObject",
|
method: "tester_deleteResourceObject",
|
||||||
objectId: resourceListModel.get(index).id});
|
objectId: resourceListModel.get(index).resourceObjectId});
|
||||||
resourceListModel.remove(index);
|
resourceListModel.remove(index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -83,7 +83,7 @@ Rectangle {
|
||||||
color: hifi.colors.white
|
color: hifi.colors.white
|
||||||
wrapMode: Text.WrapAnywhere
|
wrapMode: Text.WrapAnywhere
|
||||||
}
|
}
|
||||||
|
|
||||||
HifiStylesUit.RalewayRegular {
|
HifiStylesUit.RalewayRegular {
|
||||||
id: resourceUrl
|
id: resourceUrl
|
||||||
anchors.top: resourceName.bottom;
|
anchors.top: resourceName.bottom;
|
||||||
|
@ -311,7 +311,7 @@ Rectangle {
|
||||||
}
|
}
|
||||||
font: Qt.font({ family: "Courier", pointSize: 8, weight: Font.Normal })
|
font: Qt.font({ family: "Courier", pointSize: 8, weight: Font.Normal })
|
||||||
wrapMode: TextEdit.NoWrap
|
wrapMode: TextEdit.NoWrap
|
||||||
|
|
||||||
background: Rectangle {
|
background: Rectangle {
|
||||||
anchors.fill: parent;
|
anchors.fill: parent;
|
||||||
color: hifi.colors.baseGrayShadow;
|
color: hifi.colors.baseGrayShadow;
|
||||||
|
|
|
@ -281,15 +281,6 @@ Rectangle {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function addAllInstalledAppsToList() {
|
|
||||||
var i, apps = Commerce.getInstalledApps().split(","), len = apps.length;
|
|
||||||
for(i = 0; i < len - 1; ++i) {
|
|
||||||
if (i in apps) {
|
|
||||||
resourceListModel.append(buildResourceObj(apps[i]));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function toUrl(resource) {
|
function toUrl(resource) {
|
||||||
var httpPattern = /^http/i;
|
var httpPattern = /^http/i;
|
||||||
return httpPattern.test(resource) ? resource : "file:///" + resource;
|
return httpPattern.test(resource) ? resource : "file:///" + resource;
|
||||||
|
|
Loading…
Reference in a new issue