diff --git a/src/gd_v_express.erl b/src/gd_v_express.erl index 69cc6e8..5ec0629 100644 --- a/src/gd_v_express.erl +++ b/src/gd_v_express.erl @@ -178,8 +178,9 @@ init({Prefs, Selected, Keys}) -> _ = wxButton:disable(UploadW), _ = wxStaticBoxSizer:add(UploadSz, UploadW), - _ = wxBoxSizer:add(MainSz, DownloadSz, zxw:flags({wide, 5})), - _ = wxBoxSizer:add(MainSz, UploadSz, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(LR_Sz, DownloadSz, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(LR_Sz, UploadSz, zxw:flags({wide, 5})), + _ = wxBoxSizer:add(MainSz, LR_Sz, zxw:flags({wide, 5})), ok = wxPanel:setSizer(Panel, MainSz), ok = wxFrame:setSizer(Frame, TopSz), ok = wxSizer:layout(TopSz), @@ -204,7 +205,7 @@ init({Prefs, Selected, Keys}) -> ok = wxFrame:connect(Frame, close_window), ok = wxListBox:connect(DownloadP, command_listbox_doubleclicked), State = #s{wx = Wx, frame = Frame, lang = Lang, j = J, prefs = Prefs, - keys = KeyP, accs = Keys, + keys = KP, accs = Keys, check = CheckB, list = DL_L, dl = DownloadB, dest = DestT, ttl = TTL_T, path = PathP, sign = SignC, @@ -259,11 +260,10 @@ handle_event(#wx{event = #wxCommand{type = command_button_clicked}, id = ID}, State = #s{ul = #w{id = ID}}) -> NewState = do_ul(State), {noreply, NewState}; -handle_event(#wx{event = #wxCommand{type = command_listbox_doubleclicked, - commandInt = Selected}}, +handle_event(#wx{event = #wxCommand{type = command_listbox_doubleclicked}}, State) -> NewState = do_dl(State), - {noreply, State}; + {noreply, NewState}; handle_event(#wx{event = #wxClose{}}, State) -> ok = do_close(State), {noreply, State}; @@ -289,12 +289,6 @@ terminate(Reason, State) -> %%% doers -do_show(Manifest, State = #s{keys = KeyP}) -> - Names = [Name || #wr{name = Name} <- Manifest], - ok = wxListBox:set(KeyP, Names), - State#s{accs = Manifest}. - - do_pending(State, Manifest) -> ok = tell(info, "Would do_pending: ~p", [Manifest]), State.