Merge pull request #13 from g-w1/master

Add quit with q

src/UI/CardSelector.hs

@@ -73,6 +73,7 @@ handleEvent gs s@CSS{_list=l, _exception=exc} (VtyEvent ev) =
           (Just _, _) -> continue' $ s & exception .~ Nothing
           (_, e) -> case e of
             V.EvKey V.KEsc [] -> halt' gs
+            V.EvKey (V.KChar 'q') []  -> halt' gs
 
             _ -> do l' <- L.handleListEventVi L.handleListEvent e l
                     let s' = (s & list .~ l') in

src/UI/Cards.hs

@@ -33,7 +33,7 @@ drawUI s =  [maybe emptyWidget (`drawPopup` s) (s^.popup), drawCardUI s <=> draw
 
 drawInfo :: CS -> Widget Name
 drawInfo s = if not (s ^. showControls) then emptyWidget else
-  strWrap . ("ESC: quit" <>) $ case s ^. cardState of
+  strWrap . ("ESC or q: quit" <>) $ case s ^. cardState of
     DefinitionState {}     -> ", ENTER: flip card / continue"
     MultipleChoiceState {} -> ", ENTER: submit answer / continue"
     MultipleAnswerState {} -> ", ENTER: select / continue, c: submit selection"

src/UI/FileBrowser.hs

@@ -46,7 +46,7 @@ drawUI FBS{_fb=b, _exception'=exc} = [drawException exc, center $ ui <=> help]
                vBox [ hCenter $ txt "Up/Down: select, h: toggle show hidden files"
                     , hCenter $ txt "/: search, Ctrl-C or Esc: cancel search"
                     , hCenter $ txt "Enter: change directory or select file"
-                    , hCenter $ txt "Esc: quit"
+                    , hCenter $ txt "Esc or q: quit"
                     ]
 
 handleEvent :: GlobalState -> FBS -> BrickEvent Name Event -> EventM Name (Next GlobalState)

src/UI/Info.hs

@@ -29,6 +29,7 @@ handleEvent gs s (VtyEvent e) =
       halt' = continue . popState in
     case e of
       V.EvKey V.KEsc [] -> halt' gs
+      V.EvKey (V.KChar 'q') [] -> halt' gs
       V.EvKey V.KEnter [] -> halt' gs
       V.EvKey V.KDown [] -> vScrollBy (viewportScroll Ordinary) 1 >> continue' s
       V.EvKey (V.KChar 'j') [] -> vScrollBy (viewportScroll Ordinary) 1 >> continue' s

src/UI/MainMenu.hs

@@ -49,6 +49,7 @@ handleEvent gs s (VtyEvent e) =
   let update = updateMMS gs in
     case e of
       V.EvKey V.KEsc [] -> halt gs
+      V.EvKey (V.KChar 'q') []  -> halt gs
       V.EvKey V.KEnter [] ->
         case L.listSelected (s^.l) of
           Just 0 -> continue =<< (gs `goToState`) <$> liftIO cardSelectorState

src/UI/Parameter.hs

@@ -50,6 +50,7 @@ handleEvent gs s ev@(VtyEvent e) =
   in case e of
     -- continue gs
       V.EvKey V.KEsc []         -> halt' gs
+      V.EvKey (V.KChar 'q') []  -> halt' gs
       V.EvKey V.KDown []        -> down
       V.EvKey (V.KChar 'j') []  -> down
       V.EvKey V.KUp []          -> up

src/UI/Settings.hs

@@ -45,6 +45,7 @@ handleEvent gs form ev@(VtyEvent e) =
       in
     case e of
       V.EvKey V.KEsc []         -> halt' gs
+      V.EvKey (V.KChar 'q') []  -> halt' gs
       V.EvKey V.KDown []        -> down
       V.EvKey (V.KChar 'j') []  -> down
       V.EvKey V.KUp []          -> up