WIP
- Layout works, but is goofy (expansion directions are not managed well in nested input fields) - "Add" button doesn't do anything yet - Input types need more specific widgets - No input typechecking is done yet (not with any meaningful output to the user)
This commit is contained in:
parent
2f43d50dcb
commit
dc4b05c938
@ -595,32 +595,37 @@ deploy2(State, Source) ->
|
||||
% Options = sophia_options(),
|
||||
% case so_compiler:from_string(Source, Options) of
|
||||
{ok, Build} ->
|
||||
deploy3(State, Build);
|
||||
{ACI, Neutered} = maps:take(aci, Build),
|
||||
RawAACI = {aaci, ContractName, Funs, NS} = hz:prepare_aaci(ACI),
|
||||
{InitSpec, Callable} = maps:take("init", Funs),
|
||||
AACI = setelement(3, RawAACI, Callable),
|
||||
Complete = maps:put(aaci, AACI, Neutered),
|
||||
ok = tell(info, "Deploying Contract: ~p", [ContractName]),
|
||||
deploy3(State, InitSpec, Complete, NS);
|
||||
Other ->
|
||||
ok = tell(info, "Compilation Failed!~n~tp", [Other]),
|
||||
State
|
||||
end.
|
||||
|
||||
deploy3(State, Build) ->
|
||||
deploy3(State, InitSpec, Build, NS) ->
|
||||
case gd_con:list_keys() of
|
||||
{ok, 0, []} ->
|
||||
handle_troubling(State, "No keys exist in the current wallet.");
|
||||
{ok, Selected, Keys} ->
|
||||
deploy4(State, Build, Selected, Keys);
|
||||
deploy4(State, InitSpec, Build, NS, Selected, Keys);
|
||||
error ->
|
||||
handle_troubling(State, "No wallet is selected!")
|
||||
end.
|
||||
|
||||
deploy4(State = #s{frame = Frame, j = J}, Build = #{aci := ACI}, Selected, Keys) ->
|
||||
{#{functions := Funs}, _} = find_main(ACI),
|
||||
#{arguments := As} = lom:find(name, <<"init">>, Funs),
|
||||
deploy4(State = #s{frame = Frame, j = J}, InitSpec, Build, NS, Selected, Keys) ->
|
||||
InitArgs = element(1, InitSpec),
|
||||
Dialog = wxDialog:new(Frame, ?wxID_ANY, J("Deploy Contract")),
|
||||
Sizer = wxBoxSizer:new(?wxVERTICAL),
|
||||
ScrollWin = wxScrolledWindow:new(Dialog),
|
||||
ScrollSz = wxBoxSizer:new(?wxVERTICAL),
|
||||
ok = wxScrolledWindow:setSizerAndFit(ScrollWin, ScrollSz),
|
||||
ok = wxScrolledWindow:setScrollRate(ScrollWin, 5, 5),
|
||||
FunName = unicode:characters_to_list(["init/", integer_to_list(length(As))]),
|
||||
FunName = unicode:characters_to_list(["init/", integer_to_list(length(InitArgs))]),
|
||||
FunSz = wxStaticBoxSizer:new(?wxVERTICAL, ScrollWin, [{label, FunName}]),
|
||||
KeySz = wxStaticBoxSizer:new(?wxVERTICAL, ScrollWin, [{label, J("Signature Key")}]),
|
||||
KeyPicker = wxChoice:new(ScrollWin, ?wxID_ANY, [{choices, Keys}]),
|
||||
@ -635,24 +640,7 @@ deploy4(State = #s{frame = Frame, j = J}, Build = #{aci := ACI}, Selected, Keys)
|
||||
GridSz = wxFlexGridSizer:new(2, 4, 4),
|
||||
ok = wxFlexGridSizer:setFlexibleDirection(GridSz, ?wxHORIZONTAL),
|
||||
ok = wxFlexGridSizer:addGrowableCol(GridSz, 1),
|
||||
MakeArgField =
|
||||
fun(#{name := AN, type := T}) ->
|
||||
Type =
|
||||
case T of
|
||||
<<"address">> -> address;
|
||||
<<"int">> -> integer;
|
||||
<<"bool">> -> boolean;
|
||||
L when is_list(L) -> list; % FIXME
|
||||
% I when is_binary(I) -> iface % FIXME
|
||||
I when is_binary(I) -> address % FIXME
|
||||
end,
|
||||
ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
|
||||
TCT = wxTextCtrl:new(ScrollWin, ?wxID_ANY),
|
||||
_ = wxFlexGridSizer:add(GridSz, ANT, zxw:flags(base)),
|
||||
_ = wxFlexGridSizer:add(GridSz, TCT, zxw:flags(wide)),
|
||||
{ANT, TCT, Type}
|
||||
end,
|
||||
ArgFields = lists:map(MakeArgField, As),
|
||||
ArgFields = make_arg_fields(ScrollWin, GridSz, InitArgs, NS, J),
|
||||
_ = wxStaticBoxSizer:add(FunSz, GridSz, zxw:flags(wide)),
|
||||
_ = wxStaticBoxSizer:add(ScrollSz, FunSz, [{proportion, 1}, {flag, ?wxEXPAND}]),
|
||||
_ = wxStaticBoxSizer:add(ScrollSz, KeySz, [{proportion, 0}, {flag, ?wxEXPAND}]),
|
||||
@ -844,9 +832,9 @@ open_hash3(State, Address, Source) ->
|
||||
% TODO: Compile on load and verify the deployed hash for validity.
|
||||
Options = sophia_options(),
|
||||
case so_compiler:from_string(Source, Options) of
|
||||
{ok, Build = #{aci := ACI}} ->
|
||||
{Defs = #{functions := Funs}, ConIfaces} = find_main(ACI),
|
||||
Callable = lom:delete(name, <<"init">>, Funs),
|
||||
{ok, Build = #{aaci := AACI}} ->
|
||||
{Defs = #{functions := Funs}, ConIfaces} = find_main(AACI),
|
||||
Callable = maps:remove("init", Funs),
|
||||
FunDefs = {maps:put(functions, Callable, Defs), ConIfaces},
|
||||
ok = tell(info, "Compilation Succeeded!~n~tp~n~n~tp", [Build, FunDefs]),
|
||||
add_code_page(State, {hash, Address}, Source);
|
||||
@ -1100,12 +1088,16 @@ load3(State = #s{tabs = TopBook, cons = {Consbook, Pages}, buttons = Buttons, j
|
||||
_ = wxSizer:add(PageSz, ConsSz, [{proportion, 1}, {flag, ?wxEXPAND}]),
|
||||
{Out, IFaces, Build, NewButtons} =
|
||||
case compile(Source) of
|
||||
{ok, B = #{aci := ACI}} ->
|
||||
{#{functions := Fs}, _} = find_main(ACI),
|
||||
Callable = lom:delete(name, <<"init">>, Fs),
|
||||
{NB, IFs} = fun_interfaces(ScrollWin, FunSz, Buttons, Callable, J),
|
||||
O = io_lib:format("Compilation Succeeded!~n~tp~n~nDone!~n", [B]),
|
||||
{O, IFs, B, NB};
|
||||
{ok, Output} ->
|
||||
{ACI, Neutered} = maps:take(aci, Output),
|
||||
AACI = {aaci, ContractName, Funs, NS} = hz:prepare_aaci(ACI),
|
||||
Complete = maps:put(aaci, AACI, Neutered),
|
||||
ok = tell(info, "Loading Contract: ~p", [ContractName]),
|
||||
Callable = maps:remove("init", Funs),
|
||||
tell(info, "Callable: ~p", [Callable]),
|
||||
{NB, IFs} = fun_interfaces(ScrollWin, FunSz, Buttons, Callable, NS, J),
|
||||
O = io_lib:format("Compilation Succeeded!~n~tp~n~nDone!~n", [Complete]),
|
||||
{O, IFs, Complete, NB};
|
||||
Other ->
|
||||
O = io_lib:format("Compilation Failed!~n~tp~n", [Other]),
|
||||
{O, [], none, Buttons}
|
||||
@ -1123,9 +1115,18 @@ load3(State = #s{tabs = TopBook, cons = {Consbook, Pages}, buttons = Buttons, j
|
||||
State#s{cons = {Consbook, NewPages}, buttons = NewButtons}.
|
||||
|
||||
|
||||
get_arg({_, TextCtrl, _}) ->
|
||||
get_arg({list, AFs, _}) ->
|
||||
lists:map(fun get_arg/1, AFs);
|
||||
get_arg({record, AFs}) ->
|
||||
get_record(AFs);
|
||||
get_arg({tuple, AFs}) ->
|
||||
list_to_tuple(lists:map(fun get_arg/1, AFs));
|
||||
get_arg({_, TextCtrl}) ->
|
||||
wxTextCtrl:getValue(TextCtrl).
|
||||
|
||||
get_record([{L, A} | T]) ->
|
||||
[{L, get_arg(A)} | get_record(T)].
|
||||
|
||||
find_main(ACI) ->
|
||||
find_main(ACI, none, []).
|
||||
|
||||
@ -1141,60 +1142,166 @@ find_main([C | T], M, Is) ->
|
||||
find_main([], M, Is) ->
|
||||
{M, Is}.
|
||||
|
||||
fun_interfaces(ScrollWin, FunSz, Buttons, Funs, J) ->
|
||||
fun_interfaces(ScrollWin, FunSz, Buttons, Funs, NS, J) ->
|
||||
MakeIface =
|
||||
fun(#{name := N, arguments := As}) ->
|
||||
FunName = unicode:characters_to_list([N, "/", integer_to_list(length(As))]),
|
||||
fun(Name, {Args, _}) ->
|
||||
tell(info, "Fun: ~p, Args: ~p", [Name, Args]),
|
||||
FunName = unicode:characters_to_list([Name, "/", integer_to_list(length(Args))]),
|
||||
FN = wxStaticBoxSizer:new(?wxVERTICAL, ScrollWin, [{label, FunName}]),
|
||||
GridSz = wxFlexGridSizer:new(2, 4, 4),
|
||||
ok = wxFlexGridSizer:setFlexibleDirection(GridSz, ?wxHORIZONTAL),
|
||||
ok = wxFlexGridSizer:addGrowableCol(GridSz, 1),
|
||||
MakeArgField =
|
||||
fun(#{name := AN, type := T}) ->
|
||||
Type =
|
||||
case T of % FIXME
|
||||
<<"address">> -> address;
|
||||
<<"int">> -> integer;
|
||||
<<"bool">> -> boolean;
|
||||
#{<<"list">> := _} -> list;
|
||||
#{<<"tuple">> := _} -> tuple;
|
||||
T when is_binary(T) -> iface
|
||||
end,
|
||||
ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
|
||||
TCT = wxTextCtrl:new(ScrollWin, ?wxID_ANY),
|
||||
_ = wxFlexGridSizer:add(GridSz, ANT, zxw:flags(base)),
|
||||
_ = wxFlexGridSizer:add(GridSz, TCT, zxw:flags(wide)),
|
||||
{ANT, TCT, Type}
|
||||
end,
|
||||
ArgFields = lists:map(MakeArgField, As),
|
||||
ArgFields = make_arg_fields(ScrollWin, GridSz, Args, NS, J),
|
||||
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
|
||||
{CallButton, DryRunButton} =
|
||||
case N =:= <<"init">> of
|
||||
false ->
|
||||
CallBn = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Call")}]),
|
||||
DryRBn = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Dry Run")}]),
|
||||
_ = wxBoxSizer:add(ButtSz, CallBn, zxw:flags(wide)),
|
||||
_ = wxBoxSizer:add(ButtSz, DryRBn, zxw:flags(wide)),
|
||||
{#w{name = {N, call}, id = wxButton:getId(CallBn), wx = CallBn},
|
||||
#w{name = {N, dryr}, id = wxButton:getId(DryRBn), wx = DryRBn}};
|
||||
true ->
|
||||
Deploy = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Deploy")}]),
|
||||
_ = wxBoxSizer:add(ButtSz, Deploy, zxw:flags(wide)),
|
||||
{#w{name = {N, call}, id = wxButton:getId(Deploy), wx = Deploy},
|
||||
none}
|
||||
end,
|
||||
CallBn = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Call")}]),
|
||||
DryRBn = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Dry Run")}]),
|
||||
_ = wxBoxSizer:add(ButtSz, CallBn, zxw:flags(wide)),
|
||||
_ = wxBoxSizer:add(ButtSz, DryRBn, zxw:flags(wide)),
|
||||
CallButton = #w{name = {Name, call}, id = wxButton:getId(CallBn), wx = CallBn},
|
||||
DryRButton = #w{name = {Name, dryr}, id = wxButton:getId(DryRBn), wx = DryRBn},
|
||||
_ = wxStaticBoxSizer:add(FN, GridSz, zxw:flags(wide)),
|
||||
_ = wxStaticBoxSizer:add(FN, ButtSz, zxw:flags(base)),
|
||||
_ = wxSizer:add(FunSz, FN, zxw:flags(base)),
|
||||
#f{name = N, call = CallButton, dryrun = DryRunButton, args = ArgFields}
|
||||
#f{name = Name, call = CallButton, dryrun = DryRButton, args = ArgFields}
|
||||
end,
|
||||
IFaces = lists:map(MakeIface, Funs),
|
||||
NewButtons = lists:foldl(fun map_iface_buttons/2, Buttons, IFaces),
|
||||
IFaces = maps:map(MakeIface, Funs),
|
||||
tell(info, "IFaces: ~p", [IFaces]),
|
||||
NewButtons = maps:fold(fun map_iface_buttons/3, Buttons, IFaces),
|
||||
{NewButtons, IFaces}.
|
||||
|
||||
map_iface_buttons(#f{call = C = #w{id = CID}, dryrun = D = #w{id = DID}}, A) ->
|
||||
maps:put(DID, D, maps:put(CID, C, A));
|
||||
map_iface_buttons(#f{call = C = #w{id = CID}, dryrun = none}, A) ->
|
||||
% FIXME: This can be simplified and needs to provide better widgets for types.
|
||||
% "variant" types should be wxChoice
|
||||
% Booleans should either be wxChoice or check boxes
|
||||
% The sizer expansion direction for vertical elements is stupid
|
||||
make_arg_fields(ScrollWin, GridSz, Args, NS, J) ->
|
||||
MakeArgField =
|
||||
fun
|
||||
({AN, {T, already_normalized, T}}) ->
|
||||
% 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()),
|
||||
{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()),
|
||||
{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()),
|
||||
{T, TCT};
|
||||
({AN, {_TypeName, already_normalized, {record, InnerArgs}}}) ->
|
||||
% tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, InnerArgs]),
|
||||
ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
|
||||
InnerSz = wxFlexGridSizer:new(2, 4, 4),
|
||||
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()),
|
||||
{record, AFs};
|
||||
({AN, {_TypeName, already_normalized, {tuple, InnerArgs}}}) ->
|
||||
% tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, InnerArgs]),
|
||||
ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
|
||||
InnerSz = wxFlexGridSizer:new(2, 4, 4),
|
||||
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()),
|
||||
{tuple, AFs};
|
||||
({AN, {_TypeName, already_normalized, {list, InnerArgs}}}) ->
|
||||
% tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, InnerArgs]),
|
||||
ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
|
||||
ArgSz = wxBoxSizer:new(?wxVERTICAL),
|
||||
InnerSz = wxFlexGridSizer:new(2, 4, 4),
|
||||
ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL),
|
||||
ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1),
|
||||
AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J),
|
||||
B = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Add")}]),
|
||||
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()),
|
||||
{list, AFs, AB};
|
||||
({AN, {_TypeName, already_normalized, T}}) ->
|
||||
% tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, T]),
|
||||
ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
|
||||
InnerSz = wxFlexGridSizer:new(2, 4, 4),
|
||||
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()),
|
||||
{tuple, AFs};
|
||||
({AN, {{tuple, _}, already_normalized, {tuple, InnerArgs}}}) ->
|
||||
% tell(info, "~p Arg: ~p, Tuple: ~p", [?LINE, AN, InnerArgs]),
|
||||
ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
|
||||
InnerSz = wxFlexGridSizer:new(2, 4, 4),
|
||||
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()),
|
||||
{tuple, AFs};
|
||||
({AN, {{list, _}, already_normalized, {list, InnerArgs}}}) ->
|
||||
% tell(info, "~p Arg: ~p, List: ~p", [?LINE, AN, InnerArgs]),
|
||||
ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
|
||||
ArgSz = wxBoxSizer:new(?wxHORIZONTAL),
|
||||
InnerSz = wxFlexGridSizer:new(2, 4, 4),
|
||||
ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL),
|
||||
ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1),
|
||||
AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J),
|
||||
B = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Add")}]),
|
||||
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()),
|
||||
{list, AFs, AB};
|
||||
({{tuple, _}, already_normalized, {tuple, InnerArgs}}) ->
|
||||
% tell(info, "~p Tuple: ~p", [?LINE, InnerArgs]),
|
||||
ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, "tuple"),
|
||||
InnerSz = wxFlexGridSizer:new(2, 4, 4),
|
||||
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()),
|
||||
{tuple, AFs};
|
||||
({{list, _}, already_normalized, {list, InnerArgs}}) ->
|
||||
% tell(info, "~p List: ~p", [?LINE, InnerArgs]),
|
||||
ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, "list"),
|
||||
ArgSz = wxBoxSizer:new(?wxHORIZONTAL),
|
||||
InnerSz = wxFlexGridSizer:new(2, 4, 4),
|
||||
ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL),
|
||||
ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1),
|
||||
AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J),
|
||||
B = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Add")}]),
|
||||
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()),
|
||||
{list, AFs, AB}
|
||||
end,
|
||||
lists:map(MakeArgField, Args).
|
||||
|
||||
fill() ->
|
||||
[{proportion, 0}, {flag, ?wxEXPAND}].
|
||||
|
||||
|
||||
map_iface_buttons(_, #f{call = C = #w{id = CID}, dryrun = D = #w{id = DID}}, A) ->
|
||||
maps:merge(#{CID => C, DID => D}, A);
|
||||
map_iface_buttons(_, #f{call = C = #w{id = CID}, dryrun = none}, A) ->
|
||||
maps:put(CID, C, A).
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user