From 5c2fa92060e34a3269db1506beb718b5882cffca Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Wed, 16 Apr 2025 15:58:19 +0900 Subject: [PATCH] Hurry! --- src/gd_con.erl | 16 ++++++++++------ src/gd_gui.erl | 4 ++-- src/gd_v_devman.erl | 44 ++++++++++++++++++++++---------------------- 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/gd_con.erl b/src/gd_con.erl index 57ade09..6366d3f 100644 --- a/src/gd_con.erl +++ b/src/gd_con.erl @@ -486,11 +486,15 @@ code_change(_, State, _) -> {ok, State}. -terminate(normal, _) -> - zx:stop(); -terminate(Reason, State) -> - ok = log(info, "Reason: ~tp, State: ~tp", [Reason, State]), - zx:stop(). +terminate(Reason, _) -> + ok = log(info, "Reason: ~p,", [Reason]), + case whereis(gmc_con) of + undefined -> + zx:stop(); + PID -> + ok = log(info, "gd_con found at: ~p", [PID]), + application:stop(gajumine) + end. @@ -882,7 +886,7 @@ do_recover_key(Mnemonic, State) -> do_recover_key2(Seed, State = #s{wallet = Current, wallets = Wallets, pass = Pass}) -> #wallet{name = WalletName, keys = Keys, poas = POAs} = Current, - Recovered = #key{id = ID, name = AccName} = hz_key_master:make_key("", Seed), + Recovered = #key{id = ID, name = AccName} = hz_key_master:make_key(Seed), case lists:keymember(ID, #key.id, Keys) of false -> NewKeys = [Recovered | Keys], diff --git a/src/gd_gui.erl b/src/gd_gui.erl index 10d1261..c267d36 100644 --- a/src/gd_gui.erl +++ b/src/gd_gui.erl @@ -32,7 +32,7 @@ {wx = none :: none | wx:wx_object(), frame = none :: none | wx:wx_object(), sizer = none :: none | wx:wx_object(), - lang = en :: en | jp, + lang = en_US :: en_US | ja_JP, j = none :: none | fun(), prefs = #{} :: #{atom() := term()}, accounts = [] :: [gajudesk:poa()], @@ -84,7 +84,7 @@ start_link(Accounts) -> init(Prefs) -> ok = log(info, "GUI starting..."), - Lang = maps:get(lang, Prefs, en_us), + Lang = maps:get(lang, Prefs, en_US), Trans = gd_jt:read_translations(?MODULE), J = gd_jt:j(Lang, Trans), diff --git a/src/gd_v_devman.erl b/src/gd_v_devman.erl index 1a0f110..da81c73 100644 --- a/src/gd_v_devman.erl +++ b/src/gd_v_devman.erl @@ -1198,22 +1198,22 @@ make_arg_fields(ScrollWin, GridSz, Args, NS, J) -> % tell(info, "~p Arg: ~p, Type: ~p", [?LINE, AN, T]), ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN), TCT = wxTextCtrl:new(ScrollWin, ?wxID_ANY), - _ = wxFlexGridSizer:add(GridSz, ANT, fill()), - _ = wxFlexGridSizer:add(GridSz, TCT, fill()), + _ = wxFlexGridSizer:add(GridSz, ANT, fill()), + _ = wxFlexGridSizer:add(GridSz, TCT, fill()), {T, TCT}; ({T, already_normalized, T}) -> % tell(info, "~p Type: ~p", [?LINE, T]), ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, atom_to_list(T)), TCT = wxTextCtrl:new(ScrollWin, ?wxID_ANY), - _ = wxFlexGridSizer:add(GridSz, ANT, fill()), - _ = wxFlexGridSizer:add(GridSz, TCT, fill()), + _ = wxFlexGridSizer:add(GridSz, ANT, fill()), + _ = wxFlexGridSizer:add(GridSz, TCT, fill()), {T, TCT}; ({AN, {_TypeName, T, T}}) -> % tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, T]), ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN), TCT = wxTextCtrl:new(ScrollWin, ?wxID_ANY), - _ = wxFlexGridSizer:add(GridSz, ANT, fill()), - _ = wxFlexGridSizer:add(GridSz, TCT, fill()), + _ = wxFlexGridSizer:add(GridSz, ANT, fill()), + _ = wxFlexGridSizer:add(GridSz, TCT, fill()), {T, TCT}; ({AN, {_TypeName, already_normalized, {record, InnerArgs}}}) -> % tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, InnerArgs]), @@ -1222,8 +1222,8 @@ make_arg_fields(ScrollWin, GridSz, Args, NS, J) -> ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL), ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1), AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J), - _ = wxFlexGridSizer:add(GridSz, ANT, fill()), - _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()), + _ = wxFlexGridSizer:add(GridSz, ANT, fill()), + _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()), {record, AFs}; ({AN, {_TypeName, already_normalized, {tuple, InnerArgs}}}) -> % tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, InnerArgs]), @@ -1232,8 +1232,8 @@ make_arg_fields(ScrollWin, GridSz, Args, NS, J) -> ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL), ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1), AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J), - _ = wxFlexGridSizer:add(GridSz, ANT, fill()), - _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()), + _ = wxFlexGridSizer:add(GridSz, ANT, fill()), + _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()), {tuple, AFs}; ({AN, {_TypeName, already_normalized, {list, InnerArgs}}}) -> % tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, InnerArgs]), @@ -1247,8 +1247,8 @@ make_arg_fields(ScrollWin, GridSz, Args, NS, J) -> AB = #w{name = {AN, add}, id = wxButton:getId(B), wx = B}, _ = wxBoxSizer:add(ArgSz, InnerSz, fill()), _ = wxBoxSizer:add(ArgSz, B, fill()), - _ = wxFlexGridSizer:add(GridSz, ANT, fill()), - _ = wxFlexGridSizer:add(GridSz, ArgSz, fill()), + _ = wxFlexGridSizer:add(GridSz, ANT, fill()), + _ = wxFlexGridSizer:add(GridSz, ArgSz, fill()), {list, AFs, AB}; ({AN, {_TypeName, already_normalized, T}}) -> % tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, T]), @@ -1257,8 +1257,8 @@ make_arg_fields(ScrollWin, GridSz, Args, NS, J) -> ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL), ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1), AFs = make_arg_fields(ScrollWin, InnerSz, T, NS, J), - _ = wxFlexGridSizer:add(GridSz, ANT, fill()), - _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()), + _ = wxFlexGridSizer:add(GridSz, ANT, fill()), + _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()), {tuple, AFs}; ({AN, {{tuple, _}, already_normalized, {tuple, InnerArgs}}}) -> % tell(info, "~p Arg: ~p, Tuple: ~p", [?LINE, AN, InnerArgs]), @@ -1267,8 +1267,8 @@ make_arg_fields(ScrollWin, GridSz, Args, NS, J) -> ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL), ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1), AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J), - _ = wxFlexGridSizer:add(GridSz, ANT, fill()), - _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()), + _ = wxFlexGridSizer:add(GridSz, ANT, fill()), + _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()), {tuple, AFs}; ({AN, {{list, _}, already_normalized, {list, InnerArgs}}}) -> % tell(info, "~p Arg: ~p, List: ~p", [?LINE, AN, InnerArgs]), @@ -1282,8 +1282,8 @@ make_arg_fields(ScrollWin, GridSz, Args, NS, J) -> AB = #w{name = {AN, add}, id = wxButton:getId(B), wx = B}, _ = wxBoxSizer:add(ArgSz, InnerSz, fill()), _ = wxBoxSizer:add(ArgSz, B, fill()), - _ = wxFlexGridSizer:add(GridSz, ANT, fill()), - _ = wxFlexGridSizer:add(GridSz, ArgSz, fill()), + _ = wxFlexGridSizer:add(GridSz, ANT, fill()), + _ = wxFlexGridSizer:add(GridSz, ArgSz, fill()), {list, AFs, AB}; ({{tuple, _}, already_normalized, {tuple, InnerArgs}}) -> % tell(info, "~p Tuple: ~p", [?LINE, InnerArgs]), @@ -1292,8 +1292,8 @@ make_arg_fields(ScrollWin, GridSz, Args, NS, J) -> ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL), ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1), AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J), - _ = wxFlexGridSizer:add(GridSz, ANT, fill()), - _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()), + _ = wxFlexGridSizer:add(GridSz, ANT, fill()), + _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()), {tuple, AFs}; ({{list, _}, already_normalized, {list, InnerArgs}}) -> % tell(info, "~p List: ~p", [?LINE, InnerArgs]), @@ -1307,8 +1307,8 @@ make_arg_fields(ScrollWin, GridSz, Args, NS, J) -> AB = #w{name = {list, add}, id = wxButton:getId(B), wx = B}, _ = wxBoxSizer:add(ArgSz, InnerSz, [{proportion, 1}, {flag, ?wxEXPAND}]), _ = wxBoxSizer:add(ArgSz, B, fill()), - _ = wxFlexGridSizer:add(GridSz, ANT, fill()), - _ = wxFlexGridSizer:add(GridSz, ArgSz, fill()), + _ = wxFlexGridSizer:add(GridSz, ANT, fill()), + _ = wxFlexGridSizer:add(GridSz, ArgSz, fill()), {list, AFs, AB} end, lists:map(MakeArgField, Args).