Merge pull request 'rvv041 - User Interface' (#87) from rvv041 into milestone2
Reviewed-on: #87 Reviewed-by: pitmutt <rene@vergara.network>
This commit is contained in:
commit
244bbf76a7
1 changed files with 17 additions and 17 deletions
|
@ -308,7 +308,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
|
||||||
helpDialog st =
|
helpDialog st =
|
||||||
if st ^. helpBox
|
if st ^. helpBox
|
||||||
then D.renderDialog
|
then D.renderDialog
|
||||||
(D.dialog (Just (str "Commands")) Nothing 55)
|
(D.dialog (Just (str " Commands ")) Nothing 55)
|
||||||
(vBox ([C.hCenter $ str "Key", B.hBorder] <> keyList) <+>
|
(vBox ([C.hCenter $ str "Key", B.hBorder] <> keyList) <+>
|
||||||
vBox ([str "Actions", B.hBorder] <> actionList))
|
vBox ([str "Actions", B.hBorder] <> actionList))
|
||||||
else emptyWidget
|
else emptyWidget
|
||||||
|
@ -331,20 +331,20 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
|
||||||
case st ^. dialogBox of
|
case st ^. dialogBox of
|
||||||
WName ->
|
WName ->
|
||||||
D.renderDialog
|
D.renderDialog
|
||||||
(D.dialog (Just (str "Create Wallet")) Nothing 50)
|
(D.dialog (Just (str " Create Wallet ")) Nothing 50)
|
||||||
(renderForm $ st ^. inputForm)
|
(renderForm $ st ^. inputForm)
|
||||||
AName ->
|
AName ->
|
||||||
D.renderDialog
|
D.renderDialog
|
||||||
(D.dialog (Just (str "Create Account")) Nothing 50)
|
(D.dialog (Just (str " Create Account ")) Nothing 50)
|
||||||
(renderForm $ st ^. inputForm)
|
(renderForm $ st ^. inputForm)
|
||||||
AdName ->
|
AdName ->
|
||||||
D.renderDialog
|
D.renderDialog
|
||||||
(D.dialog (Just (str "Create Address")) Nothing 50)
|
(D.dialog (Just (str " Create Address ")) Nothing 50)
|
||||||
(renderForm $ st ^. inputForm)
|
(renderForm $ st ^. inputForm)
|
||||||
WSelect ->
|
WSelect ->
|
||||||
D.renderDialog
|
D.renderDialog
|
||||||
(D.dialog (Just (str "Select Wallet")) Nothing 50)
|
(D.dialog (Just (str " Select Wallet ")) Nothing 50)
|
||||||
(selectListBox "Wallets" (st ^. wallets) listDrawWallet <=>
|
(selectListBox " Wallets " (st ^. wallets) listDrawWallet <=>
|
||||||
C.hCenter
|
C.hCenter
|
||||||
(hBox
|
(hBox
|
||||||
[ capCommand "↑↓ " "move"
|
[ capCommand "↑↓ " "move"
|
||||||
|
@ -355,8 +355,8 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
|
||||||
]))
|
]))
|
||||||
ASelect ->
|
ASelect ->
|
||||||
D.renderDialog
|
D.renderDialog
|
||||||
(D.dialog (Just (str "Select Account")) Nothing 50)
|
(D.dialog (Just (str " Select Account ")) Nothing 50)
|
||||||
(selectListBox "Accounts" (st ^. accounts) listDrawAccount <=>
|
(selectListBox " Accounts " (st ^. accounts) listDrawAccount <=>
|
||||||
C.hCenter
|
C.hCenter
|
||||||
(hBox
|
(hBox
|
||||||
[ capCommand "↑↓ " "move"
|
[ capCommand "↑↓ " "move"
|
||||||
|
@ -366,7 +366,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
|
||||||
]))
|
]))
|
||||||
SendTx ->
|
SendTx ->
|
||||||
D.renderDialog
|
D.renderDialog
|
||||||
(D.dialog (Just (str "Send Transaction")) Nothing 50)
|
(D.dialog (Just (str " Send Transaction ")) Nothing 50)
|
||||||
(renderForm (st ^. txForm) <=>
|
(renderForm (st ^. txForm) <=>
|
||||||
C.hCenter
|
C.hCenter
|
||||||
(hBox [capCommand "↲ " "Send", capCommand "<esc> " "Cancel"]))
|
(hBox [capCommand "↲ " "Send", capCommand "<esc> " "Cancel"]))
|
||||||
|
@ -489,7 +489,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
|
||||||
Just (_, w) ->
|
Just (_, w) ->
|
||||||
withBorderStyle unicodeBold $
|
withBorderStyle unicodeBold $
|
||||||
D.renderDialog
|
D.renderDialog
|
||||||
(D.dialog (Just $ txt "Seed Phrase") Nothing 50)
|
(D.dialog (Just $ txt " Seed Phrase ") Nothing 50)
|
||||||
(padAll 1 $
|
(padAll 1 $
|
||||||
txtWrap $
|
txtWrap $
|
||||||
E.decodeUtf8Lenient $
|
E.decodeUtf8Lenient $
|
||||||
|
@ -498,12 +498,12 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
|
||||||
MsgDisplay ->
|
MsgDisplay ->
|
||||||
withBorderStyle unicodeBold $
|
withBorderStyle unicodeBold $
|
||||||
D.renderDialog
|
D.renderDialog
|
||||||
(D.dialog (Just $ txt "Message") Nothing 50)
|
(D.dialog (Just $ txt " Message ") Nothing 50)
|
||||||
(padAll 1 $ strWrap $ st ^. msg)
|
(padAll 1 $ strWrap $ st ^. msg)
|
||||||
TxIdDisplay ->
|
TxIdDisplay ->
|
||||||
withBorderStyle unicodeBold $
|
withBorderStyle unicodeBold $
|
||||||
D.renderDialog
|
D.renderDialog
|
||||||
(D.dialog (Just $ txt "Success") Nothing 50)
|
(D.dialog (Just $ txt " Success ") Nothing 50)
|
||||||
(padAll 1 $
|
(padAll 1 $
|
||||||
(txt "Tx ID: " <+>
|
(txt "Tx ID: " <+>
|
||||||
txtWrapWith
|
txtWrapWith
|
||||||
|
@ -516,7 +516,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
|
||||||
Just (_, tx) ->
|
Just (_, tx) ->
|
||||||
withBorderStyle unicodeBold $
|
withBorderStyle unicodeBold $
|
||||||
D.renderDialog
|
D.renderDialog
|
||||||
(D.dialog (Just $ txt "Transaction") Nothing 50)
|
(D.dialog (Just $ txt " Transaction ") Nothing 50)
|
||||||
(padAll
|
(padAll
|
||||||
1
|
1
|
||||||
(str
|
(str
|
||||||
|
@ -542,7 +542,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
|
||||||
SyncDisplay ->
|
SyncDisplay ->
|
||||||
withBorderStyle unicodeBold $
|
withBorderStyle unicodeBold $
|
||||||
D.renderDialog
|
D.renderDialog
|
||||||
(D.dialog (Just $ txt "Sync") Nothing 50)
|
(D.dialog (Just $ txt " Sync ") Nothing 50)
|
||||||
(padAll
|
(padAll
|
||||||
1
|
1
|
||||||
(updateAttrMap
|
(updateAttrMap
|
||||||
|
@ -556,7 +556,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
|
||||||
SendDisplay ->
|
SendDisplay ->
|
||||||
withBorderStyle unicodeBold $
|
withBorderStyle unicodeBold $
|
||||||
D.renderDialog
|
D.renderDialog
|
||||||
(D.dialog (Just $ txt "Sending Transaction") Nothing 50)
|
(D.dialog (Just $ txt " Sending Transaction ") Nothing 50)
|
||||||
(padAll
|
(padAll
|
||||||
1
|
1
|
||||||
(strWrapWith
|
(strWrapWith
|
||||||
|
@ -994,7 +994,7 @@ appEvent (BT.VtyEvent e) = do
|
||||||
V.EvKey (V.KChar 'n') [] -> do
|
V.EvKey (V.KChar 'n') [] -> do
|
||||||
BT.modify $
|
BT.modify $
|
||||||
set inputForm $
|
set inputForm $
|
||||||
updateFormState (DialogInput "New Wallet") $
|
updateFormState (DialogInput " New Wallet ") $
|
||||||
s ^. inputForm
|
s ^. inputForm
|
||||||
BT.modify $ set dialogBox WName
|
BT.modify $ set dialogBox WName
|
||||||
V.EvKey (V.KChar 's') [] ->
|
V.EvKey (V.KChar 's') [] ->
|
||||||
|
@ -1011,7 +1011,7 @@ appEvent (BT.VtyEvent e) = do
|
||||||
V.EvKey (V.KChar 'n') [] -> do
|
V.EvKey (V.KChar 'n') [] -> do
|
||||||
BT.modify $
|
BT.modify $
|
||||||
set inputForm $
|
set inputForm $
|
||||||
updateFormState (DialogInput "New Account") $
|
updateFormState (DialogInput " New Account ") $
|
||||||
s ^. inputForm
|
s ^. inputForm
|
||||||
BT.modify $ set dialogBox AName
|
BT.modify $ set dialogBox AName
|
||||||
ev -> BT.zoom accounts $ L.handleListEvent ev
|
ev -> BT.zoom accounts $ L.handleListEvent ev
|
||||||
|
|
Loading…
Reference in a new issue