changed sorting key, hooked up sort button

rashwell · Aug 26, 2014 · 48661ef · 48661ef
1 parent d6dc5ee
commit 48661ef
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -203,7 +203,7 @@ Key Bindings
 
 ### Sorting
 
-    o            - toggle sort order (Unsorted, Ascending, Descending)
+    r            - toggle sort order (Unsorted, Ascending, Descending)
                    sort order is saved on quit
 
 ### Searching

diff --git a/README.rst b/README.rst
@@ -255,7 +255,7 @@ Sorting
 
 ::
 
-    o            - toggle sort order (Unsorted, Ascending, Descending)
+    r            - toggle sort order (Unsorted, Ascending, Descending)
                    sort order is saved on quit
 
 Searching

diff --git a/todotxt_machine/urwid_ui.py b/todotxt_machine/urwid_ui.py
@@ -307,6 +307,19 @@ def toggle_help_panel(self, button=None):
             # for header_column in self.view[0].header.original_widget.contents:
             #     header_column[0].set_wrap_mode('clip')
 
+    def toggle_sorting(self, button=None):
+        self.delete_todo_widgets()
+        self.sorting.rotate(1)
+        if self.sorting[0] == 'Ascending':
+            self.todos.sorted()
+        elif self.sorting[0] == 'Descending':
+            self.todos.sorted_reverse()
+        elif self.sorting[0] == 'Unsorted':
+            self.todos.sorted_raw()
+        self.reload_todos_from_memory()
+        self.move_selection_top()
+        self.update_header()
+
     def toggle_filter_panel(self, button=None):
         if self.help_panel_is_open:
             self.toggle_help_panel()
@@ -408,18 +421,8 @@ def keystroke(self, input):
             self.toggle_wrapping()
         elif input is 'b':
             self.toggle_border()
-        elif input is 'o':
-            self.delete_todo_widgets()
-            self.sorting.rotate(1)
-            if self.sorting[0] == 'Ascending':
-                self.todos.sorted()
-            elif self.sorting[0] == 'Descending':
-                self.todos.sorted_reverse()
-            elif self.sorting[0] == 'Unsorted':
-                self.todos.sorted_raw()
-            self.reload_todos_from_memory()
-            self.move_selection_top()
-            self.update_header()
+        elif input is 'r':
+            self.toggle_sorting()
 
         elif input is '/':
             self.start_search()
@@ -524,7 +527,7 @@ def create_toolbar(self):
 
             urwid.Padding(
             urwid.AttrMap(
-            urwid.Button([('header_file', 'o'), 'rder: '+self.sorting_display[self.sorting[0]]], on_press=self.save_todos),
+            urwid.Button(['o', ('header_file', 'r'), 'der: '+self.sorting_display[self.sorting[0]]], on_press=self.toggle_sorting),
             'header', 'plain_selected'), right=2 ),
 
             urwid.Padding(
@@ -657,7 +660,7 @@ def create_help_panel(self):
                 # [ urwid.Divider(u'─') ] +
 
                 [ urwid.Text("""
-o            - toggle sort order (Unsorted, Ascending, Descending)
+r            - toggle sort order (Unsorted, Ascending, Descending)
                sort order is saved on quit
 """)] +
                 [ urwid.AttrWrap(urwid.Text("""