1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00

'v3.6.3.1'

This commit is contained in:
gnosygnu
2016-06-19 23:58:10 -04:00
parent 96636f3161
commit d4e8590345
1960 changed files with 20790 additions and 9272 deletions

View File

@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package gplx.xowa.guis.menus; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*;
import gplx.xowa.guis.menus.dom.*;
import gplx.xowa.langs.*;
public class Xog_menu_mgr implements GfoInvkAble {
public class Xog_menu_mgr implements Gfo_invk {
private Xoae_app app;
public Xog_menu_mgr(Xoa_gui_mgr gui_mgr) {
menu_bldr = new Xog_mnu_bldr();
@@ -52,6 +52,6 @@ public class Xog_menu_mgr implements GfoInvkAble {
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
if (ctx.Match(k, Invk_contexts)) return popup_mnu_mgr;
else if (ctx.Match(k, Invk_windows)) return window_mnu_mgr;
else return GfoInvkAble_.Rv_unhandled;
else return Gfo_invk_.Rv_unhandled;
} private static final String Invk_contexts = "contexts", Invk_windows = "windows";
}

View File

@@ -62,6 +62,8 @@ class Xog_menu_mgr_src {
. Add_grp_bgn(Xog_cmd_itm_.Key_gui_menus_group_tools)
. Add_btn(Xog_cmd_itm_.Key_nav_cfg_main)
. Add_spr()
. Add_btn(Xog_cmd_itm_.Key_nav_setup_download_central)
. Add_spr()
. Add_btn(Xog_cmd_itm_.Key_nav_setup_import_from_list)
. Add_btn(Xog_cmd_itm_.Key_nav_setup_import_from_script)
. Add_spr()
@@ -142,6 +144,8 @@ class Xog_menu_mgr_src {
. Add_grp_bgn(Xog_cmd_itm_.Key_gui_menus_group_tools)
. Add_btn(Xog_cmd_itm_.Key_nav_cfg_main)
. Add_spr()
. Add_btn(Xog_cmd_itm_.Key_nav_setup_download_central)
. Add_spr()
. Add_btn(Xog_cmd_itm_.Key_nav_setup_import_from_list)
. Add_btn(Xog_cmd_itm_.Key_nav_setup_import_from_script)
. Add_spr()
@@ -203,7 +207,7 @@ class Xog_menu_mgr_src {
}
class Xog_menu_bldr {
private int indent = 0;
private Bry_bfr bfr = Bry_bfr.reset_(0);
private Bry_bfr bfr = Bry_bfr_.Reset(0);
public String Gen_str() {return bfr.To_str_and_clear();}
private Xog_menu_bldr Indent_add() {indent += 2; return this;}
private Xog_menu_bldr Indent_del() {indent -= 2; return this;}

View File

@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package gplx.xowa.guis.menus; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*;
import gplx.xowa.guis.menus.dom.*;
import gplx.xowa.langs.*;
public class Xog_popup_mnu_mgr implements GfoInvkAble {
public class Xog_popup_mnu_mgr implements Gfo_invk {
private Ordered_hash hash = Ordered_hash_.New();
private Xoa_gui_mgr gui_mgr;
private Xog_mnu_grp[] mnus = new Xog_mnu_grp[6];
@@ -55,7 +55,7 @@ public class Xog_popup_mnu_mgr implements GfoInvkAble {
}
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
if (ctx.Match(k, Invk_get)) return Get_or_new(m.ReadStr("v"));
else return GfoInvkAble_.Rv_unhandled;
else return Gfo_invk_.Rv_unhandled;
} private static final String Invk_get = "get";
public static final String Root_key_tabs_btns = "browser.tabs.btns"
, Root_key_html_page = "html_box", Root_key_html_link = "browser.html.link", Root_key_html_file = "browser.html.file"

View File

@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package gplx.xowa.guis.menus; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*;
import gplx.xowa.guis.menus.dom.*;
import gplx.xowa.langs.*;
public class Xog_window_mnu_mgr implements GfoInvkAble {
public class Xog_window_mnu_mgr implements Gfo_invk {
private Ordered_hash hash = Ordered_hash_.New();
public Xog_mnu_grp Browser() {return browser;} private Xog_mnu_grp browser;
public Xog_window_mnu_mgr(Xoa_gui_mgr gui_mgr, Xog_menu_mgr menu_mgr) {
@@ -41,7 +41,7 @@ public class Xog_window_mnu_mgr implements GfoInvkAble {
}
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
if (ctx.Match(k, Invk_get)) return Get_or_new(m.ReadStr("v"));
else return GfoInvkAble_.Rv_unhandled;
else return Gfo_invk_.Rv_unhandled;
} private static final String Invk_get = "get";
public static final String Root_key_browser_win = "main_win";
}

View File

@@ -16,9 +16,10 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.xowa.guis.menus.dom; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.menus.*;
import gplx.gfui.*; import gplx.xowa.langs.*; import gplx.xowa.guis.cmds.*;
public abstract class Xog_mnu_base implements GfoInvkAble {
private List_adp list = List_adp_.new_();
import gplx.gfui.*; import gplx.gfui.imgs.*;
import gplx.xowa.langs.*; import gplx.xowa.guis.cmds.*;
public abstract class Xog_mnu_base implements Gfo_invk {
private List_adp list = List_adp_.New();
public Xog_mnu_base() {evt_mgr = new Xog_mnu_evt_mgr(this);}
public Xog_mnu_evt_mgr Evt_mgr() {return evt_mgr;} private Xog_mnu_evt_mgr evt_mgr;
public void Evt_mgr_(Xog_mnu_evt_mgr v) {this.evt_mgr = v;}
@@ -86,7 +87,7 @@ public abstract class Xog_mnu_base implements GfoInvkAble {
else if (ctx.Match(k, Invk_add_chk)) return Add_chk(m.ReadStr("key"), m.ReadStr("text"), m.ReadStr("shortcut"), m.ReadStr("img"), m.ReadStr("cmd"));
else if (ctx.Match(k, Invk_add_rdo_default)) return Add_rdo_default(m.ReadStr("v"));
else if (ctx.Match(k, Invk_add_rdo)) return Add_rdo(m.ReadStr("key"), m.ReadStr("text"), m.ReadStr("shortcut"), m.ReadStr("img"), m.ReadStr("cmd"));
else return GfoInvkAble_.Rv_unhandled;
else return Gfo_invk_.Rv_unhandled;
return this;
}
private static final String

View File

@@ -16,7 +16,8 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.xowa.guis.menus.dom; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.menus.*;
import gplx.gfui.*; import gplx.xowa.guis.cmds.*; import gplx.xowa.apps.gfs.*;
import gplx.gfui.*; import gplx.gfui.kits.core.*; import gplx.gfui.imgs.*;
import gplx.xowa.guis.cmds.*; import gplx.xowa.apps.gfs.*;
public class Xog_mnu_bldr {
private Xoae_app app; private Gfui_kit kit; private Io_url img_dir;
public void Init_by_kit(Xoae_app app, Gfui_kit kit, Io_url img_dir) {
@@ -73,8 +74,8 @@ public class Xog_mnu_bldr {
// private void Add_chk(String key, String text, String shortcut, String img) {
// Xog_mnu_itm rv = Add_itm(Xog_mnu_itm.Tid_chk, key, text, shortcut, img);
// Xog_cmd_itm cmd = gui_mgr.Cmd_mgr().Regy().Get_or_null(key); if (cmd == null) throw Err_.new_wo_type("unknown cmd; key={0}", key);
// GfoEvObj pub = gui_mgr.App().Gfs_mgr().Get_owner_as_event_obj(cmd.Cmd());
// GfoEvMgr_.SubSame(pub, Xog_mnu_evt_mgr.Evt_selected_changed, rv.Evt_mgr());
// Gfo_evt_itm pub = gui_mgr.App().Gfs_mgr().Get_owner_as_event_obj(cmd.Cmd());
// Gfo_evt_mgr_.Sub_same(pub, Xog_mnu_evt_mgr.Evt_selected_changed, rv.Evt_mgr());
// }
private Gfui_mnu_itm Add_rdo(Gfui_mnu_grp owner_gui, Xog_mnu_itm sub, String sub_text, String sub_shortcut) {
ImageAdp img = Get_img(sub.Img_nest());

View File

@@ -16,11 +16,11 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.xowa.guis.menus.dom; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.menus.*;
import gplx.gfui.*; import gplx.xowa.guis.cmds.*;
public class Xog_mnu_evt_mgr implements GfoEvObj {
import gplx.gfui.*; import gplx.gfui.kits.core.*; import gplx.xowa.guis.cmds.*;
public class Xog_mnu_evt_mgr implements Gfo_evt_itm {
private Ordered_hash itms = Ordered_hash_.New();
public Xog_mnu_evt_mgr(Xog_mnu_base owner) {this.ev_mgr = GfoEvMgr.new_(this);}
public GfoEvMgr EvMgr() {return ev_mgr;} private GfoEvMgr ev_mgr;
public Xog_mnu_evt_mgr(Xog_mnu_base owner) {this.ev_mgr = new Gfo_evt_mgr(this);}
public Gfo_evt_mgr Evt_mgr() {return ev_mgr;} private Gfo_evt_mgr ev_mgr;
public void Sub(Gfui_mnu_itm mnu_itm) {
itms.Add(mnu_itm.Uid(), mnu_itm);
}

View File

@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.xowa.guis.menus.dom; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.menus.*;
import gplx.gfui.*;
import gplx.gfui.*; import gplx.gfui.kits.core.*; import gplx.gfui.controls.standards.*;
import gplx.xowa.apps.*; import gplx.xowa.apps.gfs.*;
import gplx.xowa.guis.views.*;
public class Xog_mnu_grp extends Xog_mnu_base {
@@ -40,19 +40,19 @@ public class Xog_mnu_grp extends Xog_mnu_base {
else
this.Clear();
if (!mnu_is_popup && app.Gui_mgr().Browser_win().Win_box() != null)
GfoInvkAble_.InvkCmd(app.Gui_mgr().Browser_win(), gplx.gfui.Gfui_html.Evt_win_resized);
Gfo_invk_.Invk_by_key(app.Gui_mgr().Browser_win(), Gfui_html.Evt_win_resized);
}
public String Source() {return source;} private String source;
public String Source_default() {return source_default;} public Xog_mnu_grp Source_default_(String v) {source_default = source = v; return this;} private String source_default;
private Xog_mnu_grp Source_(Xoa_gfs_mgr gfs_mgr, String v) {
Object rslt = Source_exec(gfs_mgr, v);
if (rslt != GfoInvkAble_.Rv_error)
if (rslt != Gfo_invk_.Rv_error)
source = v;
return this;
}
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 GfoInvkAble_.Rv_handled;
if (!enabled) return Gfo_invk_.Rv_handled;
String script = "clear;\n" + v + "build;";
return gfs_mgr.Run_str_for(this, script);
}

View File

@@ -16,7 +16,8 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.xowa.guis.menus.dom; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.menus.*;
import gplx.gfui.*; import gplx.xowa.langs.*; import gplx.xowa.guis.cmds.*; import gplx.xowa.langs.msgs.*;
import gplx.gfui.*; import gplx.gfui.kits.core.*;
import gplx.xowa.langs.*; import gplx.xowa.guis.cmds.*; import gplx.xowa.langs.msgs.*;
public class Xog_mnu_itm extends Xog_mnu_base {
private Xoa_gui_mgr gui_mgr;
public Xog_mnu_itm(Xoa_gui_mgr gui_mgr, String key) {
@@ -79,9 +80,9 @@ public class Xog_mnu_itm extends Xog_mnu_base {
else return super.Invk(ctx, ikey, k, m);
return this;
}
private static final String Invk_text = "text", Invk_text_ = "text_", Invk_shortcut = "shortcut", Invk_shortcut_ = "shortcut_", Invk_cmd = "cmd", Invk_cmd_ = "cmd_", Invk_img = "img", Invk_img_ = "img_"
private static final String Invk_text = "text", Invk_text_ = "text_", Invk_shortcut = "shortcut", Invk_shortcut_ = "shortcut_", Invk_cmd = "cmd", Invk_cmd_ = "cmd_", Invk_img = "img", Invk_img_ = "img_"
;
public static final byte Tid_nil = 0, Tid_grp = 1, Tid_spr = 2, Tid_btn = 3, Tid_chk = 4, Tid_rdo = 5;
private static String[] Img_nest_of(String img) {return String_.Len_eq_0(img) ? String_.Ary_empty : String_.Split(img, "/");}
public static final Xog_mnu_itm Null = new Xog_mnu_itm(null, "null");
public static final Xog_mnu_itm Null = new Xog_mnu_itm(null, "null");
}