From 0b2ea3b5a479bd05d0bcd6e1b2a1001dc961abb3 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Mon, 11 Aug 2025 21:57:34 +0200 Subject: [PATCH] Move scripts tab --- base/sources/ts/box_preferences.ts | 2 +- base/sources/ts/tab_meshes.ts | 2 +- base/sources/ts/tab_particles.ts | 19 --------- .../ts/{tab_script.ts => tab_scripts.ts} | 41 +++++++++---------- lab/sources/ui_base_ext.ts | 2 +- paint/sources/ui_base_ext.ts | 4 +- 6 files changed, 25 insertions(+), 45 deletions(-) delete mode 100644 base/sources/ts/tab_particles.ts rename base/sources/ts/{tab_script.ts => tab_scripts.ts} (57%) diff --git a/base/sources/ts/box_preferences.ts b/base/sources/ts/box_preferences.ts index feaee44e..8d954307 100644 --- a/base/sources/ts/box_preferences.ts +++ b/base/sources/ts/box_preferences.ts @@ -826,7 +826,7 @@ plugin_notify_on_ui(plugin, function() {\ } if (ui_menu_button(tr("Edit in Script Tab"))) { let blob: buffer_t = data_get_blob("plugins/" + _box_preferences_f); - tab_script_hscript.text = sys_buffer_to_string(blob); + tab_scripts_hscript.text = sys_buffer_to_string(blob); data_delete_blob("plugins/" + _box_preferences_f); console_info(tr("Script opened")); } diff --git a/base/sources/ts/tab_meshes.ts b/base/sources/ts/tab_meshes.ts index c83ee4a5..0bdd2915 100644 --- a/base/sources/ts/tab_meshes.ts +++ b/base/sources/ts/tab_meshes.ts @@ -332,7 +332,7 @@ function tab_meshes_draw(htab: ui_handle_t) { let fmono: draw_font_t = data_get_font("font_mono.ttf"); ui_set_font(ui, fmono); ui.font_size = math_floor(15 * ui_SCALE(ui)); - ui_text_area_coloring = tab_script_get_text_coloring(); + ui_text_area_coloring = tab_scripts_get_text_coloring(); ui_text_area(hscript); ui_text_area_coloring = null; ui_set_font(ui, _font); diff --git a/base/sources/ts/tab_particles.ts b/base/sources/ts/tab_particles.ts deleted file mode 100644 index 40a637c3..00000000 --- a/base/sources/ts/tab_particles.ts +++ /dev/null @@ -1,19 +0,0 @@ - -function tab_particles_draw(htab: ui_handle_t) { - if (ui_tab(htab, tr("Particles"))) { - // if (ui_tab(htab, tr("Prompt"))) { - ui_begin_sticky(); - let row: f32[] = [1 / 4, 1 / 4, 1 / 4]; - ui_row(row); - if (ui_button(tr("New"))) { - - } - if (ui_button(tr("Import"))) { - - } - if (ui_button(tr("Nodes"))) { - - } - ui_end_sticky(); - } -} diff --git a/base/sources/ts/tab_script.ts b/base/sources/ts/tab_scripts.ts similarity index 57% rename from base/sources/ts/tab_script.ts rename to base/sources/ts/tab_scripts.ts index e3abc4ed..d4b1069a 100644 --- a/base/sources/ts/tab_script.ts +++ b/base/sources/ts/tab_scripts.ts @@ -1,36 +1,35 @@ -let tab_script_hscript: ui_handle_t = ui_handle_create(); -let tab_script_text_coloring: ui_text_coloring_t = null; +let tab_scripts_hscript: ui_handle_t = ui_handle_create(); +let tab_scripts_text_coloring: ui_text_coloring_t = null; -function tab_script_draw(htab: ui_handle_t) { +function tab_scripts_draw(htab: ui_handle_t) { let ui: ui_t = ui_base_ui; - let statush: i32 = config_raw.layout[layout_size_t.STATUS_H]; - if (ui_tab(htab, tr("Script")) && statush > ui_status_default_status_h * ui_SCALE(ui)) { + if (ui_tab(htab, tr("Scripts"))) { ui_begin_sticky(); - if (config_raw.touch_ui) { + // if (config_raw.touch_ui) { ui_row4(); - } - else { - let row: f32[] = [1 / 14, 1 / 14, 1 / 14, 1 / 14]; - ui_row(row); - } + // } + // else { + // let row: f32[] = [1 / 14, 1 / 14, 1 / 14, 1 / 14]; + // ui_row(row); + // } if (ui_button(tr("Run"))) { - js_eval(tab_script_hscript.text); + js_eval(tab_scripts_hscript.text); } if (ui_button(tr("Clear"))) { - tab_script_hscript.text = ""; + tab_scripts_hscript.text = ""; } if (ui_button(tr("Import"))) { ui_files_show("js", false, false, function (path: string) { let b: buffer_t = data_get_blob(path); - tab_script_hscript.text = sys_buffer_to_string(b); + tab_scripts_hscript.text = sys_buffer_to_string(b); data_delete_blob(path); }); } if (ui_button(tr("Export"))) { ui_files_show("js", true, false, function (path: string) { - let str: string = tab_script_hscript.text; + let str: string = tab_scripts_hscript.text; let f: string = ui_files_filename; if (f == "") { f = tr("untitled"); @@ -51,8 +50,8 @@ function tab_script_draw(htab: ui_handle_t) { ui.font_size = math_floor(15 * ui_SCALE(ui)); ui_text_area_line_numbers = true; ui_text_area_scroll_past_end = true; - ui_text_area_coloring = tab_script_get_text_coloring(); - ui_text_area(tab_script_hscript); + ui_text_area_coloring = tab_scripts_get_text_coloring(); + ui_text_area(tab_scripts_hscript); ui_text_area_line_numbers = false; ui_text_area_scroll_past_end = false; ui_text_area_coloring = null; @@ -61,10 +60,10 @@ function tab_script_draw(htab: ui_handle_t) { } } -function tab_script_get_text_coloring(): ui_text_coloring_t { - if (tab_script_text_coloring == null) { +function tab_scripts_get_text_coloring(): ui_text_coloring_t { + if (tab_scripts_text_coloring == null) { let blob: buffer_t = data_get_blob("text_coloring.json"); - tab_script_text_coloring = json_parse(sys_buffer_to_string(blob)); + tab_scripts_text_coloring = json_parse(sys_buffer_to_string(blob)); } - return tab_script_text_coloring; + return tab_scripts_text_coloring; } diff --git a/lab/sources/ui_base_ext.ts b/lab/sources/ui_base_ext.ts index 6f0a70b3..d5973774 100644 --- a/lab/sources/ui_base_ext.ts +++ b/lab/sources/ui_base_ext.ts @@ -9,7 +9,7 @@ function ui_base_ext_init_hwnd_tabs(): tab_draw_array_t[] { _draw_callback_create(tab_textures_draw), _draw_callback_create(tab_swatches_draw), _draw_callback_create(tab_plugins_draw), - _draw_callback_create(tab_script_draw), + _draw_callback_create(tab_scripts_draw), _draw_callback_create(tab_console_draw), _draw_callback_create(ui_status_draw_version_tab) ]; diff --git a/paint/sources/ui_base_ext.ts b/paint/sources/ui_base_ext.ts index b924ed7f..e5ea13af 100644 --- a/paint/sources/ui_base_ext.ts +++ b/paint/sources/ui_base_ext.ts @@ -9,7 +9,8 @@ function ui_base_ext_init_hwnd_tabs(): tab_draw_array_t[] { let a1: tab_draw_array_t = [ _draw_callback_create(tab_materials_draw), _draw_callback_create(tab_brushes_draw), - _draw_callback_create(tab_particles_draw) + _draw_callback_create(tab_scripts_draw) + ]; let a2: tab_draw_array_t = [ _draw_callback_create(tab_browser_draw), @@ -17,7 +18,6 @@ function ui_base_ext_init_hwnd_tabs(): tab_draw_array_t[] { _draw_callback_create(tab_textures_draw), _draw_callback_create(tab_fonts_draw), _draw_callback_create(tab_swatches_draw), - _draw_callback_create(tab_script_draw), _draw_callback_create(tab_console_draw), _draw_callback_create(ui_status_draw_version_tab) ];