Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

'v3.3.4.1'

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
150_gfui/src_400_win/gplx/gfui/GfuiWin.java
View File

@@ -40,7 +40,7 @@ public class GfuiWin extends GfuiElemBase {
smallOpenSize = size;
return this;
} private SizeAdp smallOpenSize = SizeAdp_.Null;
@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);
win = (GxwWin)underElem;
win.OpenedCmd_set(GfoInvkAbleCmd.new_(this, Evt_Opened));
@@ -51,7 +51,7 @@ public class GfuiWin extends GfuiElemBase {
loadList.Add(keyCmdMgr); loadList.Add(GfuiTipTextMgr.Instance);
focusMgr = GfuiWinFocusMgr.new_(this);
}
@Override public void ctor_GfuiBox_base(KeyValHash ctorArgs) {
@Override public void ctor_GfuiBox_base(Keyval_hash ctorArgs) {
super.ctor_GfuiBox_base(ctorArgs);
win = (GxwWin)this.UnderElem();
win.OpenedCmd_set(GfoInvkAbleCmd.new_(this, Evt_Opened));
@@ -62,8 +62,8 @@ public class GfuiWin extends GfuiElemBase {
loadList.Add(keyCmdMgr); loadList.Add(GfuiTipTextMgr.Instance);
focusMgr = GfuiWinFocusMgr.new_(this);
}
@Override public GxwElem UnderElem_make(KeyValHash ctorArgs) {
String type = (String)ctorArgs.FetchValOr(GfuiWin_.InitKey_winType, GfuiWin_.InitKey_winType_app);
@Override public GxwElem UnderElem_make(Keyval_hash ctorArgs) {
String type = (String)ctorArgs.Get_val_or(GfuiWin_.InitKey_winType, GfuiWin_.InitKey_winType_app);
if (String_.Eq(type, GfuiWin_.InitKey_winType_tool)) return GxwElemFactory_.Instance.win_tool_(ctorArgs);
else if (String_.Eq(type, GfuiWin_.InitKey_winType_toaster)) return GxwElemFactory_.Instance.win_toaster_(ctorArgs);
else return GxwElemFactory_.Instance.win_app_();

12
150_gfui/src_400_win/gplx/gfui/GfuiWin_.java
View File

@@ -25,15 +25,15 @@ public class GfuiWin_ {
;
public static GfuiWin as_(Object obj) {return obj instanceof GfuiWin ? (GfuiWin)obj : null;}
public static GfuiWin cast(Object obj) {try {return (GfuiWin)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiWin.class, obj);}}
public static GfuiWin app_(String key) {return bld_(key, InitKey_winType_app, KeyValHash.new_());}
public static GfuiWin tool_(String key) {return bld_(key, InitKey_winType_tool, KeyValHash.new_()).TaskbarVisible_(false);}
public static GfuiWin app_(String key) {return bld_(key, InitKey_winType_app, new Keyval_hash());}
public static GfuiWin tool_(String key) {return bld_(key, InitKey_winType_tool, new Keyval_hash()).TaskbarVisible_(false);}
public static GfuiWin sub_(String key, GfuiWin ownerWin) {
KeyValHash ctorArgs = KeyValHash.new_();
Keyval_hash ctorArgs = new Keyval_hash();
if (ownerWin != null) ctorArgs.Add(GfuiElem_.InitKey_ownerWin, ownerWin); // WORKAROUND/JAVA: null ownerWin will fail when adding to hash
return bld_(key, InitKey_winType_tool, ctorArgs);
}
public static GfuiWin toaster_(String key, GfuiWin ownerWin) {return bld_(key, InitKey_winType_toaster, KeyValHash.new_().Add(GfuiElem_.InitKey_ownerWin, ownerWin));}
static GfuiWin bld_(String key, String winType, KeyValHash ctorArgs) {
public static GfuiWin toaster_(String key, GfuiWin ownerWin) {return bld_(key, InitKey_winType_toaster, new Keyval_hash().Add(GfuiElem_.InitKey_ownerWin, ownerWin));}
static GfuiWin bld_(String key, String winType, Keyval_hash ctorArgs) {
GfuiWin rv = new GfuiWin();
rv.Key_of_GfuiElem_(key);
ctorArgs.Add(InitKey_winType, winType)
@@ -41,7 +41,7 @@ public class GfuiWin_ {
rv.ctor_GfuiBox_base(ctorArgs);
return rv;
}
public static GfuiWin kit_(Gfui_kit kit, String key, GxwWin under, KeyValHash ctorArgs) {
public static GfuiWin kit_(Gfui_kit kit, String key, GxwWin under, Keyval_hash ctorArgs) {
GfuiWin rv = new GfuiWin();
rv.ctor_kit_GfuiElemBase(kit, key, under, ctorArgs);
return rv;

6
150_gfui/src_400_win/gplx/gfui/GfuiWin_toaster.java
View File

@@ -125,9 +125,9 @@ public class GfuiWin_toaster extends GfuiWin { public void ShowPopup(GfuiWin own
this.Pos_(this.X(), PopupAnchorTop); //this.Top - increment
this.Size_(SizeAdp_.new_(this.Width(), this.Height() + increment));
}
@Override public GxwElem UnderElem_make(KeyValHash ctorArgs) {return GxwElemFactory_.Instance.win_toaster_(ctorArgs);}
@Override public GxwElem UnderElem_make(Keyval_hash ctorArgs) {return GxwElemFactory_.Instance.win_toaster_(ctorArgs);}
@Override public void ctor_GfuiBox_base(KeyValHash ctorArgs) {
@Override public void ctor_GfuiBox_base(Keyval_hash ctorArgs) {
super.ctor_GfuiBox_base(ctorArgs);
this.fullyGrown = SizeAdp_.new_(600, 96);
this.Pos_(-100, -100); this.Size_(fullyGrown); super.Show(); super.Hide();// was 20,20; set to fullyGrown b/c of java
@@ -161,7 +161,7 @@ public class GfuiWin_toaster extends GfuiWin { public void ShowPopup(GfuiWin own
GfuiWin_toaster rv = new GfuiWin_toaster();
// rv.Icon_(IconAdp.cfg_("popup"));
rv.ctor_GfuiBox_base
(KeyValHash.new_()
(new Keyval_hash()
.Add(GfuiElem_.InitKey_focusAble, false)
.Add(GfuiElem_.InitKey_ownerWin, owner)
.Add(GfuiWin_.InitKey_winType, GfuiWin_.InitKey_winType_toaster)