SILO-GROUP
/
Ivory-Tower
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

several bug fixes

2017-Q3
Chris Punches 2017-07-23 17:29:08 -04:00
parent 791a5bc4b2
commit e17238483a
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Ivory-Tower Normal file → Executable file
View File

@ -85,10 +85,11 @@ class PageStack(Gtk.EventBox):
menu.append(itemAddPeer) menu.append(itemAddPeer)
itemRename = Gtk.MenuItem("Rename this task...") itemRename = Gtk.MenuItem("Edit Description")
itemRename.connect("activate", self.pageEditMenuClicked) itemRename.connect("activate", self.pageEditMenuClicked)
itemAddAction = Gtk.MenuItem("Add a child task...") itemAddAction = Gtk.MenuItem("Split... >")
itemAddAction.connect("activate", self.addChild_menuclicked, self.ctrl_parent, self.db_task)
itemAddAction.connect("activate", self.addChild_menuclicked)
itemCompleteAction = Gtk.MenuItem("Mark as Complete") itemCompleteAction = Gtk.MenuItem("Mark as Complete")
itemCompleteAction.connect("activate", self.itemCompletionClicked) itemCompleteAction.connect("activate", self.itemCompletionClicked)
@ -113,9 +114,9 @@ class PageStack(Gtk.EventBox):
def addPeer_menuclicked(self, widget): def addPeer_menuclicked(self, widget):
# This is handled by the ctrl_parent TaskFactory since a peer is being created. # This is handled by the ctrl_parent TaskFactory since a peer is being created.
newDB_Task = self.ctrl_parent.dbhandle.generate_new_task(parent_taskID=self.ctrl_parent.db_task.taskID) newDB_Task = self.ctrl_parent.dbhandle.generate_new_task(parent_taskID=self.getParentTaskLoaderID())
newUI_Task = UI_Task(newDB_Task, self.ctrl_parent) newUI_Task = UI_Task(newDB_Task, parentTaskFactory=self.parentNotebook)
self.ctrl_parent.add_UI_Task(newUI_Task) self.parentNotebook.add_UI_Task(newUI_Task)
def addChild_menuclicked(self, widget): def addChild_menuclicked(self, widget):
task = self.ctrl_parent.dbhandle.generate_new_task(self.ctrl_parent.db_task.taskID) task = self.ctrl_parent.dbhandle.generate_new_task(self.ctrl_parent.db_task.taskID)
@ -127,11 +128,6 @@ class PageStack(Gtk.EventBox):
if event.type == Gdk.EventType.BUTTON_PRESS and event.get_button().button == 3: if event.type == Gdk.EventType.BUTTON_PRESS and event.get_button().button == 3:
widget.popup(None, None, None, None, event.get_button().button, event.time) widget.popup(None, None, None, None, event.get_button().button, event.time)
def editMenuClicked(self, widget, parentNotebook):
# parentNotebook.toggleCurrentTabStackArea()
#win = EditWindow()
self.stack.set_visible_child(self.editArea)
def returnPressed(self, widget, event, stack, entry, label, db_task): def returnPressed(self, widget, event, stack, entry, label, db_task):
#print(Gdk.keyval_name(event.keyval)) #print(Gdk.keyval_name(event.keyval))
if Gdk.keyval_name(event.keyval) == 'KP_Enter': if Gdk.keyval_name(event.keyval) == 'KP_Enter':
@ -143,6 +139,8 @@ class PageStack(Gtk.EventBox):
dbhandle.updateTaskDescription(db_task, buffer.get_text(buffer.get_start_iter(), buffer.get_end_iter(), True)) dbhandle.updateTaskDescription(db_task, buffer.get_text(buffer.get_start_iter(), buffer.get_end_iter(), True))
def pageEditMenuClicked(self, widget): def pageEditMenuClicked(self, widget):
needlessBuffer = self.editField.get_buffer()
needlessBuffer.set_text( self.viewLabel.get_text() )
self.stack.set_visible_child(self.editArea) self.stack.set_visible_child(self.editArea)
@ -236,7 +234,7 @@ class TabStack(Gtk.EventBox):
itemRename = Gtk.MenuItem("Change Title") itemRename = Gtk.MenuItem("Change Title")
itemRename.connect("activate", self.tabEditMenuClicked) itemRename.connect("activate", self.tabEditMenuClicked)
itemAddAction = Gtk.MenuItem("Split") itemAddAction = Gtk.MenuItem("Split >")
itemAddAction.connect("activate", self.addChild_menuclicked) itemAddAction.connect("activate", self.addChild_menuclicked)
itemCompleteAction = Gtk.MenuItem("Mark Complete") itemCompleteAction = Gtk.MenuItem("Mark Complete")
@ -414,11 +412,15 @@ class TaskLoader(Gtk.Notebook):
pageContainer = Gtk.Box(spacing=6, orientation=Gtk.Orientation.VERTICAL) pageContainer = Gtk.Box(spacing=6, orientation=Gtk.Orientation.VERTICAL)
pageContainer.set_border_width(10) pageContainer.set_border_width(10)
# Add the project description label to the notebook tab # Add the project description label to the notebook tab
pageContainer.pack_start(ui_task.pageDisplay, False, True, 6) pageContainer.pack_start(ui_task.pageDisplay, False, True, 6)
# Add the new task to the page of the current TaskFactory instance # Add the new task to the page of the current TaskFactory instance
self.append_page(pageContainer, ui_task) self.append_page(pageContainer, ui_task)
self.set_tab_reorderable(pageContainer, True)
if ui_task.has_children: if ui_task.has_children:
ui_task.add_child_TaskBook(pageContainer) ui_task.add_child_TaskBook(pageContainer)

BIN
default.db
View File

Binary file not shown.