mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
v2.5.4.1
This commit is contained in:
@@ -88,10 +88,10 @@ class GfoConsoleWinCmds implements GfoInvkAble {
|
||||
GfuiWin win; GfuiTextBox consoleFilBox, consoleBox, statusBox, resultBox;
|
||||
public void Owner_set(GfuiElem elem) {win = (GfuiWin)elem;}
|
||||
public void Init() {
|
||||
consoleFilBox = (GfuiTextBox)win.SubElems().Fetch("consoleFilBox");
|
||||
consoleBox = (GfuiTextBox)win.SubElems().Fetch("consoleBox");
|
||||
resultBox = (GfuiTextBox)win.SubElems().Fetch("resultBox");
|
||||
statusBox = (GfuiTextBox)win.SubElems().Fetch("statusBox");
|
||||
consoleFilBox = (GfuiTextBox)win.SubElems().Get_by("consoleFilBox");
|
||||
consoleBox = (GfuiTextBox)win.SubElems().Get_by("consoleBox");
|
||||
resultBox = (GfuiTextBox)win.SubElems().Get_by("resultBox");
|
||||
statusBox = (GfuiTextBox)win.SubElems().Get_by("statusBox");
|
||||
GfsCore._.AddObj(this, "gfoConsoleWin");
|
||||
GfsCore._.ExecRegy("gplx.gfui.GfoConsoleWin.ini");
|
||||
}
|
||||
@@ -129,7 +129,7 @@ class GfoConsoleWinCmds implements GfoInvkAble {
|
||||
}
|
||||
void Save() {
|
||||
String consoleFilStr = consoleFilBox.Text();
|
||||
Io_url url = Io_url_.Null;
|
||||
Io_url url = Io_url_.Empty;
|
||||
if (String_.Len_eq_0(consoleFilStr)) {
|
||||
url = GfuiIoDialogUtl.SelectFile();
|
||||
consoleFilBox.Text_(url.Raw());
|
||||
@@ -137,19 +137,19 @@ class GfoConsoleWinCmds implements GfoInvkAble {
|
||||
}
|
||||
else
|
||||
url = Io_url_.new_any_(consoleFilStr);
|
||||
Io_mgr._.SaveFilStr(url, consoleBox.Text());
|
||||
Io_mgr.I.SaveFilStr(url, consoleBox.Text());
|
||||
}
|
||||
void Load() {
|
||||
String consoleFilStr = consoleFilBox.Text();
|
||||
Io_url dir = Io_url_.Null;
|
||||
Io_url dir = Io_url_.Empty;
|
||||
if (String_.Len_eq_0(consoleFilStr))
|
||||
dir = Io_url_.Null;
|
||||
dir = Io_url_.Empty;
|
||||
else {
|
||||
dir = Io_url_.new_any_(consoleFilStr);
|
||||
dir = dir.OwnerDir();
|
||||
}
|
||||
Io_url url = GfuiIoDialogUtl.SelectFile(dir); if (url == Io_url_.Null) return;
|
||||
consoleBox.Text_(Io_mgr._.LoadFilStr(url));
|
||||
Io_url url = GfuiIoDialogUtl.SelectFile(dir); if (url == Io_url_.Empty) return;
|
||||
consoleBox.Text_(Io_mgr.I.LoadFilStr(url));
|
||||
}
|
||||
String FixNewLines(String cmd) {
|
||||
cmd = String_.Replace(cmd, "\n", "\r\n");
|
||||
@@ -193,7 +193,7 @@ class GfoConsoleWinCmds implements GfoInvkAble {
|
||||
Io_url v = m.ReadIoUrl("v");
|
||||
if (ctx.Deny()) return this;
|
||||
consoleFilBox.Text_(v.Xto_api());
|
||||
consoleBox.Text_(Io_mgr._.LoadFilStr(v));
|
||||
consoleBox.Text_(Io_mgr.I.LoadFilStr(v));
|
||||
}
|
||||
else return win.Invk(ctx, ikey, k, m);
|
||||
return this;
|
||||
|
||||
@@ -21,13 +21,13 @@ class GfuiFocusOrderer {
|
||||
public static void OrderByX(GfuiElem owner) {Order(owner, xcomparer, 0);}
|
||||
public static void OrderByY(GfuiElem owner) {Order(owner, ycomparer, 0);}
|
||||
static int Order(GfuiElem owner, ComparerAble comparer, int order) {
|
||||
ListAdp list = ListAdp_.new_();
|
||||
List_adp list = List_adp_.new_();
|
||||
for (int i = 0; i < owner.SubElems().Count(); i++) {
|
||||
GfuiElem sub = (GfuiElem)owner.SubElems().FetchAt(i);
|
||||
GfuiElem sub = (GfuiElem)owner.SubElems().Get_at(i);
|
||||
if (sub.Focus_idx() != NullVal) continue;
|
||||
list.Add(sub);
|
||||
}
|
||||
list.SortBy(comparer);
|
||||
list.Sort_by(comparer);
|
||||
|
||||
for (Object subObj : list) {
|
||||
GfuiElem sub = (GfuiElem)subObj;
|
||||
|
||||
@@ -23,21 +23,21 @@ class GfuiFocusXferBnd implements InjectAble, GfoInvkAble {
|
||||
IptBnd_.cmd_to_(IptCfg_.Null, elem, this, Invk_FocusPrev, IptKey_.Up);
|
||||
}
|
||||
@gplx.Internal protected void Focus(GfuiElem cur, boolean fwd) {
|
||||
ListAdp allElemsInOwnerWin = ListAdp_.new_(); AddSubs(cur.OwnerWin(), allElemsInOwnerWin);
|
||||
int curIdx = allElemsInOwnerWin.IndexOf(cur);
|
||||
List_adp allElemsInOwnerWin = List_adp_.new_(); AddSubs(cur.OwnerWin(), allElemsInOwnerWin);
|
||||
int curIdx = allElemsInOwnerWin.Idx_of(cur);
|
||||
GfuiElem target = cur;
|
||||
while (true) { // find next visible elem
|
||||
int cycle = TabBox_.Cycle(fwd, curIdx, allElemsInOwnerWin.Count());
|
||||
target = GfuiElem_.cast_(allElemsInOwnerWin.FetchAt(cycle));
|
||||
target = GfuiElem_.cast_(allElemsInOwnerWin.Get_at(cycle));
|
||||
if (target.Visible()) break;
|
||||
if (cycle == curIdx) break; // either (a) one elem in allElemsInOwnerWin or (b) n elems, and cycled back to start; break, else infinite loop
|
||||
curIdx = cycle;
|
||||
}
|
||||
target.Focus();
|
||||
}
|
||||
void AddSubs(GfuiElem owner, ListAdp allElemsInOwnerWin) {
|
||||
void AddSubs(GfuiElem owner, List_adp allElemsInOwnerWin) {
|
||||
for (int i = 0; i < owner.SubElems().Count(); i++) {
|
||||
GfuiElemBase sub = (GfuiElemBase)owner.SubElems().FetchAt(i);
|
||||
GfuiElemBase sub = (GfuiElemBase)owner.SubElems().Get_at(i);
|
||||
if (sub.Click_able()) allElemsInOwnerWin.Add(sub);
|
||||
AddSubs(sub, allElemsInOwnerWin);
|
||||
}
|
||||
|
||||
@@ -133,7 +133,7 @@ public class GfuiMenuBar implements GfoInvkAble {
|
||||
IptBnd_.cmd_to_(GfuiEnv_.IptBndMgr_win, win, this, Invk_visible_toggle, IptKey_.add_(IptKey_.Ctrl, IptKey_.Shift, IptKey_.F12));
|
||||
win.SubItms_add(SubItms_key, this);
|
||||
}
|
||||
HashAdp itms = HashAdp_.new_(); GfuiWin win;
|
||||
Hash_adp itms = Hash_adp_.new_(); GfuiWin win;
|
||||
public static final String SubItms_key = "menuBar";
|
||||
public static GfuiMenuBar new_(GfuiWin win) {
|
||||
GfuiMenuBar rv = new GfuiMenuBar();
|
||||
@@ -242,10 +242,10 @@ class GfuiMenuBarItmType {
|
||||
public String Name() {return name;} private String name;
|
||||
GfuiMenuBarItmType(int v, String n) {val = v; name = n; regy.Add(n, this);}
|
||||
public static GfuiMenuBarItmType parse_(String raw) {
|
||||
try {return (GfuiMenuBarItmType)regy.Fetch(raw);}
|
||||
try {return (GfuiMenuBarItmType)regy.Get_by(raw);}
|
||||
catch (Exception e) {Err_.Noop(e); throw Err_.parse_("GfuiMenuBarItmType", raw);}
|
||||
}
|
||||
static HashAdp regy = HashAdp_.new_();
|
||||
static Hash_adp regy = Hash_adp_.new_();
|
||||
public static final GfuiMenuBarItmType Root = new GfuiMenuBarItmType(1, "root");
|
||||
public static final GfuiMenuBarItmType Top = new GfuiMenuBarItmType(2, "top");
|
||||
public static final GfuiMenuBarItmType Mnu = new GfuiMenuBarItmType(3, "mnu");
|
||||
|
||||
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
package gplx.gfui; import gplx.*;
|
||||
import java.awt.Window;
|
||||
public class GfuiWin extends GfuiElemBase {
|
||||
private GxwWin win; private ListAdp loadList = ListAdp_.new_();
|
||||
private GxwWin win; private List_adp loadList = List_adp_.new_();
|
||||
public void Show() {win.ShowWin();}
|
||||
public void Hide() {win.HideWin();}
|
||||
public void Close() {win.CloseWin();}
|
||||
|
||||
@@ -20,7 +20,7 @@ import java.awt.Component;
|
||||
import java.awt.Container;
|
||||
import java.awt.FocusTraversalPolicy;
|
||||
public class GfuiWinFocusMgr {
|
||||
public ListAdp SubElems() {return subElems;} ListAdp subElems = ListAdp_.new_();
|
||||
public List_adp SubElems() {return subElems;} List_adp subElems = List_adp_.new_();
|
||||
public void InitForm() {this.Init(win);}
|
||||
public void Init(GfuiWin win) {
|
||||
subElems.Clear();
|
||||
@@ -28,7 +28,7 @@ public class GfuiWinFocusMgr {
|
||||
}
|
||||
int InitRecursive(GfuiElem owner, int focusIdx) {
|
||||
for (int i = 0; i < owner.SubElems().Count(); i++) {
|
||||
GfuiElem sub = (GfuiElem)owner.SubElems().FetchAt(i);
|
||||
GfuiElem sub = (GfuiElem)owner.SubElems().Get_at(i);
|
||||
if (sub.Focus_able()) {
|
||||
sub.Focus_idx_(focusIdx++);
|
||||
subElems.Add(sub);
|
||||
@@ -39,9 +39,9 @@ public class GfuiWinFocusMgr {
|
||||
}
|
||||
public GfuiElem Focus(boolean fwd, int cur) {
|
||||
int nxt = fwd
|
||||
? cur == subElems.LastIndex() ? 0 : ++cur
|
||||
: cur == 0 ? subElems.LastIndex() : --cur;
|
||||
GfuiElem elm = (GfuiElem)subElems.FetchAt(nxt);
|
||||
? cur == subElems.Idx_last() ? 0 : ++cur
|
||||
: cur == 0 ? subElems.Idx_last() : --cur;
|
||||
GfuiElem elm = (GfuiElem)subElems.Get_at(nxt);
|
||||
elm.Focus();
|
||||
return elm;
|
||||
}
|
||||
@@ -53,7 +53,7 @@ public class GfuiWinFocusMgr {
|
||||
} GfuiWinFocusMgr() {}
|
||||
}
|
||||
class FocusTraversalPolicy_cls_base extends FocusTraversalPolicy {
|
||||
ListAdp elems; GfuiWinFocusMgr formFocusMgr;
|
||||
List_adp elems; GfuiWinFocusMgr formFocusMgr;
|
||||
public FocusTraversalPolicy_cls_base(GfuiWinFocusMgr formFocusMgr) {
|
||||
this.elems = formFocusMgr.subElems;
|
||||
this.formFocusMgr = formFocusMgr;
|
||||
@@ -70,7 +70,7 @@ class FocusTraversalPolicy_cls_base extends FocusTraversalPolicy {
|
||||
if (idx == elems.Count())
|
||||
idx = 0;
|
||||
GfuiElem elem = null;
|
||||
try {elem = (GfuiElem)elems.FetchAt(idx);}
|
||||
try {elem = (GfuiElem)elems.Get_at(idx);}
|
||||
catch (Exception e) {
|
||||
System.out.println(idx);
|
||||
Err_.Noop(e);
|
||||
@@ -97,10 +97,10 @@ class FocusTraversalPolicy_cls_base extends FocusTraversalPolicy {
|
||||
while (true) {
|
||||
idx--;
|
||||
if (idx == -1)
|
||||
idx = elems.Count() - ListAdp_.Base1;
|
||||
idx = elems.Count() - List_adp_.Base1;
|
||||
GfuiElem elem = null;
|
||||
try {
|
||||
elem = (GfuiElem)elems.FetchAt(idx);
|
||||
elem = (GfuiElem)elems.Get_at(idx);
|
||||
// System.out.println(elem.Key_of_GfuiElem() + " " + elem.Focus_able() + " " + elem.Visible());
|
||||
if (elem.getClass().getName().equals("gplx.gfds.gbu.GbuGrid") && elem.Key_of_GfuiElem().equals("grid0")) {
|
||||
System.out.println(elem.Key_of_GfuiElem() + " " + elem.Focus_able() + " " + elem.Visible());
|
||||
@@ -127,7 +127,7 @@ class FocusTraversalPolicy_cls_base extends FocusTraversalPolicy {
|
||||
public Component getDefaultComponent(Container focusCycleRoot) {return getFirstComponent(focusCycleRoot);}
|
||||
public Component getFirstComponent(Container focusCycleRoot) {return elems_empty() ? focusCycleRoot : (Component)FetchAt(0).UnderElem();}
|
||||
public Component getLastComponent(Container focusCycleRoot) {return elems_empty() ? focusCycleRoot : (Component)FetchAt(elems.Count() - 1).UnderElem();}
|
||||
GfuiElem FetchAt(int idx) {return (GfuiElem)elems.FetchAt(idx);}
|
||||
GfuiElem FetchAt(int idx) {return (GfuiElem)elems.Get_at(idx);}
|
||||
GxwElem GxwElemOf(Component c) {
|
||||
if (GxwElem.class.isAssignableFrom(c.getClass())) return (GxwElem)c;
|
||||
return (GxwElem)c.getParent(); // HACK: occurs for JComboBox when editable is true; focus is on MetalComboBox, with parent of JComboBox
|
||||
|
||||
@@ -16,9 +16,9 @@ You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package gplx.gfui; import gplx.*;
|
||||
import gplx.lists.*; /*HashAdp_list*/
|
||||
import gplx.lists.*; /*Hash_adp_list*/
|
||||
class GfuiWinKeyCmdMgr implements GfuiWinOpenAble, GfoInvkAble, GfoEvObj {
|
||||
private HashAdp_list listHash = HashAdp_list.new_();
|
||||
private Hash_adp_list listHash = Hash_adp_list.new_();
|
||||
public GfoEvMgr EvMgr() {if (evMgr == null) evMgr = GfoEvMgr.new_(this); return evMgr;} private GfoEvMgr evMgr;
|
||||
public void Open_exec(GfuiWin form, GfuiElemBase owner, GfuiElemBase sub) {
|
||||
int keyVal = sub.Click_key().Val(); if (sub.Click_key().Eq(IptKey_.None)) return;
|
||||
@@ -32,9 +32,9 @@ class GfuiWinKeyCmdMgr implements GfuiWinOpenAble, GfoInvkAble, GfoEvObj {
|
||||
if (GfuiTextBox_.as_(sender) != null // is sender textBox?
|
||||
&& !Enm_.HasInt(keyVal, IptKey_.Alt.Val()) // does key not have alt
|
||||
) return false; // ignore keys from textbox if they do not have alt
|
||||
ListAdp elemList = (ListAdp)listHash.Fetch(keyVal); if (elemList == null) return false;
|
||||
List_adp elemList = (List_adp)listHash.Get_by(keyVal); if (elemList == null) return false;
|
||||
for (int i = 0; i < elemList.Count(); i++) {
|
||||
GfuiElem elem = (GfuiElem)elemList.FetchAt(i);
|
||||
GfuiElem elem = (GfuiElem)elemList.Get_at(i);
|
||||
if (elem.Visible())
|
||||
elem.Click();
|
||||
}
|
||||
|
||||
@@ -48,9 +48,9 @@ public class GfuiWin_ {
|
||||
}
|
||||
}
|
||||
class GfuiWinUtl {
|
||||
@gplx.Internal protected static void Open_exec(GfuiWin win, ListAdp loadList, GfuiElemBase owner) {
|
||||
@gplx.Internal protected static void Open_exec(GfuiWin win, List_adp loadList, GfuiElemBase owner) {
|
||||
for (int i = 0; i < owner.SubElems().Count(); i++) {
|
||||
GfuiElemBase sub = (GfuiElemBase)owner.SubElems().FetchAt(i);
|
||||
GfuiElemBase sub = (GfuiElemBase)owner.SubElems().Get_at(i);
|
||||
sub.OwnerWin_(win);
|
||||
for (Object itmObj : loadList) {
|
||||
GfuiWinOpenAble itm = (GfuiWinOpenAble)itmObj;
|
||||
@@ -61,7 +61,7 @@ class GfuiWinUtl {
|
||||
}
|
||||
@gplx.Internal protected static void SubElems_dispose(GfuiElem owner) {
|
||||
for (int i = 0; i < owner.SubElems().Count(); i++) {
|
||||
GfuiElem sub = (GfuiElem)owner.SubElems().FetchAt(i);
|
||||
GfuiElem sub = (GfuiElem)owner.SubElems().Get_at(i);
|
||||
sub.Dispose();
|
||||
SubElems_dispose(sub);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user