Add keybinding to open file in editor

[lightcards.git] / lightcards / display.py

diff --git a/lightcards/display.py b/lightcards/display.py
index a707fc15950244939afda2c206f6fe38c9afddb5..fd11158b789eccac7c0902aca69811e915b68af4 100755 (executable)
--- a/lightcards/display.py
+++ b/lightcards/display.py
@@ -6,6 +6,8 @@ from random import shuffle
 import sys
 import textwrap
 
+from . import lightcards
+
 
 def disp_bar(stdscr, stack, headers, obj):
     """
@@ -20,11 +22,15 @@ def disp_bar(stdscr, stack, headers, obj):
     else:
         percent = str(round(obj.getIdx() / (len(stack) - 1) * 100)).zfill(3)
 
+    # Print yellow if starred
+    stdscr.addstr(mlines - 1, 0, "[", curses.color_pair(1))
+    if stack[obj.getIdx()].getStar():
+        stdscr.addstr(stack[obj.getIdx()].printStar(), curses.color_pair(3))
+    else:
+        stdscr.addstr(stack[obj.getIdx()].printStar(), curses.color_pair(1))
+
     # Put all the info together
-    stdscr.insstr(mlines - 1, 0,
-                  "[" +
-                  stack[obj.getIdx()].printStar() +
-                  "] [" +
+    stdscr.addstr("] [" +
                   percent +
                   "% (" +
                   str(obj.getIdx() + 1).zfill(len(str(len(stack)))) +
@@ -50,6 +56,8 @@ def disp_menu(stdscr, stack, headers, idx):
                   "[s]: restart with starred only\n" +
                   "[u]: restart and unstar all\n" +
                   "[z]: restart and shuffle cards\n" +
+                  "[f]: restart and show the other side first\n" +
+                  "[t]: restart in reverse order\n" +
                   "[q]: quit")
     while True:
         key = stdscr.getkey()
@@ -58,11 +66,6 @@ def disp_menu(stdscr, stack, headers, idx):
         elif key == "r":
             idx.setIdx(0)
             get_key(stdscr, stack, headers, idx)
-        elif key == "u":
-            idx.setIdx(0)
-            for x in stack:
-                x.unStar()
-            get_key(stdscr, stack, headers, idx)
         elif key == "s":
             # Check if there are any starred cards before proceeding, and if
             # not, don't allow to proceed and show an error message
@@ -80,10 +83,25 @@ def disp_menu(stdscr, stack, headers, idx):
                 stdscr.addstr("ERR: Stack empty. Choose another option\n\n",
                               curses.color_pair(2))
                 disp_menu(stdscr, stack, headers, idx)
+        elif key == "u":
+            idx.setIdx(0)
+            for x in stack:
+                x.unStar()
+            get_key(stdscr, stack, headers, idx)
         elif key == "z":
             idx.setIdx(0)
             shuffle(stack)
             get_key(stdscr, stack, headers, idx)
+        elif key == "f":
+            idx.setIdx(0)
+            for x in stack:
+                x[0], x[1] = x[1], x[0]
+            headers[0], headers[1] = headers[1], headers[0]
+            get_key(stdscr, stack, headers, idx)
+        elif key == "t":
+            idx.setIdx(0)
+            stack.reverse()
+            get_key(stdscr, stack, headers, idx)
 
 
 def disp_card(stdscr, stack, headers, obj):
@@ -140,7 +158,8 @@ def disp_help(stdscr, stack, headers, idx):
                   "i, /               star card\n" +
                   "0, ^, home         go to the start of the deck\n" +
                   "$, end             go to the end of the deck\n" +
-                  "H, ?               open this screen\n\n" +
+                  "H, ?               open this screen\n" +
+                  "e                  open the input file in $EDITOR\n\n" +
                   "More information can be found in the man page, or by\n" +
                   "running `lightcards --help`.\n\n" +
                   "Press [q], [H], or [?] to go back.")
@@ -155,6 +174,7 @@ def init_disp(stdscr, stack, headers, idx):
     curses.curs_set(0)  # Hide cursor
     curses.init_pair(1, curses.COLOR_CYAN, 0)
     curses.init_pair(2, curses.COLOR_RED, 0)
+    curses.init_pair(3, curses.COLOR_YELLOW, 0)
     get_key(stdscr, stack, headers, idx)
 
 
@@ -193,3 +213,6 @@ def get_key(stdscr, stack, headers, idx):
             disp_card(stdscr, stack, headers, idx)
         elif key in ["H", "?"]:
             disp_help(stdscr, stack, headers, idx)
+        elif key == "e":
+            (headers, stack) = lightcards.reparse()
+            get_key(stdscr, stack, headers, idx)