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

'v3.3.4.1'

This commit is contained in:
gnosygnu
2016-03-27 23:44:59 -04:00
parent de67253a9c
commit baaef32df2
903 changed files with 13339 additions and 8695 deletions

View File

@@ -35,8 +35,8 @@ public class GfuiBtn extends GfuiElemBase {
Object o = GfoInvkAble_.InvkCmd(UnderElem(), Invk_btn_img);
return o == UnderElem() ? null : (ImageAdp)o; // NOTE: lgc guard
} public GfuiBtn Btn_img_(ImageAdp v) {GfoInvkAble_.InvkCmd_val(UnderElem(), Invk_btn_img_, v); return this;}
@Override public GxwElem UnderElem_make(KeyValHash ctorArgs) {return GxwElemFactory_.Instance.control_();}
@Override public void ctor_GfuiBox_base(KeyValHash ctorArgs) {
@Override public GxwElem UnderElem_make(Keyval_hash ctorArgs) {return GxwElemFactory_.Instance.control_();}
@Override public void ctor_GfuiBox_base(Keyval_hash ctorArgs) {
focusBorder = GfuiBorderMgr.new_().All_(PenAdp_.new_(ColorAdp_.Gray, 1));
super.ctor_GfuiBox_base(ctorArgs);
this.TextMgr().AlignH_(GfuiAlign_.Mid);
@@ -46,7 +46,7 @@ public class GfuiBtn extends GfuiElemBase {
Inject_(GfuiFocusXferBnd.Instance);
this.CustomDraw_set(true);
}
@Override public void ctor_kit_GfuiElemBase(Gfui_kit kit, String key, GxwElem underElem, KeyValHash ctorArgs) {
@Override public void ctor_kit_GfuiElemBase(Gfui_kit kit, String key, GxwElem underElem, Keyval_hash ctorArgs) {
this.kit = kit;
super.ctor_kit_GfuiElemBase(kit, key, underElem, ctorArgs);
focusBorder = GfuiBorderMgr.new_().All_(PenAdp_.new_(ColorAdp_.Gray, 1));

View File

@@ -30,7 +30,7 @@ public class GfuiBtn_ {
rv.Click_invk(GfoInvkAbleCmd.new_(invk, m));
return rv;
}
public static GfuiBtn kit_(Gfui_kit kit, String key, GxwElem elm, KeyValHash ctorArgs) {
public static GfuiBtn kit_(Gfui_kit kit, String key, GxwElem elm, Keyval_hash ctorArgs) {
GfuiBtn rv = new GfuiBtn();
rv.ctor_kit_GfuiElemBase(kit, key, elm, ctorArgs);
return rv;

View File

@@ -51,8 +51,8 @@ public class GfuiChkBox extends GfuiElemBase {
}
@Override public boolean FocusGotCbk() {super.FocusGotCbk(); this.Redraw(); return true;} // Redraw for focusBorder
@Override public boolean FocusLostCbk() {super.FocusLostCbk(); this.Redraw(); return true;} // Redraw for focusBorder
@Override public GxwElem UnderElem_make(KeyValHash ctorArgs) {return GxwElemFactory_.Instance.lbl_();}
@Override public void ctor_GfuiBox_base(KeyValHash ctorArgs) {
@Override public GxwElem UnderElem_make(Keyval_hash ctorArgs) {return GxwElemFactory_.Instance.lbl_();}
@Override public void ctor_GfuiBox_base(Keyval_hash ctorArgs) {
super.ctor_GfuiBox_base(ctorArgs);
focusBorder.All_(PenAdp_.new_(ColorAdp_.Gray, 1));
Inject_(GfuiFocusXferBnd.Instance).Inject_(GfuiBtnClickBnd.Instance);

View File

@@ -17,18 +17,42 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.gfui; import gplx.*;
public class GfuiComboBox extends GfuiElemBase {
@Override public GxwElem UnderElem_make(KeyValHash ctorArgs) {return GxwElemFactory_.Instance.comboBox_();} GxwComboBox comboBox;
public Object SelectedItm() {return comboBox.SelectedItm();} public void SelectedItm_set(Object v) {comboBox.SelectedItm_set(v);}
@Override public void ctor_GfuiBox_base(KeyValHash ctorArgs) {
@Override public void ctor_GfuiBox_base(Keyval_hash ctorArgs) {
super.ctor_GfuiBox_base(ctorArgs);
this.comboBox = (GxwComboBox)this.UnderElem();
}
public void DataSource_set(Object... ary) {
comboBox.DataSource_set(ary);
this.combo = (GxwComboBox)this.UnderElem();
}
@Override public GxwElem UnderElem_make(Keyval_hash ctorArgs) {return GxwElemFactory_.Instance.comboBox_();} private GxwComboBox combo;
public int SelBgn() {return combo.SelBgn();} public void SelBgn_set(int v) {combo.SelBgn_set(v); GfoEvMgr_.Pub(this, Evt__selection_start_changed);}
public int SelLen() {return combo.SelLen();} public void SelLen_set(int v) {combo.SelLen_set(v);}
public void Sel_(int bgn, int len) {combo.Sel_(bgn, len);}
public Object SelectedItm() {return combo.SelectedItm();} public void SelectedItm_set(Object v) {combo.SelectedItm_set(v);}
public String[] DataSource_as_str_ary() {return combo.DataSource_as_str_ary();}
public void DataSource_set(Object... ary) {combo.DataSource_set(ary);}
public String Text_fallback() {return combo.Text_fallback();}
public void Text_fallback_(String v) {combo.Text_fallback_(v);}
public int List_sel_idx() {return combo.List_sel_idx();}
public void List_sel_idx_(int v) {combo.List_sel_idx_(v);}
public boolean List_visible() {return combo.List_visible();}
public void List_visible_(boolean v) {combo.List_visible_(v);}
public void Items__update(String[] ary) {combo.Items__update(ary);}
public void Items__size_to_fit(int len) {combo.Items__size_to_fit(len);}
public void Items__visible_rows_(int v) {combo.Items__visible_rows_(v);}
public void Items__jump_len_(int v) {combo.Items__jump_len_(v);}
public void Margins_set(int left, int top, int right, int bot) {combo.Margins_set(left, top, right, bot);}
public static GfuiComboBox new_() {
GfuiComboBox rv = new GfuiComboBox();
rv.ctor_GfuiBox_base(GfuiElem_.init_focusAble_true_());
return rv;
}
public static GfuiComboBox kit_(Gfui_kit kit, String key, GxwElem elm, Keyval_hash ctorArgs) {
GfuiComboBox rv = new GfuiComboBox();
rv.ctor_kit_GfuiElemBase(kit, key, elm, ctorArgs);
rv.combo = (GxwComboBox)elm;
return rv;
}
public static final String
Evt__selected_changed = "Selected_changed"
, Evt__selected_accepted = "Selected_accepted"
, Evt__selection_start_changed = "SelectionStartChanged"
;
}

View File

@@ -27,13 +27,13 @@ public class GfuiLbl extends GfuiElemBase { // standard label does not support t
this.TextMgr().DrawData(args.Graphics());
return true;
}
@Override public void ctor_GfuiBox_base(KeyValHash ctorArgs) {
@Override public void ctor_GfuiBox_base(Keyval_hash ctorArgs) {
super.ctor_GfuiBox_base(ctorArgs);
this.CustomDraw_set(true);
}
@Override public void ctor_kit_GfuiElemBase(Gfui_kit kit, String key, GxwElem underElem, KeyValHash ctorArgs) {
@Override public void ctor_kit_GfuiElemBase(Gfui_kit kit, String key, GxwElem underElem, Keyval_hash ctorArgs) {
super.ctor_kit_GfuiElemBase(kit, key, underElem, ctorArgs);
this.CustomDraw_set(true);
}
@Override public GxwElem UnderElem_make(KeyValHash ctorArgs) {return GxwElemFactory_.Instance.lbl_();}
@Override public GxwElem UnderElem_make(Keyval_hash ctorArgs) {return GxwElemFactory_.Instance.lbl_();}
}

View File

@@ -23,7 +23,7 @@ public class GfuiLbl_ {
rv.TextMgr().AlignH_(GfuiAlign_.Mid);
return rv;
}
public static GfuiLbl kit_(Gfui_kit kit, String key, GxwElem elm, KeyValHash ctorArgs) {
public static GfuiLbl kit_(Gfui_kit kit, String key, GxwElem elm, Keyval_hash ctorArgs) {
GfuiLbl rv = new GfuiLbl();
rv.ctor_kit_GfuiElemBase(kit, key, elm, ctorArgs);
return rv;

View File

@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package gplx.gfui; import gplx.*;
import gplx.core.lists.*; /*EnumerAble*/
public class GfuiListBox extends GfuiElemBase {
@Override public GxwElem UnderElem_make(KeyValHash ctorArgs) {return GxwElemFactory_.Instance.listBox_();}
@Override public void ctor_GfuiBox_base(KeyValHash ctorArgs) {
@Override public GxwElem UnderElem_make(Keyval_hash ctorArgs) {return GxwElemFactory_.Instance.listBox_();}
@Override public void ctor_GfuiBox_base(Keyval_hash ctorArgs) {
super.ctor_GfuiBox_base(ctorArgs);
this.listBox = (GxwListBox)UnderElem();
}

View File

@@ -54,12 +54,12 @@ public class GfuiTextBox extends GfuiElemBase {
@gplx.Internal protected void SetTextBox(GxwTextFld textBox) {this.textBox = textBox;}
@gplx.Internal protected void CreateControlIfNeeded() {textBox.CreateControlIfNeeded();}
@Override public GxwElem UnderElem_make(KeyValHash ctorArgs) {return GxwElemFactory_.Instance.text_fld_();}
@Override public void ctor_GfuiBox_base(KeyValHash ctorArgs) {
@Override public GxwElem UnderElem_make(Keyval_hash ctorArgs) {return GxwElemFactory_.Instance.text_fld_();}
@Override public void ctor_GfuiBox_base(Keyval_hash ctorArgs) {
super.ctor_GfuiBox_base(ctorArgs);
textBox = (GxwTextFld)this.UnderElem();
} GxwTextFld textBox;
@Override public void ctor_kit_GfuiElemBase(Gfui_kit kit, String key, GxwElem underElem, KeyValHash ctorArgs) {
@Override public void ctor_kit_GfuiElemBase(Gfui_kit kit, String key, GxwElem underElem, Keyval_hash ctorArgs) {
super.ctor_kit_GfuiElemBase(kit, key, underElem, ctorArgs);
textBox = (GxwTextFld)underElem;
}

View File

@@ -38,7 +38,7 @@ public class GfuiTextBox_ {
rv.Key_of_GfuiElem_(key).Owner_(owner);
return rv;
}
public static GfuiTextBox kit_(Gfui_kit kit, String key, GxwTextFld wk_textBox, KeyValHash ctorArgs) {
public static GfuiTextBox kit_(Gfui_kit kit, String key, GxwTextFld wk_textBox, Keyval_hash ctorArgs) {
GfuiTextBox rv = new GfuiTextBox();
rv.ctor_kit_GfuiElemBase(kit, key, wk_textBox, ctorArgs);
return rv;

View File

@@ -32,8 +32,8 @@ public class GfuiTextMemo extends GfuiTextBox { public int LinesPerScreen() {re
public void SelectionStart_toFirstChar() {textBox.SelectionStart_toFirstChar(); GfoEvMgr_.Pub(this, SelectionStartChanged_evt);}
public void ScrollTillSelectionStartIsFirstLine() {textBox.ScrollTillSelectionStartIsFirstLine();}
@Override public GxwElem UnderElem_make(KeyValHash ctorArgs) {return GxwElemFactory_.Instance.text_memo_();}
@Override public void ctor_GfuiBox_base(KeyValHash ctorArgs) {
@Override public GxwElem UnderElem_make(Keyval_hash ctorArgs) {return GxwElemFactory_.Instance.text_memo_();}
@Override public void ctor_GfuiBox_base(Keyval_hash ctorArgs) {
super.ctor_GfuiBox_base(ctorArgs);
textBox = (GxwTextMemo)UnderElem();
this.SetTextBox(textBox);

View File

@@ -33,7 +33,7 @@ public class Gfui_html extends GfuiElemBase {
this.Html_doc_html_load_by_mem(v);
return this;
}
public static Gfui_html kit_(Gfui_kit kit, String key, Gxw_html under, KeyValHash ctorArgs) {
public static Gfui_html kit_(Gfui_kit kit, String key, Gxw_html under, Keyval_hash ctorArgs) {
Gfui_html rv = new Gfui_html();
rv.ctor_kit_GfuiElemBase(kit, key, (GxwElem)under, ctorArgs);
rv.under = under;

View File

@@ -21,7 +21,7 @@ public class Gfui_tab_itm extends GfuiElemBase {
public String Tab_name() {return under.Tab_name();} public void Tab_name_(String v) {under.Tab_name_(v);}
public String Tab_tip_text() {return under.Tab_tip_text();} public void Tab_tip_text_(String v) {under.Tab_tip_text_(v);}
public void Subs_add(GfuiElem elem) {under.Subs_add(elem);}
public static Gfui_tab_itm kit_(Gfui_kit kit, String key, Gxw_tab_itm under, KeyValHash ctor_args) {
public static Gfui_tab_itm kit_(Gfui_kit kit, String key, Gxw_tab_itm under, Keyval_hash ctor_args) {
Gfui_tab_itm rv = new Gfui_tab_itm();
// rv.ctor_kit_GfuiElemBase(kit, key, (GxwElem)under, ctor_args); // causes swt_tab_itm to break, since it's not a real Swt Control
rv.under = under;

View File

@@ -22,7 +22,7 @@ public class Gfui_tab_mgr extends GfuiElemBase {
public ColorAdp Btns_unselected_color() {return under.Btns_unselected_color();} public void Btns_unselected_color_(ColorAdp v) {under.Btns_unselected_color_(v);}
public Gfui_tab_itm Tabs_add(Gfui_tab_itm_data tab_data) {
Gxw_tab_itm tab_itm = under.Tabs_add(tab_data);
return Gfui_tab_itm.kit_(this.Kit(), tab_data.Key(), tab_itm, KeyValHash.Empty);
return Gfui_tab_itm.kit_(this.Kit(), tab_data.Key(), tab_itm, new Keyval_hash());
}
public int Btns_height() {return under.Btns_height();} public void Btns_height_(int v) {under.Btns_height_(v);}
public boolean Btns_place_on_top() {return under.Btns_place_on_top();} public void Btns_place_on_top_(boolean v) {under.Btns_place_on_top_(v);}
@@ -32,7 +32,7 @@ public class Gfui_tab_mgr extends GfuiElemBase {
public void Tabs_select_by_idx(int idx) {under.Tabs_select_by_idx(idx);}
public void Tabs_close_by_idx(int idx) {under.Tabs_close_by_idx(idx);}
public void Tabs_switch(int src, int trg) {under.Tabs_switch(src, trg);}
public static Gfui_tab_mgr kit_(Gfui_kit kit, String key, Gxw_tab_mgr under, KeyValHash ctor_args) {
public static Gfui_tab_mgr kit_(Gfui_kit kit, String key, Gxw_tab_mgr under, Keyval_hash ctor_args) {
Gfui_tab_mgr rv = new Gfui_tab_mgr();
rv.ctor_kit_GfuiElemBase(kit, key, (GxwElem)under, ctor_args);
rv.under = under;