diff --git a/CHANGES.md b/CHANGES.md --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,12 @@ User-visible changes in hledger-ui. See also the hledger changelog. +# 1.26.1 2022-07-11 + +- support doclayout 0.4, brick 0.72+ + +- require safe 0.3.19+ to avoid deprecation warning + # 1.26 2022-06-04 - Uses hledger 1.26. diff --git a/Hledger/UI/AccountsScreen.hs b/Hledger/UI/AccountsScreen.hs --- a/Hledger/UI/AccountsScreen.hs +++ b/Hledger/UI/AccountsScreen.hs @@ -1,5 +1,6 @@ -- The accounts screen, showing accounts and balances like the CLI balance command. +{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-} @@ -254,8 +255,15 @@ where s = chomp $ unlines $ map strip $ getEditContents ed VtyEvent (EvKey (KChar 'l') [MCtrl]) -> redraw ui VtyEvent (EvKey (KChar 'z') [MCtrl]) -> suspend ui - VtyEvent ev -> do ed' <- handleEditorEvent ev ed - continue $ ui{aMode=Minibuffer "filter" ed'} + VtyEvent ev -> do + ed' <- handleEditorEvent +#if MIN_VERSION_brick(0,72,0) + (VtyEvent ev) +#else + ev +#endif + ed + continue $ ui{aMode=Minibuffer "filter" ed'} AppEvent _ -> continue ui MouseDown{} -> continue ui MouseUp{} -> continue ui diff --git a/Hledger/UI/RegisterScreen.hs b/Hledger/UI/RegisterScreen.hs --- a/Hledger/UI/RegisterScreen.hs +++ b/Hledger/UI/RegisterScreen.hs @@ -1,5 +1,6 @@ -- The account register screen, showing transactions in an account, like hledger-web's register. +{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-} @@ -302,8 +303,15 @@ -- VtyEvent (EvKey (KChar '/') []) -> continue $ regenerateScreens j d $ showMinibuffer ui VtyEvent (EvKey (KChar 'l') [MCtrl]) -> redraw ui VtyEvent (EvKey (KChar 'z') [MCtrl]) -> suspend ui - VtyEvent ev -> do ed' <- handleEditorEvent ev ed - continue $ ui{aMode=Minibuffer "filter" ed'} + VtyEvent ev -> do + ed' <- handleEditorEvent +#if MIN_VERSION_brick(0,72,0) + (VtyEvent ev) +#else + ev +#endif + ed + continue $ ui{aMode=Minibuffer "filter" ed'} AppEvent _ -> continue ui MouseDown{} -> continue ui MouseUp{} -> continue ui diff --git a/hledger-ui.1 b/hledger-ui.1 --- a/hledger-ui.1 +++ b/hledger-ui.1 @@ -1,5 +1,5 @@ -.TH "HLEDGER-UI" "1" "June 2022" "hledger-ui-1.26 " "hledger User Manuals" +.TH "HLEDGER-UI" "1" "July 2022" "hledger-ui-1.26.1 " "hledger User Manuals" @@ -7,7 +7,7 @@ .PP hledger-ui is a terminal interface (TUI) for the hledger accounting tool. -This manual is for hledger-ui 1.26. +This manual is for hledger-ui 1.26.1. .SH SYNOPSIS .PP \f[C]hledger-ui [OPTIONS] [QUERYARGS]\f[R] diff --git a/hledger-ui.cabal b/hledger-ui.cabal --- a/hledger-ui.cabal +++ b/hledger-ui.cabal @@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack name: hledger-ui -version: 1.26 +version: 1.26.1 synopsis: Curses-style terminal interface for the hledger accounting system description: A simple curses-style terminal user interface for the hledger accounting system. It can be a more convenient way to browse your accounts than the CLI. @@ -63,7 +63,7 @@ hs-source-dirs: ./ ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-name-shadowing -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind - cpp-options: -DVERSION="1.26" + cpp-options: -DVERSION="1.26.1" build-depends: ansi-terminal >=0.9 , async @@ -73,18 +73,18 @@ , containers >=0.5.9 , data-default , directory - , doclayout ==0.3.* + , doclayout >=0.3 && <0.5 , extra >=1.6.3 , filepath , fsnotify >=0.2.1.2 && <0.4 - , hledger ==1.26.* - , hledger-lib ==1.26.* + , hledger >=1.26.1 && <1.27 + , hledger-lib >=1.26.1 && <1.27 , megaparsec >=7.0.0 && <9.3 , microlens >=0.4 , microlens-platform >=0.2.3.1 , mtl >=2.2.1 , process >=1.2 - , safe >=0.2 + , safe >=0.3.19 , split >=0.1 , text >=1.2 , text-zipper >=0.4 diff --git a/hledger-ui.info b/hledger-ui.info --- a/hledger-ui.info +++ b/hledger-ui.info @@ -12,7 +12,7 @@ ************* hledger-ui is a terminal interface (TUI) for the hledger accounting -tool. This manual is for hledger-ui 1.26. +tool. This manual is for hledger-ui 1.26.1. 'hledger-ui [OPTIONS] [QUERYARGS]' 'hledger ui -- [OPTIONS] [QUERYARGS]' @@ -639,34 +639,34 @@  Tag Table: Node: Top221 -Node: OPTIONS1654 -Ref: #options1752 -Node: MOUSE6634 -Ref: #mouse6729 -Node: KEYS7011 -Ref: #keys7104 -Node: SCREENS11190 -Ref: #screens11288 -Node: Accounts screen11378 -Ref: #accounts-screen11506 -Node: Register screen13845 -Ref: #register-screen14000 -Node: Transaction screen15984 -Ref: #transaction-screen16142 -Node: Error screen17012 -Ref: #error-screen17134 -Node: TIPS17378 -Ref: #tips17477 -Node: Watch mode17529 -Ref: #watch-mode17646 -Node: Watch mode limitations18396 -Ref: #watch-mode-limitations18537 -Node: ENVIRONMENT19673 -Ref: #environment19784 -Node: FILES21092 -Ref: #files21191 -Node: BUGS21404 -Ref: #bugs21481 +Node: OPTIONS1656 +Ref: #options1754 +Node: MOUSE6636 +Ref: #mouse6731 +Node: KEYS7013 +Ref: #keys7106 +Node: SCREENS11192 +Ref: #screens11290 +Node: Accounts screen11380 +Ref: #accounts-screen11508 +Node: Register screen13847 +Ref: #register-screen14002 +Node: Transaction screen15986 +Ref: #transaction-screen16144 +Node: Error screen17014 +Ref: #error-screen17136 +Node: TIPS17380 +Ref: #tips17479 +Node: Watch mode17531 +Ref: #watch-mode17648 +Node: Watch mode limitations18398 +Ref: #watch-mode-limitations18539 +Node: ENVIRONMENT19675 +Ref: #environment19786 +Node: FILES21094 +Ref: #files21193 +Node: BUGS21406 +Ref: #bugs21483  End Tag Table diff --git a/hledger-ui.txt b/hledger-ui.txt --- a/hledger-ui.txt +++ b/hledger-ui.txt @@ -5,7 +5,7 @@ NAME hledger-ui is a terminal interface (TUI) for the hledger accounting - tool. This manual is for hledger-ui 1.26. + tool. This manual is for hledger-ui 1.26.1. SYNOPSIS hledger-ui [OPTIONS] [QUERYARGS] @@ -548,4 +548,4 @@ -hledger-ui-1.26 June 2022 HLEDGER-UI(1) +hledger-ui-1.26.1 July 2022 HLEDGER-UI(1)