From 540a2b2b62eef269fe2ed3b7ecf8079aadd6d271 Mon Sep 17 00:00:00 2001
From: John Ladan <jladan@uwaterloo.ca>
Date: Fri, 30 Mar 2012 14:34:33 -0400
Subject: [PATCH] fixed bug in helpbar, made help easier for browsers

---
 browser.py | 8 +++++---
 helpBar.py | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/browser.py b/browser.py
index 0f59050..7b8f9f2 100644
--- a/browser.py
+++ b/browser.py
@@ -9,6 +9,7 @@ class browserWindow:
     entries = []
     selected = []
     commands = [(' /', 'search'), (' n', 'find next'), (' N', 'find previous'), (' q', 'quit')]
+    cs = []
     # column definitions are in (label, weight, specified width) triples
     columnDefs = [('something',1,None)]
     mx = my = 0
@@ -21,6 +22,7 @@ class browserWindow:
         self.w = window
         self.hb = helpbar
         self.updateGeometry()
+        self.commands = self.cs+self.commands
 
     def sortByColumn(self, col):
         self.entries.sort(key=lambda k: k.get(col)) # key=dict.get(col))
@@ -233,7 +235,7 @@ class bookBrowser(browserWindow):
                   ('Authors',30,None),
                   ('Title',60,None)]
     
-    commands = [(' u', 'update'), (' d', 'delete selected'), (' q', 'quit')]
+    cs = [(' u', 'update'), (' d', 'delete selected')]
     
     # redefinable functions
     def updateSelection(self,book):
@@ -308,7 +310,7 @@ class bookBrowser(browserWindow):
 
 class categoryBrowser(browserWindow):
     columnDefs = [('Category',100,None)]
-    commands = [(' a', 'add category'), (' d', 'delete selected'), (' q', 'quit')]
+    cs = [(' a', 'add category'), (' d', 'delete selected')]
 
 
     def refreshCategories(self):
@@ -352,7 +354,7 @@ class categoryBrowser(browserWindow):
 
 class categorySelector(browserWindow):
     columnDefs = [('Category',100,None)]
-    commands = [(' a', 'add category'), (' c', 'commit'), (' q', 'quit')]
+    cs = [(' a', 'add category'), (' c', 'commit')]
     book = {'id':''}
     original=[]
 
diff --git a/helpBar.py b/helpBar.py
index 5b01a17..ad057d6 100644
--- a/helpBar.py
+++ b/helpBar.py
@@ -5,7 +5,7 @@ class helpBar:
     commands = []
     mx=my=0
     x=y=0
-    colWidth = 10
+    colWidth = 25
     numCols=1
 
     def __init__(self, window):
@@ -18,8 +18,9 @@ class helpBar:
         numRows = len(self.commands)/self.numCols +1
         self.y += self.my - numRows
         self.my = numRows
-        self.w.mvwin(self.y,self.x)
+        self.w.mvwin(0,0)
         self.w.resize(self.my,self.mx)
+        self.w.mvwin(self.y,self.x)
 
     def refresh(self):
         self.clear()