From e17238483a257840fd68451d1e46453551b7632c Mon Sep 17 00:00:00 2001 From: Chris Punches Date: Sun, 23 Jul 2017 17:29:08 -0400 Subject: [PATCH] several bug fixes --- Ivory-Tower | 26 ++++++++++++++------------ default.db | Bin 81920 -> 81920 bytes 2 files changed, 14 insertions(+), 12 deletions(-) mode change 100644 => 100755 Ivory-Tower diff --git a/Ivory-Tower b/Ivory-Tower old mode 100644 new mode 100755 index 59b7024..06c1697 --- a/Ivory-Tower +++ b/Ivory-Tower @@ -85,10 +85,11 @@ class PageStack(Gtk.EventBox): menu.append(itemAddPeer) - itemRename = Gtk.MenuItem("Rename this task...") + itemRename = Gtk.MenuItem("Edit Description") itemRename.connect("activate", self.pageEditMenuClicked) - itemAddAction = Gtk.MenuItem("Add a child task...") - itemAddAction.connect("activate", self.addChild_menuclicked, self.ctrl_parent, self.db_task) + itemAddAction = Gtk.MenuItem("Split... >") + + itemAddAction.connect("activate", self.addChild_menuclicked) itemCompleteAction = Gtk.MenuItem("Mark as Complete") itemCompleteAction.connect("activate", self.itemCompletionClicked) @@ -113,9 +114,9 @@ class PageStack(Gtk.EventBox): def addPeer_menuclicked(self, widget): # 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) - newUI_Task = UI_Task(newDB_Task, self.ctrl_parent) - self.ctrl_parent.add_UI_Task(newUI_Task) + newDB_Task = self.ctrl_parent.dbhandle.generate_new_task(parent_taskID=self.getParentTaskLoaderID()) + newUI_Task = UI_Task(newDB_Task, parentTaskFactory=self.parentNotebook) + self.parentNotebook.add_UI_Task(newUI_Task) def addChild_menuclicked(self, widget): 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: 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): #print(Gdk.keyval_name(event.keyval)) 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)) def pageEditMenuClicked(self, widget): + needlessBuffer = self.editField.get_buffer() + needlessBuffer.set_text( self.viewLabel.get_text() ) self.stack.set_visible_child(self.editArea) @@ -236,7 +234,7 @@ class TabStack(Gtk.EventBox): itemRename = Gtk.MenuItem("Change Title") itemRename.connect("activate", self.tabEditMenuClicked) - itemAddAction = Gtk.MenuItem("Split") + itemAddAction = Gtk.MenuItem("Split >") itemAddAction.connect("activate", self.addChild_menuclicked) itemCompleteAction = Gtk.MenuItem("Mark Complete") @@ -414,11 +412,15 @@ class TaskLoader(Gtk.Notebook): pageContainer = Gtk.Box(spacing=6, orientation=Gtk.Orientation.VERTICAL) pageContainer.set_border_width(10) + + # Add the project description label to the notebook tab pageContainer.pack_start(ui_task.pageDisplay, False, True, 6) # Add the new task to the page of the current TaskFactory instance self.append_page(pageContainer, ui_task) + self.set_tab_reorderable(pageContainer, True) + if ui_task.has_children: ui_task.add_child_TaskBook(pageContainer) diff --git a/default.db b/default.db index 24c7d544cf4dfe514c3a6b2ea9babf9874c915cd..bd42af04103c5f2405b17a36253c8ab7c532f082 100644 GIT binary patch delta 3637 zcmeH~Piz}m9mgHN=VaonXO@ME4Up|in>LM-IAlX%MS(-(vR7GB)SCA`o1$miXMlRE3I)$91lgLx_ z6!IiJiJYJl$Z@5hWj zyLdvr7*ak^{-*p@`J?h!`GxW`=z%Bqkllohfi1+yr(h#>_tD6fkNNtD-!CItzU zSA{%_aueoOgEOc%h$jV8D9gl>f=QGmqICwRKuW^aNqpxC0~07+Qjmgiln&9QU<~Ct zv87-Xr7hkLqqM}bA(W<&gD8uqg+7Mb5StwZDUm{F(2ruRGdPSw?+p4-Xwgt8^#9BD zKe%k?-#^R?QHgvy?5S?SCHG^}z0iqBJfb9HkE9Qkt!IYh8*;oyQ+^qHHMSCasrz@a zfA%DLJ`;UE`kUw*(MtC{rB{A0x+FjD&U8<7eHi((^tkKIu3Q)Gv^#&)Inw#3$gN0R z`e~Ed_QPMq!_!%PLF3vL{VfRg)b#82<0frW!O7lE&Ak zRZq>RE@x?O@T{j>=7P;lmeW3)85zVq(?l8|{deOEV56+WoFO63djUF&I zaV5F{-5ceq&3H*h^Dlb4xcWmU0j{0oh4urWM;;Lr@tYdu-k zcN}hd3@jIPGyl=v6OCx(WJnsDJ?DF#WwKSvVK0N->2vKDBD}h1@QmuqSj!gf3CFWyL?lx9y?^+Rhe&vEaH?dZ3r=q@S=OzO|Q$Gh_Dc{d~4d0^VCt zAtDJ-t@|Fw8B3Wty`<-S)c_lwqjR_A&Qq>rd{0!n?y#cp`4dk%9gqDzbmBp6KzhER zL_*!MiDvEFp9(i3B2i1H>uV5!$yumQ2lKo0 ztulAwBaJXDJvosss<2>A_p%yPc*-?YGuM3JezJF{(E$_2CKk&U*3OdZ*=9ySH{d^21bsm7yGyev<9DY}L$Tr0ZVC}A-`FVW4c;k%-^AWAL&;usDw9j;rB zl~hMpGh(f6>82-=**YTBjKf`9G%0AO`!~#u_QZCSx&f|D?XEZfP#J7?SC3Sgnpbrb zJXCUU0aGMM$1SdXOcOp%7>oggtuZslHk-8pf{(NgVsr)b`!;g#hCtml# z&~PGQtBzL`rlxt;a?-ZrwxwiOO0ob6(((MA4>`mRW);(8_gluG%|#yk3A=eP`jes*o0U z7LLDZ`HtwUqNX4RuDD)tu-N|~(f8#q)@@iYJ|`xoOo&f{U9^0t34W31eFHkWr$a)p z>1QBeqJGM1fyY1o<7%hM<-xt5j$vtupd6(Qp-XV98x5;hfEpiLFNA{2b36Kra zK-Nhed6V2k-XJ%SyJQ!+Lw1lgQbTT&>Nbih!M{|bLMr%ui)fQ%d_*JK_g{JIUvvtWiU0rr delta 2308 zcmeIzX-pJn9LMqJ|DV}q0A*GY#jB1*1mXp3iO?f%rQX`2*4DGKmE{PqyD|$kRRmf? zXnj%WG%2=;v4@H`vK}ZNyl5L=wfd&9hmDPCX_R}dk1$*fvorFDff=<8#bexXE zZaPNCU?&}=qp*XH&=J^5J=6nt&|x|ZqjZQ4!D>242a_~r-LLzxzFsfT3t*W(PoD>u z>T?$Aa}WW2mOcv>>v?(}%-3`D9GI(T>)FuKv-B)=pc1`AIbWZzEYgemEZv7Yen*%O z%|FaL=AI{)czM1TcRW83uPppMwMAYUE{B=RRemPe;H?FPzNZNxnAWunXju{F7q{&3uLZS`HW~mzp6S<4zE@Dl*~0M(`Bw!X~-;- zDIUpuMdf{&FRQ#ObCt@UWv*0tL*@#V-^g69azN%XI*DJL=#{-x4Ih-bMCB(k7pue_ zU|ythk4&S(uS3n&YO(uvnGISEvQp-DEsESEGpa_*WJa`Vj4qNHR{5;V`qirE$*xm5 z1Gm)ZC{f36(i*)T^O1&(A{DU|9OnNg>c4!V${tLcQ<7q66F3&MYi+G*wE7D63iAiE z&)hq@=*h(?k5)U;Xdr$qTB$o9+a{-c?flx5r3;a=KM`*wqAU@4iC`JYLL~nrl1+c1 z(`9FH^3}v(w=hh9fjhWsWS8W1iI|&+q>(UgJF|bBj*m75oHjd~jgMUFT^74cQzQ+$ z+!)z6>8QK@Zeo3NB8n1`rnd0jbr~EP_U@DGA{35UD zXos8)yRu%Gi=Wb`xbm$_>O$ddkx*$Q+!SiCYa(GQQfc{%ExRTbvaMja!m_J_4WSAv zXxpKfE%%$)^kcR(>Waq9?N5KcEdb|$H05+V;>x1 zlkq)^+nmN}@FtID`5;~AQ9KG><5X@*MGSHZ%hT@XWX3}vdhw3I9TYvB#7Xb~d)W)S z*~1>#$vWd!iw@RUgRPjM8SY?Wf>9Q774P52^jN+oF>l*gUyn(<0hVFL-VT>)(S>U2 s4q&p5V4xT?br|Mr^;$j5#S~o!Ev;6oRR?O)nv{)NqcWz&KJV=P2O)Rs`~Uy|