WIP
This commit is contained in:
+1
-1
@@ -3,7 +3,7 @@
|
||||
{registered,[]},
|
||||
{included_applications,[]},
|
||||
{applications,[stdlib,kernel,sasl,ssl]},
|
||||
{vsn,"0.9.0"},
|
||||
{vsn,"0.10.0"},
|
||||
{modules,[gajudesk,gd_con,gd_grids,gd_gui,gd_jt,gd_lib,
|
||||
gd_m_spend,gd_m_wallet_importer,gd_sophia_editor,
|
||||
gd_sup,gd_v,gd_v_call,gd_v_devman,gd_v_netman,
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
%%% @end
|
||||
|
||||
-module(gajudesk).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-behavior(application).
|
||||
-author("Craig Everett <craigeverett@qpq.swiss>").
|
||||
-copyright("QPQ AG <info@qpq.swiss>").
|
||||
|
||||
+5
-4
@@ -3,7 +3,7 @@
|
||||
%%% @end
|
||||
|
||||
-module(gd_con).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-author("Craig Everett <craigeverett@qpq.swiss>").
|
||||
-copyright("QPQ AG <info@qpq.swiss>").
|
||||
-license("GPL-3.0-or-later").
|
||||
@@ -662,8 +662,9 @@ task_data(gd_v_wallman, #s{wallets = Wallets}) ->
|
||||
Wallets;
|
||||
task_data(gd_v_doomweaver, #s{}) ->
|
||||
[];
|
||||
task_data(gd_v_express, #s{}) ->
|
||||
[].
|
||||
task_data(gd_v_express, State) ->
|
||||
{ok, Selected, Keys} = do_list_keys(State),
|
||||
{Selected, Keys}.
|
||||
|
||||
|
||||
|
||||
@@ -1336,7 +1337,7 @@ handle_tic(State = #s{wallet = This = #wallet{poas = POAs, endpoint = Node},
|
||||
selected = Selected})
|
||||
when Selected > 0 ->
|
||||
% TODO: The closure below is kind of silly. The internal hz:acc/1 account will
|
||||
% Expand to become hz:acc/2, accepting a chain ID later.
|
||||
% expand to become hz:acc/2, accepting a chain ID later.
|
||||
NewState =
|
||||
case ensure_hz_set(Node) of
|
||||
{ok, ChainID} ->
|
||||
|
||||
+1
-1
@@ -37,7 +37,7 @@
|
||||
%%% @end
|
||||
|
||||
-module(gd_grids).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-author("Craig Everett <craigeverett@qpq.swiss>").
|
||||
-copyright("QPQ AG <info@qpq.swiss>").
|
||||
-license("GPL-3.0-or-later").
|
||||
|
||||
+2
-2
@@ -3,7 +3,7 @@
|
||||
%%% @end
|
||||
|
||||
-module(gd_gui).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-author("Craig Everett <craigeverett@qpq.swiss>").
|
||||
-copyright("QPQ AG <info@qpq.swiss>").
|
||||
-license("GPL-3.0-or-later").
|
||||
@@ -383,7 +383,7 @@ doomweaver(State) ->
|
||||
|
||||
|
||||
express(State) ->
|
||||
ok = io:format("GajuExpress~n"),
|
||||
ok = gd_con:show_ui(gd_v_express),
|
||||
State.
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
%%% translation library is retained).
|
||||
|
||||
-module(gd_jt).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-export([read_translations/1, j/2, oneshot_j/2]).
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
%%% @end
|
||||
|
||||
-module(gd_lib).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
|
||||
-include_lib("wx/include/wx.hrl").
|
||||
-export([is_int/1,
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
%%% @end
|
||||
|
||||
-module(gd_m_spend).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-author("Craig Everett <zxq9@zxq9.com>").
|
||||
-copyright("Craig Everett <zxq9@zxq9.com>").
|
||||
-license("GPL-3.0-or-later").
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
%%% @end
|
||||
|
||||
-module(gd_m_wallet_importer).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-author("Craig Everett <zxq9@zxq9.com>").
|
||||
-copyright("Craig Everett <zxq9@zxq9.com>").
|
||||
-license("GPL-3.0-or-later").
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
-module(gd_sophia_editor).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-export([new/1, update/1, update/2,
|
||||
get_text/1, set_text/2]).
|
||||
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
%%% @end
|
||||
|
||||
-module(gd_sup).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-behaviour(supervisor).
|
||||
-author("Craig Everett <craigeverett@qpq.swiss>").
|
||||
-copyright("QPQ AG <info@qpq.swiss>").
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
-module(gd_v).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-author("Craig Everett <craigeverett@qpq.swiss>").
|
||||
-copyright("QPQ AG <info@qpq.swiss>").
|
||||
-license("GPL-3.0-or-later").
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
-module(gd_v_call).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-author("Craig Everett <craigeverett@qpq.swiss>").
|
||||
-copyright("QPQ AG <info@qpq.swiss>").
|
||||
-license("GPL-3.0-or-later").
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
-module(gd_v_doomweaver).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-author("Craig Everett <craigeverett@qpq.swiss>").
|
||||
-copyright("QPQ AG <info@qpq.swiss>").
|
||||
-license("GPL-3.0-or-later").
|
||||
|
||||
+24
-18
@@ -34,7 +34,7 @@
|
||||
|
||||
|
||||
-module(gd_v_express).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-author("Craig Everett <zxq9@zxq9.com>").
|
||||
-copyright("QPQ AG <info@qpq.swiss>").
|
||||
-license("GPL-3.0-or-later").
|
||||
@@ -71,9 +71,9 @@
|
||||
cost = none :: none | wx:wx_object(),
|
||||
ul = none :: none | wx:wx_object()}).
|
||||
|
||||
-record(mochila,
|
||||
{tar = <<>> :: binary(),
|
||||
sig = none :: none | {Key :: binary(), Sig :: binary()}}).
|
||||
%-record(mochila,
|
||||
% {tar = <<>> :: binary(),
|
||||
% sig = none :: none | {Key :: binary(), Sig :: binary()}}).
|
||||
|
||||
|
||||
%%% Interface
|
||||
@@ -119,7 +119,7 @@ accounts(Manifest) ->
|
||||
start_link(Args) ->
|
||||
wx_object:start_link({local, ?MODULE}, ?MODULE, Args, []).
|
||||
|
||||
init({Prefs, Selected, Keys}) ->
|
||||
init({Prefs, {Selected, Keys}}) ->
|
||||
Lang = maps:get(lang, Prefs, en),
|
||||
Trans = gd_jt:read_translations(?MODULE),
|
||||
J = gd_jt:j(Lang, Trans),
|
||||
@@ -153,30 +153,36 @@ init({Prefs, Selected, Keys}) ->
|
||||
DestSz = wxStaticBoxSizer:new(?wxHORIZONTAL, UploadBox, [{label, J("Destination ID")}]),
|
||||
DestBox = wxStaticBoxSizer:getStaticBox(DestSz),
|
||||
DestT = wxTextCtrl:new(DestBox, ?wxID_ANY),
|
||||
_ = wxStaticBoxSizer:add(DestSz, DestT),
|
||||
_ = wxStaticBoxSizer:add(DestSz, DestT, zxw:flags({wide,5})),
|
||||
_ = wxStaticBoxSizer:add(UploadSz, DestSz, zxw:flags({wide,5})),
|
||||
TTL_Sz = wxStaticBoxSizer:new(?wxHORIZONTAL, UploadBox, [{label, J("Transfer Expiration (Days)")}]),
|
||||
TTL_Box = wxStaticBoxSizer:getStaticBox(TTL_Sz),
|
||||
TTL_T = wxTextCtrl:new(TTL_Box, ?wxID_ANY, [{value, "7"}]),
|
||||
_ = wxStaticBoxSizer:add(TTL_Sz, TTL_T),
|
||||
_ = wxStaticBoxSizer:add(TTL_Sz, TTL_T, zxw:flags({wide,5})),
|
||||
_ = wxStaticBoxSizer:add(UploadSz, TTL_Sz, zxw:flags({wide,5})),
|
||||
PathSz = wxStaticBoxSizer:new(?wxHORIZONTAL, UploadBox, [{label, J("File or Directory")}]),
|
||||
PathBox = wxStaticBoxSizer:getStaticBox(PathSz),
|
||||
PathP = wxFilePickerCtrl:new(PathBox, ?wxID_ANY),
|
||||
_ = wxStaticBoxSizer:add(PathSz, PathP),
|
||||
_ = wxStaticBoxSizer:add(PathSz, PathP, zxw:flags({wide,5})),
|
||||
_ = wxStaticBoxSizer:add(UploadSz, PathSz, zxw:flags({wide,5})),
|
||||
SignSz = wxStaticBoxSizer:new(?wxHORIZONTAL, UploadBox, [{label, J("Transfer Signature")}]),
|
||||
SignBox = wxStaticBoxSizer:getStaticBox(SignSz),
|
||||
SignC = wxCheckBox:new(SignBox, ?wxID_ANY, J("Do you want to sign this transfer?")),
|
||||
_ = wxStaticBoxSizer:add(SignSz, SignC),
|
||||
SizeSz = wxStaticBoxSizer:new(?wxHORIZONTAL, UploadBox, [{label, J("Transfer Details")}]),
|
||||
_ = wxStaticBoxSizer:add(SignSz, SignC, zxw:flags({wide,5})),
|
||||
_ = wxStaticBoxSizer:add(UploadSz, SignSz, zxw:flags({wide,5})),
|
||||
SizeSz = wxStaticBoxSizer:new(?wxHORIZONTAL, UploadBox, [{label, J("Transfer Size")}]),
|
||||
SizeBox = wxStaticBoxSizer:getStaticBox(SizeSz),
|
||||
SizeT = wxStaticText:new(SizeBox, ?wxID_ANY, J("[No File or Directory Selected]")),
|
||||
_ = wxStaticBoxSizer:add(SizeSz, SizeT),
|
||||
_ = wxStaticBoxSizer:add(SizeSz, SizeT, zxw:flags({wide,5})),
|
||||
_ = wxStaticBoxSizer:add(UploadSz, SizeSz, zxw:flags({wide,5})),
|
||||
CostSz = wxStaticBoxSizer:new(?wxHORIZONTAL, UploadBox, [{label, J("Cost to Transfer")}]),
|
||||
CostBox = wxStaticBoxSizer:getStaticBox(CostSz),
|
||||
CostT = wxStaticText:new(CostBox, ?wxID_ANY, "[N/A]"),
|
||||
_ = wxStaticBoxSizer:add(CostSz, CostT),
|
||||
_ = wxStaticBoxSizer:add(CostSz, CostT, zxw:flags({wide,5})),
|
||||
_ = wxStaticBoxSizer:add(UploadSz, CostSz, zxw:flags({wide,5})),
|
||||
UploadB = #w{wx = UploadW} = make_button(UploadBox, ul, J("Upload")),
|
||||
_ = wxButton:disable(UploadW),
|
||||
_ = wxStaticBoxSizer:add(UploadSz, UploadW),
|
||||
_ = wxStaticBoxSizer:add(UploadSz, UploadW, zxw:flags({base,5})),
|
||||
|
||||
_ = wxBoxSizer:add(LR_Sz, DownloadSz, zxw:flags({wide, 5})),
|
||||
_ = wxBoxSizer:add(LR_Sz, UploadSz, zxw:flags({wide, 5})),
|
||||
@@ -329,11 +335,11 @@ do_close(#s{frame = Frame, prefs = Prefs}) ->
|
||||
ok = wxWindow:destroy(Frame).
|
||||
|
||||
|
||||
default_name() ->
|
||||
{{YY, MM, DD}, {Hr, Mn, Sc}} = calendar:local_time(),
|
||||
Form = "~4.10.0B-~2.10.0B-~2.10.0B_~2.10.0B-~2.10.0B-~2.10.0B",
|
||||
Name = io_lib:format(Form, [YY, MM, DD, Hr, Mn, Sc]),
|
||||
unicode:characters_to_list(Name ++ ".gaju").
|
||||
%default_name() ->
|
||||
% {{YY, MM, DD}, {Hr, Mn, Sc}} = calendar:local_time(),
|
||||
% Form = "~4.10.0B-~2.10.0B-~2.10.0B_~2.10.0B-~2.10.0B-~2.10.0B",
|
||||
% Name = io_lib:format(Form, [YY, MM, DD, Hr, Mn, Sc]),
|
||||
% unicode:characters_to_list(Name ++ ".gaju").
|
||||
|
||||
|
||||
ensure_shown(Frame) ->
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
-module(gd_v_netman).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-author("Craig Everett <zxq9@zxq9.com>").
|
||||
-copyright("QPQ AG <info@qpq.swiss>").
|
||||
-license("GPL-3.0-or-later").
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
|
||||
-module(gd_v_wallman).
|
||||
-vsn("0.9.0").
|
||||
-vsn("0.10.0").
|
||||
-author("Craig Everett <zxq9@zxq9.com>").
|
||||
-copyright("QPQ AG <info@qpq.swiss>").
|
||||
-license("GPL-3.0-or-later").
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
{prefix,"gd"}.
|
||||
{author,"Craig Everett"}.
|
||||
{desc,"A desktop client for the Gajumaru network of blockchain networks"}.
|
||||
{package_id,{"otpr","gajudesk",{0,9,0}}}.
|
||||
{package_id,{"otpr","gajudesk",{0,10,0}}}.
|
||||
{deps,[{"otpr","hakuzaru",{0,9,1}},
|
||||
{"otpr","zxwidgets",{1,1,0}},
|
||||
{"otpr","eblake2",{1,0,1}},
|
||||
|
||||
Reference in New Issue
Block a user