Cfg: Standardize some cfg keys

pull/620/head
gnosygnu 8 years ago
parent f04047e584
commit 7da2d853a2

@ -75,27 +75,27 @@ public class Xoapi_toggle_mgr implements Gfo_invk {
, Cfg__toggles__descr , Cfg__toggles__descr
, Cfg__toggles__alias , Cfg__toggles__alias
, Cfg__toggles__json)) { , 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; else return Gfo_invk_.Rv_unhandled;
return this; return this;
} }
private static final String private static final String
Cfg__toggles__offline_wikis = "xowa.app.recent.toggles.offline-wikis" Cfg__toggles__offline_wikis = "xowa.html.toggles.offline-wikis"
, Cfg__toggles__wikidata_langs = "xowa.app.recent.toggles.wikidata-langs" , Cfg__toggles__wikidata_langs = "xowa.html.toggles.wikidata-langs"
, Cfg__toggles__claim = "xowa.app.recent.toggles.wikidatawiki-claim" , Cfg__toggles__claim = "xowa.html.toggles.wikidatawiki-claim"
, Cfg__toggles__slink_w = "xowa.app.recent.toggles.wikidatawiki-slink-wikipedia" , Cfg__toggles__slink_w = "xowa.html.toggles.wikidatawiki-slink-wikipedia"
, Cfg__toggles__slink_d = "xowa.app.recent.toggles.wikidatawiki-slink-wiktionary" , Cfg__toggles__slink_d = "xowa.html.toggles.wikidatawiki-slink-wiktionary"
, Cfg__toggles__slink_s = "xowa.app.recent.toggles.wikidatawiki-slink-wikisource" , Cfg__toggles__slink_s = "xowa.html.toggles.wikidatawiki-slink-wikisource"
, Cfg__toggles__slink_v = "xowa.app.recent.toggles.wikidatawiki-slink-wikivoyage" , Cfg__toggles__slink_v = "xowa.html.toggles.wikidatawiki-slink-wikivoyage"
, Cfg__toggles__slink_q = "xowa.app.recent.toggles.wikidatawiki-slink-wikiquote" , Cfg__toggles__slink_q = "xowa.html.toggles.wikidatawiki-slink-wikiquote"
, Cfg__toggles__slink_b = "xowa.app.recent.toggles.wikidatawiki-slink-wikibooks" , Cfg__toggles__slink_b = "xowa.html.toggles.wikidatawiki-slink-wikibooks"
, Cfg__toggles__slink_u = "xowa.app.recent.toggles.wikidatawiki-slink-wikiversity" , Cfg__toggles__slink_u = "xowa.html.toggles.wikidatawiki-slink-wikiversity"
, Cfg__toggles__slink_n = "xowa.app.recent.toggles.wikidatawiki-slink-wikinews" , Cfg__toggles__slink_n = "xowa.html.toggles.wikidatawiki-slink-wikinews"
, Cfg__toggles__slink_special = "xowa.app.recent.toggles.wikidatawiki-slink-special" , Cfg__toggles__slink_special = "xowa.html.toggles.wikidatawiki-slink-special"
, Cfg__toggles__label = "xowa.app.recent.toggles.wikidatawiki-label" , Cfg__toggles__label = "xowa.html.toggles.wikidatawiki-label"
, Cfg__toggles__descr = "xowa.app.recent.toggles.wikidatawiki-descr" , Cfg__toggles__descr = "xowa.html.toggles.wikidatawiki-descr"
, Cfg__toggles__alias = "xowa.app.recent.toggles.wikidatawiki-alias" , Cfg__toggles__alias = "xowa.html.toggles.wikidatawiki-alias"
, Cfg__toggles__json = "xowa.app.recent.toggles.wikidatawiki-json" , Cfg__toggles__json = "xowa.html.toggles.wikidatawiki-json"
; ;
} }

@ -37,12 +37,12 @@ public class Xoapi_wikibase implements Gfo_invk, Gfo_evt_mgr_owner {
} }
public static final String public static final String
Evt_core_langs_changed = "core_langs_changed" Evt_core_langs_changed = "core_langs_changed"
, Evt_link_wikis_changed = "link_wikis_changed"
, Evt_sort_langs_changed = "sort_langs_changed" , Evt_sort_langs_changed = "sort_langs_changed"
, Evt_link_wikis_changed = "link_wikis_changed"
; ;
private static final String private static final String
Cfg__core_langs = "xowa.addon.wikibase.pages.core_langs" Cfg__core_langs = "xowa.addon.wikibase.langs.core_langs"
, Cfg__link_wikis = "xowa.addon.wikibase.pages.link_wikis" , Cfg__sort_langs = "xowa.addon.wikibase.langs.sort_langs"
, Cfg__sort_langs = "xowa.addon.wikibase.pages.sort_langs" , Cfg__link_wikis = "xowa.addon.wikibase.xwikis.link_wikis"
; ;
} }

@ -129,8 +129,8 @@ public class Xoa_prog_mgr implements Gfo_invk {
, Cfg__resize_img = "xowa.wiki.files.apps.resize_img" , Cfg__resize_img = "xowa.wiki.files.apps.resize_img"
, Cfg__convert_svg_to_png = "xowa.wiki.files.apps.convert_svg_to_png" , 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_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_tex_to_dvi = "xowa.addon.math.apps.convert_tex_to_dvi"
, Cfg__convert_dvi_to_png = "xowa.wiki.files.apps.convert_dvi_to_png" , Cfg__convert_dvi_to_png = "xowa.addon.math.apps.convert_dvi_to_png"
, Cfg__lua = "xowa.addon.scribunto.lua.cmd" , Cfg__lua = "xowa.addon.scribunto.lua.cmd"
, Cfg__lilypond = "xowa.addon.score.apps.lilypond" , Cfg__lilypond = "xowa.addon.score.apps.lilypond"
, Cfg__abc2ly = "xowa.addon.score.apps.abc2ly" , Cfg__abc2ly = "xowa.addon.score.apps.abc2ly"

@ -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"; , Root_key_html_page = "html_box", Root_key_html_link = "browser.html.link", Root_key_html_file = "browser.html.file";
private static final String private static final String
Cfg__tabs = "xowa.gui.menus.tabs.source" Cfg__tabs = "xowa.gui.menus.tabs.source"
, Cfg__html__basic = "xowa.gui.menus.html.basic" , Cfg__html__basic = "xowa.gui.menus.html.basic.source"
, Cfg__html__link = "xowa.gui.menus.html.link" , Cfg__html__link = "xowa.gui.menus.html.link.source"
, Cfg__html__file = "xowa.gui.menus.html.file" , Cfg__html__file = "xowa.gui.menus.html.file.source"
, Cfg__status = "xowa.gui.menus.status.source"; , Cfg__status = "xowa.gui.menus.status.source";
} }

@ -27,7 +27,7 @@ public class Xog_window_mnu_mgr implements Gfo_invk {
} private Xoa_gui_mgr gui_mgr; } private Xoa_gui_mgr gui_mgr;
public void Init_by_kit(Xoae_app app) { 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 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) { public Xog_mnu_grp Get_or_new(String key) {
Xog_mnu_grp rv = (Xog_mnu_grp)hash.Get_by(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); 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) { public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
if (ctx.Match(k, Cfg__window__enabled)) browser.Enabled_(m.ReadYn("v")); if (ctx.Match(k, Cfg__browser__enabled)) browser.Enabled_(m.ReadYn("v"));
else if (ctx.Match(k, Cfg__window__source)) browser.Source_(m.ReadStr("v")); else if (ctx.Match(k, Cfg__browser__source)) browser.Source_(m.ReadStr("v"));
else return Gfo_invk_.Rv_unhandled; else return Gfo_invk_.Rv_unhandled;
return this; return this;
} }
private static final String Root_key_browser_win = "main_win"; private static final String Root_key_browser_win = "main_win";
private static final String private static final String
Cfg__window__enabled = "xowa.gui.menus.window.enabled" Cfg__browser__enabled = "xowa.gui.menus.browser.enabled"
, Cfg__window__source = "xowa.gui.menus.window.source" , Cfg__browser__source = "xowa.gui.menus.browser.source"
; ;
} }

@ -227,25 +227,25 @@ public class Xow_popup_mgr implements Gfo_invk, Gfo_evt_itm {
; ;
private static final String private static final String
Cfg__enabled = "xowa.addon.popups.enabled" Cfg__enabled = "xowa.addon.popups.enabled"
, Cfg__show_init_word_count = "xowa.addon.popups.show_init_word_count" , Cfg__show_init_word_count = "xowa.addon.popups.content.show_init_word_count"
, Cfg__show_more_word_count = "xowa.addon.popups.show_more_word_count" , Cfg__show_more_word_count = "xowa.addon.popups.content.show_more_word_count"
, Cfg__show_all_if_less_than = "xowa.addon.popups.show_all_if_less_than" , Cfg__show_all_if_less_than = "xowa.addon.popups.content.show_all_if_less_than"
, Cfg__read_til_stop_fwd = "xowa.addon.popups.read_til_stop_fwd" , Cfg__read_til_stop_fwd = "xowa.addon.popups.content.read_til_stop_fwd"
, Cfg__read_til_stop_bwd = "xowa.addon.popups.read_til_stop_bwd" , Cfg__read_til_stop_bwd = "xowa.addon.popups.content.read_til_stop_bwd"
, Cfg__stop_if_hdr_after = "xowa.addon.popups.stop_if_hdr_after" , Cfg__stop_if_hdr_after = "xowa.addon.popups.content.stop_if_hdr_after"
, Cfg__tmpl_tkn_max = "xowa.addon.popups.tmpl_tkn_max" , Cfg__tmpl_tkn_max = "xowa.addon.popups.wtxt.tmpl_tkn_max"
, Cfg__tmpl_keeplist = "xowa.addon.popups.tmpl_keeplist" , Cfg__tmpl_keeplist = "xowa.addon.popups.wtxt.tmpl_keeplist"
, Cfg__ns_allowed = "xowa.addon.popups.ns_allowed" , Cfg__ns_allowed = "xowa.addon.popups.ns_allowed"
, Cfg__xnde_ignore_ids = "xowa.addon.popups.xnde_ignore_ids" , Cfg__xnde_ignore_ids = "xowa.addon.popups.content.xnde_ignore_ids"
, Cfg__scan_len = "xowa.addon.popups.scan_len" , Cfg__scan_len = "xowa.addon.popups.scanner.scan_len"
, Cfg__scan_max = "xowa.addon.popups.scan_max" , Cfg__scan_max = "xowa.addon.popups.scanner.scan_max"
; ;
public static final String public static final String
Cfg__win_show_delay = "xowa.addon.popups.win_show_delay" Cfg__win_show_delay = "xowa.addon.popups.window.show_delay"
, Cfg__win_hide_delay = "xowa.addon.popups.win_hide_delay" , Cfg__win_hide_delay = "xowa.addon.popups.window.hide_delay"
, Cfg__win_max_w = "xowa.addon.popups.win_max_w" , Cfg__win_max_w = "xowa.addon.popups.window.max_w"
, Cfg__win_max_h = "xowa.addon.popups.win_max_h" , Cfg__win_max_h = "xowa.addon.popups.window.max_h"
, Cfg__win_show_all_max_w = "xowa.addon.popups.win_show_all_max_w" , Cfg__win_show_all_max_w = "xowa.addon.popups.window.show_all_max_w"
, Cfg__win_bind_focus_blur = "xowa.addon.popups.win_bind_focus_blur" , Cfg__win_bind_focus_blur = "xowa.addon.popups.window.bind_focus_blur"
; ;
} }

@ -27,6 +27,5 @@ public class Wdata_itemByTitle_cfg implements Gfo_invk {
return this; return this;
} }
public static final String Key = "itemByTitle"; 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";
} }

Loading…
Cancel
Save