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

v2.10.3.1

This commit is contained in:
gnosygnu
2015-10-18 22:17:57 -04:00
parent 8e18af05b6
commit 4f43f51b18
1935 changed files with 12500 additions and 12889 deletions

View File

@@ -67,7 +67,7 @@ class Swt_html implements Gxw_html, Swt_control, FocusListener {
public void Html_doc_html_load_by_url(Io_url path, String html) {
this.html_doc_html_load_tid = Gxw_html_load_tid_.Tid_url;
this.load_by_url_path = path.To_http_file_str();
Io_mgr.I.SaveFilStr(path, html);
Io_mgr.Instance.SaveFilStr(path, html);
browser.setUrl(path.Xto_api());
}
public byte Html_doc_html_load_tid() {return html_doc_html_load_tid;} private byte html_doc_html_load_tid;
@@ -99,7 +99,7 @@ class Swt_html implements Gxw_html, Swt_control, FocusListener {
if (quote_val) bfr.Add_byte(Byte_ascii.Apos);
}
bfr.Add_byte(Byte_ascii.Paren_end).Add_byte(Byte_ascii.Semic);
return Eval_script(bfr.Xto_str_and_clear());
return Eval_script(bfr.To_str_and_clear());
}
private static String Escape_quote(String v) {
String rv = v;
@@ -149,12 +149,6 @@ class Swt_core_cmds_html extends Swt_core_cmds {
this.Focus();
}
}
class Swt_html_eval_rslt {
public void Clear() {error = null; result = null;}
public boolean Result_pass() {return error == null;}
public Object Result() {return result;} public void Result_set(Object v) {result = v; error = null;} private Object result;
public String Error () {return error;} public void Error_set(String v) {error = v; result = null;} private String error;
}
class Swt_html_lnr_traverse implements TraverseListener {
public Swt_html_lnr_traverse(Swt_html html_box) {}
@Override public void keyTraversed(TraverseEvent arg0) {}
@@ -163,7 +157,7 @@ class Swt_html_lnr_title implements TitleListener {
private Swt_html html_box;
public Swt_html_lnr_title(Swt_html html_box) {this.html_box = html_box;}
@Override public void changed(TitleEvent ev) {
try {UsrDlg_._.Note(ev.title);}
try {UsrDlg_.Instance.Note(ev.title);}
catch (Exception e) {html_box.Kit().Ask_ok("xowa.swt.html_box", "title.fail", Err_.Message_gplx_full(e));} // NOTE: must catch error or will cause app to lock; currently called inside displaySync
}
}

View File

@@ -0,0 +1,25 @@
/*
XOWA: the XOWA Offline Wiki Application
Copyright (C) 2012 gnosygnu@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
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.gfui;
public class Swt_html_eval_rslt {
public void Clear() {error = null; result = null;}
public boolean Result_pass() {return error == null;}
public Object Result() {return result;} public void Result_set(Object v) {result = v; error = null;} private Object result;
public String Error () {return error;} public void Error_set(String v) {error = v; result = null;} private String error;
}

View File

@@ -192,7 +192,7 @@ class Swt_lnr__menu_btn_cmd implements Listener {
public Swt_lnr__menu_btn_cmd(GfoInvkAble invk, String cmd) {this.invk = invk; this.cmd = cmd;} GfoInvkAble invk; String cmd;
public void handleEvent(Event ev) {
try {GfoInvkAble_.InvkCmd(invk, cmd);}
catch (Exception e) {Swt_kit._.Ask_ok("", "", "error while invoking command: cmd=~{0} err=~{1}", cmd, Err_.Message_gplx_full(e));}
catch (Exception e) {Swt_kit.Instance.Ask_ok("", "", "error while invoking command: cmd=~{0} err=~{1}", cmd, Err_.Message_gplx_full(e));}
}
}
class Swt_lnr__menu_btn_msg implements Listener {
@@ -203,7 +203,7 @@ class Swt_lnr__menu_btn_msg implements Listener {
msg.Args_reset();
root_wkr.Run_str_for(invk, msg);
}
catch (Exception e) {Swt_kit._.Ask_ok("", "", "error while invoking command: cmd=~{0} err=~{1}", msg.Key(), Err_.Message_gplx_full(e));}
catch (Exception e) {Swt_kit.Instance.Ask_ok("", "", "error while invoking command: cmd=~{0} err=~{1}", msg.Key(), Err_.Message_gplx_full(e));}
}
}
class Swt_lnr__menu_chk_msg implements Listener {
@@ -219,6 +219,6 @@ class Swt_lnr__menu_chk_msg implements Listener {
msg.Args_reset();
root_wkr.Run_str_for(invk, msg);
}
catch (Exception e) {Swt_kit._.Ask_ok("", "", "error while invoking command: cmd=~{0} err=~{1}", msg.Key(), Err_.Message_gplx_full(e));}
catch (Exception e) {Swt_kit.Instance.Ask_ok("", "", "error while invoking command: cmd=~{0} err=~{1}", msg.Key(), Err_.Message_gplx_full(e));}
}
}

View File

@@ -93,7 +93,7 @@ public class Swt_tab_mgr implements Gxw_tab_mgr, Swt_control, FocusListener, Gfo
if (i == Gfui_tab_itm_data.Idx_null) return; // 0 tabs; return;
msg_tabs_select_by_idx_swt.Clear();
msg_tabs_select_by_idx_swt.Add("v", i);
cmd_sync.Invk(GfsCtx._, 0, Invk_tabs_select_by_idx_swt, msg_tabs_select_by_idx_swt);
cmd_sync.Invk(GfsCtx.Instance, 0, Invk_tabs_select_by_idx_swt, msg_tabs_select_by_idx_swt);
} private GfoMsg msg_tabs_select_by_idx_swt = GfoMsg_.new_cast_(Invk_tabs_select_by_idx_swt);
@Override public void Tabs_switch(int src, int trg) {Tabs_switch(tab_folder.getItem(src), tab_folder.getItem(trg));}
public boolean Tabs_switch(CTabItem src_tab_itm, CTabItem trg_tab_itm) {
@@ -120,7 +120,7 @@ public class Swt_tab_mgr implements Gxw_tab_mgr, Swt_control, FocusListener, Gfo
if (itm == null) return; // 0 tabs; return;
msg_tabs_select_by_itm_swt.Clear();
msg_tabs_select_by_itm_swt.Add("v", itm);
cmd_sync.Invk(GfsCtx._, 0, Invk_tabs_select_by_itm_swt, msg_tabs_select_by_itm_swt);
cmd_sync.Invk(GfsCtx.Instance, 0, Invk_tabs_select_by_itm_swt, msg_tabs_select_by_itm_swt);
} private GfoMsg msg_tabs_select_by_itm_swt = GfoMsg_.new_cast_(Invk_tabs_select_by_itm_swt);
private void Tabs_select_by_idx_swt(int idx) {
tab_folder.setSelection(idx);