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

ui: err: tweak error message, make it red

Browse Source
This commit is contained in:
Simon Michael 2015-10-28 10:02:04 -07:00
parent 6f85e02f1a
commit b527209e9f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ drawErrorScreen :: AppState -> [Widget]
drawErrorScreen AppState{ -- aopts=_uopts@UIOpts{cliopts_=_copts@CliOpts{reportopts_=_ropts@ReportOpts{query_=querystr}}}, drawErrorScreen AppState{ -- aopts=_uopts@UIOpts{cliopts_=_copts@CliOpts{reportopts_=_ropts@ReportOpts{query_=querystr}}},
aScreen=ErrorScreen{esState=err}} = [ui] aScreen=ErrorScreen{esState=err}} = [ui]
where where
toplabel = withAttr ("border" <> "bold") (str "Problem - please fix then press g to reload") toplabel = withAttr ("border" <> "bold") (str "Oops. Please fix this problem then press g to reload")
-- <+> str " transactions" -- <+> str " transactions"
-- <+> borderQueryStr querystr -- no, account transactions report shows all transactions in the acct ? -- <+> borderQueryStr querystr -- no, account transactions report shows all transactions in the acct ?
-- <+> str " and subs" -- <+> str " and subs"
@ -72,8 +72,7 @@ drawErrorScreen AppState{ -- aopts=_uopts@UIOpts{cliopts_=_copts@CliOpts{reporto
-- totalwidth = c^.availWidthL -- totalwidth = c^.availWidthL
-- - 2 -- XXX due to margin ? shouldn't be necessary (cf UIUtils) -- - 2 -- XXX due to margin ? shouldn't be necessary (cf UIUtils)
render $ defaultLayout toplabel bottomlabel $ render $ defaultLayout toplabel bottomlabel $ withAttr "error" $ str err
vBox $ map str $ lines err
drawErrorScreen _ = error "draw function called with wrong screen type, should not happen" drawErrorScreen _ = error "draw function called with wrong screen type, should not happen"

1
hledger-ui/Hledger/UI/Theme.hs
View File

@ -66,6 +66,7 @@ themesList :: [(String, AttrMap)]
themesList = [ themesList = [
("default", attrMap ("default", attrMap
(black `on` white & bold) [ -- default style for this theme (black `on` white & bold) [ -- default style for this theme
("error", currentAttr `withForeColor` red),
(borderAttr , white `on` black & dim), (borderAttr , white `on` black & dim),
(borderAttr <> "bold", white `on` black & bold), (borderAttr <> "bold", white `on` black & bold),
(borderAttr <> "query", yellow `on` black & bold), (borderAttr <> "query", yellow `on` black & bold),