hledger-ui 1.1 → 1.1.1
raw patch · 7 files changed
+51/−29 lines, 7 filesdep ~brick
Dependency ranges changed: brick
Files
- CHANGES +6/−0
- Hledger/UI/Main.hs +19/−3
- Hledger/UI/UIOptions.hs +2/−2
- doc/hledger-ui.1 +2/−2
- doc/hledger-ui.1.info +17/−17
- doc/hledger-ui.1.txt +2/−2
- hledger-ui.cabal +3/−3
CHANGES view
@@ -2,6 +2,12 @@ See also the hledger and project change logs. +# 1.1.1 (2017/1/20)++- allow brick 0.16 (Joshua Chia)++- drop obsolete --no-elide flag+ # 1.1 (2016/12/31) - with --watch, the display updates automatically to show file or date changes
Hledger/UI/Main.hs view
@@ -3,6 +3,7 @@ Copyright (c) 2007-2015 Simon Michael <simon@joyful.com> Released under GPL version 3 or later. -}+{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE MultiParamTypeClasses #-}@@ -11,12 +12,12 @@ -- import Control.Applicative -- import Lens.Micro.Platform ((^.))-import Control.Concurrent+import Control.Concurrent (threadDelay) import Control.Concurrent.Async import Control.Monad -- import Control.Monad.IO.Class (liftIO) import Data.Default (def)--- import Data.Monoid -- +-- import Data.Monoid -- import Data.List import Data.Maybe -- import Data.Text (Text)@@ -30,6 +31,12 @@ import System.FSNotify import Brick +#if MIN_VERSION_brick(0,16,0)+import qualified Brick.BChan as BC+#else+import Control.Concurrent.Chan (newChan, writeChan)+#endif+ import Hledger import Hledger.Cli hiding (progname,prognameandversion,green) import Hledger.UI.UIOptions@@ -41,6 +48,15 @@ ---------------------------------------------------------------------- +#if MIN_VERSION_brick(0,16,0)+newChan :: IO (BC.BChan a)+newChan = BC.newBChan 10++writeChan :: BC.BChan a -> a -> IO ()+writeChan = BC.writeBChan+#endif++ main :: IO () main = do opts <- getHledgerUIOpts@@ -129,7 +145,7 @@ ,aPrevScreens=[] ,aMode=Normal }- + ui = (sInit scr) d True $ (if change_ uopts' then toggleHistorical else id) $ -- XXX
Hledger/UI/UIOptions.hs view
@@ -26,7 +26,7 @@ uiflags = [ -- flagNone ["debug-ui"] (\opts -> setboolopt "rules-file" opts) "run with no terminal output, showing console"- flagNone ["watch"] (\opts -> setboolopt "watch" opts) "watch for data changes and reload automatically"+ flagNone ["watch"] (\opts -> setboolopt "watch" opts) "watch for data and date changes and reload automatically" ,flagReq ["theme"] (\s opts -> Right $ setopt "theme" s opts) "THEME" ("use this custom display theme ("++intercalate ", " themeNames++")") ,flagReq ["register"] (\s opts -> Right $ setopt "register" s opts) "ACCTREGEX" "start in the (first) matched account's register" ,flagNone ["change"] (\opts -> setboolopt "change" opts)@@ -38,7 +38,7 @@ ,flagNone ["flat"] (\opts -> setboolopt "flat" opts) "show full account names, unindented" -- ,flagReq ["drop"] (\s opts -> Right $ setopt "drop" s opts) "N" "with --flat, omit this many leading account name components" -- ,flagReq ["format"] (\s opts -> Right $ setopt "format" s opts) "FORMATSTR" "use this custom line format"- ,flagNone ["no-elide"] (\opts -> setboolopt "no-elide" opts) "don't compress empty parent accounts on one line"+ -- ,flagNone ["no-elide"] (\opts -> setboolopt "no-elide" opts) "don't compress empty parent accounts on one line" ,flagNone ["value","V"] (setboolopt "value") "show amounts as their current market value in their default valuation commodity (accounts screen)" ]
doc/hledger-ui.1 view
@@ -1,5 +1,5 @@ -.TH "hledger\-ui" "1" "December 2016" "hledger\-ui 1.1" "hledger User Manuals"+.TH "hledger\-ui" "1" "January 2017" "hledger\-ui 1.1.1" "hledger User Manuals" @@ -40,7 +40,7 @@ the data. .TP .B \f[C]\-\-watch\f[]-watch for data (and time) changes and reload automatically+watch for data and date changes and reload automatically .RS .RE .TP
doc/hledger-ui.1.info view
@@ -4,8 +4,8 @@ File: hledger-ui.1.info, Node: Top, Up: (dir) -hledger-ui(1) hledger-ui 1.1-****************************+hledger-ui(1) hledger-ui 1.1.1+****************************** hledger-ui is hledger's curses-style interface, providing an efficient full-window text UI for viewing accounts and transactions, and some@@ -38,7 +38,7 @@ the data. `--watch'- watch for data (and time) changes and reload automatically+ watch for data and date changes and reload automatically `--theme=default|terminal|greenterm' use this custom display theme@@ -359,19 +359,19 @@ Tag Table: Node: Top88-Node: OPTIONS823-Ref: #options922-Node: KEYS4003-Ref: #keys4100-Node: SCREENS6670-Ref: #screens6757-Node: Accounts screen6847-Ref: #accounts-screen6977-Node: Register screen9015-Ref: #register-screen9172-Node: Transaction screen11060-Ref: #transaction-screen11220-Node: Error screen12087-Ref: #error-screen12211+Node: OPTIONS827+Ref: #options926+Node: KEYS4005+Ref: #keys4102+Node: SCREENS6672+Ref: #screens6759+Node: Accounts screen6849+Ref: #accounts-screen6979+Node: Register screen9017+Ref: #register-screen9174+Node: Transaction screen11062+Ref: #transaction-screen11222+Node: Error screen12089+Ref: #error-screen12213 End Tag Table
doc/hledger-ui.1.txt view
@@ -36,7 +36,7 @@ the data. --watch- watch for data (and time) changes and reload automatically+ watch for data and date changes and reload automatically --theme=default|terminal|greenterm use this custom display theme@@ -362,4 +362,4 @@ -hledger-ui 1.1 December 2016 hledger-ui(1)+hledger-ui 1.1.1 January 2017 hledger-ui(1)
hledger-ui.cabal view
@@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack name: hledger-ui-version: 1.1+version: 1.1.1 stability: stable category: Finance, Console synopsis: Curses-style user interface for the hledger accounting tool@@ -55,7 +55,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.1"+ cpp-options: -DVERSION="1.1.1" build-depends: hledger >= 1.1 && < 1.2 , hledger-lib >= 1.1 && < 1.2@@ -85,7 +85,7 @@ buildable: False else build-depends:- brick >= 0.12 && < 0.16+ brick >= 0.12 && < 0.17 , vty >= 5.5 && < 5.15 if flag(threaded) ghc-options: -threaded