From fd12ed88a4e7d7feaf1d59a96f675693217ea1b4 Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Tue, 27 Dec 2016 15:16:46 -0500 Subject: [PATCH] Cfg: Standardize rest of cfg keys --- 400_xowa/src/gplx/xowa/Xowe_wiki.java | 2 +- .../apps/cfgs/mgrs/types/Xocfg_type_mgr.java | 13 ++++---- .../edits/pages/Xocfg_edit_special.java | 2 +- .../htmls/catpages/Xoctg_catpage_mgr.java | 2 +- .../htmls/pageboxs/Xoctg_pagebox_wtr.java | 2 +- .../pages/syncs/core/Xosync_read_mgr.java | 8 ++--- .../wikis/searchs/bldrs/Srch_bldr_mgr_.java | 2 +- .../gui/htmlbars/Srch_htmlbar_mgr.java | 4 +-- .../searchs/gui/urlbars/Srch_urlbar_mgr.java | 12 +++---- .../searchs/searchers/Srch_search_mgr.java | 2 +- .../searchs/specials/Srch_special_cfg.java | 10 +++--- 400_xowa/src/gplx/xowa/apps/Xoa_sys_cfg.java | 2 +- .../gplx/xowa/apps/progs/Xoa_prog_mgr.java | 33 ++++++++++--------- .../apps/servers/http/Http_server_mgr.java | 1 - 400_xowa/src/gplx/xowa/bldrs/Xobldr_cfg.java | 16 ++++----- .../xowa/bldrs/css/Xoa_css_extractor.java | 2 +- .../filters/dansguardians/Dg_match_mgr.java | 12 +++---- .../gplx/xowa/bldrs/installs/Xoi_cmd_mgr.java | 2 +- .../bldrs/installs/Xoi_cmd_wiki_import.java | 2 +- .../xowa/bldrs/installs/Xoi_dump_mgr.java | 17 ++-------- .../src/gplx/xowa/files/Xof_cfg_download.java | 2 +- .../gplx/xowa/files/caches/Xou_cache_mgr.java | 10 +++--- 400_xowa/src/gplx/xowa/guis/Xog_resizer.java | 2 +- .../gplx/xowa/guis/langs/Xol_font_info.java | 4 +-- .../xowa/guis/views/Xog_startup_tabs_.java | 2 +- .../src/gplx/xowa/guis/views/Xog_tab_mgr.java | 4 +-- .../gplx/xowa/guis/views/Xog_win_itm_cfg.java | 2 +- .../src/gplx/xowa/htmls/Xoh_page_mgr.java | 2 +- .../src/gplx/xowa/htmls/Xoh_page_wtr_mgr.java | 2 +- .../wkrs/lnkis/htmls/Xoh_file_wtr__basic.java | 4 +-- .../xowa/htmls/portal/Xow_portal_mgr.java | 6 ++-- .../hdrs/sections/Xop_section_mgr.java | 2 +- .../xowa/wikis/modules/Xow_module_mgr.java | 6 ++-- 33 files changed, 91 insertions(+), 103 deletions(-) diff --git a/400_xowa/src/gplx/xowa/Xowe_wiki.java b/400_xowa/src/gplx/xowa/Xowe_wiki.java index 6356c08c8..b40440618 100644 --- a/400_xowa/src/gplx/xowa/Xowe_wiki.java +++ b/400_xowa/src/gplx/xowa/Xowe_wiki.java @@ -294,7 +294,7 @@ public class Xowe_wiki implements Xow_wiki, Gfo_invk, Gfo_evt_itm { , Invk_domain = "domain", Invk_maint = "maint", Invk_hdump_enabled_ = "hdump_enabled_" , Invk_catpage_mgr = "catpage_mgr" ; - public static final String Cfg__variant__current = "xowa.lang.variant.current"; + public static final String Cfg__variant__current = "xowa.wiki.lang.variant.current"; public static final String Invk_db_mgr = "db_mgr"; // SERIALIZED:000.sqlite3|xowa_cfg public static final String Invk_lang_ = "lang_"; } diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/types/Xocfg_type_mgr.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/types/Xocfg_type_mgr.java index 55fdee0fa..c6cde4b9c 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/types/Xocfg_type_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/types/Xocfg_type_mgr.java @@ -19,18 +19,17 @@ package gplx.xowa.addons.apps.cfgs.mgrs.types; import gplx.*; import gplx.xowa.* public class Xocfg_type_mgr { private final Ordered_hash list_hash = Ordered_hash_.New(); public Xocfg_type_mgr() { - this.Lists__add("list:xowa.gui.browser.page_load_mode", "mem", "url"); this.Lists__add("list:xowa.app.startup.window.mode", "previous", "maximized", "absolute", "relative", "default"); this.Lists__add("list:xowa.app.startup.pages.type", "blank", "xowa", "previous", "custom"); - this.Lists__add("list:xowa.gui.window.html_box.adj_type", "none", "relative", "absolute"); - this.Lists__add("list:xowa.wiki.database.zip_mode", Keyval_.new_("raw", "text"), Keyval_.new_("gzip"), Keyval_.new_("bzip2"), Keyval_.new_("xz")); - this.Lists__add("list:xowa.html.wiki.portal.missing_class", Keyval_.new_("", "Show as blue link"), Keyval_.new_("new", "Show as red link"), Keyval_.new_("xowa_display_none", "Hide")); - this.Lists__add("list:xowa.html.category.basic.missing_class", "normal", "hide", "red_link"); + this.Lists__add("list:xowa.gui.html_box.page_load_mode", "mem", "url"); + this.Lists__add("list:xowa.gui.html_box.adj_type", "none", "relative", "absolute"); + this.Lists__add("list:xowa.html.portal.missing_class", Keyval_.new_("", "Show as blue link"), Keyval_.new_("new", "Show as red link"), Keyval_.new_("xowa_display_none", "Hide")); this.Lists__add("list:xowa.html.tidy.engine", "tidy", "jtidy"); + this.Lists__add("list:xowa.bldr.db.zip_mode", Keyval_.new_("raw", "text"), Keyval_.new_("gzip"), Keyval_.new_("bzip2"), Keyval_.new_("xz")); + this.Lists__add("list:xowa.addon.category.catpage.missing_class", "normal", "hide", "red_link"); this.Lists__add("list:xowa.addon.http_server.file_retrieve_mode", Keyval_.new_("wait"), Keyval_.new_("skip"), Keyval_.new_("async_server", "async server")); - this.Lists__add("list:xowa.addon.search_suggest.html_bar.search_mode", "Search", "AllPages", "AllPages_(v2)"); + this.Lists__add("list:xowa.addon.scribunto.engine", "luaj", "lua"); this.Lists__add("list:xowa.addon.math.renderer", Keyval_.new_("mathjax","MathJax"), Keyval_.new_("latex", "LaTeX")); - this.Lists__add("list:xowa.addon.scribunto.general.engine", "luaj", "lua"); } public void Lists__add(String key, String... vals) { int len = vals.length; diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/pages/Xocfg_edit_special.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/pages/Xocfg_edit_special.java index 9cf11533a..ef9901d7b 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/pages/Xocfg_edit_special.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/pages/Xocfg_edit_special.java @@ -28,7 +28,7 @@ public class Xocfg_edit_special implements Xow_special_page { Xocfg_edit_loader loader = Xocfg_edit_loader.New(wiki.App()); if (String_.Eq(grp, "")) { - grp = wiki.App().Cfg().Get_str_app("xowa.app.cfg.recent_page"); + grp = wiki.App().Cfg().Get_str_app("xowa.app.cfg.previous_grp"); if (!loader.Grp_key_exists(grp)) { grp = "xowa.app.security"; Gfo_usr_dlg_.Instance.Warn_many("", "", "cfg:grp_key not found; defaulting to xowa.app.security; key=~{0}", grp); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/Xoctg_catpage_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/Xoctg_catpage_mgr.java index 2b115af2e..2cbf858db 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/Xoctg_catpage_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/Xoctg_catpage_mgr.java @@ -99,7 +99,7 @@ public class Xoctg_catpage_mgr implements Gfo_invk { public static int Grp_max_dflt = 200; private static final Object thread_lock = new Object(); - private static final String Cfg__missing_class = "xowa.category.html.missing_class"; + private static final String Cfg__missing_class = "xowa.addon.category.catpage.missing_class"; private static final String Str__missing_cls__normal = "normal", Str__missing_cls__hide = "hide", Str__missing_cls__red = "red_link"; private static final byte[] Css__missing_cls__normal = Bry_.new_a7(".xowa-missing-category-entry {}"), Css__missing_cls__hide = Bry_.new_a7(".xowa-missing-category-entry {display: none;}"), Css__missing_cls__red = Bry_.new_a7(".xowa-missing-category-entry {color: red;}"); } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/Xoctg_pagebox_wtr.java b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/Xoctg_pagebox_wtr.java index 29e77c637..5670b8c32 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/Xoctg_pagebox_wtr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/Xoctg_pagebox_wtr.java @@ -69,5 +69,5 @@ public class Xoctg_pagebox_wtr implements Gfo_invk { else return Gfo_invk_.Rv_unhandled; return this; } - private static final String Cfg__grouping_enabled = "xowa.category.html.grouping_enabled"; + private static final String Cfg__grouping_enabled = "xowa.addon.category.pagebox.grouping_enabled"; } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/pages/syncs/core/Xosync_read_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/pages/syncs/core/Xosync_read_mgr.java index 1d2a5b1b8..eefd2deec 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/pages/syncs/core/Xosync_read_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/pages/syncs/core/Xosync_read_mgr.java @@ -72,9 +72,9 @@ public class Xosync_read_mgr implements Gfo_invk { return this; } private static final String - Cfg__manual__enabled = "xowa.wiki.import.page_sync.manual.enabled" - , Cfg__auto__enabled = "xowa.wiki.import.page_sync.auto.enabled" - , Cfg__auto__interval = "xowa.wiki.import.page_sync.auto.interval" - , Cfg__auto__scope = "xowa.wiki.import.page_sync.auto.scope" + Cfg__manual__enabled = "xowa.bldr.page_sync.manual.enabled" + , Cfg__auto__enabled = "xowa.bldr.page_sync.auto.enabled" + , Cfg__auto__interval = "xowa.bldr.page_sync.auto.interval" + , Cfg__auto__scope = "xowa.bldr.page_sync.auto.scope" ; } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/Srch_bldr_mgr_.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/Srch_bldr_mgr_.java index 9aefe86ec..7857e96be 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/Srch_bldr_mgr_.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/Srch_bldr_mgr_.java @@ -24,7 +24,7 @@ public class Srch_bldr_mgr_ { Xob_bldr bldr = app.Bldr(); bldr.Cmd_mgr().Add_many(wiki, Xob_cmd_keys.Key_text_search_cmd); - int page_rank_iterations = app.Cfg().Get_int_app_or("xowa.wiki.import.page_rank.iteration_max", 0); + int page_rank_iterations = app.Cfg().Get_int_app_or("xowa.bldr.import.page_rank.iteration_max", 0); boolean page_rank_enabled = page_rank_iterations > 0; if (page_rank_enabled) { bldr.Cmd_mgr().Add(new gplx.xowa.bldrs.cmds.utils.Xob_download_cmd(bldr, wiki).Dump_type_(gplx.xowa.addons.bldrs.wmdumps.pagelinks.bldrs.Pglnk_bldr_cmd.Dump_type_key)); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/gui/htmlbars/Srch_htmlbar_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/gui/htmlbars/Srch_htmlbar_mgr.java index 04f38652e..91957e90e 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/gui/htmlbars/Srch_htmlbar_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/gui/htmlbars/Srch_htmlbar_mgr.java @@ -48,7 +48,7 @@ public class Srch_htmlbar_mgr implements Gfo_invk { return this; } private static final String - Cfg__enabled = "xowa.addon.search.html_bar.enabled" - , Cfg__results_max = "xowa.addon.search.html_bar.results_max" + Cfg__enabled = "xowa.addon.search.suggest.enabled" + , Cfg__results_max = "xowa.addon.search.suggest.results_max" ; } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/gui/urlbars/Srch_urlbar_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/gui/urlbars/Srch_urlbar_mgr.java index 04fe43636..5c242393f 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/gui/urlbars/Srch_urlbar_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/gui/urlbars/Srch_urlbar_mgr.java @@ -92,11 +92,11 @@ public class Srch_urlbar_mgr implements Gfo_invk { // NOTE: needs to be app-leve return this; } private static final String - Cfg__enabled = "xowa.gui.urlbar.search.enabled" - , Cfg__max_results = "xowa.gui.urlbar.search.max_results" - , Cfg__auto_wildcard = "xowa.gui.urlbar.search.auto_wildcard" - , Cfg__ns_ids = "xowa.gui.urlbar.search.ns_ids" - , Cfg__visible_rows = "xowa.gui.urlbar.search.visible_rows" - , Cfg__jump_len = "xowa.gui.urlbar.search.jump_len" + Cfg__enabled = "xowa.gui.url_bar.search.enabled" + , Cfg__max_results = "xowa.gui.url_bar.search.max_results" + , Cfg__auto_wildcard = "xowa.gui.url_bar.search.auto_wildcard" + , Cfg__ns_ids = "xowa.gui.url_bar.search.ns_ids" + , Cfg__visible_rows = "xowa.gui.url_bar.search.visible_rows" + , Cfg__jump_len = "xowa.gui.url_bar.search.jump_len" ; } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_search_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_search_mgr.java index 1f069ba2e..cf2f20469 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_search_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_search_mgr.java @@ -93,5 +93,5 @@ public class Srch_search_mgr implements Gfo_invk { else return Gfo_invk_.Rv_unhandled; return this; } - public static final String Cfg__args_default = "xowa.addon.search.args_default"; + public static final String Cfg__args_default = "xowa.addon.search.special.args_default"; } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_cfg.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_cfg.java index 56a5a27c3..b788ab0ec 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_cfg.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_cfg.java @@ -56,11 +56,11 @@ public class Srch_special_cfg implements Gfo_invk { return this; } private static final String - Cfg__results_per_page = "xowa.addon.search.results_per_page" - , Cfg__async_db = "xowa.addon.search.async_db" - , Cfg__auto_wildcard = "xowa.addon.search.auto_wildcard" - , Cfg__multi_wikis = "xowa.addon.search.multi_wikis" - , Cfg__multi_sorts = "xowa.addon.search.multi_sorts" + Cfg__results_per_page = "xowa.addon.search.special.results_per_page" + , Cfg__async_db = "xowa.addon.search.special.async_db" + , Cfg__auto_wildcard = "xowa.addon.search.special.auto_wildcard" + , Cfg__multi_wikis = "xowa.addon.search.special.multi_wikis" + , Cfg__multi_sorts = "xowa.addon.search.special.multi_sorts" ; public static final byte[] Dflt_multi_wikis_bry = Bry_.new_a7("|") diff --git a/400_xowa/src/gplx/xowa/apps/Xoa_sys_cfg.java b/400_xowa/src/gplx/xowa/apps/Xoa_sys_cfg.java index 1ac8088b1..dd1eb2cca 100644 --- a/400_xowa/src/gplx/xowa/apps/Xoa_sys_cfg.java +++ b/400_xowa/src/gplx/xowa/apps/Xoa_sys_cfg.java @@ -34,7 +34,7 @@ public class Xoa_sys_cfg implements Gfo_invk { app.Cfg().Type_mgr().Lists__add("list:" + Cfg__lang, Options_list_lang_.new_()); app.Cfg().Bind_many_app(this, Cfg__lang); } - private static final String Cfg__lang = "xowa.gui.lang.name"; + private static final String Cfg__lang = "xowa.gui.app.lang"; public int Options_version() {return options_version;} public Xoa_sys_cfg Options_version_(int v) {options_version = v; return this;} private int options_version = 1; public Keyval[] Options_lang_list() {if (options_lang_list == null) options_lang_list = Options_list_lang_.new_(); return options_lang_list;} private Keyval[] options_lang_list; public long Free_mem_when() {return free_mem_when;} long free_mem_when; 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 1cfaddd4d..e3141458b 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 @@ -116,22 +116,25 @@ public class Xoa_prog_mgr implements Gfo_invk { } private static final String Invk_convert_tex_to_dvi = "convert_tex_to_dvi", Invk_convert_dvi_to_png = "convert_dvi_to_png"; private static final String - Cfg__web = "xowa.app.content_apps.web" - , Cfg__media = "xowa.app.content_apps.media" - , Cfg__image = "xowa.app.content_apps.image" - , Cfg__svg = "xowa.app.content_apps.svg" - , Cfg__pdf = "xowa.app.content_apps.pdf" - , Cfg__djvu = "xowa.app.content_apps.djvu" - , Cfg__bz2__stdout_cmd = "xowa.wiki.import.bz2.stdout_cmd" - , Cfg__bz2 = "xowa.wiki.import.apps.bz2" - , Cfg__gz = "xowa.wiki.import.apps.gz" - , Cfg__query_size = "xowa.wiki.files.apps.query_size" - , Cfg__resize_img = "xowa.wiki.files.apps.resize_img" - , Cfg__convert_svg_to_png = "xowa.wiki.files.apps.convert_svg_to_png" - , Cfg__convert_djvu_to_tiff = "xowa.wiki.files.apps.convert_djvu_to_tiff" - , Cfg__convert_tex_to_dvi = "xowa.addon.math.apps.convert_tex_to_dvi" - , Cfg__convert_dvi_to_png = "xowa.addon.math.apps.convert_dvi_to_png" + Cfg__web = "xowa.files.apps.view.web" + , Cfg__media = "xowa.files.apps.view.media" + , Cfg__image = "xowa.files.apps.view.image" + , Cfg__svg = "xowa.files.apps.view.svg" + , Cfg__pdf = "xowa.files.apps.view.pdf" + , Cfg__djvu = "xowa.files.apps.view.djvu" + + , Cfg__query_size = "xowa.files.apps.make.img_size_get" + , Cfg__resize_img = "xowa.files.apps.make.img_size_set" + , Cfg__convert_svg_to_png = "xowa.files.apps.make.svg_to_png" + , Cfg__convert_djvu_to_tiff = "xowa.files.apps.make.djvu_to_tiff" + + , Cfg__bz2__stdout_cmd = "xowa.bldr.import.apps.bz2_stdout.cmd" + , Cfg__bz2 = "xowa.bldr.import.apps.bz2" + , Cfg__gz = "xowa.bldr.import.apps.gz" + , Cfg__lua = "xowa.addon.scribunto.lua.cmd" + , Cfg__convert_tex_to_dvi = "xowa.addon.math.apps.tex_to_dvi" + , Cfg__convert_dvi_to_png = "xowa.addon.math.apps.dvi_to_png" , Cfg__lilypond = "xowa.addon.score.apps.lilypond" , Cfg__abc2ly = "xowa.addon.score.apps.abc2ly" , Cfg__trim_img = "xowa.addon.score.apps.trim_img" diff --git a/400_xowa/src/gplx/xowa/apps/servers/http/Http_server_mgr.java b/400_xowa/src/gplx/xowa/apps/servers/http/Http_server_mgr.java index 84b609c6d..eb3679d9f 100644 --- a/400_xowa/src/gplx/xowa/apps/servers/http/Http_server_mgr.java +++ b/400_xowa/src/gplx/xowa/apps/servers/http/Http_server_mgr.java @@ -147,5 +147,4 @@ public class Http_server_mgr implements Gfo_invk { private static final String Cfg__port = "xowa.addon.http_server.port" , Cfg__file_retrieve_mode = "xowa.addon.http_server.file_retrieve_mode"; - } diff --git a/400_xowa/src/gplx/xowa/bldrs/Xobldr_cfg.java b/400_xowa/src/gplx/xowa/bldrs/Xobldr_cfg.java index 60ed3f69e..cdf4e2a0a 100644 --- a/400_xowa/src/gplx/xowa/bldrs/Xobldr_cfg.java +++ b/400_xowa/src/gplx/xowa/bldrs/Xobldr_cfg.java @@ -23,22 +23,22 @@ public class Xobldr_cfg { private static boolean hzip_enabled = Bool_.Y; private static boolean hzip_mode_is_b256 = Bool_.Y; - public static byte Zip_mode__text(Xoa_app app) {return Zip_mode(app, "xowa.wiki.database.zip_mode.text");} // CFG: Cfg__ - public static byte Zip_mode__html(Xoa_app app) {return Zip_mode(app, "xowa.wiki.database.zip_mode.html");} // CFG: Cfg__ + public static byte Zip_mode__text(Xoa_app app) {return Zip_mode(app, "xowa.bldr.db.zip_mode.text");} // CFG: Cfg__ + public static byte Zip_mode__html(Xoa_app app) {return Zip_mode(app, "xowa.bldr.db.zip_mode.html");} // CFG: Cfg__ private static byte Zip_mode(Xoa_app app, String key) { String val = app.Cfg().Get_str_app_or(key, "gzip"); return gplx.core.ios.streams.Io_stream_tid_.To_tid(val); } - public static long Max_size__text(Xoa_app app) {return Max_size(app, "xowa.wiki.database.max_size.text");} // CFG: Cfg__ - public static long Max_size__html(Xoa_app app) {return Max_size(app, "xowa.wiki.database.max_size.html");} // CFG: Cfg__ - public static long Max_size__file(Xoa_app app) {return Max_size(app, "xowa.wiki.database.max_size.file");} // CFG: Cfg__ + public static long Max_size__text(Xoa_app app) {return Max_size(app, "xowa.bldr.db.max_size.text");} // CFG: Cfg__ + public static long Max_size__html(Xoa_app app) {return Max_size(app, "xowa.bldr.db.max_size.html");} // CFG: Cfg__ + public static long Max_size__file(Xoa_app app) {return Max_size(app, "xowa.bldr.db.max_size.file");} // CFG: Cfg__ private static long Max_size(Xoa_app app, String key) { long rv = app.Cfg().Get_long_app_or(key, Io_size_.To_long_by_int_mb(1500)); return rv * Io_mgr.Len_mb; } - public static long Layout_size__text(Xoa_app app) {return Layout_size(app, "xowa.wiki.database.layout_size.text");} // CFG: Cfg__ - public static long Layout_size__html(Xoa_app app) {return Layout_size(app, "xowa.wiki.database.layout_size.html");} // CFG: Cfg__ - public static long Layout_size__file(Xoa_app app) {return Layout_size(app, "xowa.wiki.database.layout_size.file");} // CFG: Cfg__ + public static long Layout_size__text(Xoa_app app) {return Layout_size(app, "xowa.bldr.db.layout_size.text");} // CFG: Cfg__ + public static long Layout_size__html(Xoa_app app) {return Layout_size(app, "xowa.bldr.db.layout_size.html");} // CFG: Cfg__ + public static long Layout_size__file(Xoa_app app) {return Layout_size(app, "xowa.bldr.db.layout_size.file");} // CFG: Cfg__ private static long Layout_size(Xoa_app app, String key) { long rv = app.Cfg().Get_long_app_or(key, Io_size_.To_long_by_int_mb(1500)); return rv * Io_mgr.Len_mb; diff --git a/400_xowa/src/gplx/xowa/bldrs/css/Xoa_css_extractor.java b/400_xowa/src/gplx/xowa/bldrs/css/Xoa_css_extractor.java index 9508774e6..93548d331 100644 --- a/400_xowa/src/gplx/xowa/bldrs/css/Xoa_css_extractor.java +++ b/400_xowa/src/gplx/xowa/bldrs/css/Xoa_css_extractor.java @@ -72,7 +72,7 @@ public class Xoa_css_extractor { } } private void Install_by_wmf(Xowe_wiki wiki, Io_url wiki_html_dir) { - opt_download_css_common = wiki.Appe().Cfg().Get_bool_app_or("xowa.wiki.import.download_xowa_common", true); // CFG: Cfg__ + opt_download_css_common = wiki.Appe().Cfg().Get_bool_app_or("xowa.bldr.import.download_xowa_common", true); // CFG: Cfg__ if (!gplx.core.ios.IoEngine_system.Web_access_enabled) opt_download_css_common = false; // if !web_access_enabled, don't download this.wiki_domain = wiki.Domain_bry(); mainpage_url = "https://" + wiki.Domain_str(); // NOTE: cannot reuse protocol_prefix b/c "//" needs to be added manually; protocol_prefix is used for logo and images which have form of "//domain/image.png"; changed to https; DATE:2015-02-17 diff --git a/400_xowa/src/gplx/xowa/bldrs/filters/dansguardians/Dg_match_mgr.java b/400_xowa/src/gplx/xowa/bldrs/filters/dansguardians/Dg_match_mgr.java index 4ea8a6e09..84d2c1ee2 100644 --- a/400_xowa/src/gplx/xowa/bldrs/filters/dansguardians/Dg_match_mgr.java +++ b/400_xowa/src/gplx/xowa/bldrs/filters/dansguardians/Dg_match_mgr.java @@ -139,15 +139,15 @@ public class Dg_match_mgr { String ctx = cfg_mgr.To_ctx(wiki); return new Dg_match_mgr ( cfg_mgr.Get_url_or(ctx, Cfg__root_dir, app.Fsys_mgr().Bin_xowa_dir().GenSubDir_nest("cfg", "bldr", "filter")).GenSubDir(wiki.Domain_str()) - , cfg_mgr.Get_int_or(ctx, "xowa.wiki.import.dansguardian.score_init", 0) - , cfg_mgr.Get_int_or(ctx, "xowa.wiki.import.dansguardian.score_fail", 0) - , cfg_mgr.Get_bool_or(ctx, "xowa.wiki.import.dansguardian.case_match", false) - , cfg_mgr.Get_bool_or(ctx, "xowa.wiki.import.dansguardian.log_enabled", true) + , cfg_mgr.Get_int_or(ctx, "xowa.bldr.dansguardian.score_init", 0) + , cfg_mgr.Get_int_or(ctx, "xowa.bldr.dansguardian.score_fail", 0) + , cfg_mgr.Get_bool_or(ctx, "xowa.bldr.dansguardian.case_match", false) + , cfg_mgr.Get_bool_or(ctx, "xowa.bldr.dansguardian.log_enabled", true) , wiki.Fsys_mgr().Root_dir().GenSubFil("dansguardian_log.sqlite3") ); } - public static final String Cfg__enabled = "xowa.wiki.import.dansguardian.enabled"; - private static final String Cfg__root_dir = "xowa.wiki.import.dansguardian.root_dir"; + public static final String Cfg__enabled = "xowa.bldr.dansguardian.enabled"; + private static final String Cfg__root_dir = "xowa.bldr.dansguardian.root_dir"; } class Dg_rule_group { public Dg_rule_group(byte[] word) {this.word = word;} diff --git a/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_mgr.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_mgr.java index 0fa734d06..0d6341a18 100644 --- a/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_mgr.java +++ b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_mgr.java @@ -87,7 +87,7 @@ public class Xoi_cmd_mgr implements Gfo_invk { return cmd; // return last cmd } public Gfo_thread_cmd Dump_add_many_custom(String wiki_key, String wiki_date, String dump_type, boolean dumpfile_cmd) { - String[] custom_cmds = (app.Cfg().Get_bool_app_or("xowa.wiki.import.unzip_bz2_file", false)) // CFG: Cfg__ + String[] custom_cmds = (app.Cfg().Get_bool_app_or("xowa.bldr.import.unzip_bz2_file", false)) // CFG: Cfg__ ? String_.Ary(Xoi_cmd_wiki_download.Key_wiki_download, Xoi_cmd_wiki_unzip.KEY_dump, Xoi_cmd_wiki_import.KEY) : String_.Ary(Xoi_cmd_wiki_download.Key_wiki_download, Xoi_cmd_wiki_import.KEY); int custom_cmds_len = custom_cmds.length; diff --git a/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_import.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_import.java index f008738cf..cf2ab2489 100644 --- a/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_import.java +++ b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_import.java @@ -65,7 +65,7 @@ class Xoi_cmd_wiki_import implements Gfo_thread_cmd { wiki.Html_mgr().Page_wtr_mgr().Init_(true); wiki.Init_assert(); if (String_.Eq(src_url.Ext(), ".xml")) { - if (app.Cfg().Get_bool_app_or("xowa.wiki.import.delete_xml_file", true)) // CFG: Cfg__ + if (app.Cfg().Get_bool_app_or("xowa.bldr.import.delete_xml_file", true)) // CFG: Cfg__ Io_mgr.Instance.DeleteFil(src_url); } else if (String_.Eq(src_url.Ext(), ".bz2")) { diff --git a/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_dump_mgr.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_dump_mgr.java index 0e0b3d5cf..37e7d4e57 100644 --- a/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_dump_mgr.java +++ b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_dump_mgr.java @@ -18,22 +18,9 @@ along with this program. If not, see . package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.dumps.*; public class Xoi_dump_mgr { -// public String[] Server_urls() {return server_urls;} private String[] server_urls = String_.Ary(Xowm_dump_file_.Server_your_org, Xowm_dump_file_.Server_wmf_https, Xowm_dump_file_.Server_c3sl, Xowm_dump_file_.Server_masaryk); // promote your.org to primary url; DATE:2016-08-07 -// public void Init_by_app(Xoa_app app) { -// app.Cfg().Bind_many_app(this, Cfg__server_urls); -// } -// public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { -// if (ctx.Match(k, Cfg__server_urls)) server_urls = m.ReadStrAryIgnore("v", ",", "\n"); -// else return Gfo_invk_.Rv_unhandled; -// return this; -// } -// private static final String -// Cfg__server_urls = "xowa.wiki.import.dump_servers" -// ; - - public static boolean Import_bz2_by_stdout(Xoa_app app) {return app.Cfg().Get_bool_app_or("xowa.wiki.import.bz2.stdout_enabled", true);} // CFG: Cfg__ + public static boolean Import_bz2_by_stdout(Xoa_app app) {return app.Cfg().Get_bool_app_or("xowa.bldr.import.apps.bz2_stdout.enabled", true);} // CFG: Cfg__ public static String[] Server_urls(Xoa_app app) { String[] or = String_.Ary(Xowm_dump_file_.Server_your_org, Xowm_dump_file_.Server_wmf_https, Xowm_dump_file_.Server_c3sl, Xowm_dump_file_.Server_masaryk); // promote your.org to primary url; DATE:2016-08-07 - return app.Cfg().Get_strary_app_or("xowa.wiki.import.dump_servers", ",", or); // CFG: Cfg__ + return app.Cfg().Get_strary_app_or("xowa.bldr.import.dump_servers", ",", or); // CFG: Cfg__ } } diff --git a/400_xowa/src/gplx/xowa/files/Xof_cfg_download.java b/400_xowa/src/gplx/xowa/files/Xof_cfg_download.java index 359cb0817..5a734fd7a 100644 --- a/400_xowa/src/gplx/xowa/files/Xof_cfg_download.java +++ b/400_xowa/src/gplx/xowa/files/Xof_cfg_download.java @@ -51,5 +51,5 @@ public class Xof_cfg_download implements Gfo_invk { default: throw Err_.new_unhandled(v); } } - private static final String Cfg__retrieval_enabled = "xowa.wiki.files.retrieval_enabled"; + private static final String Cfg__retrieval_enabled = "xowa.files.retrieval_enabled"; } diff --git a/400_xowa/src/gplx/xowa/files/caches/Xou_cache_mgr.java b/400_xowa/src/gplx/xowa/files/caches/Xou_cache_mgr.java index 653daad99..3587af9df 100644 --- a/400_xowa/src/gplx/xowa/files/caches/Xou_cache_mgr.java +++ b/400_xowa/src/gplx/xowa/files/caches/Xou_cache_mgr.java @@ -174,11 +174,11 @@ public class Xou_cache_mgr implements Gfo_invk { return this; } private static final String - Cfg__fsys_size_min = "xowa.wiki.files.cache.fsys_size_min" - , Cfg__fsys_size_max = "xowa.wiki.files.cache.fsys_size_max" - , Val__fsys_info = "xowa.wiki.files.cache.info" - , Run__fsys_reduce_to_min = "xowa.wiki.files.cache.reduce_to_min" - , Run__fsys_clear = "xowa.wiki.files.cache.clear" + Cfg__fsys_size_min = "xowa.files.cache.fsys_size_min" + , Cfg__fsys_size_max = "xowa.files.cache.fsys_size_max" + , Run__fsys_reduce_to_min = "xowa.files.cache.reduce_to_min" + , Run__fsys_clear = "xowa.files.cache.clear" + , Val__fsys_info = "xowa.files.cache.info" ; public void Fsys_size_(long min, long max) {fsys_size_min = min; fsys_size_max = max;} // TEST: private String Info_str() { diff --git a/400_xowa/src/gplx/xowa/guis/Xog_resizer.java b/400_xowa/src/gplx/xowa/guis/Xog_resizer.java index 4c40018da..87a2b1691 100644 --- a/400_xowa/src/gplx/xowa/guis/Xog_resizer.java +++ b/400_xowa/src/gplx/xowa/guis/Xog_resizer.java @@ -92,7 +92,7 @@ public class Xog_resizer implements Gfo_invk { else return Gfo_invk_.Rv_unhandled; return this; } - private static final String Cfg__browser__adj_type = "xowa.gui.window.browser.adj_type", Cfg__browser__adj_rect = "xowa.gui.window.browser.adj_rect"; + private static final String Cfg__browser__adj_type = "xowa.gui.html_box.adj_type", Cfg__browser__adj_rect = "xowa.gui.html_box.adj_rect"; private static RectAdp Prv_elem_rect_initial = RectAdp_.Zero, Prv_elem_rect_win_7 = RectAdp_.new_(0, -1, 0, 0); private static void Exec_win_resize_elem(Xog_layout_box box, GfuiElem cur_elem, Rect_ref cur_elem_rect, GfuiElem prv_elem, byte layout) {Exec_win_resize_elem(box, cur_elem, cur_elem_rect, prv_elem.Rect(), layout);} diff --git a/400_xowa/src/gplx/xowa/guis/langs/Xol_font_info.java b/400_xowa/src/gplx/xowa/guis/langs/Xol_font_info.java index 6681a24be..ac733ecf5 100644 --- a/400_xowa/src/gplx/xowa/guis/langs/Xol_font_info.java +++ b/400_xowa/src/gplx/xowa/guis/langs/Xol_font_info.java @@ -40,6 +40,6 @@ public class Xol_font_info implements Gfo_invk, Gfo_evt_mgr_owner { public static final String Font_changed = "font_changed"; private void Font_changed_pub() {Gfo_evt_mgr_.Pub_obj(this, Font_changed, "font", this);} - private static final String Cfg__font_name = "xowa.gui.window.font.name"; - public static final String Cfg__font_size = "xowa.gui.window.font.size"; + private static final String Cfg__font_name = "xowa.gui.app.font.name"; + public static final String Cfg__font_size = "xowa.gui.app.font.size"; } 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 0fa739a22..178f300b8 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.session.version"; + public static final String Cfg__prev_version = "xowa.app.previous_version"; } diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_tab_mgr.java b/400_xowa/src/gplx/xowa/guis/views/Xog_tab_mgr.java index 511944211..f00b20d94 100644 --- a/400_xowa/src/gplx/xowa/guis/views/Xog_tab_mgr.java +++ b/400_xowa/src/gplx/xowa/guis/views/Xog_tab_mgr.java @@ -274,7 +274,7 @@ public class Xog_tab_mgr implements Gfo_evt_itm { , Cfg__unselected_close_btn_visible = "xowa.gui.tabs.unselected_close_btn_visible" , Cfg__max_chars = "xowa.gui.tabs.max_chars" , Cfg__min_chars = "xowa.gui.tabs.min_chars" - , Cfg__javascript_enabled = "xowa.gui.browser.javascript_enabled" - , Cfg__page_load_mode = "xowa.gui.browser.page_load_mode" + , Cfg__javascript_enabled = "xowa.gui.html_box.javascript_enabled" + , Cfg__page_load_mode = "xowa.gui.html_box.page_load_mode" ; } diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_win_itm_cfg.java b/400_xowa/src/gplx/xowa/guis/views/Xog_win_itm_cfg.java index 0f882fca1..904532232 100644 --- a/400_xowa/src/gplx/xowa/guis/views/Xog_win_itm_cfg.java +++ b/400_xowa/src/gplx/xowa/guis/views/Xog_win_itm_cfg.java @@ -26,5 +26,5 @@ public class Xog_win_itm_cfg implements Gfo_invk { else return Gfo_invk_.Rv_unhandled; return this; } - private static final String Cfg__status__show_short_url = "xowa.gui.window.status.show_short_url"; + private static final String Cfg__status__show_short_url = "xowa.gui.prog_box.show_short_url"; } diff --git a/400_xowa/src/gplx/xowa/htmls/Xoh_page_mgr.java b/400_xowa/src/gplx/xowa/htmls/Xoh_page_mgr.java index 154aac8ad..bbe774ff9 100644 --- a/400_xowa/src/gplx/xowa/htmls/Xoh_page_mgr.java +++ b/400_xowa/src/gplx/xowa/htmls/Xoh_page_mgr.java @@ -57,7 +57,7 @@ public class Xoh_page_mgr implements Gfo_invk { Cfg__font_name = "xowa.html.css.font.name" , Cfg__font_format = "xowa.html.css.font.format" , Cfg__custom_script = "xowa.html.css.custom.script" - , Cfg__content_code_fmt = "xowa.html.wiki.content_code_fmt" + , Cfg__content_code_fmt = "xowa.html.page.content_code_fmt" ; public static final float Font_size_default = 16; } diff --git a/400_xowa/src/gplx/xowa/htmls/Xoh_page_wtr_mgr.java b/400_xowa/src/gplx/xowa/htmls/Xoh_page_wtr_mgr.java index e36e2de97..fef3af39a 100644 --- a/400_xowa/src/gplx/xowa/htmls/Xoh_page_wtr_mgr.java +++ b/400_xowa/src/gplx/xowa/htmls/Xoh_page_wtr_mgr.java @@ -93,7 +93,7 @@ public class Xoh_page_wtr_mgr implements Gfo_invk { , "portal_div_admin", "portal_div_wikis", "portal_sidebar" , "edit_div_rename", "edit_div_preview", "js_edit_toolbar" }; - private static final String Cfg__scripting_enabled = "xowa.addon.scripting.enabled"; + private static final String Cfg__scripting_enabled = "xowa.html.scripting.enabled"; } /* NOTE_1:xowa_anchor_button diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/lnkis/htmls/Xoh_file_wtr__basic.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/lnkis/htmls/Xoh_file_wtr__basic.java index 28c13c10f..5677cb04e 100644 --- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/lnkis/htmls/Xoh_file_wtr__basic.java +++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/lnkis/htmls/Xoh_file_wtr__basic.java @@ -271,8 +271,8 @@ public class Xoh_file_wtr__basic implements Gfo_invk { return this; } private static final String - Cfg__alt_in_caption = "xowa.html.wiki.alt_in_caption" - , Cfg__alt_defaults_to_caption = "xowa.html.wiki.alt_defaults_to_caption"; + Cfg__alt_in_caption = "xowa.html.alt.show_in_caption" + , Cfg__alt_defaults_to_caption = "xowa.html.alt.empty_alt_uses_caption"; private static final byte[] Div_center_bgn = Bry_.new_a7("
") diff --git a/400_xowa/src/gplx/xowa/htmls/portal/Xow_portal_mgr.java b/400_xowa/src/gplx/xowa/htmls/portal/Xow_portal_mgr.java index 66b1e3515..4012bb4a8 100644 --- a/400_xowa/src/gplx/xowa/htmls/portal/Xow_portal_mgr.java +++ b/400_xowa/src/gplx/xowa/htmls/portal/Xow_portal_mgr.java @@ -171,8 +171,8 @@ public class Xow_portal_mgr implements Gfo_invk { , "jumpto", "jumptonavigation", "comma-separator", "jumptosearch"); private static final String - Cfg__missing_class = "xowa.html.wiki.portal.missing_class" - , Cfg__sidebar_enabled__desktop = "xowa.html.wiki.portal.sidebar_enabled_desktop" - , Cfg__sidebar_enabled__server = "xowa.html.wiki.portal.sidebar_enabled_server" + Cfg__missing_class = "xowa.html.portal.missing_class" + , Cfg__sidebar_enabled__desktop = "xowa.html.portal.sidebar_enabled_desktop" + , Cfg__sidebar_enabled__server = "xowa.html.portal.sidebar_enabled_server" ; } diff --git a/400_xowa/src/gplx/xowa/parsers/hdrs/sections/Xop_section_mgr.java b/400_xowa/src/gplx/xowa/parsers/hdrs/sections/Xop_section_mgr.java index a23050179..90a71aa4c 100644 --- a/400_xowa/src/gplx/xowa/parsers/hdrs/sections/Xop_section_mgr.java +++ b/400_xowa/src/gplx/xowa/parsers/hdrs/sections/Xop_section_mgr.java @@ -86,5 +86,5 @@ public class Xop_section_mgr implements Gfo_invk { public static final byte[] Bry__meta = Bry_.new_a7("