diff options
45 files changed, 1109 insertions, 17 deletions
diff --git a/css/ninja.css b/css/ninja.css index 682dfc9d..34b0b296 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -118,9 +118,9 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
118 | 118 | ||
119 | #sceneBar { height: 70px; background-color: #474747; } | 119 | #sceneBar { height: 70px; background-color: #474747; } |
120 | 120 | ||
121 | #mainContainer .rulerTop { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; border-right: 11px solid black; } | 121 | #mainContainer .rulerTop { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; } |
122 | 122 | ||
123 | .rulerLeft { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; border-bottom: 11px solid black; } | 123 | .rulerLeft { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; } |
124 | 124 | ||
125 | #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } | 125 | #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } |
126 | 126 | ||
@@ -867,6 +867,8 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
867 | 867 | ||
868 | .InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); } | 868 | .InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); } |
869 | 869 | ||
870 | .bindingTool { background-image: url("../images/tools/binding.png"); } | ||
871 | |||
870 | .blueDiv { background: blue; opacity: 0.2; } | 872 | .blueDiv { background: blue; opacity: 0.2; } |
871 | 873 | ||
872 | ::-webkit-scrollbar { width: 11px; height: 11px; } | 874 | ::-webkit-scrollbar { width: 11px; height: 11px; } |
@@ -941,4 +943,12 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
941 | 943 | ||
942 | .montage-invisible { display: none; } | 944 | .montage-invisible { display: none; } |
943 | 945 | ||
946 | .panels .panel { display: none; } | ||
947 | |||
948 | .panels .panel.ws-binding { display: none; -webkit-box-flex-group: 2; } | ||
949 | |||
950 | body.ws-binding .panel.ws-binding { display: -webkit-box; } | ||
951 | |||
952 | body.ws-default .panel.default { display: -webkit-box; -webkit-box-flex-group: 1; } | ||
953 | |||
944 | /*77*/ | 954 | /*77*/ |
diff --git a/images/cursors/binding.png b/images/cursors/binding.png new file mode 100644 index 00000000..16e84574 --- /dev/null +++ b/images/cursors/binding.png | |||
Binary files differ | |||
diff --git a/images/tools/binding.png b/images/tools/binding.png new file mode 100644 index 00000000..33545ee1 --- /dev/null +++ b/images/tools/binding.png | |||
Binary files differ | |||
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index df603bf8..dec37a84 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
@@ -95,6 +95,9 @@ | |||
95 | "ZoomTool1": { | 95 | "ZoomTool1": { |
96 | "prototype": "js/tools/ZoomTool" | 96 | "prototype": "js/tools/ZoomTool" |
97 | }, | 97 | }, |
98 | "BindingTool1": { | ||
99 | "prototype": "js/tools/BindingTool" | ||
100 | }, | ||
98 | 101 | ||
99 | "disable": { | 102 | "disable": { |
100 | "prototype": "montage/ui/condition.reel", | 103 | "prototype": "montage/ui/condition.reel", |
@@ -131,6 +134,7 @@ | |||
131 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, | 134 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, |
132 | "PanTool": {"@": "PanTool1"}, | 135 | "PanTool": {"@": "PanTool1"}, |
133 | "ZoomTool": {"@": "ZoomTool1"}, | 136 | "ZoomTool": {"@": "ZoomTool1"}, |
137 | "bindingTool": {"@": "BindingTool1"}, | ||
134 | "components": [ | 138 | "components": [ |
135 | {"@": "repetition1"} | 139 | {"@": "repetition1"} |
136 | ] | 140 | ] |
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index e7d1ac8b..ffaa0fca 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.html | |||
@@ -102,6 +102,12 @@ | |||
102 | "element": {"#": "zoomProperties"} | 102 | "element": {"#": "zoomProperties"} |
103 | } | 103 | } |
104 | }, | 104 | }, |
105 | "bindingProperties1": { | ||
106 | "prototype": "js/components/tools-properties/binding-properties.reel", | ||
107 | "properties": { | ||
108 | "element": {"#": "bindingProperties"} | ||
109 | } | ||
110 | }, | ||
105 | 111 | ||
106 | "disable": { | 112 | "disable": { |
107 | "prototype": "montage/ui/condition.reel", | 113 | "prototype": "montage/ui/condition.reel", |
@@ -134,7 +140,8 @@ | |||
134 | "eraserProperties": {"@": "eraserProperties1"}, | 140 | "eraserProperties": {"@": "eraserProperties1"}, |
135 | "rotateStageProperties": {"@": "rotateStageProperties1"}, | 141 | "rotateStageProperties": {"@": "rotateStageProperties1"}, |
136 | "panProperties": {"@": "panProperties1"}, | 142 | "panProperties": {"@": "panProperties1"}, |
137 | "zoomProperties": {"@": "zoomProperties1"} | 143 | "zoomProperties": {"@": "zoomProperties1"}, |
144 | "bindingProperties": {"@": "bindingProperties1"} | ||
138 | }, | 145 | }, |
139 | "bindings": { | 146 | "bindings": { |
140 | "currentSelectedTool": { | 147 | "currentSelectedTool": { |
@@ -164,6 +171,7 @@ | |||
164 | <div data-montage-id="rotateStageProperties"></div> | 171 | <div data-montage-id="rotateStageProperties"></div> |
165 | <div data-montage-id="panProperties"></div> | 172 | <div data-montage-id="panProperties"></div> |
166 | <div data-montage-id="zoomProperties"></div> | 173 | <div data-montage-id="zoomProperties"></div> |
174 | <div data-montage-id="bindingProperties"></div> | ||
167 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> | 175 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
168 | </div> | 176 | </div> |
169 | </body> | 177 | </body> |
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.css b/js/components/tools-properties/binding-properties.reel/binding-properties.css new file mode 100755 index 00000000..19d2b6c6 --- /dev/null +++ b/js/components/tools-properties/binding-properties.reel/binding-properties.css | |||
@@ -0,0 +1,17 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | .bindingSubTools { | ||
8 | padding:9px; | ||
9 | font-size:12px; | ||
10 | } | ||
11 | |||
12 | .bindingSubTools label { | ||
13 | |||
14 | } | ||
15 | .bindingSubTools input[type=checkbox] { | ||
16 | margin: 0px 3px; | ||
17 | } \ No newline at end of file | ||
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.html b/js/components/tools-properties/binding-properties.reel/binding-properties.html new file mode 100755 index 00000000..cd0e0a50 --- /dev/null +++ b/js/components/tools-properties/binding-properties.reel/binding-properties.html | |||
@@ -0,0 +1,35 @@ | |||
1 | <!DOCTYPE HTML> | ||
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever |