<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Apr 20 21:33:42 2009 -->
+<!--Generated with glade3 3.4.5 on Thu Apr 23 22:50:12 2009 -->
<glade-interface>
<widget class="GtkWindow" id="mainWindow">
<property name="default_width">800</property>
<property name="visible">True</property>
<property name="label" translatable="yes">_View</property>
<property name="use_underline">True</property>
+ <child>
+ <widget class="GtkMenu" id="menu1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkMenuItem" id="projectMenuItem">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Projects</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
<child>
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
+ <widget class="GtkComboBox" id="serviceCombo">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkEntry" id="passwordentry">
+ <widget class="GtkLabel" id="username_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
+ <property name="label" translatable="yes">Username</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="password_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Password</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="password_label">
+ <widget class="GtkEntry" id="passwordentry">
<property name="visible">True</property>
- <property name="label" translatable="yes">Password</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="username_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Username</property>
- </widget>
- </child>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkComboBox" id="serviceCombo">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkHBox" id="edit-hbox2">
+ <widget class="GtkHBox" id="edit-dueDateDisplayControlBox">
<property name="visible">True</property>
<child>
- <widget class="GtkEntry" id="edit-taskNameEntry">
+ <widget class="GtkCalendar" id="edit-dueDateCalendar">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="is_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
+ <property name="year">2009</property>
+ <property name="month">3</property>
+ <property name="day">16</property>
+ <property name="show_details">False</property>
</widget>
</child>
<child>
- <widget class="GtkHButtonBox" id="edit-hbuttonbox2">
+ <widget class="GtkHButtonBox" id="edit-dueDateActionBox">
<property name="visible">True</property>
<child>
- <widget class="GtkButton" id="edit-pasteTaskNameButton">
+ <widget class="GtkButton" id="edit-clearDueDate">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-paste</property>
+ <property name="label" translatable="yes">gtk-clear</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="edit-dueDateLabel">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="edit-dueDateLabel">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="edit-dueDateDisplayControlBox">
+ <widget class="GtkHBox" id="edit-hbox2">
<property name="visible">True</property>
<child>
- <widget class="GtkCalendar" id="edit-dueDateCalendar">
+ <widget class="GtkEntry" id="edit-taskNameEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="year">2009</property>
- <property name="month">3</property>
- <property name="day">16</property>
- <property name="show_details">False</property>
+ <property name="has_focus">True</property>
+ <property name="is_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
</widget>
</child>
<child>
- <widget class="GtkHButtonBox" id="edit-dueDateActionBox">
+ <widget class="GtkHButtonBox" id="edit-hbuttonbox2">
<property name="visible">True</property>
<child>
- <widget class="GtkButton" id="edit-clearDueDate">
+ <widget class="GtkButton" id="edit-pasteTaskNameButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-clear</property>
+ <property name="label" translatable="yes">gtk-paste</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
</widget>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<child>
- <widget class="GtkTreeView" id="treeview1">
+ <widget class="GtkTreeView" id="proj-projectView">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
self.__parentBox.remove(self.__errorBox)
+class DummyErrorDisplay(object):
+
+ def __init__(self):
+ super(DummyErrorDisplay, self).__init__()
+
+ self.__messages = []
+
+ def push_message_with_lock(self, message):
+ self.push_message(message)
+
+ def push_message(self, message):
+ if 0 < len(self.__messages):
+ self.__messages.append(message)
+ else:
+ self.__show_message(message)
+
+ def push_exception(self, exception = None):
+ if exception is None:
+ warningMessage = traceback.format_exc()
+ else:
+ warningMessage = exception
+ warnings.warn(warningMessage, stacklevel=3)
+
+ def pop_message(self):
+ if 0 < len(self.__messages):
+ self.__show_message(self.__messages[0])
+ del self.__messages[0]
+
+ def __show_message(self, message):
+ warnings.warn(message, stacklevel=2)
+
+
class MessageBox(gtk.MessageDialog):
def __init__(self, message):
warnings.warn(e.message)
+class QuickAddView(object):
+
+ def __init__(self, widgetTree, errorDisplay, signalSink, prefix):
+ self._errorDisplay = errorDisplay
+ self._manager = None
+ self._signalSink = signalSink
+
+ self._clipboard = gtk.clipboard_get()
+
+ self._taskNameEntry = widgetTree.get_widget(prefix+"-nameEntry")
+ self._addTaskButton = widgetTree.get_widget(prefix+"-addButton")
+ self._pasteTaskNameButton = widgetTree.get_widget(prefix+"-pasteNameButton")
+ self._clearTaskNameButton = widgetTree.get_widget(prefix+"-clearNameButton")
+ self._onAddId = None
+ self._onAddClickedId = None
+ self._onAddReleasedId = None
+ self._addToEditTimerId = None
+ self._onClearId = None
+ self._onPasteId = None
+
+ def enable(self, manager):
+ self._manager = manager
+
+ 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._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 set_addability(self, addability):
+ self._addTaskButton.set_sensitive(addability)
+
+ def _on_add(self, *args):
+ try:
+ name = self._taskNameEntry.get_text()
+ self._taskNameEntry.set_text("")
+
+ self._signalSink.stage.send(("add", name))
+ except StandardError, e:
+ self._errorDisplay.push_exception()
+
+ def _on_add_edit(self, *args):
+ try:
+ name = self._taskNameEntry.get_text()
+ self._taskNameEntry.set_text("")
+
+ self._signalSink.stage.send(("add-edit", name))
+ 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()
+ addedText = self._clipboard.wait_for_text()
+ if addedText:
+ entry += addedText
+ 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 NotesDialog(object):
def __init__(self, widgetTree):
self._dialog.response(gtk.RESPONSE_CANCEL)
+class ProjectsDialog(object):
+
+ ID_IDX = 0
+ NAME_IDX = 1
+ VISIBILITY_IDX = 2
+
+ def __init__(self, widgetTree):
+ self._manager = None
+
+ self._dialog = widgetTree.get_widget("projectsDialog")
+ self._projView = widgetTree.get_widget("proj-projectView")
+
+ addSink = coroutines.CoSwitch(["add", "add-edit"])
+ addSink.register_sink("add", coroutines.func_sink(self._on_add))
+ addSink.register_sink("add-edit", coroutines.func_sink(self._on_add_edit))
+ self._addView = QuickAddView(widgetTree, DummyErrorDisplay(), addSink, "proj")
+
+ self._projList = gtk.ListStore(
+ gobject.TYPE_STRING, # id
+ gobject.TYPE_STRING, # name
+ gobject.TYPE_BOOLEAN, # is visible
+ )
+ self._visibilityColumn = gtk.TreeViewColumn('') # Complete?
+ self._visibilityCell = gtk.CellRendererToggle()
+ self._visibilityCell.set_property("activatable", True)
+ self._visibilityCell.connect("toggled", self._on_toggle_visibility)
+ self._visibilityColumn.pack_start(self._visibilityCell, False)
+ self._visibilityColumn.set_attributes(self._visibilityCell, active=self.VISIBILITY_IDX)
+ self._nameColumn = gtk.TreeViewColumn('Name')
+ self._nameCell = gtk.CellRendererText()
+ self._nameColumn.pack_start(self._nameCell, True)
+ self._nameColumn.set_attributes(self._nameCell, text=self.NAME_IDX)
+ self._nameColumn.set_expand(True)
+
+ self._projView.append_column(self._visibilityColumn)
+ self._projView.append_column(self._nameColumn)
+ self._projView.connect("row-activated", self._on_proj_select)
+
+ def enable(self, manager):
+ self._manager = manager
+
+ self._populate_projects()
+ self._dialog.show_all()
+
+ def disable(self):
+ self._dialog.hide_all()
+ self._manager = None
+
+ self._projList.clear()
+ self._projView.set_model(None)
+
+ def _populate_projects(self):
+ self._projList.clear()
+
+ projects = self._manager.get_projects()
+ for project in projects:
+ projectId = project["id"]
+ projectName = project["name"]
+ isVisible = project["isVisible"]
+ row = (projectId, projectName, isVisible)
+ self._projList.append(row)
+ self._projView.set_model(self._projList)
+
+ def _on_add(self, eventData):
+ eventName, taskName, = eventData
+ # @todo
+ self._populate_projects()
+
+ def _on_add_edit(self, eventData):
+ self._on_add(eventData)
+
+ def _on_toggle_visibility(self, *args):
+ # @todo
+ pass
+
+ def _on_proj_select(self, *args):
+ # @todo
+ pass
+
+
if __name__ == "__main__":
if True:
win = gtk.Window()
self._errorDisplay.push_exception()
-class QuickAddView(object):
-
- def __init__(self, widgetTree, errorDisplay, signalSink, prefix):
- self._errorDisplay = errorDisplay
- self._manager = None
- self._signalSink = signalSink
-
- self._clipboard = gtk.clipboard_get()
-
- self._taskNameEntry = widgetTree.get_widget(prefix+"-nameEntry")
- self._addTaskButton = widgetTree.get_widget(prefix+"-addButton")
- self._pasteTaskNameButton = widgetTree.get_widget(prefix+"-pasteNameButton")
- self._clearTaskNameButton = widgetTree.get_widget(prefix+"-clearNameButton")
- self._onAddId = None
- self._onAddClickedId = None
- self._onAddReleasedId = None
- self._addToEditTimerId = None
- self._onClearId = None
- self._onPasteId = None
-
- def enable(self, manager):
- self._manager = manager
-
- 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._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 set_addability(self, addability):
- self._addTaskButton.set_sensitive(addability)
-
- def _on_add(self, *args):
- try:
- name = self._taskNameEntry.get_text()
- self._taskNameEntry.set_text("")
-
- self._signalSink.stage.send(("add", name))
- except StandardError, e:
- self._errorDisplay.push_exception()
-
- def _on_add_edit(self, *args):
- try:
- name = self._taskNameEntry.get_text()
- self._taskNameEntry.set_text("")
-
- self._signalSink.stage.send(("add-edit", name))
- 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()
- addedText = self._clipboard.wait_for_text()
- if addedText:
- entry += addedText
- 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):
self._credentials = "", "", ""
self._editDialog = gtk_toolbox.EditTaskDialog(widgetTree)
+ self._projDialog = gtk_toolbox.ProjectsDialog(widgetTree)
self._projectsList = gtk.ListStore(gobject.TYPE_STRING)
self._projectsCombo = widgetTree.get_widget("projectsCombo")
self._projectCell = gtk.CellRendererText()
self._onListActivateId = 0
+ self._projectMenuItem = widgetTree.get_widget("projectMenuItem")
+ self._onProjectMenuItemActivated = 0
+
self._itemView = ItemListView(widgetTree, self._errorDisplay)
addSink = coroutines.CoSwitch(["add", "add-edit"])
addSink.register_sink("add", coroutines.func_sink(self._on_add))
addSink.register_sink("add-edit", coroutines.func_sink(self._on_add_edit))
- self._addView = QuickAddView(widgetTree, self._errorDisplay, addSink, "add")
+ self._addView = gtk_toolbox.QuickAddView(widgetTree, self._errorDisplay, addSink, "add")
self._credentialsDialog = gtk_toolbox.LoginWindow(widgetTree)
@staticmethod
self._itemView.enable(self._manager, projId)
self._onListActivateId = self._projectsCombo.connect("changed", self._on_list_activate)
+ self._onProjectMenuItemActivated = self._projectMenuItem.connect("activate", self._on_proj_activate)
def disable(self):
"""
@note UI Thread
"""
self._projectsCombo.disconnect(self._onListActivateId)
+ self._projectMenuItem.disconnect(self._onProjectMenuItemActivated)
self._onListActivateId = 0
self._addView.disable()
def _on_add(self, eventData):
eventName, taskName, = eventData
- try:
- projectName = self._get_project()
- projId = self._manager.lookup_project(projectName)["id"]
+ projectName = self._get_project()
+ projId = self._manager.lookup_project(projectName)["id"]
- taskId = self._manager.add_task(projId, taskName)
+ taskId = self._manager.add_task(projId, taskName)
- self._itemView.reset_task_list(projId)
- except StandardError, e:
- self._errorDisplay.push_exception()
+ self._itemView.reset_task_list(projId)
def _on_add_edit(self, eventData):
eventName, taskName, = eventData
- try:
- projectName = self._get_project()
- projId = self._manager.lookup_project(projectName)["id"]
+ projectName = self._get_project()
+ projId = self._manager.lookup_project(projectName)["id"]
- taskId = self._manager.add_task(projId, taskName)
+ taskId = self._manager.add_task(projId, taskName)
- self._editDialog.enable(self._manager)
- try:
- self._editDialog.request_task(self._manager, taskId)
- finally:
- self._editDialog.disable()
- self._itemView.reset_task_list(projId)
- except StandardError, e:
- self._errorDisplay.push_exception()
+ self._editDialog.enable(self._manager)
+ try:
+ self._editDialog.request_task(self._manager, taskId)
+ finally:
+ self._editDialog.disable()
+ self._itemView.reset_task_list(projId)
+
+ def _on_proj_activate(self, *args):
+ self._projDialog.enable(self._manager)
projects / doneit / commitdiff