diff options
| author | Jose Antonio Marquez | 2012-03-14 15:17:01 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-14 15:17:01 -0700 |
| commit | e7e18f02870a0cfe06e550acf8ffef6eab945231 (patch) | |
| tree | c940a63fd47e60f121c42b1823194522c8c2820f /js/components/tools-properties/brush-properties.reel/brush-properties.html | |
| parent | ef601b13a2529c207eb782942e918212e5a0805e (diff) | |
| parent | 089534a80c64226bf7d124ab9147afce386fdb5c (diff) | |
| download | ninja-e7e18f02870a0cfe06e550acf8ffef6eab945231.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Document
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 | 56 |
1 files changed, 55 insertions, 1 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 38f7f856..608111bd 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html | |||
| @@ -11,12 +11,55 @@ | |||
| 11 | 11 | ||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | "strokeSizeHT": { | ||
| 15 | "module": "js/components/hottextunit.reel", | ||
| 16 | "name": "HotTextUnit", | ||
| 17 | "properties": { | ||
| 18 | "element": {"#": "strokeSize"}, | ||
| 19 | "minValue": 1, | ||
| 20 | "maxValue": 100, | ||
| 21 | "value": 1, | ||
| 22 | "decimalPlace": 10, | ||
| 23 | "acceptableUnits" : ["px", "pt"] | ||
| 24 | } | ||
| 25 | }, | ||
| 26 | |||
| 27 | "strokeHardnessHT": { | ||
| 28 | "module": "js/components/hottextunit.reel", | ||
| 29 | "name": "HotTextUnit", | ||
| 30 | "properties": { | ||
| 31 | "element": {"#": "strokeHardness"}, | ||
| 32 | "minValue": 0, | ||
| 33 | "maxValue": 100, | ||
| 34 | "value": 100, | ||
| 35 | "decimalPlace": 10, | ||
| 36 | "acceptableUnits" : ["px", "pt"] | ||
| 37 | } | ||
| 38 | }, | ||
| 39 | |||
| 40 | "strokeAngleHT": { | ||
| 41 | "module": "js/components/hottextunit.reel", | ||
| 42 | "name": "HotTextUnit", | ||
| 43 | "properties": { | ||
| 44 | "element": {"#": "strokeAngle"}, | ||
| 45 | "minValue": -90, | ||
| 46 | "maxValue": 90, | ||
| 47 | "value": 0, | ||
| 48 | "decimalPlace": 10, | ||
| 49 | "acceptableUnits" : ["px", "pt"] | ||
| 50 | } | ||
| 51 | }, | ||
| 14 | 52 | ||
| 15 | "owner": { | 53 | "owner": { |
| 16 | "module": "js/components/tools-properties/brush-properties.reel", | 54 | "module": "js/components/tools-properties/brush-properties.reel", |
| 17 | "name": "BrushProperties", | 55 | "name": "BrushProperties", |
| 18 | "properties": { | 56 | "properties": { |
| 19 | "element": {"#": "brushProperties"} | 57 | "element": {"#": "brushProperties"}, |
| 58 | "_strokeSize": {"@": "strokeSizeHT"}, | ||
| 59 | "_strokeHardness": {"@": "strokeHardnessHT"}, | ||
| 60 | "_doSmoothing": {"#": "doSmoothing"}, | ||
| 61 | "_useCalligraphic":{"#": "useCalligraphic"}, | ||
| 62 | "_strokeAngle": {"@": "strokeAngleHT"} | ||
| 20 | } | 63 | } |
| 21 | } | 64 | } |
| 22 | } | 65 | } |
| @@ -26,6 +69,17 @@ | |||
| 26 | 69 | ||
| 27 | <body> | 70 | <body> |
| 28 | <div id="brushProperties" class="subToolHolderPanel"> | 71 | <div id="brushProperties" class="subToolHolderPanel"> |
| 72 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | ||
| 73 | <label class="label"> Width:</label> | ||
| 74 | <div id="strokeSize" class="label"></div> | ||
| 75 | <label class="label"> Hardness:</label> | ||
| 76 | <div id="strokeHardness" class="label"></div> | ||
| 77 | <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label> | ||
| 78 | <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label> | ||
| 79 | <label class="label"> Angle:</label> | ||
| 80 | <div id="strokeAngle" class="label"></div> | ||
| 81 | |||
| 82 | </div> | ||
| 29 | </div> | 83 | </div> |
| 30 | </body> | 84 | </body> |
| 31 | 85 | ||