6 files changed, 98 insertions, 57 deletions
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.js b/js/components/tools-properties/fill-properties.reel/fill-properties.js
index 7331b375..ef1699af 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.js
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.js
@@ -10,6 +10,31 @@ var Montage = require("montage/core/core").Montage,
 var FillProperties = exports.FillProperties = Montage.create(ToolProperties, {
+    useFillColor: {
+        value: null,
+        serializable: true
+    },
+    _fillColorCtrl: {
+        value: null,
+        serializable: true
+    },
+    useWebGL: {
+        value: null,
+        serializable: true
+    },
+    _materialsContainer: {
+        value: null,
+        serializable: true
+    },
+    fillMaterial: {
+        value: null,
+        serializable: true
+    },
    addedColorChips: { value: false },
    _fill: {
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
index e52da410..25823d11 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
@@ -11,22 +11,22 @@ var Montage = require("montage/core/core").Montage,
 var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolProperties, {
    addedColorChips: { value: false },
-    _strokeColorCtrl: {
+    useStrokeColor: {
        value: null,
        serializable: true
    },
-    useBorderWidth: {
+    _strokeColorCtrl: {
        value: null,
        serializable: true
    },
-    borderWidthLabel: {
+    borderWidth: {
        value: null,
        serializable: true
    },
-    _borderWidth: {
+    useBorderWidth: {
        value: null,
        serializable: true
    },
@@ -36,42 +36,42 @@ var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolPrope
        serializable: true
    },
-    borderStyleLabel: {
+    borderStyle: {
        value: null,
        serializable: true
    },
-    _borderStyle: {
+    useStrokeSize: {
        value: null,
        serializable: true
    },
-    useStrokeSize: {
+    strokeSize: {
        value: null,
        serializable: true
    },
-    strokeSizeLabel: {
+    _useWebGL: {
        value: null,
        serializable: true
    },
-    _strokeSize: {
+    useWebGL: {
        value: null,
        serializable: true
    },
-    _useWebGL: {
+    _materialsContainer: {
        value: null,
        serializable: true
    },
-    _materialsContainer: {
+    _strokeMaterial: {
        value: null,
        serializable: true
    },
-    _strokeMaterial: {
+    strokeMaterial: {
        value: null,
        serializable: true
    },
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index 4ea6aac4..adb5cd7d 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -29,14 +29,18 @@
                "properties": {
                    "element": {"#": "penProperties"},
+                    "_penToolRadio": {"#": "penTool"},
+                    "_penPlusRadio": {"#": "penPlus"},
+                    "_penMinusRadio": {"#": "penMinus"},
                    "_fillColorCtrl": {"#": "fillColorCtrl"},
                    "_strokeColorCtrl": {"#": "strokeColorCtrl"},
                    "_strokeSize": {"@": "strokeSizeHT"}
                }
            }
-        }
+        }
        </script>
-       
    </head>
    <body>
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js
index 5ae03adc..78065b99 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.js
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js
@@ -9,9 +9,21 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
 var PenProperties = exports.PenProperties = Montage.create(ToolProperties, {
    addedColorChips: { value: false },
-    _penToolRadio:     { value: null, enumerable: false },
-    _penPlusRadio:   { value: null, enumerable: false },
+    _penToolRadio: {
-    _penMinusRadio:   { value: null, enumerable: false },
+        value: null,
+        serializable: true
+    },
+    _penPlusRadio: {
+        value: null,
+        serializable: true
+    },
+    _penMinusRadio: {
+        value: null,
+        serializable: true
+    },

diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.js b/js/components/tools-properties/fill-properties.reel/fill-properties.js index 7331b375..ef1699af 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.js +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.js
@@ -10,6 +10,31 @@ var Montage = require("montage/core/core").Montage,
10		10
11	var FillProperties = exports.FillProperties = Montage.create(ToolProperties, {	11	var FillProperties = exports.FillProperties = Montage.create(ToolProperties, {
12		12
		13	useFillColor: {
		14	value: null,
		15	serializable: true
		16	},
		17
		18	_fillColorCtrl: {
		19	value: null,
		20	serializable: true
		21	},
		22
		23	useWebGL: {
		24	value: null,
		25	serializable: true
		26	},
		27
		28	_materialsContainer: {
		29	value: null,
		30	serializable: true
		31	},
		32
		33	fillMaterial: {
		34	value: null,
		35	serializable: true
		36	},
		37
13	addedColorChips: { value: false },	38	addedColorChips: { value: false },
14		39
15	_fill: {	40	_fill: {


diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js index e52da410..25823d11 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
@@ -11,22 +11,22 @@ var Montage = require("montage/core/core").Montage,
11	var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolProperties, {	11	var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolProperties, {
12	addedColorChips: { value: false },	12	addedColorChips: { value: false },
13		13
14	_strokeColorCtrl: {	14	useStrokeColor: {
15	value: null,	15	value: null,
16	serializable: true	16	serializable: true
17	},	17	},
18		18
19	useBorderWidth: {	19	_strokeColorCtrl: {
20	value: null,	20	value: null,
21	serializable: true	21	serializable: true
22	},	22	},
23		23
24	borderWidthLabel: {	24	borderWidth: {
25	value: null,	25	value: null,
26	serializable: true	26	serializable: true
27	},	27	},
28		28
29	_borderWidth: {	29	useBorderWidth: {
30	value: null,	30	value: null,
31	serializable: true	31	serializable: true
32	},	32	},
@@ -36,42 +36,42 @@ var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolPrope
36	serializable: true	36	serializable: true
37	},	37	},
38		38
39	borderStyleLabel: {	39	borderStyle: {
40	value: null,	40	value: null,
41	serializable: true	41	serializable: true
42	},	42	},
43		43
44	_borderStyle: {	44	useStrokeSize: {
45	value: null,	45	value: null,
46	serializable: true	46	serializable: true
47	},	47	},
48		48
49	useStrokeSize: {	49	strokeSize: {
50	value: null,	50	value: null,
51	serializable: true	51	serializable: true
52	},	52	},
53		53
54	strokeSizeLabel: {	54	_useWebGL: {
55	value: null,	55	value: null,
56	serializable: true	56	serializable: true
57	},	57	},
58		58
59	_strokeSize: {	59	useWebGL: {
60	value: null,	60	value: null,
61	serializable: true	61	serializable: true
62	},	62	},
63		63
64	_useWebGL: {	64	_materialsContainer: {
65	value: null,	65	value: null,
66	serializable: true	66	serializable: true
67	},	67	},
68		68
69	_materialsContainer: {	69	_strokeMaterial: {
70	value: null,	70	value: null,
71	serializable: true	71	serializable: true
72	},	72	},
73		73
74	_strokeMaterial: {	74	strokeMaterial: {
75	value: null,	75	value: null,
76	serializable: true	76	serializable: true
77	},	77	},


diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index 4ea6aac4..adb5cd7d 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -29,14 +29,18 @@
29	"properties": {	29	"properties": {
30	"element": {"#": "penProperties"},	30	"element": {"#": "penProperties"},
31		31
		32	"_penToolRadio": {"#": "penTool"},
		33	"_penPlusRadio": {"#": "penPlus"},
		34	"_penMinusRadio": {"#": "penMinus"},
		35
32	"_fillColorCtrl": {"#": "fillColorCtrl"},	36	"_fillColorCtrl": {"#": "fillColorCtrl"},
33	"_strokeColorCtrl": {"#": "strokeColorCtrl"},	37	"_strokeColorCtrl": {"#": "strokeColorCtrl"},
34	"_strokeSize": {"@": "strokeSizeHT"}	38	"_strokeSize": {"@": "strokeSizeHT"}
35	}	39	}
36	}	40	}
37	}	41	}
38	</script>	42	</script>
39		43
40	</head>	44	</head>
41		45
42	<body>	46	<body>


diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js index 5ae03adc..78065b99 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.js +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js
@@ -9,9 +9,21 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
9		9
10	var PenProperties = exports.PenProperties = Montage.create(ToolProperties, {	10	var PenProperties = exports.PenProperties = Montage.create(ToolProperties, {
11	addedColorChips: { value: false },	11	addedColorChips: { value: false },
12	_penToolRadio: { value: null, enumerable: false },	12
13	_penPlusRadio: { value: null, enumerable: false },	13	_penToolRadio: {
14	_penMinusRadio: { value: null, enumerable: false },	14	value: null,
		15	serializable: true
		16	},
		17
		18	_penPlusRadio: {
		19	value: null,
		20	serializable: true
		21	},
		22
		23	_penMinusRadio: {
		24	value: null,
		25	serializable: true
		26	},
15		27