Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-09 15:52:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove add Grid entity button, fix color

Browse source
This commit is contained in:
David Back 2019-01-07 17:07:28 -08:00
parent 90e2feb977
commit d9e229d38e
5 changed files with 2 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/resources/icons/create-icons/142-grid-01.svg
View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
<path d="M448.8,273.5c8.3,0,15-6.7,15-15s-6.7-15-15-15h-42.3V137.5h42.3c8.3,0,15-6.7,15-15s-6.7-15-15-15h-42.3V67.1
c0-8.3-6.7-15-15-15s-15,6.7-15,15v40.3H276.3V67.1c0-8.3-6.7-15-15-15s-15,6.7-15,15v40.3H142.2V67.1c0-8.3-6.7-15-15-15
s-15,6.7-15,15v40.3H70.9c-8.3,0-15,6.7-15,15s6.7,15,15,15h41.3v106.1H70.9c-8.3,0-15,6.7-15,15s6.7,15,15,15h41.3v104.1H70.9
c-8.3,0-15,6.7-15,15s6.7,15,15,15h41.3V448c0,8.3,6.7,15,15,15s15-6.7,15-15v-40.3h104.1V448c0,8.3,6.7,15,15,15s15-6.7,15-15
v-40.3h100.1V448c0,8.3,6.7,15,15,15s15-6.7,15-15v-40.3h42.3c8.3,0,15-6.7,15-15s-6.7-15-15-15h-42.3V273.5H448.8z M376.4,137.5
v106.1H276.3V137.5H376.4z M142.2,137.5h104.1v106.1H142.2V137.5z M142.2,377.7V273.5h104.1v104.1H142.2z M376.4,377.7H276.3V273.5
h100.1V377.7z"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

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

@ -190,18 +190,6 @@ TabBar {
editTabView.currentIndex = 2
}
}
NewEntityButton {
icon: "icons/create-icons/142-grid-01.svg"
text: "GRID"
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked",
params: { buttonName: "newGridButton" }
});
editTabView.currentIndex = 2
}
}
}
HifiControls.Button {

12
interface/resources/qml/hifi/tablet/EditToolsTabView.qml
View file

@ -196,18 +196,6 @@ TabBar {
editTabView.currentIndex = tabIndex.properties
}
}
NewEntityButton {
icon: "icons/create-icons/142-grid-01.svg"
text: "GRID"
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked",
params: { buttonName: "newGridButton" }
});
editTabView.currentIndex = tabIndex.properties
}
}
}
HifiControls.Button {

6
scripts/system/edit.js
View file

@ -892,12 +892,6 @@ var toolBar = (function () {
});
addButton("newMaterialButton", createNewEntityDialogButtonCallback("Material"));
addButton("newGridButton", function () {
createNewEntity({
type: "Grid",
});
});
var deactivateCreateIfDesktopWindowsHidden = function() {
if (!shouldUseEditTabletApp() && !entityListTool.isVisible() && !createToolsWindow.isVisible()) {

3
scripts/system/html/js/entityProperties.js
View file

@ -653,7 +653,8 @@ const GROUPS = [
{
label: "Color",
type: "color",
propertyID: "color",
propertyID: "gridColor",
propertyName: "color", // actual entity property name
},
{
label: "Follow Camera",