From 7da2d853a2b08a2530e79f67fe502b3a8c0e3f0d Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Tue, 27 Dec 2016 10:42:06 -0500 Subject: [PATCH] Cfg: Standardize some cfg keys --- .../apps/apis/xowa/html/Xoapi_toggle_mgr.java | 34 +++++++++---------- .../apps/apis/xowa/xtns/Xoapi_wikibase.java | 8 ++--- .../gplx/xowa/apps/progs/Xoa_prog_mgr.java | 4 +-- .../xowa/guis/menus/Xog_popup_mnu_mgr.java | 6 ++-- .../xowa/guis/menus/Xog_window_mnu_mgr.java | 10 +++--- .../htmls/modules/popups/Xow_popup_mgr.java | 34 +++++++++---------- .../specials/Wdata_itemByTitle_cfg.java | 3 +- 7 files changed, 49 insertions(+), 50 deletions(-) diff --git a/400_xowa/src/gplx/xowa/apps/apis/xowa/html/Xoapi_toggle_mgr.java b/400_xowa/src/gplx/xowa/apps/apis/xowa/html/Xoapi_toggle_mgr.java index f6ab59e24..e273cd635 100644 --- a/400_xowa/src/gplx/xowa/apps/apis/xowa/html/Xoapi_toggle_mgr.java +++ b/400_xowa/src/gplx/xowa/apps/apis/xowa/html/Xoapi_toggle_mgr.java @@ -75,27 +75,27 @@ public class Xoapi_toggle_mgr implements Gfo_invk { , Cfg__toggles__descr , Cfg__toggles__alias , Cfg__toggles__json)) { - this.Get_or_new(String_.Replace(k, "xowa.app.recent.toggles.", "")).Visible_(m.ReadYn("v")); + this.Get_or_new(String_.Replace(k, "xowa.html.toggles.", "")).Visible_(m.ReadYn("v")); } else return Gfo_invk_.Rv_unhandled; return this; } private static final String - Cfg__toggles__offline_wikis = "xowa.app.recent.toggles.offline-wikis" - , Cfg__toggles__wikidata_langs = "xowa.app.recent.toggles.wikidata-langs" - , Cfg__toggles__claim = "xowa.app.recent.toggles.wikidatawiki-claim" - , Cfg__toggles__slink_w = "xowa.app.recent.toggles.wikidatawiki-slink-wikipedia" - , Cfg__toggles__slink_d = "xowa.app.recent.toggles.wikidatawiki-slink-wiktionary" - , Cfg__toggles__slink_s = "xowa.app.recent.toggles.wikidatawiki-slink-wikisource" - , Cfg__toggles__slink_v = "xowa.app.recent.toggles.wikidatawiki-slink-wikivoyage" - , Cfg__toggles__slink_q = "xowa.app.recent.toggles.wikidatawiki-slink-wikiquote" - , Cfg__toggles__slink_b = "xowa.app.recent.toggles.wikidatawiki-slink-wikibooks" - , Cfg__toggles__slink_u = "xowa.app.recent.toggles.wikidatawiki-slink-wikiversity" - , Cfg__toggles__slink_n = "xowa.app.recent.toggles.wikidatawiki-slink-wikinews" - , Cfg__toggles__slink_special = "xowa.app.recent.toggles.wikidatawiki-slink-special" - , Cfg__toggles__label = "xowa.app.recent.toggles.wikidatawiki-label" - , Cfg__toggles__descr = "xowa.app.recent.toggles.wikidatawiki-descr" - , Cfg__toggles__alias = "xowa.app.recent.toggles.wikidatawiki-alias" - , Cfg__toggles__json = "xowa.app.recent.toggles.wikidatawiki-json" + Cfg__toggles__offline_wikis = "xowa.html.toggles.offline-wikis" + , Cfg__toggles__wikidata_langs = "xowa.html.toggles.wikidata-langs" + , Cfg__toggles__claim = "xowa.html.toggles.wikidatawiki-claim" + , Cfg__toggles__slink_w = "xowa.html.toggles.wikidatawiki-slink-wikipedia" + , Cfg__toggles__slink_d = "xowa.html.toggles.wikidatawiki-slink-wiktionary" + , Cfg__toggles__slink_s = "xowa.html.toggles.wikidatawiki-slink-wikisource" + , Cfg__toggles__slink_v = "xowa.html.toggles.wikidatawiki-slink-wikivoyage" + , Cfg__toggles__slink_q = "xowa.html.toggles.wikidatawiki-slink-wikiquote" + , Cfg__toggles__slink_b = "xowa.html.toggles.wikidatawiki-slink-wikibooks" + , Cfg__toggles__slink_u = "xowa.html.toggles.wikidatawiki-slink-wikiversity" + , Cfg__toggles__slink_n = "xowa.html.toggles.wikidatawiki-slink-wikinews" + , Cfg__toggles__slink_special = "xowa.html.toggles.wikidatawiki-slink-special" + , Cfg__toggles__label = "xowa.html.toggles.wikidatawiki-label" + , Cfg__toggles__descr = "xowa.html.toggles.wikidatawiki-descr" + , Cfg__toggles__alias = "xowa.html.toggles.wikidatawiki-alias" + , Cfg__toggles__json = "xowa.html.toggles.wikidatawiki-json" ; } diff --git a/400_xowa/src/gplx/xowa/apps/apis/xowa/xtns/Xoapi_wikibase.java b/400_xowa/src/gplx/xowa/apps/apis/xowa/xtns/Xoapi_wikibase.java index b90cefdbb..00333cb08 100644 --- a/400_xowa/src/gplx/xowa/apps/apis/xowa/xtns/Xoapi_wikibase.java +++ b/400_xowa/src/gplx/xowa/apps/apis/xowa/xtns/Xoapi_wikibase.java @@ -37,12 +37,12 @@ public class Xoapi_wikibase implements Gfo_invk, Gfo_evt_mgr_owner { } public static final String Evt_core_langs_changed = "core_langs_changed" - , Evt_link_wikis_changed = "link_wikis_changed" , Evt_sort_langs_changed = "sort_langs_changed" + , Evt_link_wikis_changed = "link_wikis_changed" ; private static final String - Cfg__core_langs = "xowa.addon.wikibase.pages.core_langs" - , Cfg__link_wikis = "xowa.addon.wikibase.pages.link_wikis" - , Cfg__sort_langs = "xowa.addon.wikibase.pages.sort_langs" + Cfg__core_langs = "xowa.addon.wikibase.langs.core_langs" + , Cfg__sort_langs = "xowa.addon.wikibase.langs.sort_langs" + , Cfg__link_wikis = "xowa.addon.wikibase.xwikis.link_wikis" ; } 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 b9d1b444d..1cfaddd4d 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 @@ -129,8 +129,8 @@ public class Xoa_prog_mgr implements Gfo_invk { , 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.wiki.files.apps.convert_tex_to_dvi" - , Cfg__convert_dvi_to_png = "xowa.wiki.files.apps.convert_dvi_to_png" + , 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__lua = "xowa.addon.scribunto.lua.cmd" , Cfg__lilypond = "xowa.addon.score.apps.lilypond" , Cfg__abc2ly = "xowa.addon.score.apps.abc2ly" diff --git a/400_xowa/src/gplx/xowa/guis/menus/Xog_popup_mnu_mgr.java b/400_xowa/src/gplx/xowa/guis/menus/Xog_popup_mnu_mgr.java index 00d60ae72..94dc68d3c 100644 --- a/400_xowa/src/gplx/xowa/guis/menus/Xog_popup_mnu_mgr.java +++ b/400_xowa/src/gplx/xowa/guis/menus/Xog_popup_mnu_mgr.java @@ -66,8 +66,8 @@ public class Xog_popup_mnu_mgr implements Gfo_invk { , Root_key_html_page = "html_box", Root_key_html_link = "browser.html.link", Root_key_html_file = "browser.html.file"; private static final String Cfg__tabs = "xowa.gui.menus.tabs.source" - , Cfg__html__basic = "xowa.gui.menus.html.basic" - , Cfg__html__link = "xowa.gui.menus.html.link" - , Cfg__html__file = "xowa.gui.menus.html.file" + , Cfg__html__basic = "xowa.gui.menus.html.basic.source" + , Cfg__html__link = "xowa.gui.menus.html.link.source" + , Cfg__html__file = "xowa.gui.menus.html.file.source" , Cfg__status = "xowa.gui.menus.status.source"; } diff --git a/400_xowa/src/gplx/xowa/guis/menus/Xog_window_mnu_mgr.java b/400_xowa/src/gplx/xowa/guis/menus/Xog_window_mnu_mgr.java index b96a9fc54..f6f4f30a0 100644 --- a/400_xowa/src/gplx/xowa/guis/menus/Xog_window_mnu_mgr.java +++ b/400_xowa/src/gplx/xowa/guis/menus/Xog_window_mnu_mgr.java @@ -27,7 +27,7 @@ public class Xog_window_mnu_mgr implements Gfo_invk { } private Xoa_gui_mgr gui_mgr; public void Init_by_kit(Xoae_app app) { browser.Source_exec(gui_mgr.App().Gfs_mgr()); // NOTE: build menu now; NOTE: do not set default here, or else will override user setting - app.Cfg().Bind_many_app(this, Cfg__window__enabled, Cfg__window__source); + app.Cfg().Bind_many_app(this, Cfg__browser__enabled, Cfg__browser__source); } public Xog_mnu_grp Get_or_new(String key) { Xog_mnu_grp rv = (Xog_mnu_grp)hash.Get_by(key); @@ -41,15 +41,15 @@ public class Xog_window_mnu_mgr implements Gfo_invk { Xog_mnu_base.Update_grp_by_lang(gui_mgr.Menu_mgr().Menu_bldr(), lang, browser); } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { - if (ctx.Match(k, Cfg__window__enabled)) browser.Enabled_(m.ReadYn("v")); - else if (ctx.Match(k, Cfg__window__source)) browser.Source_(m.ReadStr("v")); + if (ctx.Match(k, Cfg__browser__enabled)) browser.Enabled_(m.ReadYn("v")); + else if (ctx.Match(k, Cfg__browser__source)) browser.Source_(m.ReadStr("v")); else return Gfo_invk_.Rv_unhandled; return this; } private static final String Root_key_browser_win = "main_win"; private static final String - Cfg__window__enabled = "xowa.gui.menus.window.enabled" - , Cfg__window__source = "xowa.gui.menus.window.source" + Cfg__browser__enabled = "xowa.gui.menus.browser.enabled" + , Cfg__browser__source = "xowa.gui.menus.browser.source" ; } diff --git a/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_mgr.java b/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_mgr.java index 211a6d317..83e67e10e 100644 --- a/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_mgr.java +++ b/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_mgr.java @@ -227,25 +227,25 @@ public class Xow_popup_mgr implements Gfo_invk, Gfo_evt_itm { ; private static final String Cfg__enabled = "xowa.addon.popups.enabled" - , Cfg__show_init_word_count = "xowa.addon.popups.show_init_word_count" - , Cfg__show_more_word_count = "xowa.addon.popups.show_more_word_count" - , Cfg__show_all_if_less_than = "xowa.addon.popups.show_all_if_less_than" - , Cfg__read_til_stop_fwd = "xowa.addon.popups.read_til_stop_fwd" - , Cfg__read_til_stop_bwd = "xowa.addon.popups.read_til_stop_bwd" - , Cfg__stop_if_hdr_after = "xowa.addon.popups.stop_if_hdr_after" - , Cfg__tmpl_tkn_max = "xowa.addon.popups.tmpl_tkn_max" - , Cfg__tmpl_keeplist = "xowa.addon.popups.tmpl_keeplist" + , Cfg__show_init_word_count = "xowa.addon.popups.content.show_init_word_count" + , Cfg__show_more_word_count = "xowa.addon.popups.content.show_more_word_count" + , Cfg__show_all_if_less_than = "xowa.addon.popups.content.show_all_if_less_than" + , Cfg__read_til_stop_fwd = "xowa.addon.popups.content.read_til_stop_fwd" + , Cfg__read_til_stop_bwd = "xowa.addon.popups.content.read_til_stop_bwd" + , Cfg__stop_if_hdr_after = "xowa.addon.popups.content.stop_if_hdr_after" + , Cfg__tmpl_tkn_max = "xowa.addon.popups.wtxt.tmpl_tkn_max" + , Cfg__tmpl_keeplist = "xowa.addon.popups.wtxt.tmpl_keeplist" , Cfg__ns_allowed = "xowa.addon.popups.ns_allowed" - , Cfg__xnde_ignore_ids = "xowa.addon.popups.xnde_ignore_ids" - , Cfg__scan_len = "xowa.addon.popups.scan_len" - , Cfg__scan_max = "xowa.addon.popups.scan_max" + , Cfg__xnde_ignore_ids = "xowa.addon.popups.content.xnde_ignore_ids" + , Cfg__scan_len = "xowa.addon.popups.scanner.scan_len" + , Cfg__scan_max = "xowa.addon.popups.scanner.scan_max" ; public static final String - Cfg__win_show_delay = "xowa.addon.popups.win_show_delay" - , Cfg__win_hide_delay = "xowa.addon.popups.win_hide_delay" - , Cfg__win_max_w = "xowa.addon.popups.win_max_w" - , Cfg__win_max_h = "xowa.addon.popups.win_max_h" - , Cfg__win_show_all_max_w = "xowa.addon.popups.win_show_all_max_w" - , Cfg__win_bind_focus_blur = "xowa.addon.popups.win_bind_focus_blur" + Cfg__win_show_delay = "xowa.addon.popups.window.show_delay" + , Cfg__win_hide_delay = "xowa.addon.popups.window.hide_delay" + , Cfg__win_max_w = "xowa.addon.popups.window.max_w" + , Cfg__win_max_h = "xowa.addon.popups.window.max_h" + , Cfg__win_show_all_max_w = "xowa.addon.popups.window.show_all_max_w" + , Cfg__win_bind_focus_blur = "xowa.addon.popups.window.bind_focus_blur" ; } diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/specials/Wdata_itemByTitle_cfg.java b/400_xowa/src/gplx/xowa/xtns/wbases/specials/Wdata_itemByTitle_cfg.java index 1a9df1871..ca9fd1643 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/specials/Wdata_itemByTitle_cfg.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/specials/Wdata_itemByTitle_cfg.java @@ -27,6 +27,5 @@ public class Wdata_itemByTitle_cfg implements Gfo_invk { return this; } public static final String Key = "itemByTitle"; - private static final String Cfg__site_default = "xowa.addon.wikibase.site_default"; - + private static final String Cfg__site_default = "xowa.addon.wikibase.item_by_title.site_default"; }