From 7aa8d10cbf041f26606087f4d28ad1bfdac208bf Mon Sep 17 00:00:00 2001 From: Antoine Pouille Date: Tue, 24 Sep 2024 18:20:47 +0200 Subject: [PATCH] Webapp: renamings in editor --- gui/JsSim.ml | 8 +++---- gui/ui/{panel_tab.ml => panel_tabs.ml} | 8 +++---- gui/ui/{panel_tab.mli => panel_tabs.mli} | 0 gui/ui/tabs/{tab_flux.ml => tab_din.ml} | 0 gui/ui/tabs/{tab_flux.mli => tab_din.mli} | 0 .../{subpanel_editor.ml => editor.ml} | 10 ++++----- .../{subpanel_editor.mli => editor.mli} | 0 ...tor_controller.ml => editor_controller.ml} | 0 ...r_controller.mli => editor_controller.mli} | 0 ...enu_editor_file.ml => editor_menu_file.ml} | 22 +++++++++---------- ...u_editor_file.mli => editor_menu_file.mli} | 0 ...ller.ml => editor_menu_file_controller.ml} | 2 +- ...er.mli => editor_menu_file_controller.mli} | 0 gui/ui/tabs/tab_editor/subtab_influences.ml | 4 ++-- gui/ui/tabs/tab_editor/tab_editor.ml | 10 ++++----- 15 files changed, 32 insertions(+), 32 deletions(-) rename gui/ui/{panel_tab.ml => panel_tabs.ml} (93%) rename gui/ui/{panel_tab.mli => panel_tabs.mli} (100%) rename gui/ui/tabs/{tab_flux.ml => tab_din.ml} (100%) rename gui/ui/tabs/{tab_flux.mli => tab_din.mli} (100%) rename gui/ui/tabs/tab_editor/{subpanel_editor.ml => editor.ml} (97%) rename gui/ui/tabs/tab_editor/{subpanel_editor.mli => editor.mli} (100%) rename gui/ui/tabs/tab_editor/{subpanel_editor_controller.ml => editor_controller.ml} (100%) rename gui/ui/tabs/tab_editor/{subpanel_editor_controller.mli => editor_controller.mli} (100%) rename gui/ui/tabs/tab_editor/{menu_editor_file.ml => editor_menu_file.ml} (94%) rename gui/ui/tabs/tab_editor/{menu_editor_file.mli => editor_menu_file.mli} (100%) rename gui/ui/tabs/tab_editor/{menu_editor_file_controller.ml => editor_menu_file_controller.ml} (97%) rename gui/ui/tabs/tab_editor/{menu_editor_file_controller.mli => editor_menu_file_controller.mli} (100%) diff --git a/gui/JsSim.ml b/gui/JsSim.ml index 1a6ba6d21c..1bc148658f 100644 --- a/gui/JsSim.ml +++ b/gui/JsSim.ml @@ -12,21 +12,21 @@ let onload (_ : 'a) : bool Js.t = let () = Dom.appendChild main (Tyxml_js.To_dom.of_div (Panel_projects.content ())) in - let () = Dom.appendChild main (Panel_tab.navtabs ()) in - let () = Dom.appendChild main (Panel_tab.navcontents ()) in + let () = Dom.appendChild main (Panel_tabs.navtabs ()) in + let () = Dom.appendChild main (Panel_tabs.navcontents ()) in let () = Dom.appendChild main (Tyxml_js.To_dom.of_div (Panel_settings.content ())) in let () = Panel_projects.onload () in - let () = Panel_tab.onload () in + let () = Panel_tabs.onload () in let () = Panel_settings.onload () in let _ = Dom_html.window##.onresize := Dom_html.handler (fun _ -> let () = Panel_projects.onresize () in - let () = Panel_tab.onresize () in + let () = Panel_tabs.onresize () in let () = Panel_settings.onresize () in Js._true) in diff --git a/gui/ui/panel_tab.ml b/gui/ui/panel_tabs.ml similarity index 93% rename from gui/ui/panel_tab.ml rename to gui/ui/panel_tabs.ml index 0d83544834..afd3666332 100644 --- a/gui/ui/panel_tab.ml +++ b/gui/ui/panel_tabs.ml @@ -25,7 +25,7 @@ let navtabs () = "editor", None, Tab_editor.navli (); "log", None, Tab_log.navli (); "plot", None, Tab_plot.navli (); - "DIN", None, Tab_flux.navli (); + "DIN", None, Tab_din.navli (); "snapshot", None, Tab_snapshot.navli (); "outputs", None, Tab_outputs.navli (); "stories", story_class, Tab_stories.navli (); @@ -41,7 +41,7 @@ let navcontents () = "editor", [ "row" ], Tab_editor.content (); "log", [], Tab_log.content (); "plot", [], Tab_plot.content (); - "DIN", [], Tab_flux.content (); + "DIN", [], Tab_din.content (); "snapshot", [], Tab_snapshot.content (); "outputs", [], Tab_outputs.content (); "stories", [ "row" ], Tab_stories.content (); @@ -52,7 +52,7 @@ let onload () = let () = Tab_editor.onload () in let () = Tab_log.onload () in let () = Tab_plot.onload () in - let () = Tab_flux.onload () in + let () = Tab_din.onload () in let () = Tab_snapshot.onload () in let () = Tab_outputs.onload () in let () = Tab_stories.onload () in @@ -63,7 +63,7 @@ let onresize () = let () = Tab_editor.onresize () in let () = Tab_log.onresize () in let () = Tab_plot.onresize () in - let () = Tab_flux.onresize () in + let () = Tab_din.onresize () in let () = Tab_snapshot.onresize () in let () = Tab_outputs.onresize () in let () = Tab_stories.onresize () in diff --git a/gui/ui/panel_tab.mli b/gui/ui/panel_tabs.mli similarity index 100% rename from gui/ui/panel_tab.mli rename to gui/ui/panel_tabs.mli diff --git a/gui/ui/tabs/tab_flux.ml b/gui/ui/tabs/tab_din.ml similarity index 100% rename from gui/ui/tabs/tab_flux.ml rename to gui/ui/tabs/tab_din.ml diff --git a/gui/ui/tabs/tab_flux.mli b/gui/ui/tabs/tab_din.mli similarity index 100% rename from gui/ui/tabs/tab_flux.mli rename to gui/ui/tabs/tab_din.mli diff --git a/gui/ui/tabs/tab_editor/subpanel_editor.ml b/gui/ui/tabs/tab_editor/editor.ml similarity index 97% rename from gui/ui/tabs/tab_editor/subpanel_editor.ml rename to gui/ui/tabs/tab_editor/editor.ml index a1f07a74fd..f3329eab7c 100644 --- a/gui/ui/tabs/tab_editor/subpanel_editor.ml +++ b/gui/ui/tabs/tab_editor/editor.ml @@ -40,7 +40,7 @@ let panel_heading = [ Html.a_class [ "btn-group" ]; Html.Unsafe.string_attrib "role" "group"; ] - Menu_editor_file.content + Editor_menu_file.content in let buttons = menu_editor_file_content :: [ toggle_button ] in [%html @@ -134,7 +134,7 @@ let jump_to_line (codemirror : codemirror Js.t) (line : int) : unit = () let onload () : unit = - let () = Menu_editor_file.onload () in + let () = Editor_menu_file.onload () in let lint_config = Codemirror.create_lint_configuration () in let () = @@ -165,7 +165,7 @@ let onload () : unit = in let () = codemirror##setValue (Js.string "") in let () = - Subpanel_editor_controller.with_file + Editor_controller.with_file (Result_util.fold ~ok:(fun (content, id) -> let () = set_filename (Some id) in @@ -177,7 +177,7 @@ let onload () : unit = in let () = Codemirror.commands##.save := - fun _ -> Menu_editor_file_controller.export_current_file () + fun _ -> Editor_menu_file_controller.export_current_file () in let timeout : Dom_html.timeout_id option ref = ref None in let handler codemirror change = @@ -199,7 +199,7 @@ let onload () : unit = match React.S.value filename with | None -> () | Some filename -> - Subpanel_editor_controller.set_content ~filename + Editor_controller.set_content ~filename ~filecontent:(Js.to_string codemirror##getValue) in let () = diff --git a/gui/ui/tabs/tab_editor/subpanel_editor.mli b/gui/ui/tabs/tab_editor/editor.mli similarity index 100% rename from gui/ui/tabs/tab_editor/subpanel_editor.mli rename to gui/ui/tabs/tab_editor/editor.mli diff --git a/gui/ui/tabs/tab_editor/subpanel_editor_controller.ml b/gui/ui/tabs/tab_editor/editor_controller.ml similarity index 100% rename from gui/ui/tabs/tab_editor/subpanel_editor_controller.ml rename to gui/ui/tabs/tab_editor/editor_controller.ml diff --git a/gui/ui/tabs/tab_editor/subpanel_editor_controller.mli b/gui/ui/tabs/tab_editor/editor_controller.mli similarity index 100% rename from gui/ui/tabs/tab_editor/subpanel_editor_controller.mli rename to gui/ui/tabs/tab_editor/editor_controller.mli diff --git a/gui/ui/tabs/tab_editor/menu_editor_file.ml b/gui/ui/tabs/tab_editor/editor_menu_file.ml similarity index 94% rename from gui/ui/tabs/tab_editor/menu_editor_file.ml rename to gui/ui/tabs/tab_editor/editor_menu_file.ml index dd713d9957..627502adbc 100644 --- a/gui/ui/tabs/tab_editor/menu_editor_file.ml +++ b/gui/ui/tabs/tab_editor/editor_menu_file.ml @@ -204,7 +204,7 @@ let content = ~submit: (Dom_html.handler (fun _ -> let filename : string = Js.to_string file_new_input_dom##.value in - let () = Menu_editor_file_controller.create_file filename in + let () = Editor_menu_file_controller.create_file filename in let () = Common.modal ~id:("#" ^ file_new_modal_id) ~action:"hide" in @@ -214,7 +214,7 @@ let content = let order_files (element : Dom_html.element Js.t) = let filenames : string list = Common.children_value element "li[data-file-id]" (fun element -> - let () = Common.log_group "[Menu_editor_file.order_files]" in + let () = Common.log_group "[Editor_menu_file.order_files]" in let () = Common.debug ~loc:__LOC__ element in let () = Common.log_group_end () in Js.Opt.case @@ -222,7 +222,7 @@ let order_files (element : Dom_html.element Js.t) = (fun () -> failwith "missing filename") Js.to_string) in - let () = Menu_editor_file_controller.order_files filenames in + let () = Editor_menu_file_controller.order_files filenames in () let file_select_handler _ _ : unit Lwt.t = @@ -231,7 +231,7 @@ let file_select_handler _ _ : unit Lwt.t = let file = Js.Opt.get (files##item 0) (fun () -> assert false) in let file_id = Js.to_string file##.name in let () = - Menu_editor_file_controller.create_file + Editor_menu_file_controller.create_file ~text:(Js_of_ocaml_lwt.File.readAsText file) file_id in @@ -256,13 +256,13 @@ let onload () = let () = Common.jquery_on ("#" ^ file_close_li_id) "click" (Dom_html.handler (fun _ -> - let () = Menu_editor_file_controller.close_file () in + let () = Editor_menu_file_controller.close_file () in Js._false)) in let () = Common.jquery_on ("#" ^ file_export_li_id) "click" (Dom_html.handler (fun _ -> - let () = Menu_editor_file_controller.export_current_file () in + let () = Editor_menu_file_controller.export_current_file () in Js._false)) in let () = @@ -270,7 +270,7 @@ let onload () = (Dom_html.handler (fun (event : Dom_html.event Js.t) -> (* let () = - Common.log_group "[Menu_editor_file] clicked span[data-file-id]" + Common.log_group "[Editor_menu_file] clicked span[data-file-id]" in let () = Common.debug ~loc:__LOC__ event in let () = Common.log_group_end () in @@ -284,7 +284,7 @@ let onload () = Js.Opt.case file_id (fun _ -> ()) (fun file_id -> - Menu_editor_file_controller.set_file (Js.to_string file_id)) + Editor_menu_file_controller.set_file (Js.to_string file_id)) in Js._false)) in @@ -300,7 +300,7 @@ let onload () = else Common.debug ~loc:__LOC__ (Format.sprintf - "[Menu_editor_file] file dropdown : unexpected id %s" id))) + "[Editor_menu_file] file dropdown : unexpected id %s" id))) in let () = Common.jquery_on @@ -325,13 +325,13 @@ let onload () = (fun file_id -> let () = Common.log_group - "[Menu_editor_file] triggered \ + "[Editor_menu_file] triggered \ input.file_compile_checkbox, file_id:" in let () = Common.debug ~loc:__LOC__ file_id in let () = Common.log_group_end () in let () = - Menu_editor_file_controller.set_file_compile + Editor_menu_file_controller.set_file_compile (Js.to_string file_id) is_checked in ()) diff --git a/gui/ui/tabs/tab_editor/menu_editor_file.mli b/gui/ui/tabs/tab_editor/editor_menu_file.mli similarity index 100% rename from gui/ui/tabs/tab_editor/menu_editor_file.mli rename to gui/ui/tabs/tab_editor/editor_menu_file.mli diff --git a/gui/ui/tabs/tab_editor/menu_editor_file_controller.ml b/gui/ui/tabs/tab_editor/editor_menu_file_controller.ml similarity index 97% rename from gui/ui/tabs/tab_editor/menu_editor_file_controller.ml rename to gui/ui/tabs/tab_editor/editor_menu_file_controller.ml index 457849587b..00b533e902 100644 --- a/gui/ui/tabs/tab_editor/menu_editor_file_controller.ml +++ b/gui/ui/tabs/tab_editor/editor_menu_file_controller.ml @@ -24,7 +24,7 @@ let set_file (file_id : string) : unit = let () = Common.debug ~loc:__LOC__ (Js.string - (Format.sprintf "[Menu_editor_file_controller.set_file] file `%s`" + (Format.sprintf "[Editor_menu_file_controller.set_file] file `%s`" file_id)) in Common.async __LOC__ (fun () -> diff --git a/gui/ui/tabs/tab_editor/menu_editor_file_controller.mli b/gui/ui/tabs/tab_editor/editor_menu_file_controller.mli similarity index 100% rename from gui/ui/tabs/tab_editor/menu_editor_file_controller.mli rename to gui/ui/tabs/tab_editor/editor_menu_file_controller.mli diff --git a/gui/ui/tabs/tab_editor/subtab_influences.ml b/gui/ui/tabs/tab_editor/subtab_influences.ml index 3423aed549..d1d7b8f3f9 100644 --- a/gui/ui/tabs/tab_editor/subtab_influences.ml +++ b/gui/ui/tabs/tab_editor/subtab_influences.ml @@ -104,7 +104,7 @@ let influencemap = (Yojson.Basic.from_string (Js.to_string x)) in let () = - Subpanel_editor.move_cursor_hook_send + Editor.move_cursor_hook_send (Public_data.position_of_refined_influence_node node) in let origin = Some (Public_data.short_node_of_refined_node node) in @@ -467,7 +467,7 @@ let pop_cell = function [ Html.a_onclick (fun _ -> let () = - Subpanel_editor.move_cursor_hook_send + Editor.move_cursor_hook_send (Public_data.position_of_refined_influence_node node) in let origin = diff --git a/gui/ui/tabs/tab_editor/tab_editor.ml b/gui/ui/tabs/tab_editor/tab_editor.ml index c860036505..320299aaf4 100644 --- a/gui/ui/tabs/tab_editor/tab_editor.ml +++ b/gui/ui/tabs/tab_editor/tab_editor.ml @@ -17,7 +17,7 @@ let rightsubpanel () = ~a: [ Tyxml_js.R.Html.a_class - (React.S.bind Subpanel_editor.editor_full (fun editor_full -> + (React.S.bind Editor.editor_full (fun editor_full -> React.S.const (if editor_full then [ "hidden" ] @@ -61,7 +61,7 @@ let content () = ~a: [ Tyxml_js.R.Html.a_class - (React.S.bind Subpanel_editor.editor_full (fun editor_full -> + (React.S.bind Editor.editor_full (fun editor_full -> (* child hiding set here to avoid "gc" *) let () = childs_hide editor_full in React.S.const @@ -70,7 +70,7 @@ let content () = else [ "col-md-6"; "flex-content" ]))); ] - [ Subpanel_editor.content () ]; + [ Editor.content () ]; rightsubpanel (); ] @@ -225,7 +225,7 @@ let init_non_weakly_reversible_transitions () = let dont_gc_me = ref [] let onload () = - let () = Subpanel_editor.onload () in + let () = Editor.onload () in dont_gc_me := init_dead_rules () :: !dont_gc_me; dont_gc_me := init_dead_agents () :: !dont_gc_me; dont_gc_me := init_non_weakly_reversible_transitions () :: !dont_gc_me; @@ -242,7 +242,7 @@ let onload () = () let onresize () : unit = - let () = Subpanel_editor.onresize () in + let () = Editor.onresize () in let () = Subtab_contact_map.onresize () in let () = Subtab_influences.onresize () in let () = Subtab_constraints.onresize () in