search menu

socketteer · Mar 14, 2021 · 96fc7c7 · 96fc7c7
1 parent 111e7b3
commit 96fc7c7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -111,6 +111,8 @@ Go to prev bookmark: `a`, `Control-a`
 
 Toggle bookmark: `b`, `Control-b`
 
+Search: `Control-f`
+
 
 ### Edit topology
 

diff --git a/TODO.md b/TODO.md
@@ -85,14 +85,17 @@ global edit mode, where all nodes turn into textboxes, but no zooming?
 # versioning
 * save version each time node is edited
 * save origin information (prompt, logprobs, merge or branch)
+* undo
+
 
+# Search
+* enter to search
+* search chapters
+* regex
+* case (in)sensitive
 
 # Features
 
-* search (global or by subtree or in ancestry)
- * fuzzy?
-* search chapter titles, bookmarks
-* undo
 * "floating" notes
  * global or associated with subtree
 * bookmark-like tags define subsets of tree (and option to only display/navigate tag)

diff --git a/controller.py b/controller.py
@@ -148,7 +148,8 @@ def build_menus(self):
  ("Next Bookmark", "D", None, no_junk_args(self.next_bookmark)),
  ("Prev Bookmark", "A", None, no_junk_args(self.prev_bookmark)),
  ("Stochastic walk", "W", None, no_junk_args(self.walk)),
- ("Change chapter", "Ctrl+Y", None, no_junk_args(self.chapter_dialog)),
+ ("Edit chapter", "Ctrl+Y", None, no_junk_args(self.chapter_dialog)),
+ ("Search", "Ctrl+F", None, no_junk_args(self.search)),
 
  ],
  "Generation": [

diff --git a/view/dialogs.py b/view/dialogs.py
@@ -158,6 +158,9 @@ def body(self, master):
  self.search_entry.focus_entry()
  create_button(master, "Search", self.search)
 
+ # return causes freeze whether or not bound
+ #self.master.bind('<Return>', lambda event=None: self.search)
+
  def search(self):
  search_term = self.search_entry.tk_variables.get()
  if not search_term: