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

ui: support ctrl-l everywhere

Browse Source
This commit is contained in:
Simon Michael 2019-01-18 16:27:42 -08:00
parent bb5d6c47c6
commit c02647d05e
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,6 +276,7 @@ asHandle ui0@UIState{
VtyEvent (EvKey KEsc []) -> continue $ closeMinibuffer ui VtyEvent (EvKey KEsc []) -> continue $ closeMinibuffer ui
VtyEvent (EvKey KEnter []) -> continue $ regenerateScreens j d $ setFilter s $ closeMinibuffer ui VtyEvent (EvKey KEnter []) -> continue $ regenerateScreens j d $ setFilter s $ closeMinibuffer ui
where s = chomp $ unlines $ map strip $ getEditContents ed where s = chomp $ unlines $ map strip $ getEditContents ed
VtyEvent (EvKey (KChar 'l') [MCtrl]) -> redraw ui
VtyEvent ev -> do ed' <- handleEditorEvent ev ed VtyEvent ev -> do ed' <- handleEditorEvent ev ed
continue $ ui{aMode=Minibuffer ed'} continue $ ui{aMode=Minibuffer ed'}
AppEvent _ -> continue ui AppEvent _ -> continue ui
@ -285,6 +286,7 @@ asHandle ui0@UIState{
Help -> Help ->
case ev of case ev of
VtyEvent (EvKey (KChar 'q') []) -> halt ui VtyEvent (EvKey (KChar 'q') []) -> halt ui
VtyEvent (EvKey (KChar 'l') [MCtrl]) -> redraw ui
_ -> helpHandle ui ev _ -> helpHandle ui ev
Normal -> Normal ->

4
hledger-ui/Hledger/UI/ErrorScreen.hs
View File

@ -20,7 +20,7 @@ import Data.Monoid
#endif #endif
import Data.Time.Calendar (Day) import Data.Time.Calendar (Day)
import Data.Void (Void) import Data.Void (Void)
import Graphics.Vty (Event(..),Key(..)) import Graphics.Vty (Event(..),Key(..),Modifier(..))
import Text.Megaparsec import Text.Megaparsec
import Text.Megaparsec.Char import Text.Megaparsec.Char
@ -85,6 +85,7 @@ esHandle ui@UIState{aScreen=ErrorScreen{..}
Help -> Help ->
case ev of case ev of
VtyEvent (EvKey (KChar 'q') []) -> halt ui VtyEvent (EvKey (KChar 'q') []) -> halt ui
VtyEvent (EvKey (KChar 'l') [MCtrl]) -> redraw ui
_ -> helpHandle ui ev _ -> helpHandle ui ev
_ -> do _ -> do
@ -105,6 +106,7 @@ esHandle ui@UIState{aScreen=ErrorScreen{..}
-- Left err -> continue ui{aScreen=s{esError=err}} -- show latest parse error -- Left err -> continue ui{aScreen=s{esError=err}} -- show latest parse error
-- Right j' -> continue $ regenerateScreens j' d $ popScreen ui -- return to previous screen, and reload it -- Right j' -> continue $ regenerateScreens j' d $ popScreen ui -- return to previous screen, and reload it
VtyEvent (EvKey (KChar 'I') []) -> continue $ uiCheckBalanceAssertions d (popScreen $ toggleIgnoreBalanceAssertions ui) VtyEvent (EvKey (KChar 'I') []) -> continue $ uiCheckBalanceAssertions d (popScreen $ toggleIgnoreBalanceAssertions ui)
VtyEvent (EvKey (KChar 'l') [MCtrl]) -> redraw ui
_ -> continue ui _ -> continue ui
esHandle _ _ = error "event handler called with wrong screen type, should not happen" esHandle _ _ = error "event handler called with wrong screen type, should not happen"

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

@ -281,6 +281,7 @@ rsHandle ui@UIState{
VtyEvent (EvKey KEsc []) -> continue $ closeMinibuffer ui VtyEvent (EvKey KEsc []) -> continue $ closeMinibuffer ui
VtyEvent (EvKey KEnter []) -> continue $ regenerateScreens j d $ setFilter s $ closeMinibuffer ui VtyEvent (EvKey KEnter []) -> continue $ regenerateScreens j d $ setFilter s $ closeMinibuffer ui
where s = chomp $ unlines $ map strip $ getEditContents ed where s = chomp $ unlines $ map strip $ getEditContents ed
VtyEvent (EvKey (KChar 'l') [MCtrl]) -> redraw ui
VtyEvent ev -> do ed' <- handleEditorEvent ev ed VtyEvent ev -> do ed' <- handleEditorEvent ev ed
continue $ ui{aMode=Minibuffer ed'} continue $ ui{aMode=Minibuffer ed'}
AppEvent _ -> continue ui AppEvent _ -> continue ui
@ -290,6 +291,7 @@ rsHandle ui@UIState{
Help -> Help ->
case ev of case ev of
VtyEvent (EvKey (KChar 'q') []) -> halt ui VtyEvent (EvKey (KChar 'q') []) -> halt ui
VtyEvent (EvKey (KChar 'l') [MCtrl]) -> redraw ui
_ -> helpHandle ui ev _ -> helpHandle ui ev
Normal -> Normal ->

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

@ -17,7 +17,7 @@ import Data.Monoid
#endif #endif
import qualified Data.Text as T import qualified Data.Text as T
import Data.Time.Calendar (Day) import Data.Time.Calendar (Day)
import Graphics.Vty (Event(..),Key(..)) import Graphics.Vty (Event(..),Key(..),Modifier(..))
import Brick import Brick
import Brick.Widgets.List (listMoveTo) import Brick.Widgets.List (listMoveTo)
@ -119,6 +119,7 @@ tsHandle ui@UIState{aScreen=s@TransactionScreen{tsTransaction=(i,t)
Help -> Help ->
case ev of case ev of
VtyEvent (EvKey (KChar 'q') []) -> halt ui VtyEvent (EvKey (KChar 'q') []) -> halt ui
VtyEvent (EvKey (KChar 'l') [MCtrl]) -> redraw ui
_ -> helpHandle ui ev _ -> helpHandle ui ev
_ -> do _ -> do
@ -178,6 +179,7 @@ tsHandle ui@UIState{aScreen=s@TransactionScreen{tsTransaction=(i,t)
where where
ui'@UIState{aScreen=scr} = popScreen ui ui'@UIState{aScreen=scr} = popScreen ui
ui'' = ui'{aScreen=rsSelect (fromIntegral i) scr} ui'' = ui'{aScreen=rsSelect (fromIntegral i) scr}
VtyEvent (EvKey (KChar 'l') [MCtrl]) -> redraw ui
_ -> continue ui _ -> continue ui
tsHandle _ _ = error "event handler called with wrong screen type, should not happen" tsHandle _ _ = error "event handler called with wrong screen type, should not happen"