From c4b3a4f9966a91d74ed9c098e704dc5122399841 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sat, 18 Jun 2016 09:00:38 -0700 Subject: [PATCH] ui: use Z instead of E for nonzero mode Breaking consistency with hledger cli flags, but I think it's more mnemonic, and E will more useful for something else. --- hledger-ui/Hledger/UI/AccountsScreen.hs | 2 +- hledger-ui/Hledger/UI/RegisterScreen.hs | 2 +- hledger-ui/Hledger/UI/UIUtils.hs | 4 ++-- hledger-ui/doc/hledger-ui.1 | 4 ++-- hledger-ui/doc/hledger-ui.1.info | 4 ++-- hledger-ui/doc/hledger-ui.1.m4.md | 4 ++-- hledger-ui/doc/hledger-ui.1.txt | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hledger-ui/Hledger/UI/AccountsScreen.hs b/hledger-ui/Hledger/UI/AccountsScreen.hs index 0dc2d0da3..8550ded25 100644 --- a/hledger-ui/Hledger/UI/AccountsScreen.hs +++ b/hledger-ui/Hledger/UI/AccountsScreen.hs @@ -280,7 +280,7 @@ asHandle ui0@UIState{ EvKey (KChar '_') [] -> continue $ regenerateScreens j d $ decDepth ui EvKey (KChar c) [] | c `elem` ['+','='] -> continue $ regenerateScreens j d $ incDepth ui EvKey (KChar 'F') [] -> continue $ regenerateScreens j d $ toggleFlat ui - EvKey (KChar 'E') [] -> scrollTop >> (continue $ regenerateScreens j d $ toggleEmpty ui) + EvKey (KChar 'Z') [] -> scrollTop >> (continue $ regenerateScreens j d $ toggleEmpty ui) EvKey (KChar 'C') [] -> scrollTop >> (continue $ regenerateScreens j d $ toggleCleared ui) EvKey (KChar 'U') [] -> scrollTop >> (continue $ regenerateScreens j d $ toggleUncleared ui) EvKey (KChar 'R') [] -> scrollTop >> (continue $ regenerateScreens j d $ toggleReal ui) diff --git a/hledger-ui/Hledger/UI/RegisterScreen.hs b/hledger-ui/Hledger/UI/RegisterScreen.hs index 11ad5a8e1..b8cae0951 100644 --- a/hledger-ui/Hledger/UI/RegisterScreen.hs +++ b/hledger-ui/Hledger/UI/RegisterScreen.hs @@ -249,7 +249,7 @@ rsHandle ui@UIState{ EvKey (KChar 'g') [] -> liftIO (uiReloadJournalIfChanged copts d j ui) >>= continue EvKey (KChar 'a') [] -> suspendAndResume $ clearScreen >> setCursorPosition 0 0 >> add copts j >> uiReloadJournalIfChanged copts d j ui EvKey (KChar 'F') [] -> scrollTop >> (continue $ regenerateScreens j d $ toggleFlat ui) - EvKey (KChar 'E') [] -> scrollTop >> (continue $ regenerateScreens j d $ toggleEmpty ui) + EvKey (KChar 'Z') [] -> scrollTop >> (continue $ regenerateScreens j d $ toggleEmpty ui) EvKey (KChar 'C') [] -> scrollTop >> (continue $ regenerateScreens j d $ toggleCleared ui) EvKey (KChar 'U') [] -> scrollTop >> (continue $ regenerateScreens j d $ toggleUncleared ui) EvKey (KChar 'R') [] -> scrollTop >> (continue $ regenerateScreens j d $ toggleReal ui) diff --git a/hledger-ui/Hledger/UI/UIUtils.hs b/hledger-ui/Hledger/UI/UIUtils.hs index 324ba0948..df3c1dcdd 100644 --- a/hledger-ui/Hledger/UI/UIUtils.hs +++ b/hledger-ui/Hledger/UI/UIUtils.hs @@ -48,12 +48,12 @@ helpDialog = vBox [ str "FILTERING" ,renderKey ("/", "set a filter query") - ,renderKey ("DEL/BS", "remove filters") ,renderKey ("C", "toggle cleared filter") ,renderKey ("U", "toggle uncleared filter") ,renderKey ("R", "toggle real filter") - ,renderKey ("E", "toggle nonzero filter") + ,renderKey ("Z", "toggle nonzero filter") ,renderKey ("F", "toggle flat/exclusive mode") + ,renderKey ("DEL/BS", "remove filters") ,str "accounts screen:" ,renderKey ("-+0123456789", "set depth limit") ] diff --git a/hledger-ui/doc/hledger-ui.1 b/hledger-ui/doc/hledger-ui.1 index 17bea1a4d..37c0568dc 100644 --- a/hledger-ui/doc/hledger-ui.1 +++ b/hledger-ui/doc/hledger-ui.1 @@ -282,7 +282,7 @@ transactions/postings are shown. .PP \f[C]R\f[] toggles real mode, in which virtual postings are ignored. .PP -\f[C]E\f[] toggles nonzero mode, in which only accounts with nonzero +\f[C]Z\f[] toggles nonzero mode, in which only accounts with nonzero balances are shown (hledger\-ui shows zero items by default, unlike command\-line hledger). .PP @@ -344,7 +344,7 @@ transactions/postings are shown. .PP \f[C]R\f[] toggles real mode, in which virtual postings are ignored. .PP -\f[C]E\f[] toggles nonzero mode, in which only transactions posting a +\f[C]Z\f[] toggles nonzero mode, in which only transactions posting a nonzero change are shown (hledger\-ui shows zero items by default, unlike command\-line hledger). .PP diff --git a/hledger-ui/doc/hledger-ui.1.info b/hledger-ui/doc/hledger-ui.1.info index 888a8c1de..7b6832c72 100644 --- a/hledger-ui/doc/hledger-ui.1.info +++ b/hledger-ui/doc/hledger-ui.1.info @@ -225,7 +225,7 @@ uncleared transactions/postings are shown. `R' toggles real mode, in which virtual postings are ignored. - `E' toggles nonzero mode, in which only accounts with nonzero + `Z' toggles nonzero mode, in which only accounts with nonzero balances are shown (hledger-ui shows zero items by default, unlike command-line hledger). @@ -278,7 +278,7 @@ uncleared transactions/postings are shown. `R' toggles real mode, in which virtual postings are ignored. - `E' toggles nonzero mode, in which only transactions posting a + `Z' toggles nonzero mode, in which only transactions posting a nonzero change are shown (hledger-ui shows zero items by default, unlike command-line hledger). diff --git a/hledger-ui/doc/hledger-ui.1.m4.md b/hledger-ui/doc/hledger-ui.1.m4.md index dd2e40b37..9c7d67e18 100644 --- a/hledger-ui/doc/hledger-ui.1.m4.md +++ b/hledger-ui/doc/hledger-ui.1.m4.md @@ -130,7 +130,7 @@ transactions/postings are shown. `R` toggles real mode, in which [virtual postings](/journal.html#virtual-postings) are ignored. -`E` toggles nonzero mode, in which only accounts with nonzero balances +`Z` toggles nonzero mode, in which only accounts with nonzero balances are shown (hledger-ui shows zero items by default, unlike command-line hledger). @@ -179,7 +179,7 @@ transactions/postings are shown. `R` toggles real mode, in which [virtual postings](/journal.html#virtual-postings) are ignored. -`E` toggles nonzero mode, in which only transactions posting a nonzero +`Z` toggles nonzero mode, in which only transactions posting a nonzero change are shown (hledger-ui shows zero items by default, unlike command-line hledger). diff --git a/hledger-ui/doc/hledger-ui.1.txt b/hledger-ui/doc/hledger-ui.1.txt index 59bb31f74..67f1e673b 100644 --- a/hledger-ui/doc/hledger-ui.1.txt +++ b/hledger-ui/doc/hledger-ui.1.txt @@ -196,7 +196,7 @@ SCREENS R toggles real mode, in which virtual postings are ignored. - E toggles nonzero mode, in which only accounts with nonzero balances + Z toggles nonzero mode, in which only accounts with nonzero balances are shown (hledger-ui shows zero items by default, unlike command-line hledger). @@ -241,7 +241,7 @@ SCREENS R toggles real mode, in which virtual postings are ignored. - E toggles nonzero mode, in which only transactions posting a nonzero + Z toggles nonzero mode, in which only transactions posting a nonzero change are shown (hledger-ui shows zero items by default, unlike com- mand-line hledger).