- Transform Controls +

+ Transform Controls

-- cgit v1.2.3 From 3ae45590d320b4e13367f78f821b7abcd9dbc53a Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 8 May 2012 14:47:41 -0700 Subject: removed unused classes form selection properties reel --- .../selection-properties.reel/selection-properties.css | 7 ------- 1 file changed, 7 deletions(-) (limited to 'js/components/tools-properties/selection-properties.reel') diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.css b/js/components/tools-properties/selection-properties.reel/selection-properties.css index 1d5eb513..7f1b0f7f 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.css +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.css @@ -4,10 +4,3 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ -.optionsSelectionTool { - padding: 6px; -} - - .optionsSelectionTool > * { - float:left; -} \ No newline at end of file -- cgit v1.2.3 From 0088f8e5f3a0be4b6e5e497afbe34de11211493c Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Wed, 9 May 2012 11:36:13 -0700 Subject: -Put new selection tool icons in the options bar -Styled the selection tool options bar --- .../selection-properties.html | 69 ++++++++++++++++------ .../selection-properties.js | 30 +++++++++- 2 files changed, 79 insertions(+), 20 deletions(-) (limited to 'js/components/tools-properties/selection-properties.reel') diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html index 2a791542..a05bb7a1 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.html +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html @@ -16,31 +16,66 @@ "prototype": "js/components/tools-properties/selection-properties.reel", "properties": { "element": {"#": "selectionProperties"}, - "transform": {"#": "transformCheck"} + "transform": {"#": "transformCheck"}, + + "topAlign": {"#": "topAlignBtn"}, + "middleAlign": {"#": "middleAlignBtn"}, + "bottomAlign": {"#": "bottomAlignBtn"}, + + "leftAlign": {"#": "leftAlignBtn"}, + "centerAlign": {"#": "centerAlignBtn"}, + "rightAlign": {"#": "rightAlignBtn"}, + + "distTop": {"#": "distTopBtn"}, + "distMiddle": {"#": "distMiddleBtn"}, + "distBottom": {"#": "distBottomBtn"}, + + "distLeft": {"#": "distLeftBtn"}, + "distCenter": {"#": "distCenterBtn"}, + "distRight": {"#": "distRightBtn"}, + + "arrangeBringForward": {"#": "arrangeBringForwardBtn"}, + "arrangeSendBackward": {"#": "arrangeSendBackwardBtn"}, + "arrangeBringToFront": {"#": "arrangeBringToFrontBtn"}, + "arrangeSendToBack": {"#": "arrangeSendToBackBtn"} } } } - +

- Transform Controls -

+ + Transform Control +

+ + + + +

+ + + + + +

diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.js b/js/components/tools-properties/selection-properties.reel/selection-properties.js index c25e96d1..43622960 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.js +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.js @@ -14,15 +14,39 @@ exports.SelectionProperties = Montage.create(ToolProperties, { _controls: { value: false }, _subPrepare: { - value: function() { + value: function () { this.transform.addEventListener("change", this, false); + + // The functionality for these buttons is not currently implemented + // Until it is we will make them all disabled by default. + this.topAlign.disabled = true; + + this.middleAlign.disabled = true; + this.bottomAlign.disabled = true; + + this.leftAlign.disabled = true; + this.centerAlign.disabled = true; + this.rightAlign.disabled = true; + + this.distTop.disabled = true; + this.distMiddle.disabled = true; + this.distBottom.disabled = true; + + this.distLeft.disabled = true; + this.distCenter.disabled = true; + this.distRight.disabled = true; + + this.arrangeBringForward.disabled = true; + this.arrangeSendBackward.disabled = true; + this.arrangeBringToFront.disabled = true; + this.arrangeSendToBack.disabled = true; } }, handleChange: { - value: function(event) { + value: function (event) { this._controls = this.transform.checked; - NJevent("toolOptionsChange", {source: "SelectionProperties", inTransformMode: this.transform.checked}); + NJevent("toolOptionsChange", { source: "SelectionProperties", inTransformMode: this.transform.checked }); } } -- cgit v1.2.3 From 18370abcf406c6ab36d5c5f2613cb79e756ff6d2 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Wed, 9 May 2012 18:07:32 -0700 Subject: -Consolidated many redundant css classes used in the tool options bars --- .../selection-properties.reel/selection-properties.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/components/tools-properties/selection-properties.reel') diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html index a05bb7a1..3dd04f2c 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.html +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html @@ -46,7 +46,7 @@ -

Transform Control

-- cgit v1.2.3