Use new property names

1 files changed, 121 insertions, 121 deletions

diff --git a/tests/test-gtk-label.json b/tests/test-gtk-label.json
index 4bd666a..1a46dcf 100644
--- a/tests/test-gtk-label.json
+++ b/tests/test-gtk-label.json
@@ -1,256 +1,256 @@
 [
-	{"id": 1, "type": "menuitem",
+	{"id": 1, "type": "standard",
 	 "label": "value1",
 	 "submenu": [
-	 	{"id": 30, "type": "menuitem",
+	 	{"id": 30, "type": "standard",
 		 "label": "value30"},
-	 	{"id": 31, "type": "menuitem",
+	 	{"id": 31, "type": "standard",
 		 "label": "value31"},
-	 	{"id": 32, "type": "menuitem",
+	 	{"id": 32, "type": "standard",
 		 "label": "value32"},
-	 	{"id": 33, "type": "menuitem",
+	 	{"id": 33, "type": "standard",
 		 "label": "value33"},
-	 	{"id": 34, "type": "menuitem",
+	 	{"id": 34, "type": "standard",
 		 "label": "value34"},
-	 	{"id": 35, "type": "menuitem",
+	 	{"id": 35, "type": "standard",
 		 "label": "value35"},
-	 	{"id": 36, "type": "menuitem",
+	 	{"id": 36, "type": "standard",
 		 "label": "value36"},
-	 	{"id": 37, "type": "menuitem",
+	 	{"id": 37, "type": "standard",
 		 "label": "value37"},
-	 	{"id": 38, "type": "menuitem",
+	 	{"id": 38, "type": "standard",
 		 "label": "value38"},
-	 	{"id": 39, "type": "menuitem",
+	 	{"id": 39, "type": "standard",
 		 "label": "value39"}
 	 ]
 	},
-	{"id": 2, "type": "menuitem",
+	{"id": 2, "type": "standard",
 	 "label": "value2",
 	 "submenu": [
-	 	{"id": 20, "type": "menuitem",
+	 	{"id": 20, "type": "standard",
 		 "label": "value20"},
 	 	{"id": 21, "type": "separator",
 		 "label": "value21"},
-	 	{"id": 22, "type": "menuitem",
+	 	{"id": 22, "type": "standard",
 		 "label": "value22"},
 	 	{"id": 23, "type": "separator",
 		 "label": "value23"},
-	 	{"id": 24, "type": "menuitem",
+	 	{"id": 24, "type": "standard",
 		 "label": "value24"},
 	 	{"id": 25, "type": "separator",
 		 "label": "value25"},
-	 	{"id": 26, "type": "menuitem",
+	 	{"id": 26, "type": "standard",
 		 "label": "value26"},
 	 	{"id": 27, "type": "separator",
 		 "label": "value27"},
-	 	{"id": 28, "type": "menuitem",
+	 	{"id": 28, "type": "standard",
 		 "label": "value28"},
-	 	{"id": 29, "type": "menuitem", "visible": "false",
+	 	{"id": 29, "type": "standard", "visible": "false",
 		 "label": "value29"}
 	 ]
 	},
-	{"id": 4, "type": "menuitem",
+	{"id": 4, "type": "standard",
 	 "label": "value4",
 	 "submenu": [
 	 	{"id": 40,
-		 "type": "menuitem",
-		 "sensitive": "true",
+		 "type": "standard",
+		 "enabled": "true",
 		 "label": "value40"},
 	 	{"id": 41,
-		 "type": "menuitem",
-		 "sensitive": "false",
+		 "type": "standard",
+		 "enabled": "false",
 		 "label": "value41"},
 	 	{"id": 42,
-		 "type": "menuitem",
-		 "sensitive": "true",
+		 "type": "standard",
+		 "enabled": "true",
 		 "label": "value42"},
 	 	{"id": 43,
-		 "type": "menuitem",
-		 "sensitive": "false",
+		 "type": "standard",
+		 "enabled": "false",
 		 "label": "value43"},
 	 	{"id": 44,
-		 "type": "menuitem",
-		 "sensitive": "true",
+		 "type": "standard",
+		 "enabled": "true",
 		 "label": "value44"},
 	 	{"id": 45,
-		 "type": "menuitem",
-		 "sensitive": "false",
+		 "type": "standard",
+		 "enabled": "false",
 		 "label": "value45"},
 	 	{"id": 46,
-		 "type": "menuitem",
-		 "sensitive": "true",
+		 "type": "standard",
+		 "enabled": "true",
 		 "label": "value46"},
 	 	{"id": 47,
-		 "type": "menuitem",
-		 "sensitive": "false",
+		 "type": "standard",
+		 "enabled": "false",
 		 "label": "value47"},
 	 	{"id": 48,
-		 "type": "menuitem",
-		 "sensitive": "true",
+		 "type": "standard",
+		 "enabled": "true",
 		 "label": "value48"},
 	 	{"id": 49,
-		 "type": "menuitem",
+		 "type": "standard",
 		 "visible": "false",
-		 "sensitive": "false",
+		 "enabled": "false",
 		 "label": "value49"}
 	 ]
 	},
-	{"id": 3, "type": "menuitem",
+	{"id": 3, "type": "standard",
 	 "label": "a super long label that is really of unreasonable length but we should make sure it makes it across the bus",
 	 "not.a.value": "A useless value",
 	 "submenu": [
-	 	{"id": 10, "type": "menuitem",
+	 	{"id": 10, "type": "standard",
 		 "label": "value10"},
-	 	{"id": 11, "type": "menuitem",
+	 	{"id": 11, "type": "standard",
 		 "label": "value11"},
-	 	{"id": 12, "type": "menuitem",
+	 	{"id": 12, "type": "standard",
 		 "label": "value12"},
-	 	{"id": 13, "type": "menuitem",
+	 	{"id": 13, "type": "standard",
 		 "label": "value13"},
-	 	{"id": 14, "type": "menuitem",
+	 	{"id": 14, "type": "standard",
 		 "label": "value14"},
-	 	{"id": 15, "type": "menuitem",
+	 	{"id": 15, "type": "standard",
 		 "label": "value15"},
-	 	{"id": 16, "type": "menuitem",
+	 	{"id": 16, "type": "standard",
 		 "label": "value16"},
-	 	{"id": 17, "type": "menuitem",
+	 	{"id": 17, "type": "standard",
 		 "label": "value17"},
-	 	{"id": 18, "type": "menuitem",
+	 	{"id": 18, "type": "standard",
 		 "label": "value18"},
-	 	{"id": 19, "type": "menuitem",
+	 	{"id": 19, "type": "standard",
 		 "label": "value19"}
 	 ]
 	},
-	{"id": 4, "type": "menuitem",
+	{"id": 4, "type": "standard",
 	 "label": "value2",
 	 "submenu": [
-	 	{"id": 5, "type": "menuitem",
+	 	{"id": 5, "type": "standard",
 		 "label": "value5",
 		 "submenu": [
-			{"id": 10, "type": "menuitem",
+			{"id": 10, "type": "standard",
 			 "label": "value10"},
-			{"id": 11, "type": "menuitem",
+			{"id": 11, "type": "standard",
 			 "label": "value11"},
-			{"id": 12, "type": "menuitem",
+			{"id": 12, "type": "standard",
 			 "label": "value12"},
-			{"id": 13, "type": "menuitem",
+			{"id": 13, "type": "standard",
 			 "label": "value13"},
-			{"id": 14, "type": "menuitem",
+			{"id": 14, "type": "standard",
 			 "label": "value14"},
-			{"id": 15, "type": "menuitem",
+			{"id": 15, "type": "standard",
 			 "label": "value15"},
-			{"id": 16, "type": "menuitem",
+			{"id": 16, "type": "standard",
 			 "label": "value16"},
-			{"id": 17, "type": "menuitem",
+			{"id": 17, "type": "standard",
 			 "label": "value17"},
-			{"id": 18, "type": "menuitem",
+			{"id": 18, "type": "standard",
 			 "label": "value18"},
-			{"id": 19, "type": "menuitem",
+			{"id": 19, "type": "standard",
 			 "label": "value19"}
 		 ]
 		},
-	 	{"id": 6, "type": "menuitem",
+	 	{"id": 6, "type": "standard",
 		 "label": "value6",
 		 "submenu": [
-			{"id": 20, "type": "menuitem",
+			{"id": 20, "type": "standard",
 			 "label": "value20"},
-			{"id": 21, "type": "menuitem",
+			{"id": 21, "type": "standard",
 			 "label": "value21"},
-			{"id": 22, "type": "menuitem",
+			{"id": 22, "type": "standard",
 			 "label": "value22"},
-			{"id": 23, "type": "menuitem",
+			{"id": 23, "type": "standard",
 			 "label": "value23"},
-			{"id": 24, "type": "menuitem",
+			{"id": 24, "type": "standard",
 			 "label": "value24"},
-			{"id": 25, "type": "menuitem",
+			{"id": 25, "type": "standard",
 			 "label": "value25"},
-			{"id": 26, "type": "menuitem",
+			{"id": 26, "type": "standard",
 			 "label": "value26"},
-			{"id": 27, "type": "menuitem",
+			{"id": 27, "type": "standard",
 			 "label": "value27"},
-			{"id": 28, "type": "menuitem",
+			{"id": 28, "type": "standard",
 			 "label": "value28"},
-			{"id": 29, "type": "menuitem",
+			{"id": 29, "type": "standard",
 			 "label": "value29"}
 		 ]
 		},
-	 	{"id": 7, "type": "menuitem",
+	 	{"id": 7, "type": "standard",
 		 "label": "value7",
 		 "submenu": [
-			{"id": 30, "type": "menuitem",
+			{"id": 30, "type": "standard",
 			 "label": "value30"},
-			{"id": 31, "type": "menuitem",
+			{"id": 31, "type": "standard",
 			 "label": "value31"},
-			{"id": 32, "type": "menuitem",
+			{"id": 32, "type": "standard",
 			 "label": "value32"},
-			{"id": 33, "type": "menuitem",
+			{"id": 33, "type": "standard",
 			 "label": "value33"},
-			{"id": 34, "type": "menuitem",
+			{"id": 34, "type": "standard",
 			 "label": "value34"},
-			{"id": 35, "type": "menuitem",
+			{"id": 35, "type": "standard",
 			 "label": "value35"},
-			{"id": 36, "type": "menuitem",
+			{"id": 36, "type": "standard",
 			 "label": "value36"},
-			{"id": 37, "type": "menuitem",
+			{"id": 37, "type": "standard",
 			 "label": "value37"},
-			{"id": 38, "type": "menuitem",
+			{"id": 38, "type": "standard",
 			 "label": "value38"},
-			{"id": 39, "type": "menuitem",
+			{"id": 39, "type": "standard",
 			 "label": "value39"}
 		 ]
 		},
 	 ]
 	},
-	{"id": 8, "type": "menuitem",
+	{"id": 8, "type": "standard",
 	 "label": "value1",
 	 "submenu": [
 	 	{"id": 80,
-		 "type": "menuitem",
-		 "icon": "face-angel",
+		 "type": "standard",
+		 "icon-name": "face-angel",
 		 "label": "angel"},
 	 	{"id": 81,
-		 "type": "menuitem",
-		 "icon": "face-angry",
+		 "type": "standard",
+		 "icon-name": "face-angry",
 		 "label": "angry"},
 	 	{"id": 82,
-		 "type": "menuitem",
-		 "icon": "face-cool",
+		 "type": "standard",
+		 "icon-name": "face-cool",
 		 "label": "cool"},
 	 	{"id": 83,
-		 "type":"menuitem",
-		 "icon": "face-devilish",
+		 "type":"standard",
+		 "icon-name": "face-devilish",
 		 "label": "devilish"},
 	 	{"id": 84,
-		 "type": "menuitem",
-		 "icon": "face-embarrassed",
+		 "type": "standard",
+		 "icon-name": "face-embarrassed",
 		 "label": "embarrassed"},
 	 	{"id": 85,
-		 "type": "menuitem",
-		 "icon": "face-kiss",
+		 "type": "standard",
+		 "icon-name": "face-kiss",
 		 "label": "kiss"},
 	 	{"id": 86,
-		 "type": "menuitem",
-		 "icon": "face-laugh",
+		 "type": "standard",
+		 "icon-name": "face-laugh",
 		 "label": "laugh"},
 	 	{"id": 87,
-		 "type": "menuitem",
-		 "icon": "face-monkey",
+		 "type": "standard",
+		 "icon-name": "face-monkey",
 		 "label": "monkey"},
 	 	{"id": 88,
-		 "type": "menuitem",
-		 "icon": "face-sad",
+		 "type": "standard",
+		 "icon-name": "face-sad",
 		 "label": "sad"},
 	 	{"id": 89,
-		 "type": "menuitem",
-		 "icon": "face-sick",
+		 "type": "standard",
+		 "icon-name": "face-sick",
 		 "label": "sick"}
 	 ]
 	},
-	{"id": 9, "type": "menuitem",
+	{"id": 9, "type": "standard",
 	 "label": "value1",
 	 "submenu": [
 	 	{"id": 90,
-		 "type": "menuitem",
+		 "type": "standard",
 		 "icon-data":
 "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACPUlEQVR4nGJgoBAAAAAA///Ch1gW
 BzK0LQ5iaGNgYGDBpQgAAAD//8KpeY4/Q9+DCV7/H/S4/p8byDABlyEAAAAA///CqnluAMOEx5O8
@@ -266,7 +266,7 @@ Bi8YEIEIBwAAAAD//8JmAAcDA4MAlEYGPxgYGD5AaTgAAAAA//8DAD6xjTP5Y+A7AAAAAElFTkSu
 QmCC",
 		 "label": "up"},
 	 	{"id": 91,
-		 "type": "menuitem",
+		 "type": "standard",
 		 "icon-data":
 "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACl0lEQVR4nGJgoBAAAAAA//9ixCLG
 sSWS4bs0B1QWip/+YGDwWcLAycDA8ANZMQAAAP//YsFigIA0JwODdvIsBob/fxgY/vxk+P/7OwPD
@@ -283,8 +283,8 @@ AwODR18kw4UJ0QyX8WkGAAAA///ClpkYoAolGBgYFKBqHjAwMDxnYGD4ha4QAAAA///CZQDMEG4o
 +ys2zQwMDAwAAAAA//8DAAF5nhyE7tENAAAAAElFTkSuQmCC",
 		 "label": "down"},
 	 	{"id": 92,
-		 "type": "menuitem",
-		 "icon": "up",
+		 "type": "standard",
+		 "icon-name": "up",
 		 "icon-data":
 "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACl0lEQVR4nGJgoBAAAAAA//9ixCLG
 sSWS4bs0B1QWip/+YGDwWcLAycDA8ANZMQAAAP//YsFigIA0JwODdvIsBob/fxgY/vxk+P/7OwPD
@@ -301,8 +301,8 @@ AwODR18kw4UJ0QyX8WkGAAAA///ClpkYoAolGBgYFKBqHjAwMDxnYGD4ha4QAAAA///CZQDMEG4o
 +ys2zQwMDAwAAAAA//8DAAF5nhyE7tENAAAAAElFTkSuQmCC",
 		 "label": "up"},
 	 	{"id": 93,
-		 "type": "menuitem",
-		 "icon": "down",
+		 "type": "standard",
+		 "icon-name": "down",
 		 "icon-data":
 "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACPUlEQVR4nGJgoBAAAAAA///Ch1gW
 BzK0LQ5iaGNgYGDBpQgAAAD//8KpeY4/Q9+DCV7/H/S4/p8byDABlyEAAAAA///CqnluAMOEx5O8
@@ -319,7 +319,7 @@ QmCC",
 		 "label": "down"}
 	 ]
 	},
-	{"id": 1, "type": "menuitem",
+	{"id": 1, "type": "standard",
 	 "label": "value1",
 	 "submenu": [
 	 	{"id": 30,
@@ -329,42 +329,42 @@ QmCC",
 	 	{"id": 31,
 		 "label": "No check (checked)",
 		 "toggle-type": "none",
-		 "toggle-checked": "checked"
+		 "toggle-state": 1
 		 },
 	 	{"id": 32,
 		 "label": "No check (????)",
 		 "toggle-type": "none",
-		 "toggle-checked": "indeterminate"
+		 "toggle-state": -1
 		 },
 	 	{"id": 33,
 		 "label": "Check (empty)",
 		 "toggle-type": "checkmark",
-		 "toggle-checked": "unchecked"
+		 "toggle-state": 0
 		 },
 	 	{"id": 34,
 		 "label": "Check (checked)",
 		 "toggle-type": "checkmark",
-		 "toggle-checked": "checked"
+		 "toggle-state": 1
 		 },
 	 	{"id": 35,
 		 "label": "Check (?????)",
 		 "toggle-type": "checkmark",
-		 "toggle-checked": "indeterminate"
+		 "toggle-state": -1
 		 },
 	 	{"id": 36,
 		 "label": "Radio (empty)",
 		 "toggle-type": "radio",
-		 "toggle-checked": "unchecked"
+		 "toggle-state": 0
 		 },
 	 	{"id": 37,
 		 "label": "Radio (checked)",
 		 "toggle-type": "radio",
-		 "toggle-checked": "checked"
+		 "toggle-state": 1
 		 },
 	 	{"id": 38,
 		 "label": "Radio (?????)",
 		 "toggle-type": "radio",
-		 "toggle-checked": "indeterminate"
+		 "toggle-state": -1
 		 }
 	 ]
 	},