From 32fdbc6fbe1d301ab4357747d084f3006f9a7480 Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Wed, 28 Dec 2016 22:47:16 -0500 Subject: [PATCH] Cfg: Update cfg keys; Fix dynamic scribunto updates --- .../apps/cfgs/specials/edits/services/Xocfg_edit_svc.java | 2 +- 400_xowa/src/gplx/xowa/apps/progs/Xoa_prog_mgr.java | 4 +++- 400_xowa/src/gplx/xowa/guis/views/Xog_startup_tabs_.java | 2 +- 400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core.java | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/services/Xocfg_edit_svc.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/services/Xocfg_edit_svc.java index eb258bfd1..68859910d 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/services/Xocfg_edit_svc.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/services/Xocfg_edit_svc.java @@ -45,7 +45,7 @@ public class Xocfg_edit_svc { } if (!String_.Eq(type, "btn") && String_.Eq(grp.Dflt(), val)) - app.Gui__cbk_mgr().Send_json(cbk_trg, "xo.cfg_edit.revert__recv", Gfobj_nde.New().Add_str("key", key).Add_str("val", val).Add_str("type", type)); + app.Gui__cbk_mgr().Send_json(cbk_trg, "xo.cfg_edit.delete__recv", Gfobj_nde.New().Add_str("key", key).Add_str("val", val).Add_str("type", type)); else app.Gui__cbk_mgr().Send_json(cbk_trg, "xo.cfg_edit.update__pass", Gfobj_nde.New().Add_str("key", key).Add_str("val", val).Add_str("type", type)); } diff --git a/400_xowa/src/gplx/xowa/apps/progs/Xoa_prog_mgr.java b/400_xowa/src/gplx/xowa/apps/progs/Xoa_prog_mgr.java index e3141458b..8dc42baad 100644 --- a/400_xowa/src/gplx/xowa/apps/progs/Xoa_prog_mgr.java +++ b/400_xowa/src/gplx/xowa/apps/progs/Xoa_prog_mgr.java @@ -18,10 +18,12 @@ along with this program. If not, see . package gplx.xowa.apps.progs; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*; import gplx.xowa.apps.fsys.*; import gplx.xowa.files.*; import gplx.core.envs.*; public class Xoa_prog_mgr implements Gfo_invk { + private Xoa_app app; private Gfo_usr_dlg usr_dlg; private Process_adp app_web; private Process_adp[] apps_by_ext = new Process_adp[Xof_ext_.Id__max]; public void Init_by_app(Xoa_app app, Xoa_fsys_eval cmd_eval) { + this.app = app; this.usr_dlg = Xoa_app_.Usr_dlg(); Process_adp.ini_(this, usr_dlg, app_query_img_size , cmd_eval, Process_adp.Run_mode_sync_timeout , 10 * 60, "~{<>bin_plat_dir<>}imagemagick\\identify", "-ping -format \"<{%w,%h}>\" \"~{file}\"", "file"); Process_adp.ini_(this, usr_dlg, app_resize_img , cmd_eval, Process_adp.Run_mode_sync_timeout , 10 * 60, "~{<>bin_plat_dir<>}imagemagick\\convert", "\"~{source}\" -coalesce -resize ~{width}x~{height} \"~{target}\"", "source", "target", "width", "height"); @@ -90,7 +92,7 @@ public class Xoa_prog_mgr implements Gfo_invk { else if (String_.Eq(k, Cfg__convert_djvu_to_tiff)) {Init_cmd(m.ReadStr("v"), app_convert_djvu_to_tiff);} else if (String_.Eq(k, Cfg__convert_tex_to_dvi)) {Init_cmd(m.ReadStr("v"), app_convert_tex_to_dvi);} else if (String_.Eq(k, Cfg__convert_dvi_to_png)) {Init_cmd(m.ReadStr("v"), app_convert_dvi_to_png);} - else if (String_.Eq(k, Cfg__lua)) {Init_cmd(m.ReadStr("v"), app_lua);} + else if (String_.Eq(k, Cfg__lua)) {Init_cmd(m.ReadStr("v"), app_lua); gplx.xowa.xtns.scribunto.Scrib_core_mgr.Term_all((Xoae_app)app);} else if (String_.Eq(k, Cfg__lilypond)) {Init_cmd(m.ReadStr("v"), app_lilypond);} else if (String_.Eq(k, Cfg__abc2ly)) {Init_cmd(m.ReadStr("v"), app_abc2ly);} else if (String_.Eq(k, Cfg__trim_img)) {Init_cmd(m.ReadStr("v"), app_trim_img);} diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_startup_tabs_.java b/400_xowa/src/gplx/xowa/guis/views/Xog_startup_tabs_.java index 178f300b8..9418e7805 100644 --- a/400_xowa/src/gplx/xowa/guis/views/Xog_startup_tabs_.java +++ b/400_xowa/src/gplx/xowa/guis/views/Xog_startup_tabs_.java @@ -96,5 +96,5 @@ public class Xog_startup_tabs_ { , Cfg__prev_selected = "xowa.app.startup.tabs.previous_selected" , Opt__tabs_type__previous = "previous" ; - public static final String Cfg__prev_version = "xowa.app.previous_version"; + public static final String Cfg__prev_version = "xowa.app.setup.previous_version"; } diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core.java b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core.java index 13f0e90bc..39733680e 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core.java @@ -70,7 +70,7 @@ public class Scrib_core { public Scrib_lib_wikibase Lib_wikibase() {return lib_wikibase;} private Scrib_lib_wikibase lib_wikibase; public Scrib_lib_wikibase_entity Lib_wikibase_entity() {return lib_wikibase_entity;} private Scrib_lib_wikibase_entity lib_wikibase_entity; public Scrib_core Init() { // REF:LuaCommon.php!Load - Scrib_xtn_mgr xtn_mgr = (Scrib_xtn_mgr)app.Xtn_mgr().Get_or_fail(Scrib_xtn_mgr.XTN_KEY); + Scrib_xtn_mgr xtn_mgr = (Scrib_xtn_mgr)wiki.Xtn_mgr().Get_or_fail(Scrib_xtn_mgr.XTN_KEY); Engine_(xtn_mgr.Engine_type(), xtn_mgr.Luaj_debug_enabled()); engine.Server().Server_timeout_(xtn_mgr.Lua_timeout()).Server_timeout_polling_(xtn_mgr.Lua_timeout_polling()).Server_timeout_busy_wait_(xtn_mgr.Lua_timeout_busy_wait()); enabled = xtn_mgr.Enabled();