Cleanup

Bundled/themes/theme.arm

@@ -1,35 +1,35 @@
-{
-	"FONT_SIZE": 13,
-	"ELEMENT_W": 100,
-	"ELEMENT_H": 22,
-	"ELEMENT_OFFSET": 4,
-	"ARROW_SIZE": 5,
-	"BUTTON_H": 17,
-	"CHECK_SIZE": 15,
-	"CHECK_SELECT_SIZE": 8,
-	"SCROLL_W": 8,
-	"TEXT_OFFSET": 8,
-	"TAB_W": 12,
-	"LINE_STRENGTH": 1,
-	"FLASH_SPEED": 0.5,
-	"TOOLTIP_DELAY": 1.0,
-	"FILL_WINDOW_BG": true,
-	"FILL_BUTTON_BG": true,
-	"FILL_ACCENT_BG": false,
-
-	"WINDOW_BG_COL": "0xff333333",
-	"WINDOW_TINT_COL": "0xffffffff",
-	"ACCENT_COL": "0xff444444",
-	"ACCENT_HOVER_COL": "0xff484848",
-	"ACCENT_SELECT_COL": "0xff606060",
-	"PANEL_BG_COL": "0xff333333",
-	"PANEL_TEXT_COL": "0xffcac9c7",
-	"BUTTON_COL": "0xff484848",
-	"BUTTON_TEXT_COL": "0xffcac9c7",
-	"BUTTON_HOVER_COL": "0xff3b3b3b",
-	"BUTTON_PRESSED_COL": "0xff1b1b1b",
-	"TEXT_COL": "0xffcac9c7",
-	"LABEL_COL": "0xffaaaaaa",
-	"ARROW_COL": "0xffcac9c7",
-	"SEPARATOR_COL": "0xff272727"
-}
+{
+	"FONT_SIZE": 13,
+	"ELEMENT_W": 100,
+	"ELEMENT_H": 22,
+	"ELEMENT_OFFSET": 4,
+	"ARROW_SIZE": 5,
+	"BUTTON_H": 17,
+	"CHECK_SIZE": 15,
+	"CHECK_SELECT_SIZE": 8,
+	"SCROLL_W": 8,
+	"TEXT_OFFSET": 8,
+	"TAB_W": 12,
+	"LINE_STRENGTH": 1,
+	"FLASH_SPEED": 0.5,
+	"TOOLTIP_DELAY": 1.0,
+	"FILL_WINDOW_BG": true,
+	"FILL_BUTTON_BG": true,
+	"FILL_ACCENT_BG": false,
+
+	"WINDOW_BG_COL": "0xff333333",
+	"WINDOW_TINT_COL": "0xffffffff",
+	"ACCENT_COL": "0xff444444",
+	"ACCENT_HOVER_COL": "0xff484848",
+	"ACCENT_SELECT_COL": "0xff606060",
+	"PANEL_BG_COL": "0xff333333",
+	"PANEL_TEXT_COL": "0xffcac9c7",
+	"BUTTON_COL": "0xff484848",
+	"BUTTON_TEXT_COL": "0xffcac9c7",
+	"BUTTON_HOVER_COL": "0xff3b3b3b",
+	"BUTTON_PRESSED_COL": "0xff1b1b1b",
+	"TEXT_COL": "0xffcac9c7",
+	"LABEL_COL": "0xffaaaaaa",
+	"ARROW_COL": "0xffcac9c7",
+	"SEPARATOR_COL": "0xff272727"
+}

Bundled/themes/theme_light.arm

@@ -1,34 +1,34 @@
-{
-	"FONT_SIZE": 13,
-	"ELEMENT_W": 100,
-	"ELEMENT_H": 22,
-	"ELEMENT_OFFSET": 2,
-	"ARROW_SIZE": 5,
-	"BUTTON_H": 17,
-	"CHECK_SIZE": 15,
-	"CHECK_SELECT_SIZE": 8,
-	"SCROLL_W": 8,
-	"TEXT_OFFSET": 8,
-	"TAB_W": 12,
-	"LINE_STRENGTH": 1,
-	"FLASH_SPEED": 0.5,
-	"TOOLTIP_DELAY": 1.0,
-	"FILL_WINDOW_BG": true,
-	"FILL_BUTTON_BG": true,
-	"FILL_ACCENT_BG": false,
-	"WINDOW_BG_COL": "0xffefefef",
-	"WINDOW_TINT_COL": "0xffffffff",
-	"ACCENT_COL": "0xffeeeeee",
-	"ACCENT_HOVER_COL": "0xffbbbbbb",
-	"ACCENT_SELECT_COL": "0xffaaaaaa",
-	"PANEL_BG_COL": "0xffffffff",
-	"PANEL_TEXT_COL": "0xff222222",
-	"BUTTON_COL": "0xffcccccc",
-	"BUTTON_TEXT_COL": "0xff222222",
-	"BUTTON_HOVER_COL": "0xffb3b3b3",
-	"BUTTON_PRESSED_COL": "0xffb1b1b1",
-	"TEXT_COL": "0xff222222",
-	"LABEL_COL": "0xff222222",
-	"ARROW_COL": "0xff222222",
-	"SEPARATOR_COL": "0xff999999"
-}
+{
+	"FONT_SIZE": 13,
+	"ELEMENT_W": 100,
+	"ELEMENT_H": 22,
+	"ELEMENT_OFFSET": 2,
+	"ARROW_SIZE": 5,
+	"BUTTON_H": 17,
+	"CHECK_SIZE": 15,
+	"CHECK_SELECT_SIZE": 8,
+	"SCROLL_W": 8,
+	"TEXT_OFFSET": 8,
+	"TAB_W": 12,
+	"LINE_STRENGTH": 1,
+	"FLASH_SPEED": 0.5,
+	"TOOLTIP_DELAY": 1.0,
+	"FILL_WINDOW_BG": true,
+	"FILL_BUTTON_BG": true,
+	"FILL_ACCENT_BG": false,
+	"WINDOW_BG_COL": "0xffefefef",
+	"WINDOW_TINT_COL": "0xffffffff",
+	"ACCENT_COL": "0xffeeeeee",
+	"ACCENT_HOVER_COL": "0xffbbbbbb",
+	"ACCENT_SELECT_COL": "0xffaaaaaa",
+	"PANEL_BG_COL": "0xffffffff",
+	"PANEL_TEXT_COL": "0xff222222",
+	"BUTTON_COL": "0xffcccccc",
+	"BUTTON_TEXT_COL": "0xff222222",
+	"BUTTON_HOVER_COL": "0xffb3b3b3",
+	"BUTTON_PRESSED_COL": "0xffb1b1b1",
+	"TEXT_COL": "0xff222222",
+	"LABEL_COL": "0xff222222",
+	"ARROW_COL": "0xff222222",
+	"SEPARATOR_COL": "0xff999999"
+}

Sources/arm/ui/UITrait.hx

@@ -341,7 +341,7 @@ class UITrait extends iron.Trait {
 
 		var scale = C.window_scale;
 		ui = new Zui( { theme: arm.App.theme, font: arm.App.font, scaleFactor: scale, color_wheel: arm.App.color_wheel } );
-		loadBundled(['cursor.png', 'empty.jpg', 'brush_draw.png', 'brush_erase.png', 'brush_fill.png', 'brush_bake.png', 'brush_colorid.png', 'brush_decal.png', 'brush_text.png','brush_shape.png', 'brush_particle.png'], done);
+		loadBundled(['cursor.png', 'empty.jpg', 'tool_draw.png', 'tool_eraser.png', 'tool_fill.png', 'tool_bake.png', 'tool_colorid.png', 'tool_decal.png', 'tool_text.png','tool_shape.png', 'tool_particle.png'], done);
 	}
 
 	public function showMessage(s:String) {
@@ -1007,15 +1007,15 @@ class UITrait extends iron.Trait {
 			ui._y += 2;
 
 			ui.imageScrollAlign = false;
-			var img1 = bundled.get("brush_draw.png");
-			var img2 = bundled.get("brush_erase.png");
-			var img3 = bundled.get("brush_fill.png");
-			var img4 = bundled.get("brush_bake.png");
-			var img5 = bundled.get("brush_colorid.png");
-			var img6 = bundled.get("brush_decal.png");
-			var img7 = bundled.get("brush_text.png");
-			var img8 = bundled.get("brush_shape.png");
-			var img9 = bundled.get("brush_particle.png");
+			var img1 = bundled.get("tool_draw.png");
+			var img2 = bundled.get("tool_eraser.png");
+			var img3 = bundled.get("tool_fill.png");
+			var img4 = bundled.get("tool_bake.png");
+			var img5 = bundled.get("tool_colorid.png");
+			var img6 = bundled.get("tool_decal.png");
+			var img7 = bundled.get("tool_text.png");
+			var img8 = bundled.get("tool_shape.png");
+			var img9 = bundled.get("tool_particle.png");
 			var tool = "";
 			
 			ui._x += 2;