1 files changed, 72 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..98442164 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,71 @@
        <script type="text/montage-serialization">
        {
+            "strokeSizeHT": {
+                "module": "js/components/hottextunit.reel",
+                "name": "HotTextUnit",
+                "properties": {
+                    "element": {"#": "strokeSize"},
+                    "minValue": 1,
+                    "maxValue": 100,
+                    "value": 1,
+                    "decimalPlace": 10,
+                    "acceptableUnits" : ["px", "pt"]
+                }
+            },
+            "strokeHardnessHT": {
+                "module": "js/components/hottextunit.reel",
+                "name": "HotTextUnit",
+                "properties": {
+                    "element": {"#": "strokeHardness"},
+                    "minValue": 0,
+                    "maxValue": 100,
+                    "value": 100,
+                    "decimalPlace": 10,
+                    "acceptableUnits" : ["%"],
+                    "units" : "%"
+                }
+            },
+            "strokeAngleHT": {
+                "module": "js/components/hottextunit.reel",
+                "name": "HotTextUnit",
+                "properties": {
+                    "element": {"#": "strokeAngle"},
+                    "minValue": -90,
+                    "maxValue": 90,
+                    "value": 0,
+                    "decimalPlace": 10,
+                    "acceptableUnits" : ["deg."],
+                    "units" : "deg."
+                }
+            },
+            "smoothingAmountHT": {
+                "module": "js/components/hottext.reel",
+                "name": "HotText",
+                "properties": {
+                    "element": {"#": "smoothingAmount"},
+                    "minValue": 0,
+                    "maxValue": 100,
+                    "value": 0,
+                    "decimalPlace": 10
+                }
+            },
            "owner": {
                "module": "js/components/tools-properties/brush-properties.reel",
                "name": "BrushProperties",
                "properties": {
-                    "element": {"#": "brushProperties"}
+                    "element": {"#": "brushProperties"},
+                    "_strokeSize": {"@": "strokeSizeHT"},
+                    "_strokeHardness": {"@": "strokeHardnessHT"},
+                    "_doSmoothing": {"#": "doSmoothing"},
+                    "_smoothingAmount": {"@": "smoothingAmountHT"},
+                    "_useCalligraphic":{"#": "useCalligraphic"},
+                    "_strokeAngle": {"@": "strokeAngleHT"},
+                    "_angleLabel": {"#": "angleLabel"}
                }
            }
        }
@@ -26,6 +85,18 @@
    <body>
        <div id="brushProperties" class="subToolHolderPanel">
+            <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
+                <label class="label"> Width:</label>
+                <div id="strokeSize" class="label"></div>
+                <label class="label"> Hardness:</label>
+                <div id="strokeHardness" class="label"></div>
+                <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label>
+                <div id="smoothingAmount" class="label"></div>
+                <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label>
+                <label class="label" id="angleLabel"> Angle:</label>
+                <div id="strokeAngle" class="label"></div>
+            </div>
        </div>
    </body>

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..98442164 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,71 @@
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" : ["%"],
		37	"units" : "%"
		38	}
		39	},
		40
		41	"strokeAngleHT": {
		42	"module": "js/components/hottextunit.reel",
		43	"name": "HotTextUnit",
		44	"properties": {
		45	"element": {"#": "strokeAngle"},
		46	"minValue": -90,
		47	"maxValue": 90,
		48	"value": 0,
		49	"decimalPlace": 10,
		50	"acceptableUnits" : ["deg."],
		51	"units" : "deg."
		52	}
		53	},
		54
		55	"smoothingAmountHT": {
		56	"module": "js/components/hottext.reel",
		57	"name": "HotText",
		58	"properties": {
		59	"element": {"#": "smoothingAmount"},
		60	"minValue": 0,
		61	"maxValue": 100,
		62	"value": 0,
		63	"decimalPlace": 10
		64	}
		65	},
14		66
15	"owner": {	67	"owner": {
16	"module": "js/components/tools-properties/brush-properties.reel",	68	"module": "js/components/tools-properties/brush-properties.reel",
17	"name": "BrushProperties",	69	"name": "BrushProperties",
18	"properties": {	70	"properties": {
19	"element": {"#": "brushProperties"}	71	"element": {"#": "brushProperties"},
		72	"_strokeSize": {"@": "strokeSizeHT"},
		73	"_strokeHardness": {"@": "strokeHardnessHT"},
		74	"_doSmoothing": {"#": "doSmoothing"},
		75	"_smoothingAmount": {"@": "smoothingAmountHT"},
		76	"_useCalligraphic":{"#": "useCalligraphic"},
		77	"_strokeAngle": {"@": "strokeAngleHT"},
		78	"_angleLabel": {"#": "angleLabel"}
20	}	79	}
21	}	80	}
22	}	81	}
@@ -26,6 +85,18 @@
26		85
27	<body>	86	<body>
28	<div id="brushProperties" class="subToolHolderPanel">	87	<div id="brushProperties" class="subToolHolderPanel">
		88	<div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
		89	<label class="label"> Width:</label>
		90	<div id="strokeSize" class="label"></div>
		91	<label class="label"> Hardness:</label>
		92	<div id="strokeHardness" class="label"></div>
		93	<label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label>
		94	<div id="smoothingAmount" class="label"></div>
		95	<label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label>
		96	<label class="label" id="angleLabel"> Angle:</label>
		97	<div id="strokeAngle" class="label"></div>
		98
		99	</div>
29	</div>	100	</div>
30	</body>	101	</body>
31		102