Minor fixes found while working on packaging
[doneit] / src / rtm_view.py
index aec21a6..1eb8516 100644 (file)
@@ -1,6 +1,16 @@
 """
 @todo Add an agenda view to the task list
        Tree of days, with each successive 7 days dropping the visibility of further lower priority items
+@todo Add a map view
+       Using new api widgets people are developing)
+       Integrate GPS w/ fallback to default location
+       Use locations for mapping
+@todo Add a quick search (OR within a property type, and between property types) view
+       Drop down for multi selecting priority
+       Drop down for multi selecting tags
+       Drop down for multi selecting locations
+       Calendar selector for choosing due date range
+@todo Remove blocking operations from UI thread
 """
 
 import webbrowser
@@ -11,6 +21,7 @@ import base64
 import gobject
 import gtk
 
+import coroutines
 import toolbox
 import gtk_toolbox
 import rtm_backend
@@ -101,8 +112,8 @@ def item_in_agenda(item):
        return isVisible
 
 
-def item_agenda_sort_by_date_then_priority(items):
-       sortedTasks = list(item for item in items if item_in_agenda(item))
+def item_sort_by_fuzzydate_then_priority(items):
+       sortedTasks = list(items)
 
        def advanced_key(taskDetails):
                dueDate = taskDetails["dueDate"].get_nothrow(datetime.datetime.max)
@@ -117,6 +128,9 @@ def item_agenda_sort_by_date_then_priority(items):
 
 
 class ItemListView(object):
+       """
+       @bug Not all columns are visible on maemo
+       """
 
        ID_IDX = 0
        COMPLETION_IDX = 1
@@ -127,13 +141,15 @@ class ItemListView(object):
        LINK_IDX = 6
        NOTES_IDX = 7
 
-       def __init__(self, widgetTree):
+       def __init__(self, widgetTree, errorDisplay):
+               self._errorDisplay = errorDisplay
                self._manager = None
                self._projId = None
                self._showCompleted = False
                self._showIncomplete = True
 
                self._editDialog = gtk_toolbox.EditTaskDialog(widgetTree)
+               self._notesDialog = gtk_toolbox.NotesDialog(widgetTree)
 
                self._itemList = gtk.ListStore(
                        gobject.TYPE_STRING, # id
@@ -179,7 +195,6 @@ class ItemListView(object):
                self._todoItemScroll.add(self._todoItemTree)
                self._onItemSelectId = 0
 
-
        def enable(self, manager, projId):
                self._manager = manager
                self._projId = projId
@@ -194,7 +209,10 @@ class ItemListView(object):
                self._todoItemTree.append_column(self._dueColumn)
                self._todoItemTree.append_column(self._linkColumn)
                self._todoItemTree.append_column(self._notesColumn)
-               self.reset_task_list(self._projId)
+               try:
+                       self.reset_task_list(self._projId)
+               except StandardError, e:
+                       self._errorDisplay.push_exception()
 
                self._todoItemTree.set_headers_visible(False)
                self._nameColumn.set_expand(True)
@@ -231,9 +249,10 @@ class ItemListView(object):
                        for taskDetails in rawTasks
                                if self._showCompleted and taskDetails["isCompleted"] or self._showIncomplete and not taskDetails["isCompleted"]
                )
+               # filteredTasks = (taskDetails for taskDetails in filteredTasks if item_in_agenda(taskDetails))
                sortedTasks = item_sort_by_priority_then_date(filteredTasks)
                # sortedTasks = item_sort_by_date_then_priority(filteredTasks)
-               # sortedTasks = item_agenda_sort_by_date_then_priority(filteredTasks)
+               # sortedTasks = item_sort_by_fuzzydate_then_priority(filteredTasks)
                for taskDetails in sortedTasks:
                        id = taskDetails["id"]
                        isCompleted = taskDetails["isCompleted"]
@@ -258,56 +277,55 @@ class ItemListView(object):
                self._todoItemTree.set_model(self._itemList)
 
        def _on_item_select(self, treeView, path, viewColumn):
-               # @todo See if there is a way to use the new gtk_toolbox.ContextHandler
-               taskId = self._itemList[path[0]][self.ID_IDX]
-
-               if viewColumn is self._priorityColumn:
-                       pass
-               elif viewColumn is self._nameColumn:
-                       self._editDialog.enable(self._manager)
-                       try:
-                               self._editDialog.request_task(self._manager, taskId)
-                       finally:
-                               self._editDialog.disable()
-                       self.reset_task_list(self._projId)
-               elif viewColumn is self._dueColumn:
-                       self._editDialog.enable(self._manager)
-                       try:
-                               self._editDialog.request_task(self._manager, taskId)
-                       finally:
-                               self._editDialog.disable()
-                       self.reset_task_list(self._projId)
-               elif viewColumn is self._linkColumn:
-                       webbrowser.open(self._manager.get_task_details(taskId)["url"])
-               elif viewColumn is self._notesColumn:
-                       pass
+               try:
+                       # @todo See if there is a way to use the new gtk_toolbox.ContextHandler
+                       taskId = self._itemList[path[0]][self.ID_IDX]
+
+                       if viewColumn is self._priorityColumn:
+                               pass
+                       elif viewColumn is self._nameColumn:
+                               self._editDialog.enable(self._manager)
+                               try:
+                                       self._editDialog.request_task(self._manager, taskId)
+                               finally:
+                                       self._editDialog.disable()
+                               self.reset_task_list(self._projId)
+                       elif viewColumn is self._dueColumn:
+                               due = self._manager.get_task_details(taskId)["dueDate"]
+                               if due.is_good():
+                                       calendar = gtk_toolbox.PopupCalendar(None, due.get())
+                                       calendar.run()
+                       elif viewColumn is self._linkColumn:
+                               webbrowser.open(self._manager.get_task_details(taskId)["url"])
+                       elif viewColumn is self._notesColumn:
+                               self._notesDialog.enable()
+                               try:
+                                       self._notesDialog.run(self._manager, taskId)
+                               finally:
+                                       self._notesDialog.disable()
+               except StandardError, e:
+                       self._errorDisplay.push_exception()
 
        def _on_completion_change(self, cell, path):
-               taskId = self._itemList[path[0]][self.ID_IDX]
-               self._manager.complete_task(taskId)
-               self.reset_task_list(self._projId)
-
-
-class ItemAgendaView(object):
-       pass
+               try:
+                       taskId = self._itemList[path[0]][self.ID_IDX]
+                       self._manager.complete_task(taskId)
+                       self.reset_task_list(self._projId)
+               except StandardError, e:
+                       self._errorDisplay.push_exception()
 
 
-class GtkRtMilk(object):
+class QuickAddView(object):
 
-       def __init__(self, widgetTree):
-               """
-               @note Thread agnostic
-               """
+       def __init__(self, widgetTree, errorDisplay, addSink):
+               self._errorDisplay = errorDisplay
                self._manager = None
-               self._credentials = "", "", ""
+               self._projId = None
+               self._addSink = addSink
 
                self._clipboard = gtk.clipboard_get()
                self._editDialog = gtk_toolbox.EditTaskDialog(widgetTree)
 
-               self._projectsList = gtk.ListStore(gobject.TYPE_STRING)
-               self._projectsCombo = widgetTree.get_widget("projectsCombo")
-               self._onListActivateId = 0
-
                self._taskNameEntry = widgetTree.get_widget("add-taskNameEntry")
                self._addTaskButton = widgetTree.get_widget("add-addTaskButton")
                self._pasteTaskNameButton = widgetTree.get_widget("add-pasteTaskNameButton")
@@ -319,7 +337,109 @@ class GtkRtMilk(object):
                self._onClearId = None
                self._onPasteId = None
 
-               self._itemView = ItemListView(widgetTree)
+       def enable(self, manager, projId):
+               self._manager = manager
+               self._projId = projId
+
+               self._onAddId = self._addTaskButton.connect("clicked", self._on_add)
+               self._onAddClickedId = self._addTaskButton.connect("pressed", self._on_add_pressed)
+               self._onAddReleasedId = self._addTaskButton.connect("released", self._on_add_released)
+               self._onPasteId = self._pasteTaskNameButton.connect("clicked", self._on_paste)
+               self._onClearId = self._clearTaskNameButton.connect("clicked", self._on_clear)
+
+       def disable(self):
+               self._manager = None
+               self._projId = None
+
+               self._addTaskButton.disconnect(self._onAddId)
+               self._addTaskButton.disconnect(self._onAddClickedId)
+               self._addTaskButton.disconnect(self._onAddReleasedId)
+               self._pasteTaskNameButton.disconnect(self._onPasteId)
+               self._clearTaskNameButton.disconnect(self._onClearId)
+
+       def reset_task_list(self, projId):
+               self._projId = projId
+               isMeta = self._manager.get_project(self._projId)["isMeta"]
+               # @todo RTM handles this by defaulting to a specific list
+               self._addTaskButton.set_sensitive(not isMeta)
+
+       def _on_add(self, *args):
+               try:
+                       name = self._taskNameEntry.get_text()
+
+                       projId = self._projId
+                       taskId = self._manager.add_task(projId, name)
+
+                       self._taskNameEntry.set_text("")
+                       self._addSink.send((projId, taskId))
+               except StandardError, e:
+                       self._errorDisplay.push_exception()
+
+       def _on_add_edit(self, *args):
+               try:
+                       name = self._taskNameEntry.get_text()
+
+                       projId = self._projId
+                       taskId = self._manager.add_task(projId, name)
+
+                       try:
+                               self._editDialog.enable(self._manager)
+                               try:
+                                       self._editDialog.request_task(self._manager, taskId)
+                               finally:
+                                       self._editDialog.disable()
+                       finally:
+                               self._taskNameEntry.set_text("")
+                               self._addSink.send((projId, taskId))
+               except StandardError, e:
+                       self._errorDisplay.push_exception()
+
+       def _on_add_pressed(self, widget):
+               try:
+                       self._addToEditTimerId = gobject.timeout_add(1000, self._on_add_edit)
+               except StandardError, e:
+                       self._errorDisplay.push_exception()
+
+       def _on_add_released(self, widget):
+               try:
+                       if self._addToEditTimerId is not None:
+                               gobject.source_remove(self._addToEditTimerId)
+                       self._addToEditTimerId = None
+               except StandardError, e:
+                       self._errorDisplay.push_exception()
+
+       def _on_paste(self, *args):
+               try:
+                       entry = self._taskNameEntry.get_text()
+                       entry += self._clipboard.wait_for_text()
+                       self._taskNameEntry.set_text(entry)
+               except StandardError, e:
+                       self._errorDisplay.push_exception()
+
+       def _on_clear(self, *args):
+               try:
+                       self._taskNameEntry.set_text("")
+               except StandardError, e:
+                       self._errorDisplay.push_exception()
+
+
+class GtkRtMilk(object):
+
+       def __init__(self, widgetTree, errorDisplay):
+               """
+               @note Thread agnostic
+               """
+               self._errorDisplay = errorDisplay
+               self._manager = None
+               self._credentials = "", "", ""
+
+               self._projectsList = gtk.ListStore(gobject.TYPE_STRING)
+               self._projectsCombo = widgetTree.get_widget("projectsCombo")
+               self._onListActivateId = 0
+
+               self._itemView = ItemListView(widgetTree, self._errorDisplay)
+               addSink = coroutines.func_sink(lambda eventData: self._itemView.reset_task_list(eventData[0]))
+               self._addView = QuickAddView(widgetTree, self._errorDisplay, addSink)
                self._credentialsDialog = gtk_toolbox.LoginWindow(widgetTree)
 
        @staticmethod
@@ -382,26 +502,18 @@ class GtkRtMilk(object):
 
                currentProject = self._get_project()
                projId = self._manager.lookup_project(currentProject)["id"]
+               self._addView.enable(self._manager, projId)
                self._itemView.enable(self._manager, projId)
 
                self._onListActivateId = self._projectsCombo.connect("changed", self._on_list_activate)
-               self._onAddId = self._addTaskButton.connect("clicked", self._on_add)
-               self._onAddClickedId = self._addTaskButton.connect("pressed", self._on_add_pressed)
-               self._onAddReleasedId = self._addTaskButton.connect("released", self._on_add_released)
-               self._onPasteId = self._pasteTaskNameButton.connect("clicked", self._on_paste)
-               self._onClearId = self._clearTaskNameButton.connect("clicked", self._on_clear)
 
        def disable(self):
                """
                @note UI Thread
                """
                self._projectsCombo.disconnect(self._onListActivateId)
-               self._addTaskButton.disconnect(self._onAddId)
-               self._addTaskButton.disconnect(self._onAddClickedId)
-               self._addTaskButton.disconnect(self._onAddReleasedId)
-               self._pasteTaskNameButton.disconnect(self._onPasteId)
-               self._clearTaskNameButton.disconnect(self._onClearId)
 
+               self._addView.disable()
                self._itemView.disable()
 
                self._projectsList.clear()
@@ -424,12 +536,9 @@ class GtkRtMilk(object):
                self._projectsCombo.set_active(0)
 
        def _reset_task_list(self):
-               currentProject = self._get_project()
-               projId = self._manager.lookup_project(currentProject)["id"]
-               isMeta = self._manager.get_project(projId)["isMeta"]
-               # @todo RTM handles this by defaulting to a specific list
-               self._addTaskButton.set_sensitive(not isMeta)
-
+               projectName = self._get_project()
+               projId = self._manager.lookup_project(projectName)["id"]
+               self._addView.reset_task_list(projId)
                self._itemView.reset_task_list(projId)
 
        def _get_project(self):
@@ -437,47 +546,7 @@ class GtkRtMilk(object):
                return currentProjectName
 
        def _on_list_activate(self, *args):
-               self._reset_task_list()
-
-       def _on_add(self, *args):
-               name = self._taskNameEntry.get_text()
-
-               currentProject = self._get_project()
-               projId = self._manager.lookup_project(currentProject)["id"]
-               taskId = self._manager.add_task(projId, name)
-
-               self._taskNameEntry.set_text("")
-               self._reset_task_list()
-
-       def _on_add_edit(self, *args):
-               name = self._taskNameEntry.get_text()
-
-               currentProject = self._get_project()
-               projId = self._manager.lookup_project(currentProject)["id"]
-               taskId = self._manager.add_task(projId, name)
-
                try:
-                       self._editDialog.enable(self._manager)
-                       try:
-                               self._editDialog.request_task(self._manager, taskId)
-                       finally:
-                               self._editDialog.disable()
-               finally:
-                       self._taskNameEntry.set_text("")
                        self._reset_task_list()
-
-       def _on_add_pressed(self, widget):
-               self._addToEditTimerId = gobject.timeout_add(1000, self._on_add_edit)
-
-       def _on_add_released(self, widget):
-               if self._addToEditTimerId is not None:
-                       gobject.source_remove(self._addToEditTimerId)
-               self._addToEditTimerId = None
-
-       def _on_paste(self, *args):
-               entry = self._taskNameEntry.get_text()
-               entry += self._clipboard.wait_for_text()
-               self._taskNameEntry.set_text(entry)
-
-       def _on_clear(self, *args):
-               self._taskNameEntry.set_text("")
+               except StandardError, e:
+                       self._errorDisplay.push_exception()