From e0e9a7de15abb7e91e0e96e638d81a4097199b18 Mon Sep 17 00:00:00 2001 From: David Back Date: Fri, 4 Jan 2019 18:35:00 -0800 Subject: [PATCH] tabs --- .../resources/qml/hifi/tablet/EditTabView.qml | 4 ++-- .../qml/hifi/tablet/EditToolsTabView.qml | 4 ++-- scripts/system/edit.js | 4 ++-- scripts/system/html/js/entityList.js | 2 +- scripts/system/html/js/entityProperties.js | 16 +++++++-------- scripts/system/html/js/includes.js | 20 +++++++++---------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml index 21c8756d9a..c6b66ae24d 100644 --- a/interface/resources/qml/hifi/tablet/EditTabView.qml +++ b/interface/resources/qml/hifi/tablet/EditTabView.qml @@ -190,8 +190,8 @@ TabBar { editTabView.currentIndex = 2 } } - - NewEntityButton { + + NewEntityButton { icon: "icons/create-icons/21-cube-01.svg" text: "GRID" onClicked: { diff --git a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml b/interface/resources/qml/hifi/tablet/EditToolsTabView.qml index dc062910ca..9db09cd229 100644 --- a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml +++ b/interface/resources/qml/hifi/tablet/EditToolsTabView.qml @@ -196,8 +196,8 @@ TabBar { editTabView.currentIndex = tabIndex.properties } } - - NewEntityButton { + + NewEntityButton { icon: "icons/create-icons/21-cube-01.svg" text: "GRID" onClicked: { diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 94fca20a9d..2bbbd60c23 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -892,8 +892,8 @@ var toolBar = (function () { }); addButton("newMaterialButton", createNewEntityDialogButtonCallback("Material")); - - addButton("newGridButton", function () { + + addButton("newGridButton", function () { createNewEntity({ type: "Grid", }); diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js index 12ea6c91d0..fdf0993235 100644 --- a/scripts/system/html/js/entityList.js +++ b/scripts/system/html/js/entityList.js @@ -153,7 +153,7 @@ const FILTER_TYPES = [ "PolyLine", "PolyVox", "Text", - "Grid", + "Grid", ]; const DOUBLE_CLICK_TIMEOUT = 300; // ms diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js index 863a179d17..662d883bd2 100644 --- a/scripts/system/html/js/entityProperties.js +++ b/scripts/system/html/js/entityProperties.js @@ -646,7 +646,7 @@ const GROUPS = [ }, ] }, - { + { id: "grid", addToGroup: "base", properties: [ @@ -663,17 +663,17 @@ const GROUPS = [ { label: "Major Grid Every", type: "number-draggable", - min: 0, - step: 1, - decimals: 0, + min: 0, + step: 1, + decimals: 0, propertyID: "majorGridEvery", }, - { + { label: "Minor Grid Every", type: "number-draggable", - min: 0, - step: 0.01, - decimals: 2, + min: 0, + step: 0.01, + decimals: 2, propertyID: "minorGridEvery", }, ] diff --git a/scripts/system/html/js/includes.js b/scripts/system/html/js/includes.js index 02af65b691..4d2c7f2e15 100644 --- a/scripts/system/html/js/includes.js +++ b/scripts/system/html/js/includes.js @@ -10,17 +10,17 @@ const ENTITY_TYPE_ICON = { Box: "m", - Grid: "V", - Image: "", - Light: "p", - Material: "", - Model: "", - ParticleEffect: "", - PolyVox: "", - PolyLine: "", - Shape: "n", + Grid: "V", + Image: "", + Light: "p", + Material: "", + Model: "", + ParticleEffect: "", + PolyVox: "", + PolyLine: "", + Shape: "n", Sphere: "n", - Text: "l", + Text: "l", Web: "q", Zone: "o", Multiple: "",