Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

Cfg: Change converter to use gfs parser; other minor changes

Browse Source
This commit is contained in:
gnosygnu
2017-01-02 21:45:44 -05:00
parent 562c5b5a56
commit 758248b6a4
8 changed files with 25 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java
View File

@@ -49,8 +49,8 @@ public class Xog_bnd_mgr implements Gfo_invk {
, "xowa.gui.shortcuts.xowa.nav.help.about-1"
, "xowa.gui.shortcuts.xowa.nav.help.change_log-1"
, "xowa.gui.shortcuts.xowa.nav.help.diagnostics-1"
, "xowa.gui.shortcuts.xowa.nav.xowa_main-1"
, "xowa.gui.shortcuts.xowa.nav.xowa_blog-1"
, "xowa.gui.shortcuts.xowa.nav.help.xowa_main-1"
, "xowa.gui.shortcuts.xowa.nav.help.xowa_blog-1"
, "xowa.gui.shortcuts.xowa.nav.setup.download_central-1"
, "xowa.gui.shortcuts.xowa.nav.setup.import_from_list-1"
, "xowa.gui.shortcuts.xowa.nav.setup.import_from_script-1"
@@ -59,8 +59,6 @@ public class Xog_bnd_mgr implements Gfo_invk {
, "xowa.gui.shortcuts.xowa.nav.system_data.log_session-1"
, "xowa.gui.shortcuts.xowa.nav.system_data.cfg_app-1"
, "xowa.gui.shortcuts.xowa.nav.system_data.cfg_lang-1"
, "xowa.gui.shortcuts.xowa.nav.system_data.cfg_user-1"
, "xowa.gui.shortcuts.xowa.nav.system_data.cfg_custom-1"
, "xowa.gui.shortcuts.xowa.nav.system_data.usr_history-1"
, "xowa.gui.shortcuts.xowa.gui.font.increase-1"
, "xowa.gui.shortcuts.xowa.gui.font.decrease-1"
@@ -176,6 +174,7 @@ public class Xog_bnd_mgr implements Gfo_invk {
}
// if ipts match, delete old_bnd
else if ( new_ipt_exists
&& old_bnd.Box() == new_bnd.Box()
&& String_.Eq(old_bnd.Ipt().Key(), new_ipt.Key())) {
Xog_bnd_box_.Set_bnd_for_grp(Xog_bnd_box_.Set_del_ipt, win, invk_mgr, old_box, old_bnd, old_bnd.Ipt());
old_bnd.Ipt_to_none();
@@ -239,8 +238,6 @@ public class Xog_bnd_mgr implements Gfo_invk {
Init_itm(Xog_cmd_itm_.Key_nav_system_data_log_session , Xog_bnd_box_.Tid_browser , "");
Init_itm(Xog_cmd_itm_.Key_nav_system_data_cfg_app , Xog_bnd_box_.Tid_browser , "");
Init_itm(Xog_cmd_itm_.Key_nav_system_data_cfg_lang , Xog_bnd_box_.Tid_browser , "");
Init_itm(Xog_cmd_itm_.Key_nav_system_data_cfg_user , Xog_bnd_box_.Tid_browser , "");
Init_itm(Xog_cmd_itm_.Key_nav_system_data_cfg_custom , Xog_bnd_box_.Tid_browser , "");
Init_itm(Xog_cmd_itm_.Key_nav_system_data_usr_history , Xog_bnd_box_.Tid_browser , "");
Init_itm(Xog_cmd_itm_.Key_gui_font_increase , Xog_bnd_box_.Tid_browser , "mod.c+key.equal");
Init_itm(Xog_cmd_itm_.Key_gui_font_decrease , Xog_bnd_box_.Tid_browser , "mod.c+key.minus");

2
400_xowa/src/gplx/xowa/guis/cmds/Xog_cmd_itm_.java
View File

@@ -47,8 +47,6 @@ public class Xog_cmd_itm_ {
, Key_nav_system_data_log_session = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.system_data.log_session" , "Special:XowaSystemData?type=log_session")
, Key_nav_system_data_cfg_app = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.system_data.cfg_app" , "Special:XowaSystemData?type=cfg_app")
, Key_nav_system_data_cfg_lang = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.system_data.cfg_lang" , "Special:XowaSystemData?type=cfg_lang")
, Key_nav_system_data_cfg_user = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.system_data.cfg_user" , "Special:XowaSystemData?type=cfg_user")
, Key_nav_system_data_cfg_custom = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.system_data.cfg_custom" , "Special:XowaSystemData?type=cfg_custom")
, Key_nav_system_data_usr_history = new_page_(Xog_ctg_itm_.Tid_nav_pages , "xowa.nav.system_data.usr_history" , "Special:XowaSystemData?type=usr_history")
, Key_gui_font_increase = new_dflt_(Xog_ctg_itm_.Tid_font , "xowa.gui.font.increase")

3
400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_grp.java
View File

@@ -42,7 +42,8 @@ public class Xog_mnu_grp extends Xog_mnu_base {
if (!mnu_is_popup && app.Gui_mgr().Browser_win().Win_box() != null)
Gfo_invk_.Invk_by_key(app.Gui_mgr().Browser_win(), Gfui_html.Evt_win_resized);
}
public String Source() {return source;} private String source; public void Source_(String v) {this.source = v; this.Source_exec(app.Gfs_mgr());}
public String Source() {return source;} private String source = ""; // NOTE: default to "" not null, else init will try to run "clear;\nnullbuild;"
public void Source_(String v) {this.source = v; this.Source_exec(app.Gfs_mgr());}
public Object Source_exec(Xoa_gfs_mgr gfs_mgr) {return Source_exec(gfs_mgr, source);}
private Object Source_exec(Xoa_gfs_mgr gfs_mgr, String v) {
if (!enabled) return Gfo_invk_.Rv_handled;

2
400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_regy.java
View File

@@ -86,8 +86,6 @@ public class Xog_mnu_regy {
Init_obsolete_itm(hash, gui_mgr, "xowa.system.data.log_session" , Xog_cmd_itm_.Key_nav_system_data_log_session);
Init_obsolete_itm(hash, gui_mgr, "xowa.system.data.cfg_app" , Xog_cmd_itm_.Key_nav_system_data_cfg_app);
Init_obsolete_itm(hash, gui_mgr, "xowa.system.data.cfg_lang" , Xog_cmd_itm_.Key_nav_system_data_cfg_lang);
Init_obsolete_itm(hash, gui_mgr, "xowa.system.data.cfg_user" , Xog_cmd_itm_.Key_nav_system_data_cfg_user);
Init_obsolete_itm(hash, gui_mgr, "xowa.system.data.cfg_custom" , Xog_cmd_itm_.Key_nav_system_data_cfg_custom);
Init_obsolete_itm(hash, gui_mgr, "xowa.system.data.usr_history" , Xog_cmd_itm_.Key_nav_system_data_usr_history);
Init_obsolete_itm(hash, gui_mgr, "xowa.help.about" , Xog_cmd_itm_.Key_nav_help_about);
Init_obsolete_itm(hash, gui_mgr, "xowa.tabs.new_link__at_dflt__focus_n" , Xog_cmd_itm_.Key_gui_browser_tabs_new_link__at_dflt__focus_n);

2
400_xowa/src/gplx/xowa/guis/views/Xog_tab_mgr.java
View File

@@ -199,7 +199,7 @@ public class Xog_tab_mgr implements Gfo_evt_itm {
public void Tabs_new_link(boolean focus, String link) { // handle empty link
if (String_.Len_eq_0(link)) {
if (this.Active_tab_is_null()) return;
link = active_tab.Html_itm().Html_selected_get_active_or_selection();
link = gplx.langs.htmls.encoders.Gfo_url_encoder_.Http_url.Decode_str(active_tab.Html_itm().Html_selected_get_active_or_selection()); // NOTE: must decode else url-encoded special pages don't work; EX:home/wiki/Special:XowaCfg%3Fgrp%3Dxowa.html.css; DATE:2017-01-02
}
if (String_.Len_eq_0(link)) {win.App().Usr_dlg().Prog_many("", "", "no link or text selected"); return;}
Tabs_new_link(link, focus);