mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
v2.11.1.1
This commit is contained in:
@@ -46,7 +46,7 @@ public class Xous_window_mgr implements GfoInvkAble {
|
||||
for (int i = 0; i < len; ++i) {
|
||||
if (i != 0) bfr.Add_byte_nl();
|
||||
Xog_tab_itm tab = tab_mgr.Tabs_get_at(i);
|
||||
bfr.Add_str(tab.Page().Url().To_str());
|
||||
bfr.Add_str_u8(tab.Page().Url().To_str());
|
||||
}
|
||||
return bfr.To_str_and_clear();
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ public class Dbui_tbl_itm__bmk implements Dbui_tbl_itm {
|
||||
}
|
||||
public void Select(Bry_bfr bfr, int owner) {
|
||||
Xoud_bmk_itm_row[] db_rows = tbl.Select_grp(owner);
|
||||
byte[] option_link = app.Html__lnki_bldr().Href_(Bry_.new_a7("home"), app.User().Wikii().Ttl_parse(Bry_.new_a7("Help:Options/Bookmarks"))).Img_16x16(gplx.xowa.htmls.wtrs.Xoh_img_path.Img_option).Bld_to_bry();
|
||||
byte[] option_link = app.Html__lnki_bldr().Href_(Bry_.new_a7("home"), app.User().Wikii().Ttl_parse(Bry_.new_a7("Help:Options/Bookmarks"))).Img_16x16(gplx.xowa.htmls.core.htmls.utls.Xoh_img_path.Img_option).Bld_to_bry();
|
||||
byte[] delete_confirm_msg = app.Api_root().Usr().Bookmarks().Delete_confirm() ? Msg__delete_confirm : Bry_.Empty;
|
||||
tbl_fmtr.Write(bfr, this, option_link, delete_confirm_msg, To_ui_rows(db_rows));
|
||||
} private static final byte[] Msg__delete_confirm = Bry_.new_a7(" data-dbui-delete_confirm_msg='Are you sure you want to delete this bookmark?'");
|
||||
|
||||
@@ -38,7 +38,7 @@ public class Dbui_tbl_itm__history implements Dbui_tbl_itm {
|
||||
public void Select(Bry_bfr bfr, int top) {
|
||||
tbl.Select_by_top(select_list, 100);
|
||||
Xoud_history_row[] db_rows = (Xoud_history_row[])select_list.To_ary_and_clear(Xoud_history_row.class);
|
||||
byte[] option_link = app.Html__lnki_bldr().Href_(Bry_.new_a7("home"), app.User().Wikii().Ttl_parse(Bry_.new_a7("Help:Options/PageHistory"))).Img_16x16(gplx.xowa.htmls.wtrs.Xoh_img_path.Img_option).Bld_to_bry();
|
||||
byte[] option_link = app.Html__lnki_bldr().Href_(Bry_.new_a7("home"), app.User().Wikii().Ttl_parse(Bry_.new_a7("Help:Options/PageHistory"))).Img_16x16(gplx.xowa.htmls.core.htmls.utls.Xoh_img_path.Img_option).Bld_to_bry();
|
||||
byte[] delete_confirm_msg = app.Api_root().Usr().Bookmarks().Delete_confirm() ? Msg__delete_confirm : Bry_.Empty;
|
||||
tbl_fmtr.Write(bfr, this, option_link, delete_confirm_msg, To_ui_rows(db_rows));
|
||||
} private static final byte[] Msg__delete_confirm = Bry_.new_a7(" data-dbui-delete_confirm_msg='Are you sure you want to delete this row?'");
|
||||
|
||||
@@ -89,7 +89,7 @@ public class Prefs_converter {
|
||||
else {
|
||||
if (depth != 0) bfr.Add_byte(Byte_ascii.Dot);
|
||||
if (String_.Eq(m.Key(), "scripts")) {bfr.Clear(); return;}
|
||||
bfr.Add_str(m.Key());
|
||||
bfr.Add_str_u8(m.Key());
|
||||
int args_count = m.Args_count();
|
||||
if (args_count > 0) {
|
||||
bfr.Add_byte(Byte_ascii.Paren_bgn);
|
||||
@@ -97,7 +97,7 @@ public class Prefs_converter {
|
||||
if (i != 0) bfr.Add_byte(Byte_ascii.Comma);
|
||||
KeyVal kv = m.Args_getAt(i);
|
||||
bfr.Add_byte(Byte_ascii.Quote);
|
||||
bfr.Add_str(kv.Val_to_str_or_empty());
|
||||
bfr.Add_str_u8(kv.Val_to_str_or_empty());
|
||||
bfr.Add_byte(Byte_ascii.Quote);
|
||||
}
|
||||
bfr.Add_byte(Byte_ascii.Paren_end);
|
||||
|
||||
@@ -42,9 +42,9 @@ class Prefs_converter_fxt {
|
||||
public void Parse(String raw_str) {
|
||||
byte[] raw_bry = Bry_.new_u8(raw_str);
|
||||
int bgn_pos = Bry_find_.Find_fwd(raw_bry, Byte_ascii.Paren_bgn);
|
||||
if (bgn_pos == Bry_.NotFound) throw Err_.new_wo_type("unable to find paren_bgn", "raw", raw_str);
|
||||
if (bgn_pos == Bry_find_.Not_found) throw Err_.new_wo_type("unable to find paren_bgn", "raw", raw_str);
|
||||
int end_pos = Bry_find_.Find_fwd(raw_bry, Byte_ascii.Paren_end, bgn_pos);
|
||||
if (end_pos == Bry_.NotFound) throw Err_.new_wo_type("unable to find paren_end", "raw", raw_str);
|
||||
if (end_pos == Bry_find_.Not_found) throw Err_.new_wo_type("unable to find paren_end", "raw", raw_str);
|
||||
raw_bry = Bry_.Mid(raw_bry, bgn_pos, end_pos);
|
||||
int len = raw_bry.length;
|
||||
for (int i = 0; i < len; i++) {
|
||||
|
||||
@@ -59,12 +59,12 @@ class Prefs_html_wtr {
|
||||
for (int i = 0; i < len; i++) {
|
||||
KeyVal option = options_list[i];
|
||||
bfr.Add(Nde_stub_option_bgn); // " <option value='"
|
||||
bfr.Add_str(option.Key()); // "option_key"
|
||||
bfr.Add_str_u8(option.Key()); // "option_key"
|
||||
bfr.Add_byte(Byte_ascii.Apos); // "'"
|
||||
if (String_.Eq(Object_.Xto_str_strict_or_empty(prop_val), option.Key()))
|
||||
bfr.Add_str_a7(" selected='selected'"); // " selected='selected'"
|
||||
bfr.Add_byte(Byte_ascii.Gt); // ">"
|
||||
bfr.Add_str(option.Val_to_str_or_empty()); // "option_text"
|
||||
bfr.Add_str_u8(option.Val_to_str_or_empty());// "option_text"
|
||||
bfr.Add(Nde_stub_option_end); // "</option>\n"
|
||||
}
|
||||
}
|
||||
@@ -76,12 +76,12 @@ class Prefs_html_wtr {
|
||||
Write_io_btn(bfr, hnde, prop_idx);
|
||||
}
|
||||
private void Write_io_btn(Bry_bfr bfr, Html_nde hnde, int prop_idx) {
|
||||
bfr.Add_str_a7("<button id='xowa_prop_").Add_int_variable(prop_idx).Add_str("_io").Add_byte(Byte_ascii.Apos);
|
||||
bfr.Add_str_a7("<button id='xowa_prop_").Add_int_variable(prop_idx).Add_str_a7("_io").Add_byte(Byte_ascii.Apos);
|
||||
bfr.Add_str_a7(" class='options_button' onclick='xowa_io_select(\"file\", \"");
|
||||
bfr.Add_str_a7("xowa_prop_").Add_int_variable(prop_idx);
|
||||
byte[] xowa_io_msg = hnde.Atrs_val_by_key_bry(Bry_.new_a7("xowa_io_msg"));
|
||||
if (xowa_io_msg == null) xowa_io_msg = Bry_.new_a7("Please select a file.");
|
||||
bfr.Add_str_a7("\", \"").Add(xowa_io_msg).Add_str("\");'>");
|
||||
bfr.Add_str_a7("\", \"").Add(xowa_io_msg).Add_str_a7("\");'>");
|
||||
bfr.Add_str_a7("...</button>").Add_byte_nl();
|
||||
}
|
||||
private static final byte[] Atr_key_xowa_prop_list = Bry_.new_a7("xowa_prop_list")
|
||||
|
||||
Reference in New Issue
Block a user