diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/Xocfg_mgr.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/Xocfg_mgr.java index ae875aeee..ab15267dc 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/Xocfg_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/Xocfg_mgr.java @@ -120,16 +120,18 @@ public class Xocfg_mgr implements Gfo_invk { cache_mgr.Del(ctx, key); } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { - if (ctx.Match(k, Invk__set_temp)) cache_mgr.Set_wo_save((String)m.ReadValAt(0), (String)m.ReadValAt(1), (String)m.ReadValAt(2)); + if (ctx.Match(k, "set")) cache_mgr.Set ((String)m.ReadValAt(0), (String)m.ReadValAt(1), (String)m.ReadValAt(2)); + else if (ctx.Match(k, "set_temp")) cache_mgr.Set_wo_save ((String)m.ReadValAt(0), (String)m.ReadValAt(1), (String)m.ReadValAt(2)); + else if (ctx.Match(k, "set_dflt")) dflt_mgr.Add ((String)m.ReadValAt(0), (String)m.ReadValAt(1)); else return Gfo_invk_.Rv_unhandled; return this; - } private static final String Invk__set_temp = "set_temp"; + } public static String Ctx__app = "app"; public static String[] Parse_io_cmd(String raw) { String[] rv = new String[2]; rv[0] = ""; rv[1] = ""; - int pos = String_.FindFwd(raw, "\n"); + int pos = String_.FindFwd(raw, "|"); if (pos != Bry_find_.Not_found) { rv[0] = String_.Mid(raw, 0, pos); rv[1] = String_.Mid(raw, pos + 1); diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/dflts/Xocfg_dflt_mgr.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/dflts/Xocfg_dflt_mgr.java index c6c7aab8f..087ba2d0a 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/dflts/Xocfg_dflt_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/dflts/Xocfg_dflt_mgr.java @@ -24,8 +24,9 @@ public class Xocfg_dflt_mgr { this.cache_mgr = cache_mgr; } public void Init_by_app(Xoa_app app) { - Xocfg_dflt_loader loader = new Xocfg_dflt_loader(); - loader.Load_by_file(this, app.Fsys_mgr().Bin_plat_dir().GenSubFil_nest("xowa", "cfg", "xo.cfg.dflt.json")); + app.Gfs_mgr().Run_url(app.Fsys_mgr().Bin_plat_dir().GenSubFil_nest("xowa", "cfg", "xo.cfg.dflt.gfs")); +// Xocfg_dflt_loader loader = new Xocfg_dflt_loader(); +// loader.Load_by_file(this, ); } public String Get_or(String key, String or) { Gfo_invk itm = (Gfo_invk)hash.Get_by(key); diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_itm_html.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_itm_html.java index fc8324eb8..1e9b2ed38 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_itm_html.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_itm_html.java @@ -66,7 +66,7 @@ public class Xoedit_itm_html { , gui_type_key, gui_args, key, lines[0]); bfr.Add_str_u8_fmt ( "\n" - , gui_type_key, gui_args, key, lines[1]); + , gui_type_key, gui_args, key, String_.Replace(lines[1], "\"", """)); break; case Xoitm_gui_tid.Tid__gui_binding: String[] flds = Xoitm_gui_binding.To_gui(val);