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

Gui: Add initial support for night-mode

This commit is contained in:
gnosygnu
2017-03-03 16:20:00 -05:00
parent 3e69a06434
commit a28ba26ca6
27 changed files with 148 additions and 49 deletions

View File

@@ -35,8 +35,6 @@ public class Xog_tab_mgr implements Gfo_evt_itm {
public void Init_by_kit(Gfui_kit kit) {
tab_mgr = kit.New_tab_mgr("xowa.tab_mgr", win.Win_box());
active_tab = Xog_tab_itm_.Null;
tab_mgr.Btns_selected_color_(ColorAdp_.White);
tab_mgr.Btns_unselected_color_(ColorAdp_.LightGray);
Gfo_evt_mgr_.Sub_same_many(tab_mgr, this, Gfui_tab_mgr.Evt_tab_selected, Gfui_tab_mgr.Evt_tab_closed, Gfui_tab_mgr.Evt_tab_switched);
win.App().Cfg().Bind_many_app(this, Cfg__page_load_mode
, Cfg__place_on_top, Cfg__height, Cfg__hide_if_one, Cfg__curved, Cfg__close_btn_visible, Cfg__unselected_close_btn_visible, Cfg__max_chars, Cfg__min_chars);

View File

@@ -313,8 +313,7 @@ public class Xog_win_itm implements Gfo_invk, Gfo_evt_itm {
win_box.Layout_mgr_(new Swt_layout_mgr__grid().Cols_(1).Margin_w_(0).Margin_h_(0).Spacing_h_(0));
// toolbar
Gfui_grp toolbar_grp = kit.New_grp("toolbar_grp", win_box);
toolbar_grp.BackColor_(ColorAdp_.White);
Gfui_grp toolbar_grp = Xog_win_itm_.new_grp(app, kit, win_box, "toolbar_grp");
go_bwd_btn = Xog_win_itm_.new_btn(app, kit, toolbar_grp, img_dir, "go_bwd_btn", "go_bwd.png" );
go_fwd_btn = Xog_win_itm_.new_btn(app, kit, toolbar_grp, img_dir, "go_fwd_btn", "go_fwd.png" );
url_box = Xog_win_itm_.new_cbo(app, kit, toolbar_grp, ui_font, "url_box" , true);
@@ -338,8 +337,7 @@ public class Xog_win_itm implements Gfo_invk, Gfo_evt_itm {
tab_mgr.Tab_mgr().Layout_data_(new Swt_layout_data__grid().Grab_excess_h_(true).Align_w__fill_().Align_h__fill_().Grab_excess_w_(true));
// statusbar
this.statusbar_grp = kit.New_grp("statusbar_grp", win_box);
statusbar_grp.BackColor_(ColorAdp_.White);
this.statusbar_grp = Xog_win_itm_.new_grp(app, kit, win_box, "statusbar_grp");
find_close_btn = Xog_win_itm_.new_btn(app, kit, statusbar_grp, img_dir, "find_close_btn", "find_close.png" );
find_box = Xog_win_itm_.new_txt(app, kit, statusbar_grp, ui_font, "find_box" , true);
find_fwd_btn = Xog_win_itm_.new_btn(app, kit, statusbar_grp, img_dir, "find_fwd_btn", "find_fwd.png" );

View File

@@ -24,24 +24,51 @@ public class Xog_win_itm_ {
win_box.Focus_able_(false);
win_box.BackColor_(ColorAdp_.White);
win.Tab_mgr().Tab_mgr().BackColor_(ColorAdp_.White);
win.Tab_mgr().Tab_mgr().Btns_selected_foreground_(ColorAdp_.Black);
win.Tab_mgr().Tab_mgr().Btns_selected_background_(ColorAdp_.White);
win.Tab_mgr().Tab_mgr().Btns_unselected_foreground_(ColorAdp_.Black);
win.Tab_mgr().Tab_mgr().Btns_unselected_background_(ColorAdp_.White);
// win_box.BackColor_(ColorAdp_.Black);
// win.Tab_mgr().Tab_mgr().BackColor_(ColorAdp_.Black);
// win.Tab_mgr().Tab_mgr().Btns_selected_foreground_(ColorAdp_.White);
// win.Tab_mgr().Tab_mgr().Btns_selected_background_(ColorAdp_.Black);
// win.Tab_mgr().Tab_mgr().Btns_unselected_foreground_(ColorAdp_.White);
// win.Tab_mgr().Tab_mgr().Btns_unselected_background_(ColorAdp_.Black);
Xog_startup_win_.Startup(app, win_box);
win_box.Icon_(IconAdp.file_or_blank(app.Fsys_mgr().Bin_xowa_dir().GenSubFil_nest("file", "app.window", "app_icon.png")));
}
public static Gfui_grp new_grp(Xoae_app app, Gfui_kit kit, GfuiElem win, String id) {
Gfui_grp rv = kit.New_grp(id, win);
rv.BackColor_(ColorAdp_.White);
// rv.BackColor_(ColorAdp_.Black);
return rv;
}
public static GfuiBtn new_btn(Xoae_app app, Gfui_kit kit, GfuiElem win, Io_url img_dir, String id, String file) {
GfuiBtn rv = kit.New_btn(id, win);
rv.Btn_img_(kit.New_img_load(img_dir.GenSubFil(file)));
rv.ForeColor_(ColorAdp_.Black).BackColor_(ColorAdp_.White);
// rv.ForeColor_(ColorAdp_.White).BackColor_(ColorAdp_.Black);
return rv;
}
public static GfuiComboBox new_cbo(Xoae_app app, Gfui_kit kit, GfuiElem win, FontAdp ui_font, String id, boolean border_on) {
GfuiComboBox rv = kit.New_combo(id, win, Keyval_.new_(GfuiTextBox.CFG_border_on_, border_on));
rv.TextMgr().Font_(ui_font);
rv.ForeColor_(ColorAdp_.Black).BackColor_(ColorAdp_.White);
rv.Border_color_(ColorAdp_.LightGray);
// rv.ForeColor_(ColorAdp_.White).BackColor_(ColorAdp_.Black);
// rv.Border_color_(ColorAdp_.Black);
return rv;
}
public static GfuiTextBox new_txt(Xoae_app app, Gfui_kit kit, GfuiElem win, FontAdp ui_font, String id, boolean border_on) {
GfuiTextBox rv = kit.New_text_box(id, win, Keyval_.new_(GfuiTextBox.CFG_border_on_, border_on));
rv.TextMgr().Font_(ui_font);
rv.ForeColor_(ColorAdp_.Black).BackColor_(ColorAdp_.White);
rv.Border_color_(border_on ? ColorAdp_.LightGray : rv.BackColor());
// rv.ForeColor_(ColorAdp_.White).BackColor_(ColorAdp_.Black);
// rv.Border_color_(border_on ? ColorAdp_.Black : rv.BackColor());
return rv;
}
public static void Update_tiptext(Xoae_app app, GfuiElem elem, int tiptext_id) {

View File

@@ -19,10 +19,12 @@ public class Default_tab_page implements Xow_special_page {
public void Special__gen(Xow_wiki wiki, Xoa_page pagei, Xoa_url url, Xoa_ttl ttl) {
Xoae_page page = (Xoae_page)pagei;
page.Db().Text().Text_bry_(Bry_.Empty);
page.Html_data().Custom_html_(Bry_.Empty);
page.Html_data().Custom_html_(DEFAULT_HTML);
page.Html_data().Custom_tab_name_(Tab_name_bry);
}
public static final byte[] Tab_name_bry = Bry_.new_a7("New Tab");
public Xow_special_page Special__clone() {return this;}
private static final byte[] DEFAULT_HTML = Bry_.new_a7("<html><body class='xowa-default_new_tab-body'></body></html>");
}

View File

@@ -31,8 +31,10 @@ public class Xow_xwiki_mgr {
public Xow_xwiki_itm Get_at(int i) {return (Xow_xwiki_itm)list.Get_at(i);}
public Xow_xwiki_itm Get_by_key(byte[] key) {return (Xow_xwiki_itm)hash.Get_by_bry(key);}
public Xow_xwiki_itm Get_by_mid(byte[] src, int bgn, int end) {return (Xow_xwiki_itm)hash.Get_by_mid(src, bgn, end);}
public Xow_xwiki_itm Add_by_atrs_offline(String key, String domain) {
return Add_by_atrs(Bry_.new_a7(key), Bry_.new_a7(domain), null).Offline_(true);
return Add_by_atrs(Bry_.new_a7(key), Bry_.new_a7(domain), null)
.Offline_(true);// NOTE: need to mark offline in order to show in left sidebar
}
public Xow_xwiki_itm Add_by_atrs(String key, String domain) {return Add_by_atrs(Bry_.new_a7(key), Bry_.new_a7(domain), null);}
public Xow_xwiki_itm Add_by_atrs(byte[] key, byte[] domain) {return Add_by_atrs(key, domain, null);}