diff options
| author | Pushkar Joshi | 2012-03-02 12:36:34 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-02 12:36:34 -0800 |
| commit | dc3c813320c8d3fb837d5d18e70ab35a53b116c1 (patch) | |
| tree | da417684de5e302d302ea617854015bd9a8ca17a /js/components/tools-properties/brush-properties.reel/brush-properties.html | |
| parent | d7d78d4a4e8cf82c56379d25efbe679b3b823abc (diff) | |
| parent | 4419209a1fd850ab468209b562b66b0242b42a9c (diff) | |
| download | ninja-dc3c813320c8d3fb837d5d18e70ab35a53b116c1.tar.gz | |
Merge branch 'brushtool' into pentool
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 | 35 |
1 files changed, 34 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..af07b3f2 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,39 @@ | |||
| 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 | }, | ||
| 14 | 39 | ||
| 15 | "owner": { | 40 | "owner": { |
| 16 | "module": "js/components/tools-properties/brush-properties.reel", | 41 | "module": "js/components/tools-properties/brush-properties.reel", |
| 17 | "name": "BrushProperties", | 42 | "name": "BrushProperties", |
| 18 | "properties": { | 43 | "properties": { |
| 19 | "element": {"#": "brushProperties"} | 44 | "element": {"#": "brushProperties"}, |
| 45 | "_strokeSize": {"@": "strokeSizeHT"}, | ||
| 46 | "_strokeHardness": {"@": "strokeHardnessHT"} | ||
| 20 | } | 47 | } |
| 21 | } | 48 | } |
| 22 | } | 49 | } |
| @@ -26,6 +53,12 @@ | |||
| 26 | 53 | ||
| 27 | <body> | 54 | <body> |
| 28 | <div id="brushProperties" class="subToolHolderPanel"> | 55 | <div id="brushProperties" class="subToolHolderPanel"> |
| 56 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | ||
| 57 | <label class="label"> Stroke:</label> | ||
| 58 | <div id="strokeSize" class="label"></div> | ||
| 59 | <label class="label"> Hardness:</label> | ||
| 60 | <div id="strokeHardness" class="label"></div> | ||
| 61 | </div> | ||
| 29 | </div> | 62 | </div> |
| 30 | </body> | 63 | </body> |
| 31 | 64 | ||