hledger-ui 1.17.1.1 → 1.18
raw patch · 11 files changed
+74/−102 lines, 11 filesdep ~hledgerdep ~hledger-lib
Dependency ranges changed: hledger, hledger-lib
Files
- CHANGES.md +6/−2
- Hledger/UI/AccountsScreen.hs +4/−4
- Hledger/UI/Main.hs +1/−1
- Hledger/UI/RegisterScreen.hs +5/−5
- Hledger/UI/UIState.hs +7/−3
- README +0/−45
- README.md +9/−0
- hledger-ui.1 +1/−1
- hledger-ui.cabal +18/−18
- hledger-ui.info +22/−22
- hledger-ui.txt +1/−1
CHANGES.md view
@@ -1,18 +1,22 @@ User-visible changes in hledger-ui. See also the hledger changelog. +# 1.18 2020-06-07++- builds with hledger 1.18+ # 1.17.1.1 2020-03-19 - update bounds after some belated hledger-* version bumps # 1.17.1 2020-03-19 -- ui: fix a regression, empty register of depth-limited account (fix #1208)+- fix a regression, empty register of depth-limited account (fix #1208) - require newer Decimal, math-functions libs to ensure consistent rounding behaviour, even when built with old GHCs/snapshots. hledger uses banker's rounding (rounds to nearest even number, eg- 0.5 with with zero decimal places is "0").+ 0.5 displayed with zero decimal places is "0"). # 1.17 2020-03-01
Hledger/UI/AccountsScreen.hs view
@@ -86,8 +86,8 @@ q = And [queryFromOpts d ropts, excludeforecastq (forecast_ ropts)] where -- Except in forecast mode, exclude future/forecast transactions.- excludeforecastq True = Any- excludeforecastq False = -- not:date:tomorrow- not:tag:generated-transaction+ excludeforecastq (Just _) = Any+ excludeforecastq Nothing = -- not:date:tomorrow- not:tag:generated-transaction And [ Not (Date $ DateSpan (Just $ addDays 1 d) Nothing) ,Not (Tag "generated-transaction" Nothing)@@ -218,7 +218,7 @@ ,("-+", str "depth") ,("T", renderToggle (tree_ ropts) "flat" "tree") ,("H", renderToggle (not ishistorical) "end-bals" "changes")- ,("F", renderToggle1 (forecast_ ropts) "forecast")+ ,("F", renderToggle1 (isJust $ forecast_ ropts) "forecast") --,("/", "filter") --,("DEL", "unfilter") --,("ESC", "cancel/top")@@ -339,7 +339,7 @@ VtyEvent (EvKey (KChar 'U') []) -> asCenterAndContinue $ regenerateScreens j d $ toggleUnmarked ui VtyEvent (EvKey (KChar 'P') []) -> asCenterAndContinue $ regenerateScreens j d $ togglePending ui VtyEvent (EvKey (KChar 'C') []) -> asCenterAndContinue $ regenerateScreens j d $ toggleCleared ui- VtyEvent (EvKey (KChar 'F') []) -> continue $ regenerateScreens j d $ toggleForecast ui+ VtyEvent (EvKey (KChar 'F') []) -> continue $ regenerateScreens j d $ toggleForecast d ui VtyEvent (EvKey (KDown) [MShift]) -> continue $ regenerateScreens j d $ shrinkReportPeriod d ui VtyEvent (EvKey (KUp) [MShift]) -> continue $ regenerateScreens j d $ growReportPeriod d ui
Hledger/UI/Main.hs view
@@ -66,7 +66,7 @@ -- always include forecasted periodic transactions when loading data; -- they will be toggled on and off in the UI.- let copts' = copts{reportopts_=ropts{forecast_=True}}+ let copts' = copts{reportopts_=ropts{forecast_=Just $ fromMaybe nulldatespan (forecast_ ropts)}} case True of _ | "help" `inRawOpts` rawopts -> putStr (showModeUsage uimode)
Hledger/UI/RegisterScreen.hs view
@@ -72,15 +72,15 @@ q = And [queryFromOpts d ropts', excludeforecastq (forecast_ ropts)] where -- Except in forecast mode, exclude future/forecast transactions.- excludeforecastq True = Any- excludeforecastq False = -- not:date:tomorrow- not:tag:generated-transaction+ excludeforecastq (Just _) = Any+ excludeforecastq Nothing = -- not:date:tomorrow- not:tag:generated-transaction And [ Not (Date $ DateSpan (Just $ addDays 1 d) Nothing) ,Not (Tag "generated-transaction" Nothing) ] (_label,items) = accountTransactionsReport ropts' j q thisacctq- items' = (if empty_ ropts' then id else filter (not . isZeroMixedAmount . fifth6)) $ -- without --empty, exclude no-change txns+ items' = (if empty_ ropts' then id else filter (not . mixedAmountLooksZero . fifth6)) $ -- without --empty, exclude no-change txns reverse -- most recent last items @@ -237,7 +237,7 @@ -- ,("RIGHT", str "transaction") ,("T", renderToggle (tree_ ropts) "flat(-subs)" "tree(+subs)") -- rsForceInclusive may override, but use tree_ to ensure a visible toggle effect ,("H", renderToggle (not ishistorical) "historical" "period")- ,("F", renderToggle1 (forecast_ ropts) "forecast")+ ,("F", renderToggle1 (isJust $ forecast_ ropts) "forecast") -- ,("a", "add") -- ,("g", "reload") -- ,("q", "quit")@@ -336,7 +336,7 @@ VtyEvent (EvKey (KChar 'U') []) -> rsCenterAndContinue $ regenerateScreens j d $ toggleUnmarked ui VtyEvent (EvKey (KChar 'P') []) -> rsCenterAndContinue $ regenerateScreens j d $ togglePending ui VtyEvent (EvKey (KChar 'C') []) -> rsCenterAndContinue $ regenerateScreens j d $ toggleCleared ui- VtyEvent (EvKey (KChar 'F') []) -> rsCenterAndContinue $ regenerateScreens j d $ toggleForecast ui+ VtyEvent (EvKey (KChar 'F') []) -> rsCenterAndContinue $ regenerateScreens j d $ toggleForecast d ui VtyEvent (EvKey (KChar '/') []) -> continue $ regenerateScreens j d $ showMinibuffer ui VtyEvent (EvKey (KDown) [MShift]) -> continue $ regenerateScreens j d $ shrinkReportPeriod d ui
Hledger/UI/UIState.hs view
@@ -164,11 +164,15 @@ -- overkill, probably we should just hide/show the periodic -- transactions with a query for their special tag. ---toggleForecast :: UIState -> UIState-toggleForecast ui@UIState{aopts=uopts@UIOpts{cliopts_=copts@CliOpts{reportopts_=ropts}}} =+toggleForecast :: Day -> UIState -> UIState+toggleForecast d ui@UIState{aopts=uopts@UIOpts{cliopts_=copts@CliOpts{reportopts_=ropts}}} = ui{aopts=uopts{cliopts_=copts'}} where- copts' = copts{reportopts_=ropts{forecast_=not $ forecast_ ropts}}+ copts' = copts{reportopts_=ropts{forecast_=forecast'}}+ forecast' =+ case forecast_ ropts of+ Just _ -> Nothing+ Nothing -> forecastPeriodFromRawOpts d $ rawopts_ copts -- | Toggle between showing all and showing only real (non-virtual) items. toggleReal :: UIState -> UIState
− README
@@ -1,45 +0,0 @@-A curses-style text user interface for the hledger accounting tool.--hledger-ui is the new name for hledger-vty. Revived in 2015, this-package is intended to be installed as standard by all hledger users,-except those on (native) Windows, where it is not supported.--hledger-ui currently allows browsing the balance, register and print-reports, with drill-down and scrolling.---# HACKING--## Backlog:-```-reg: show historical running balance-acc: fix -H, show historical balances- switch to multibalance report ?-adjust filter- accounts screen- register screen-reg: improve other account names- test showing only real postings when there are reals and virtuals-journal entry view dialog-blog-reg: support -V-redraw on ctrl-l/cmd-r- reload on redraw- reload on screen change- reload on file change-acc: show total-fix --drop-show "modified account names" with --drop or --alias-journal screen-bs/is/cf-ish reports-persistent custom reports-persistent config-search in page-adjust other options-add-edit-custom screens-plugin screens---```
+ README.md view
@@ -0,0 +1,9 @@+# hledger-ui++A simple curses-style text user interface for the hledger accounting system.+It can be a more convenient way to browse your accounts than the CLI.+This package currently does not support Microsoft Windows, except in WSL.++See also:+the [project README](https://hledger.org/README.html)+and [home page](https://hledger.org).
hledger-ui.1 view
@@ -1,5 +1,5 @@ -.TH "hledger-ui" "1" "March 2020" "hledger-ui 1.17.1.1" "hledger User Manuals"+.TH "hledger-ui" "1" "June 2020" "hledger-ui 1.18" "hledger User Manuals"
hledger-ui.cabal view
@@ -1,24 +1,24 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.31.2.+-- This file has been generated from package.yaml by hpack version 0.33.0. -- -- see: https://github.com/sol/hpack ----- hash: 22506ce2642fc6b4c1cca0261151117f16a150751b27630d0952cdafbc8f80ad+-- hash: 315b95d3ecfb2c8ff5debfcbcd2d1ef92989941f0cdfec48b8c39a4535a8228a name: hledger-ui-version: 1.17.1.1-synopsis: Terminal user interface for the hledger accounting tool-description: This is hledger's terminal interface.- It is simpler and more convenient for browsing data than the command-line interface,- but lighter and faster than hledger-web.+version: 1.18+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.+ This package currently does not support Microsoft Windows, except in WSL. .- hledger is a cross-platform program for tracking money, time, or- any other commodity, using double-entry accounting and a simple,- editable file format. It is inspired by and largely compatible- with ledger(1). hledger provides command-line, terminal and web- interfaces, and aims to be a reliable, practical tool for daily- use.+ hledger is a robust, cross-platform set of tools for tracking money,+ time, or any other commodity, using double-entry accounting and a+ simple, editable file format, with command-line, terminal and web+ interfaces. It is a Haskell rewrite of Ledger, and one of the leading+ implementations of Plain Text Accounting. Read more at:+ <https://hledger.org> category: Finance, Console stability: stable homepage: http://hledger.org@@ -27,11 +27,11 @@ maintainer: Simon Michael <simon@joyful.com> license: GPL-3 license-file: LICENSE-tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5, GHC==8.8.2, GHC==8.10+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.0.20200123 build-type: Simple extra-source-files: CHANGES.md- README+ README.md hledger-ui.1 hledger-ui.txt hledger-ui.info@@ -64,7 +64,7 @@ hs-source-dirs: ./. ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans- cpp-options: -DVERSION="1.17.1.1"+ cpp-options: -DVERSION="1.18" build-depends: ansi-terminal >=0.6.2.3 , async@@ -77,8 +77,8 @@ , extra >=1.6.3 , filepath , fsnotify >=0.2.1.2 && <0.4- , hledger >=1.17.1.1 && <1.18- , hledger-lib >=1.17.1 && <1.18+ , hledger >=1.18 && <1.19+ , hledger-lib >=1.18 && <1.19 , megaparsec >=7.0.0 && <8.1 , microlens >=0.4 , microlens-platform >=0.2.3.1
hledger-ui.info view
@@ -3,8 +3,8 @@ File: hledger-ui.info, Node: Top, Next: OPTIONS, Up: (dir) -hledger-ui(1) hledger-ui 1.17.1.1-*********************************+hledger-ui(1) hledger-ui 1.18+***************************** hledger-ui - terminal interface for the hledger accounting tool @@ -499,26 +499,26 @@ Tag Table: Node: Top71-Node: OPTIONS1478-Ref: #options1575-Node: KEYS5006-Ref: #keys5101-Node: SCREENS9377-Ref: #screens9482-Node: Accounts screen9572-Ref: #accounts-screen9700-Node: Register screen11916-Ref: #register-screen12071-Node: Transaction screen14068-Ref: #transaction-screen14226-Node: Error screen15096-Ref: #error-screen15218-Node: ENVIRONMENT15462-Ref: #environment15576-Node: FILES16383-Ref: #files16482-Node: BUGS16695-Ref: #bugs16772+Node: OPTIONS1470+Ref: #options1567+Node: KEYS4998+Ref: #keys5093+Node: SCREENS9369+Ref: #screens9474+Node: Accounts screen9564+Ref: #accounts-screen9692+Node: Register screen11908+Ref: #register-screen12063+Node: Transaction screen14060+Ref: #transaction-screen14218+Node: Error screen15088+Ref: #error-screen15210+Node: ENVIRONMENT15454+Ref: #environment15568+Node: FILES16375+Ref: #files16474+Node: BUGS16687+Ref: #bugs16764 End Tag Table
hledger-ui.txt view
@@ -441,4 +441,4 @@ -hledger-ui 1.17.1.1 March 2020 hledger-ui(1)+hledger-ui 1.18 June 2020 hledger-ui(1)