From 2c9d188761312b79ba0e791f2a2275efbd3ab1b6 Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Thu, 21 May 2026 20:44:01 +0900 Subject: [PATCH] Borders --- src/gd_gui.erl | 154 +++++++++++++++++++++---------------------- src/gd_v_call.erl | 20 +++--- src/gd_v_wallman.erl | 4 +- 3 files changed, 91 insertions(+), 87 deletions(-) diff --git a/src/gd_gui.erl b/src/gd_gui.erl index 713bd22..77b8982 100644 --- a/src/gd_gui.erl +++ b/src/gd_gui.erl @@ -122,8 +122,8 @@ init(Prefs) -> _ = wxSizer:add(BalanceSz, BalanceT, zxw:flags(wide)), NumbersSz = wxBoxSizer:new(?wxVERTICAL), - _ = wxSizer:add(NumbersSz, ID_Sz, zxw:flags(wide)), - _ = wxSizer:add(NumbersSz, BalanceSz, zxw:flags(wide)), + _ = wxSizer:add(NumbersSz, ID_Sz, zxw:flags({wide, 5})), + _ = wxSizer:add(NumbersSz, BalanceSz, zxw:flags({wide, 5})), ButtonTemplates = [{make_key, J("Create")}, @@ -165,26 +165,26 @@ init(Prefs) -> #w{wx = CopyBn} = lists:keyfind(copy, #w.name, Buttons), #w{wx = WWW_Bn} = lists:keyfind(www, #w.name, Buttons), _ = wxSizer:add(DetailsSz, NumbersSz, zxw:flags(wide)), - _ = wxSizer:add(DetailsSz, CopyBn, zxw:flags(base)), - _ = wxSizer:add(DetailsSz, WWW_Bn, zxw:flags(base)), + _ = wxSizer:add(DetailsSz, CopyBn, zxw:flags({base, 5})), + _ = wxSizer:add(DetailsSz, WWW_Bn, zxw:flags({base, 5})), #w{wx = MakeBn} = lists:keyfind(make_key, #w.name, Buttons), #w{wx = RecoBn} = lists:keyfind(recover, #w.name, Buttons), #w{wx = MnemBn} = lists:keyfind(mnemonic, #w.name, Buttons), #w{wx = Rename} = lists:keyfind(rename, #w.name, Buttons), #w{wx = DropBn} = lists:keyfind(drop_key, #w.name, Buttons), - _ = wxSizer:add(AccountSz, MakeBn, zxw:flags(wide)), - _ = wxSizer:add(AccountSz, RecoBn, zxw:flags(wide)), - _ = wxSizer:add(AccountSz, MnemBn, zxw:flags(wide)), - _ = wxSizer:add(AccountSz, Rename, zxw:flags(wide)), - _ = wxSizer:add(AccountSz, DropBn, zxw:flags(wide)), + _ = wxSizer:add(AccountSz, MakeBn, zxw:flags({wide, 5})), + _ = wxSizer:add(AccountSz, RecoBn, zxw:flags({wide, 5})), + _ = wxSizer:add(AccountSz, MnemBn, zxw:flags({wide, 5})), + _ = wxSizer:add(AccountSz, Rename, zxw:flags({wide, 5})), + _ = wxSizer:add(AccountSz, DropBn, zxw:flags({wide, 5})), #w{wx = SendBn} = lists:keyfind(send, #w.name, Buttons), % #w{wx = RecvBn} = lists:keyfind(recv, #w.name, Buttons), #w{wx = GridsBn} = lists:keyfind(grids, #w.name, Buttons), - _ = wxSizer:add(ActionsSz, SendBn, zxw:flags(wide)), -% _ = wxSizer:add(ActionsSz, RecvBn, zxw:flags(wide)), - _ = wxSizer:add(ActionsSz, GridsBn, zxw:flags(wide)), + _ = wxSizer:add(ActionsSz, SendBn, zxw:flags({wide, 5})), +% _ = wxSizer:add(ActionsSz, RecvBn, zxw:flags({wide, 5})), + _ = wxSizer:add(ActionsSz, GridsBn, zxw:flags({wide, 5})), #w{wx = Refresh} = lists:keyfind(refresh, #w.name, Buttons), @@ -193,13 +193,13 @@ init(Prefs) -> % ok = wxScrolledWindow:setSizerAndFit(HistoryWin, HistorySz), % ok = wxScrolledWindow:setScrollRate(HistoryWin, 5, 5), - _ = wxSizer:add(MainSz, ChainSz, zxw:flags(base)), + _ = wxSizer:add(MainSz, ChainSz, zxw:flags({base, 5})), _ = wxSizer:add(MainSz, AccountSz, zxw:flags(base)), - _ = wxSizer:add(MainSz, Picker, zxw:flags(wide)), + _ = wxSizer:add(MainSz, Picker, zxw:flags({wide, 5})), _ = wxSizer:add(MainSz, DetailsSz, zxw:flags(base)), _ = wxSizer:add(MainSz, ActionsSz, zxw:flags(base)), - _ = wxSizer:add(MainSz, Refresh, zxw:flags(base)), -% _ = wxSizer:add(MainSz, HistoryWin, zxw:flags(wide)), + _ = wxSizer:add(MainSz, Refresh, zxw:flags({base, 5})), +% _ = wxSizer:add(MainSz, HistoryWin, zxw:flags({wide, 5})), ok = wxWindow:setSizer(Panel, MainSz), ok = wxFrame:setSizer(Frame, TopSz), ok = wxSizer:layout(MainSz), @@ -407,7 +407,7 @@ set_node(State = #s{frame = Frame, j = J}) -> AddressSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Address")}]), AddressTx = wxTextCtrl:new(Dialog, ?wxID_ANY), - _ = wxSizer:add(AddressSz, AddressTx, zxw:flags(wide)), + _ = wxSizer:add(AddressSz, AddressTx, zxw:flags({wide, 5})), PortSz = wxBoxSizer:new(?wxHORIZONTAL), Labels = @@ -420,8 +420,8 @@ set_node(State = #s{frame = Frame, j = J}) -> fun(L) -> Sz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, L}]), Tx = wxTextCtrl:new(Dialog, ?wxID_ANY), - _ = wxSizer:add(Sz, Tx, zxw:flags(wide)), - _ = wxSizer:add(PortSz, Sz, zxw:flags(wide)), + _ = wxSizer:add(Sz, Tx, zxw:flags({wide, 5})), + _ = wxSizer:add(PortSz, Sz, zxw:flags({wide, 5})), Tx end, PortCtrls = lists:map(MakePortCtrl, Labels), @@ -429,16 +429,16 @@ set_node(State = #s{frame = Frame, j = J}) -> ButtSz = wxBoxSizer:new(?wxHORIZONTAL), Affirm = wxButton:new(Dialog, ?wxID_OK), Cancel = wxButton:new(Dialog, ?wxID_CANCEL), - _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)), - _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)), + _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})), - _ = wxSizer:add(Sizer, AddressSz, zxw:flags(base)), + _ = wxSizer:add(Sizer, AddressSz, zxw:flags({base, 5})), _ = wxSizer:add(Sizer, PortSz, zxw:flags(base)), _ = wxSizer:add(Sizer, ButtSz, zxw:flags(wide)), ok = wxDialog:setSizer(Dialog, Sizer), ok = wxBoxSizer:layout(Sizer), - ok = wxDialog:setSize(Dialog, {500, 200}), + ok = wxDialog:setSize(Dialog, {700, 240}), ok = wxDialog:center(Dialog), ok = wxStyledTextCtrl:setFocus(AddressTx), @@ -512,21 +512,21 @@ make_key(State = #s{frame = Frame, j = J}) -> ButtSz = wxBoxSizer:new(?wxHORIZONTAL), Affirm = wxButton:new(Dialog, ?wxID_OK), Cancel = wxButton:new(Dialog, ?wxID_CANCEL), - _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)), - _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)), + _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})), - _ = wxStaticBoxSizer:add(NameSz, NameTx, zxw:flags(base)), - _ = wxStaticBoxSizer:add(SeedSz, SeedTx, zxw:flags(wide)), - _ = wxStaticBoxSizer:add(OptionsSz, EncodingOptions, zxw:flags(wide)), - _ = wxStaticBoxSizer:add(OptionsSz, TransformOptions, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, NameSz, zxw:flags(base)), - _ = wxBoxSizer:add(Sizer, SeedSz, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, OptionsSz, zxw:flags(base)), + _ = wxStaticBoxSizer:add(NameSz, NameTx, zxw:flags({base, 5})), + _ = wxStaticBoxSizer:add(SeedSz, SeedTx, zxw:flags({wide, 5})), + _ = wxStaticBoxSizer:add(OptionsSz, EncodingOptions, zxw:flags({wide, 5})), + _ = wxStaticBoxSizer:add(OptionsSz, TransformOptions, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, NameSz, zxw:flags({base, 5})), + _ = wxBoxSizer:add(Sizer, SeedSz, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, OptionsSz, zxw:flags({base, 5})), _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)), ok = wxDialog:setSizer(Dialog, Sizer), ok = wxBoxSizer:layout(Sizer), - ok = wxFrame:setSize(Dialog, {400, 300}), + ok = wxFrame:setSize(Dialog, {400, 400}), ok = wxFrame:center(Dialog), ok = wxStyledTextCtrl:setFocus(NameTx), @@ -562,13 +562,13 @@ recover_key(State = #s{frame = Frame, j = J}) -> Sizer = wxBoxSizer:new(?wxVERTICAL), MnemSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Recovery Phrase")}]), MnemTx = wxTextCtrl:new(Dialog, ?wxID_ANY, [{style, ?wxTE_MULTILINE}]), - _ = wxStaticBoxSizer:add(MnemSz, MnemTx, zxw:flags(wide)), + _ = wxStaticBoxSizer:add(MnemSz, MnemTx, zxw:flags({wide, 5})), ButtSz = wxBoxSizer:new(?wxHORIZONTAL), Affirm = wxButton:new(Dialog, ?wxID_OK), Cancel = wxButton:new(Dialog, ?wxID_CANCEL), - _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)), - _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, MnemSz, zxw:flags(wide)), + _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, MnemSz, zxw:flags({wide, 5})), _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)), ok = wxDialog:setSizer(Dialog, Sizer), ok = wxBoxSizer:layout(Sizer), @@ -602,13 +602,13 @@ show_mnemonic(Selected, State = #s{frame = Frame, j = J, accounts = Accounts}) - MnemSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Recovery Phrase")}]), Options = [{value, Mnemonic}, {style, ?wxTE_MULTILINE bor ?wxTE_READONLY}], MnemTx = wxTextCtrl:new(Dialog, ?wxID_ANY, Options), - _ = wxStaticBoxSizer:add(MnemSz, MnemTx, zxw:flags(wide)), + _ = wxStaticBoxSizer:add(MnemSz, MnemTx, zxw:flags({wide, 5})), ButtSz = wxBoxSizer:new(?wxHORIZONTAL), CloseB = wxButton:new(Dialog, ?wxID_CANCEL, [{label, J("Close")}]), CopyB = wxButton:new(Dialog, ?wxID_OK, [{label, J("Copy to Clipboard")}]), - _ = wxBoxSizer:add(ButtSz, CloseB, zxw:flags(wide)), - _ = wxBoxSizer:add(ButtSz, CopyB, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, MnemSz, zxw:flags(wide)), + _ = wxBoxSizer:add(ButtSz, CloseB, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(ButtSz, CopyB, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, MnemSz, zxw:flags({wide, 5})), _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)), ok = wxDialog:setSizer(Dialog, Sizer), ok = wxBoxSizer:layout(Sizer), @@ -655,7 +655,7 @@ drop_key(State = #s{picker = Picker}) -> drop_key(Selected, State = #s{frame = Frame, j = J, accounts = Accounts, prefs = Prefs}) -> #poa{id = ID, name = Name} = lists:nth(Selected, Accounts), - Dialog = wxDialog:new(Frame, ?wxID_ANY, J("New Key"), [{size, {500, 150}}]), + Dialog = wxDialog:new(Frame, ?wxID_ANY, J("Drop Key"), [{size, {500, 200}}]), Sizer = wxBoxSizer:new(?wxVERTICAL), Message = ["REALLY delete key?\r\n\r\n\"", Name, "\"\r\n(", ID, ")"], MessageT = wxStaticText:new(Dialog, ?wxID_ANY, Message, @@ -663,9 +663,9 @@ drop_key(Selected, State = #s{frame = Frame, j = J, accounts = Accounts, prefs = ButtSz = wxBoxSizer:new(?wxHORIZONTAL), Affirm = wxButton:new(Dialog, ?wxID_OK), Cancel = wxButton:new(Dialog, ?wxID_CANCEL), - _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)), - _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, MessageT, zxw:flags(wide)), + _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, MessageT, zxw:flags({wide, 5})), _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)), ok = wxDialog:setSizer(Dialog, Sizer), ok = wxBoxSizer:layout(Sizer), @@ -856,12 +856,12 @@ do_ask_password(#s{frame = Frame, prefs = Prefs, j = J}) -> Label = J("Password (leave blank for no password)"), PassSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, Label}]), PassTx = wxTextCtrl:new(Dialog, ?wxID_ANY), - _ = wxStaticBoxSizer:add(PassSz, PassTx, zxw:flags(wide)), + _ = wxStaticBoxSizer:add(PassSz, PassTx, zxw:flags({wide, 5})), ButtSz = wxBoxSizer:new(?wxHORIZONTAL), Affirm = wxButton:new(Dialog, ?wxID_OK), - _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, PassSz, zxw:flags(base)), - _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)), + _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, PassSz, zxw:flags({base, 5})), + _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags({base, 5})), ok = wxDialog:setSizer(Dialog, Sizer), ok = wxBoxSizer:layout(Sizer), ok = wxFrame:center(Dialog), @@ -918,25 +918,25 @@ do_grids_mess_sig2(Request = #{"grids" := 1, InstTx = wxStaticText:new(Dialog, ?wxID_ANY, Instruction), AcctSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Signature Account")}]), AcctTx = wxStaticText:new(Dialog, ?wxID_ANY, ID), - _ = wxStaticBoxSizer:add(AcctSz, AcctTx, zxw:flags(wide)), + _ = wxStaticBoxSizer:add(AcctSz, AcctTx, zxw:flags({wide, 5})), URL_Label = J("Originating URL"), URL_Sz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, URL_Label}]), URL_Tx = wxStaticText:new(Dialog, ?wxID_ANY, URL), - _ = wxStaticBoxSizer:add(URL_Sz, URL_Tx, zxw:flags(wide)), + _ = wxStaticBoxSizer:add(URL_Sz, URL_Tx, zxw:flags({wide, 5})), MessSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Message")}]), MessStyle = ?wxTE_MULTILINE bor ?wxTE_READONLY, MessTx = wxTextCtrl:new(Dialog, ?wxID_ANY, [{value, Message}, {style, MessStyle}]), - _ = wxStaticBoxSizer:add(MessSz, MessTx, zxw:flags(wide)), + _ = wxStaticBoxSizer:add(MessSz, MessTx, zxw:flags({wide, 5})), ButtSz = wxBoxSizer:new(?wxHORIZONTAL), Affirm = wxButton:new(Dialog, ?wxID_OK), Cancel = wxButton:new(Dialog, ?wxID_CANCEL), - _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)), - _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, InstTx, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, AcctSz, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, URL_Sz, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, MessSz, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)), + _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, InstTx, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, AcctSz, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, URL_Sz, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, MessSz, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags({base, 5})), ok = wxDialog:setSizer(Dialog, Sizer), ok = wxDialog:setSize(Dialog, {500, 500}), ok = wxBoxSizer:layout(Sizer), @@ -960,25 +960,25 @@ do_grids_mess_sig2(Request = #{"grids" := 1, InstTx = wxStaticText:new(Dialog, ?wxID_ANY, Instruction), AcctSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Signature Account")}]), AcctTx = wxStaticText:new(Dialog, ?wxID_ANY, ID), - _ = wxStaticBoxSizer:add(AcctSz, AcctTx, zxw:flags(wide)), + _ = wxStaticBoxSizer:add(AcctSz, AcctTx, zxw:flags({wide, 5})), URL_Label = J("Originating URL"), URL_Sz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, URL_Label}]), URL_Tx = wxStaticText:new(Dialog, ?wxID_ANY, URL), - _ = wxStaticBoxSizer:add(URL_Sz, URL_Tx, zxw:flags(wide)), + _ = wxStaticBoxSizer:add(URL_Sz, URL_Tx, zxw:flags({wide, 5})), MessSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Base-64 Data")}]), MessStyle = ?wxTE_MULTILINE bor ?wxTE_READONLY, MessTx = wxTextCtrl:new(Dialog, ?wxID_ANY, [{value, Base64}, {style, MessStyle}]), - _ = wxStaticBoxSizer:add(MessSz, MessTx, zxw:flags(wide)), + _ = wxStaticBoxSizer:add(MessSz, MessTx, zxw:flags({wide, 5})), ButtSz = wxBoxSizer:new(?wxHORIZONTAL), Affirm = wxButton:new(Dialog, ?wxID_OK), Cancel = wxButton:new(Dialog, ?wxID_CANCEL), - _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)), - _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, InstTx, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, AcctSz, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, URL_Sz, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, MessSz, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)), + _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, InstTx, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, AcctSz, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, URL_Sz, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, MessSz, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags({base, 5})), ok = wxDialog:setSizer(Dialog, Sizer), ok = wxDialog:setSize(Dialog, {500, 500}), ok = wxBoxSizer:layout(Sizer), @@ -1018,7 +1018,7 @@ do_grids_mess_sig2(Request = #{"grids" := 1, _ = wxFlexGridSizer:add(DetailSz, T) end, ok = lists:foreach(AddDetail, Details), - _ = wxStaticBoxSizer:add(LabeledSz, DetailSz, zxw:flags(wide)), + _ = wxStaticBoxSizer:add(LabeledSz, DetailSz, zxw:flags({wide, 5})), DataLabel = wxStaticText:new(Dialog, ?wxID_ANY, J("TX Data")), DataStyle = ?wxTE_MULTILINE bor ?wxTE_READONLY, @@ -1027,14 +1027,14 @@ do_grids_mess_sig2(Request = #{"grids" := 1, ButtSz = wxBoxSizer:new(?wxHORIZONTAL), Affirm = wxButton:new(Dialog, ?wxID_OK), Cancel = wxButton:new(Dialog, ?wxID_CANCEL), - _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)), - _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)), + _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})), - _ = wxBoxSizer:add(Sizer, TitleTx, zxw:flags(base)), - _ = wxBoxSizer:add(Sizer, LabeledSz, zxw:flags(base)), - _ = wxBoxSizer:add(Sizer, DataLabel, zxw:flags(base)), - _ = wxBoxSizer:add(Sizer, DataTx, zxw:flags(wide)), - _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)), + _ = wxBoxSizer:add(Sizer, TitleTx, zxw:flags({base, 5})), + _ = wxBoxSizer:add(Sizer, LabeledSz, zxw:flags({base, 5})), + _ = wxBoxSizer:add(Sizer, DataLabel, zxw:flags({base, 5})), + _ = wxBoxSizer:add(Sizer, DataTx, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags({base, 5})), ok = wxDialog:setSizer(Dialog, Sizer), ok = wxDialog:setSize(Dialog, {700, 400}), ok = wxBoxSizer:layout(Sizer), diff --git a/src/gd_v_call.erl b/src/gd_v_call.erl index 7d733be..474896c 100644 --- a/src/gd_v_call.erl +++ b/src/gd_v_call.erl @@ -106,9 +106,12 @@ init({Prefs, FunDef = {FunName, FunIlk}, ConID, Build, Selected, Keys}) -> Title = [CallTypeLabel, ": ", ConName, ".", FunName, "/", Arity], Wx = wx:new(), Frame = wxFrame:new(Wx, ?wxID_ANY, Title), + Panel = wxWindow:new(Frame, ?wxID_ANY), + TopSz = wxBoxSizer:new(?wxVERTICAL), + _ = wxBoxSizer:add(TopSz, Panel, zxw:flags(wide)), MainSz = wxBoxSizer:new(?wxVERTICAL), - KeySz = wxStaticBoxSizer:new(?wxVERTICAL, Frame, [{label, J("Signature Key")}]), + KeySz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, J("Signature Key")}]), KeyBox = wxStaticBoxSizer:getStaticBox(KeySz), KeyPicker = wxChoice:new(KeyBox, ?wxID_ANY, [{choices, Keys}]), KP = #w{name = key_picker, id = wxChoice:getId(KeyPicker), wx = KeyPicker}, @@ -116,12 +119,12 @@ init({Prefs, FunDef = {FunName, FunIlk}, ConID, Build, Selected, Keys}) -> ok = wxChoice:setSelection(KeyPicker, ZeroBasedSelected), _ = wxStaticBoxSizer:add(KeySz, KeyPicker, zxw:flags(wide)), - {ArgSz, Args, Return, Copy, HasArgs} = call_arg_sizer(Frame, J, FunIlk, FunSpec), - {ParamSz, Params} = call_param_sizer(Frame, J), + {ArgSz, Args, Return, Copy, HasArgs} = call_arg_sizer(Panel, J, FunIlk, FunSpec), + {ParamSz, Params} = call_param_sizer(Panel, J), - Action = #w{wx = ActionBn} = gd_lib:button(Frame, ActionLabel), + Action = #w{wx = ActionBn} = gd_lib:button(Panel, ActionLabel), - TX_Sz = wxStaticBoxSizer:new(?wxVERTICAL, Frame, [{label, J("Transaction Info")}]), + TX_Sz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, J("Transaction Info")}]), TX_Sz_Box = wxStaticBoxSizer:getStaticBox(TX_Sz), Single = [{style, ?wxTE_READONLY}], Multi = [{style, ?wxTE_MULTILINE bor ?wxTE_READONLY}], @@ -142,9 +145,10 @@ init({Prefs, FunDef = {FunName, FunIlk}, ConID, Build, Selected, Keys}) -> _ = wxSizer:add(MainSz, ActionBn, zxw:flags({base, 5})), _ = wxSizer:add(MainSz, TX_Sz, [{proportion, 1}, {flag, ?wxEXPAND bor ?wxALL}, {border, 5}]), - _ = wxFrame:setSizer(Frame, MainSz), - _ = wxFrame:setSize(Frame, {900, 900}), - _ = wxSizer:layout(MainSz), + ok = wxWindow:setSizer(Panel, MainSz), + ok = wxFrame:setSizer(Frame, TopSz), + ok = wxFrame:setSize(Frame, {900, 900}), + ok = wxSizer:layout(MainSz), ok = wxFrame:connect(Frame, close_window), ok = wxFrame:connect(Frame, command_button_clicked), true = wxFrame:show(Frame), diff --git a/src/gd_v_wallman.erl b/src/gd_v_wallman.erl index a528288..46c936e 100644 --- a/src/gd_v_wallman.erl +++ b/src/gd_v_wallman.erl @@ -108,12 +108,12 @@ init({Prefs, Manifest}) -> MakeButton = fun({Name, Label}) -> B = wxButton:new(Frame, ?wxID_ANY, [{label, Label}]), - _ = wxSizer:add(ButtSz, B, zxw:flags(wide)), + _ = wxSizer:add(ButtSz, B, zxw:flags({wide, 5})), #w{name = Name, id = wxButton:getId(B), wx = B} end, Buttons = lists:map(MakeButton, ButtonTemplates), - _ = wxSizer:add(MainSz, Picker, zxw:flags(wide)), + _ = wxSizer:add(MainSz, Picker, zxw:flags({wide, 5})), _ = wxSizer:add(MainSz, ButtSz, zxw:flags(base)), ok = wxFrame:setSizer(Frame, MainSz),