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

Bldr: Add more implementation for missing origs

This commit is contained in:
gnosygnu
2017-03-04 09:44:22 -05:00
parent ef11577d08
commit 3e39b2fe77
12 changed files with 216 additions and 44 deletions

View File

@@ -19,7 +19,7 @@ import gplx.gfui.*; import gplx.gfui.ipts.*; import gplx.gfui.kits.core.*; impor
import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.guis.menus.*; import gplx.xowa.guis.cmds.*; import gplx.xowa.apps.cfgs.*; import gplx.xowa.users.*;
import gplx.xowa.langs.*;
import gplx.xowa.guis.bnds.*; import gplx.xowa.guis.views.*; import gplx.xowa.guis.urls.url_macros.*; import gplx.xowa.addons.wikis.searchs.gui.htmlbars.*;
import gplx.xowa.guis.views.boots.*;
import gplx.xowa.guis.views.boots.*; import gplx.xowa.guis.views.nightmodes.*;
import gplx.gfui.layouts.swts.*;
public class Xoa_gui_mgr implements Gfo_evt_itm, Gfo_invk {
public Xoa_gui_mgr(Xoae_app app) {
@@ -41,7 +41,8 @@ public class Xoa_gui_mgr implements Gfo_evt_itm, Gfo_invk {
public Xog_layout Layout() {return layout;} private Xog_layout layout = new Xog_layout();
public Xog_html_mgr Html_mgr() {return html_mgr;} private Xog_html_mgr html_mgr;
public Xog_menu_mgr Menu_mgr() {return menu_mgr;} private Xog_menu_mgr menu_mgr;
public Xog_url_macro_mgr Url_macro_mgr() {return url_macro_mgr;} private Xog_url_macro_mgr url_macro_mgr = new Xog_url_macro_mgr();
public Xog_url_macro_mgr Url_macro_mgr() {return url_macro_mgr;} private final Xog_url_macro_mgr url_macro_mgr = new Xog_url_macro_mgr();
public Xog_nightmode_mgr Nightmode_mgr() {return nightmode_mgr;} private final Xog_nightmode_mgr nightmode_mgr = new Xog_nightmode_mgr();
public void Show_prog() {
// get rects for positioning
RectAdp statusbar_rect = browser_win.Statusbar_grp().Rect();
@@ -76,6 +77,7 @@ public class Xoa_gui_mgr implements Gfo_evt_itm, Gfo_invk {
, new gplx.core.logs.Gfo_log_itm_wtr__csv()));
}
win_cfg.Init_by_app(app);
nightmode_mgr.Init_by_app(app);
}
public void Kit_(Gfui_kit kit) {
this.kit = kit;

View File

@@ -311,6 +311,7 @@ public class Xog_bnd_mgr implements Gfo_invk {
Init_itm(Xog_cmd_itm_.Key_gui_browser_info_focus , Xog_bnd_box_.Tid_browser , "mod.ca+key.i");
Init_itm(Xog_cmd_itm_.Key_gui_browser_info_clear , Xog_bnd_box_.Tid_browser , "mod.ca+key.c");
Init_itm(Xog_cmd_itm_.Key_gui_browser_prog_log_show , Xog_bnd_box_.Tid_browser_prog , "mouse.middle", "mod.cs+key.p");
Init_itm(Xog_cmd_itm_.Key_gui_browser_nightmode_toggle , Xog_bnd_box_.Tid_browser , "");
Init_itm(Xog_cmd_itm_.Key_html_tidy_toggle , Xog_bnd_box_.Tid_browser , "key.f7");
Init_itm(Xog_cmd_itm_.Key_usr_bookmarks_add , Xog_bnd_box_.Tid_browser , "");
Init_itm(Xog_cmd_itm_.Key_usr_bookmarks_show , Xog_bnd_box_.Tid_browser , "key.f3");

View File

@@ -123,6 +123,7 @@ public class Xog_cmd_itm_ {
, Key_gui_browser_prog_log_show = new_dflt_(Xog_ctg_itm_.Tid_browser , "xowa.gui.browser.prog_log.show")
, Key_gui_browser_info_focus = new_dflt_(Xog_ctg_itm_.Tid_browser , "xowa.gui.browser.info.focus")
, Key_gui_browser_info_clear = new_dflt_(Xog_ctg_itm_.Tid_browser , "xowa.gui.browser.info.clear")
, Key_gui_browser_nightmode_toggle = new_dflt_(Xog_ctg_itm_.Tid_browser , "xowa.gui.browser.nightmode_toggle")
, Key_gui_menus_group_file = "xowa.gui.menus.group.file"
, Key_gui_menus_group_edit = "xowa.gui.menus.group.edit"

View File

@@ -33,6 +33,7 @@ public class Xog_win_itm implements Gfo_invk, Gfo_evt_itm {
public Xoa_gui_mgr Gui_mgr() {return gui_mgr;} private Xoa_gui_mgr gui_mgr;
public GfuiWin Win_box() {return win_box;} private GfuiWin win_box;
public Gfui_grp Toolbar_grp() {return toolbar_grp;} private Gfui_grp toolbar_grp;
public GfuiBtn Go_bwd_btn() {return go_bwd_btn;} private GfuiBtn go_bwd_btn;
public GfuiBtn Go_fwd_btn() {return go_fwd_btn;} private GfuiBtn go_fwd_btn;
public GfuiComboBox Url_box() {return url_box;} private GfuiComboBox url_box;
@@ -313,7 +314,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 = Xog_win_itm_.new_grp(app, kit, win_box, "toolbar_grp");
this.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);

View File

@@ -20,55 +20,28 @@ import gplx.xowa.guis.langs.*;
public class Xog_win_itm_ {
public static void Show_win(Xog_win_itm win) {
Xoae_app app = win.App(); GfuiWin win_box = win.Win_box();
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);
app.Gui_mgr().Nightmode_mgr().Enabled_dflt_();
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;
return kit.New_grp(id, win);
}
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

@@ -0,0 +1,80 @@
/*
XOWA: the XOWA Offline Wiki Application
Copyright (C) 2012-2017 gnosygnu@gmail.com
XOWA is licensed under the terms of the General Public License (GPL) Version 3,
or alternatively under the terms of the Apache License Version 2.0.
You may use XOWA according to either of these licenses as is most appropriate
for your project on a case-by-case basis.
The terms of each license can be found in the source code repository:
GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
*/
package gplx.xowa.guis.views.nightmodes; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.views.*;
import gplx.gfui.controls.elems.*; import gplx.gfui.draws.*;
public class Xog_nightmode_mgr {
private boolean enabled;
private Xog_win_itm win;
public void Init_by_app(Xoae_app app) {
this.win = app.Gui_mgr().Browser_win();
}
public boolean Enabled() {return enabled;}
public void Enabled_dflt_() {
Enabled_(false);
}
public void Enabled_toggle_() {
Enabled_(!enabled);
}
private void Enabled_(boolean v) {
this.enabled = v;
// get colors
ColorAdp backcolor, forecolor, edgecolor;
if (enabled) {
backcolor = ColorAdp_.Black;
forecolor = ColorAdp_.White;
edgecolor = ColorAdp_.Black;
}
else {
backcolor = ColorAdp_.White;
forecolor = ColorAdp_.Black;
edgecolor = ColorAdp_.LightGray;
}
// set back / fore for window and tab
win.Win_box().BackColor_(backcolor);
win.Tab_mgr().Tab_mgr().BackColor_(backcolor);
win.Tab_mgr().Tab_mgr().Btns_selected_background_(backcolor);
win.Tab_mgr().Tab_mgr().Btns_selected_foreground_(forecolor);
win.Tab_mgr().Tab_mgr().Btns_unselected_background_(backcolor);
win.Tab_mgr().Tab_mgr().Btns_unselected_foreground_(forecolor);
// set back / fore for other elems
GfuiElemBase[] elems = new GfuiElemBase[]
{ win.Toolbar_grp()
, win.Go_bwd_btn()
, win.Go_fwd_btn()
, win.Url_box()
, win.Url_exec_btn()
, win.Search_box()
, win.Search_exec_btn()
, win.Statusbar_grp()
, win.Find_close_btn()
, win.Find_bwd_btn()
, win.Find_fwd_btn()
, win.Find_box()
, win.Prog_box()
};
for (GfuiElemBase elem : elems)
elem.BackColor_(backcolor).ForeColor_(forecolor);
// set edge colors
win.Url_box().Border_color_(edgecolor);
win.Search_box().Border_color_(edgecolor);
win.Find_box().Border_color_(edgecolor);
win.Prog_box().Border_color_(backcolor);
}
}