diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/tools-properties/brush-properties.reel/brush-properties.html | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/tools-properties/brush-properties.reel/brush-properties.html')
| -rwxr-xr-x | js/components/tools-properties/brush-properties.reel/brush-properties.html | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index d9c35dc2..e7aaf0e8 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -12,8 +12,7 @@ | |||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | "strokeSizeHT": { | 14 | "strokeSizeHT": { |
| 15 | "module": "js/components/hottextunit.reel", | 15 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 16 | "name": "HotTextUnit", | ||
| 17 | "properties": { | 16 | "properties": { |
| 18 | "element": {"#": "strokeSize"}, | 17 | "element": {"#": "strokeSize"}, |
| 19 | "minValue": 1, | 18 | "minValue": 1, |
| @@ -25,8 +24,7 @@ | |||
| 25 | }, | 24 | }, |
| 26 | 25 | ||
| 27 | "strokeHardnessHT": { | 26 | "strokeHardnessHT": { |
| 28 | "module": "js/components/hottextunit.reel", | 27 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 29 | "name": "HotTextUnit", | ||
| 30 | "properties": { | 28 | "properties": { |
| 31 | "element": {"#": "strokeHardness"}, | 29 | "element": {"#": "strokeHardness"}, |
| 32 | "minValue": 0, | 30 | "minValue": 0, |
| @@ -39,8 +37,7 @@ | |||
| 39 | }, | 37 | }, |
| 40 | 38 | ||
| 41 | "strokeAngleHT": { | 39 | "strokeAngleHT": { |
| 42 | "module": "js/components/hottextunit.reel", | 40 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 43 | "name": "HotTextUnit", | ||
| 44 | "properties": { | 41 | "properties": { |
| 45 | "element": {"#": "strokeAngle"}, | 42 | "element": {"#": "strokeAngle"}, |
| 46 | "minValue": -90, | 43 | "minValue": -90, |
| @@ -53,8 +50,7 @@ | |||
| 53 | }, | 50 | }, |
| 54 | 51 | ||
| 55 | "smoothingAmountHT": { | 52 | "smoothingAmountHT": { |
| 56 | "module": "js/components/hottext.reel", | 53 | "prototype": "js/components/hottext.reel[HotText]", |
| 57 | "name": "HotText", | ||
| 58 | "properties": { | 54 | "properties": { |
| 59 | "element": {"#": "smoothingAmount"}, | 55 | "element": {"#": "smoothingAmount"}, |
| 60 | "minValue": 0, | 56 | "minValue": 0, |
| @@ -65,8 +61,7 @@ | |||
| 65 | }, | 61 | }, |
| 66 | 62 | ||
| 67 | "owner": { | 63 | "owner": { |
| 68 | "module": "js/components/tools-properties/brush-properties.reel", | 64 | "prototype": "js/components/tools-properties/brush-properties.reel", |
| 69 | "name": "BrushProperties", | ||
| 70 | "properties": { | 65 | "properties": { |
| 71 | "element": {"#": "brushProperties"}, | 66 | "element": {"#": "brushProperties"}, |
| 72 | "_strokeSize": {"@": "strokeSizeHT"}, | 67 | "_strokeSize": {"@": "strokeSizeHT"}, |
| @@ -85,16 +80,16 @@ | |||
| 85 | 80 | ||
| 86 | <body> | 81 | <body> |
| 87 | <div data-montage-id="brushProperties" class="subToolHolderPanel"> | 82 | <div data-montage-id="brushProperties" class="subToolHolderPanel"> |
| 88 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | 83 | <div data-montage-id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> |
| 89 | <label class="label"> Width:</label> | 84 | <label class="label"> Width:</label> |
| 90 | <div id="strokeSize" class="label"></div> | 85 | <div data-montage-id="strokeSize" class="label"></div> |
| 91 | <label class="label"> Hardness:</label> | 86 | <label class="label"> Hardness:</label> |
| 92 | <div id="strokeHardness" class="label"></div> | 87 | <div data-montage-id="strokeHardness" class="label"></div> |
| 93 | <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label> | 88 | <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label> |
| 94 | <div id="smoothingAmount" class="label"></div> | 89 | <div data-montage-id="smoothingAmount" class="label"></div> |
| 95 | <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label> | 90 | <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label> |
| 96 | <label class="label" id="angleLabel"> Angle:</label> | 91 | <label class="label" id="angleLabel"> Angle:</label> |
| 97 | <div id="strokeAngle" class="label"></div> | 92 | <div data-montage-id="strokeAngle" class="label"></div> |
| 98 | 93 | ||
| 99 | </div> | 94 | </div> |
| 100 | </div> | 95 | </div> |