From 29ad6355ef60cfb3b3fc7f780504f3ed30845883 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 7 May 2012 14:30:47 -0700 Subject: More implementation of moving color chips to the individual subtools. Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools --- .../layout/tools-properties.reel/tools-properties.html | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'js/components/layout/tools-properties.reel') diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index 8dd0f713..c51ab27d 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.html @@ -66,12 +66,6 @@ } } }, - "pencilProperties1": { - "prototype": "js/components/tools-properties/pencil-properties.reel", - "properties": { - "element": {"#": "pencilProperties"} - } - }, "brushProperties1": { "prototype": "js/components/tools-properties/brush-properties.reel", "properties": { @@ -90,12 +84,6 @@ "element": {"#": "inkbottleProperties"} } }, - "eyedropperProperties1": { - "prototype": "js/components/tools-properties/eyedropper-properties.reel", - "properties": { - "element": {"#": "eyedropperProperties"} - } - }, "eraserProperties1": { "prototype": "js/components/tools-properties/eraser-properties.reel", "properties": { @@ -147,11 +135,9 @@ "penProperties": {"@": "penProperties1"}, "textProperties": {"@": "textProperties1"}, "shapeProperties": {"@": "shapeProperties1"}, - "pencilProperties": {"@": "pencilProperties1"}, "brushProperties": {"@": "brushProperties1"}, "fillProperties": {"@": "fillProperties1"}, "inkbottleProperties": {"@": "inkbottleProperties1"}, - "eyedropperProperties": {"@": "eyedropperProperties1"}, "eraserProperties": {"@": "eraserProperties1"}, "rotateStageProperties": {"@": "rotateStageProperties1"}, "panProperties": {"@": "panProperties1"}, @@ -179,11 +165,9 @@
-
-
-- cgit v1.2.3 From dd663d8fe9191cc57c9cebe6d425562cb45982c2 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 8 May 2012 07:25:09 -0700 Subject: Removed unused SubSelect Tool --- js/components/layout/tools-properties.reel/tools-properties.html | 8 -------- 1 file changed, 8 deletions(-) (limited to 'js/components/layout/tools-properties.reel') diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index a24ce658..e7d1ac8b 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.html @@ -18,12 +18,6 @@ "element": {"#": "selectionProperties"} } }, - "subSelectionProperties1": { - "prototype": "js/components/tools-properties/subselection-properties.reel[SubSelectionProperties]", - "properties": { - "element": {"#": "subSelectionProperties"} - } - }, "object3DProperties1": { "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]", "properties": { @@ -128,7 +122,6 @@ "properties": { "element": {"#": "toolsProperties"}, "selectionProperties": {"@": "selectionProperties1"}, - "subSelectionProperties": {"@": "subSelectionProperties1"}, "rotate3DProperties": {"@": "object3DProperties1"}, "translate3DProperties": {"@": "object3DProperties1"}, "tagProperties": {"@": "tagProperties1"}, @@ -159,7 +152,6 @@
-
-- cgit v1.2.3