From 1217073fa57fc04bf16d97cd6e27ce35950bae91 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Wed, 6 Mar 2019 14:30:53 +0100 Subject: [PATCH] Cleanup --- Bundled/{ => defaults}/default_brush.json | 0 Bundled/{ => defaults}/default_logic.json | 0 Bundled/{ => defaults}/default_material.json | 0 .../{brush_bake.png => icons/tool_bake.png} | Bin .../tool_colorid.png} | Bin .../{brush_decal.png => icons/tool_decal.png} | Bin .../{brush_draw.png => icons/tool_draw.png} | Bin .../tool_eraser.png} | Bin .../{brush_fill.png => icons/tool_fill.png} | Bin Bundled/{ => icons}/tool_gizmo.png | Bin .../tool_particle.png} | Bin .../{brush_shape.png => icons/tool_shape.png} | Bin .../{brush_text.png => icons/tool_text.png} | Bin Bundled/{ => plugins}/plugin_hello.js | 0 Bundled/{ => plugins}/plugin_rotate.js | 0 Bundled/{ => themes}/theme.arm | 70 +++++++++--------- Bundled/{ => themes}/theme_light.arm | 68 ++++++++--------- Sources/arm/ui/UITrait.hx | 20 ++--- 18 files changed, 79 insertions(+), 79 deletions(-) rename Bundled/{ => defaults}/default_brush.json (100%) rename Bundled/{ => defaults}/default_logic.json (100%) rename Bundled/{ => defaults}/default_material.json (100%) rename Bundled/{brush_bake.png => icons/tool_bake.png} (100%) rename Bundled/{brush_colorid.png => icons/tool_colorid.png} (100%) rename Bundled/{brush_decal.png => icons/tool_decal.png} (100%) rename Bundled/{brush_draw.png => icons/tool_draw.png} (100%) rename Bundled/{brush_erase.png => icons/tool_eraser.png} (100%) rename Bundled/{brush_fill.png => icons/tool_fill.png} (100%) rename Bundled/{ => icons}/tool_gizmo.png (100%) rename Bundled/{brush_particle.png => icons/tool_particle.png} (100%) rename Bundled/{brush_shape.png => icons/tool_shape.png} (100%) rename Bundled/{brush_text.png => icons/tool_text.png} (100%) rename Bundled/{ => plugins}/plugin_hello.js (100%) rename Bundled/{ => plugins}/plugin_rotate.js (100%) rename Bundled/{ => themes}/theme.arm (95%) rename Bundled/{ => themes}/theme_light.arm (96%) diff --git a/Bundled/default_brush.json b/Bundled/defaults/default_brush.json similarity index 100% rename from Bundled/default_brush.json rename to Bundled/defaults/default_brush.json diff --git a/Bundled/default_logic.json b/Bundled/defaults/default_logic.json similarity index 100% rename from Bundled/default_logic.json rename to Bundled/defaults/default_logic.json diff --git a/Bundled/default_material.json b/Bundled/defaults/default_material.json similarity index 100% rename from Bundled/default_material.json rename to Bundled/defaults/default_material.json diff --git a/Bundled/brush_bake.png b/Bundled/icons/tool_bake.png similarity index 100% rename from Bundled/brush_bake.png rename to Bundled/icons/tool_bake.png diff --git a/Bundled/brush_colorid.png b/Bundled/icons/tool_colorid.png similarity index 100% rename from Bundled/brush_colorid.png rename to Bundled/icons/tool_colorid.png diff --git a/Bundled/brush_decal.png b/Bundled/icons/tool_decal.png similarity index 100% rename from Bundled/brush_decal.png rename to Bundled/icons/tool_decal.png diff --git a/Bundled/brush_draw.png b/Bundled/icons/tool_draw.png similarity index 100% rename from Bundled/brush_draw.png rename to Bundled/icons/tool_draw.png diff --git a/Bundled/brush_erase.png b/Bundled/icons/tool_eraser.png similarity index 100% rename from Bundled/brush_erase.png rename to Bundled/icons/tool_eraser.png diff --git a/Bundled/brush_fill.png b/Bundled/icons/tool_fill.png similarity index 100% rename from Bundled/brush_fill.png rename to Bundled/icons/tool_fill.png diff --git a/Bundled/tool_gizmo.png b/Bundled/icons/tool_gizmo.png similarity index 100% rename from Bundled/tool_gizmo.png rename to Bundled/icons/tool_gizmo.png diff --git a/Bundled/brush_particle.png b/Bundled/icons/tool_particle.png similarity index 100% rename from Bundled/brush_particle.png rename to Bundled/icons/tool_particle.png diff --git a/Bundled/brush_shape.png b/Bundled/icons/tool_shape.png similarity index 100% rename from Bundled/brush_shape.png rename to Bundled/icons/tool_shape.png diff --git a/Bundled/brush_text.png b/Bundled/icons/tool_text.png similarity index 100% rename from Bundled/brush_text.png rename to Bundled/icons/tool_text.png diff --git a/Bundled/plugin_hello.js b/Bundled/plugins/plugin_hello.js similarity index 100% rename from Bundled/plugin_hello.js rename to Bundled/plugins/plugin_hello.js diff --git a/Bundled/plugin_rotate.js b/Bundled/plugins/plugin_rotate.js similarity index 100% rename from Bundled/plugin_rotate.js rename to Bundled/plugins/plugin_rotate.js diff --git a/Bundled/theme.arm b/Bundled/themes/theme.arm similarity index 95% rename from Bundled/theme.arm rename to Bundled/themes/theme.arm index 00e8dd04..5e3dc4eb 100644 --- a/Bundled/theme.arm +++ b/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" +} diff --git a/Bundled/theme_light.arm b/Bundled/themes/theme_light.arm similarity index 96% rename from Bundled/theme_light.arm rename to Bundled/themes/theme_light.arm index b87d53b4..6036b8af 100644 --- a/Bundled/theme_light.arm +++ b/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" +} diff --git a/Sources/arm/ui/UITrait.hx b/Sources/arm/ui/UITrait.hx index 49f28bb9..7825d487 100644 --- a/Sources/arm/ui/UITrait.hx +++ b/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;