slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imp: ui: improve screens' help footer

Browse Source
This commit is contained in:
Simon Michael 2023-03-24 11:33:36 -10:00
parent 6b80d2e83a
commit 056553e8a9
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hledger-ui/Hledger/UI/AccountsScreen.hs
View File

@ -138,8 +138,8 @@ asDrawHelper UIState{aScreen=scr, aopts=uopts, ajournal=j, aMode=mode} ropts scr
_ -> quickhelp _ -> quickhelp
where where
quickhelp = borderKeysStr' [ quickhelp = borderKeysStr' [
("?", str "help") ("LEFT", str "back")
-- ,("RIGHT", str "register") -- ,("RIGHT", str "register")
,("t", renderToggle (tree_ ropts) "list" "tree") ,("t", renderToggle (tree_ ropts) "list" "tree")
-- ,("t", str "tree") -- ,("t", str "tree")
-- ,("l", str "list") -- ,("l", str "list")
@ -152,9 +152,10 @@ asDrawHelper UIState{aScreen=scr, aopts=uopts, ajournal=j, aMode=mode} ropts scr
--,("/", "filter") --,("/", "filter")
--,("DEL", "unfilter") --,("DEL", "unfilter")
--,("ESC", "cancel/top") --,("ESC", "cancel/top")
,("a", str "add") -- ,("a", str "add")
-- ,("g", "reload") -- ,("g", "reload")
,("q", str "quit") ,("?", str "help")
-- ,("q", str "quit")
] ]
asDrawItem :: (Int,Int) -> Bool -> AccountsScreenItem -> Widget Name asDrawItem :: (Int,Int) -> Bool -> AccountsScreenItem -> Widget Name

7
hledger-ui/Hledger/UI/MenuScreen.hs
View File

@ -68,8 +68,8 @@ msDraw UIState{aopts=_uopts@UIOpts{uoCliOpts=copts@CliOpts{reportspec_=_rspec}}
_ -> quickhelp _ -> quickhelp
where where
quickhelp = borderKeysStr' [ quickhelp = borderKeysStr' [
("?", str "help") ("DOWN/UP", str "select")
-- ,("RIGHT", str "register") ,("RIGHT", str "enter screen")
-- ,("t", renderToggle (tree_ ropts) "list" "tree") -- ,("t", renderToggle (tree_ ropts) "list" "tree")
-- ,("t", str "tree") -- ,("t", str "tree")
-- ,("l", str "list") -- ,("l", str "list")
@ -79,8 +79,9 @@ msDraw UIState{aopts=_uopts@UIOpts{uoCliOpts=copts@CliOpts{reportspec_=_rspec}}
--,("/", "filter") --,("/", "filter")
--,("DEL", "unfilter") --,("DEL", "unfilter")
--,("ESC", "cancel/top") --,("ESC", "cancel/top")
,("a", str "add") ,("a", str "add txn")
-- ,("g", "reload") -- ,("g", "reload")
,("?", str "help")
,("q", str "quit") ,("q", str "quit")
] ]

12
hledger-ui/Hledger/UI/RegisterScreen.hs
View File

@ -136,9 +136,8 @@ rsDraw UIState{aopts=_uopts@UIOpts{uoCliOpts=copts@CliOpts{reportspec_=rspec}}
_ -> quickhelp _ -> quickhelp
where where
quickhelp = borderKeysStr' [ quickhelp = borderKeysStr' [
("?", str "help") ("LEFT", str "back")
,("LEFT", str "back") -- ,("RIGHT", str "transaction")
-- ,("RIGHT", str "transaction")
-- tree/list mode - rsForceInclusive may override, but use tree_ to ensure a visible toggle effect -- tree/list mode - rsForceInclusive may override, but use tree_ to ensure a visible toggle effect
,("t", renderToggle (tree_ ropts) "list(-subs)" "tree(+subs)") ,("t", renderToggle (tree_ ropts) "list(-subs)" "tree(+subs)")
@ -147,9 +146,10 @@ rsDraw UIState{aopts=_uopts@UIOpts{uoCliOpts=copts@CliOpts{reportspec_=rspec}}
,("H", renderToggle (not ishistorical) "historical" "period") ,("H", renderToggle (not ishistorical) "historical" "period")
,("F", renderToggle1 (isJust . forecast_ . inputopts_ $ copts) "forecast") ,("F", renderToggle1 (isJust . forecast_ . inputopts_ $ copts) "forecast")
-- ,("a", "add") -- ,("a", "add")
-- ,("g", "reload") -- ,("g", "reload")
-- ,("q", "quit") ,("?", str "help")
-- ,("q", "quit")
] ]
rsDraw _ = dbgui "rsDraw 2" $ errorWrongScreenType "draw function" -- PARTIAL: rsDraw _ = dbgui "rsDraw 2" $ errorWrongScreenType "draw function" -- PARTIAL:

10
hledger-ui/Hledger/UI/TransactionScreen.hs
View File

@ -85,14 +85,14 @@ tsDraw UIState{aopts=UIOpts{uoCliOpts=copts@CliOpts{reportspec_=rspec@ReportSpec
-- _ -> quickhelp -- _ -> quickhelp
where where
quickhelp = borderKeysStr [ quickhelp = borderKeysStr [
("?", "help") ("LEFT", "back")
,("LEFT", "back") ,("UP/DOWN", "prev/next txn")
,("UP/DOWN", "prev/next")
--,("ESC", "cancel/top") --,("ESC", "cancel/top")
-- ,("a", "add") -- ,("a", "add")
,("E", "editor") ,("E", "edit")
,("g", "reload") ,("g", "reload")
,("q", "quit") ,("?", "help")
-- ,("q", "quit")
] ]
tsDraw _ = errorWrongScreenType "draw function" -- PARTIAL: tsDraw _ = errorWrongScreenType "draw function" -- PARTIAL: