Merge lp:~cyberone-mail/gtg/fix-316922 into lp:~gtg/gtg/old-trunk

[A. S. Popov]

Fixed bug #316922

[Izidor Matušov (izidor)]

The code looks good for me. One of the GTG features is Multi-parent tasks (one task could be a child for more parents). You need allow choose which parent do you want to open. You can inspire by the way tag button in task editor works. When you click on tag, it opens the first tag, when you press the arrow, you can choose which parent task you want.

review: Needs Fixing (code review,running code)

[A. S. Popov (cyberone-mail)]

Just give me an example how do I make multi-parent task. Or maybe XML. I need one for testing.

[lp:~cyberone-mail/gtg/fix-316922]

932. By A. S. Popov on 2011-03-30

Reworked to support miltiple tasks. Needs testing

[Luca Invernizzi (invernizzi)]

First of all, thanks a lot for working on this and sorry for the delay.

For making a multi-parent task, you just have to copy and paste its textual link from the task parent to another task text (for now, the process is completely based on copying the link, maybe we'll add something more discoverable later). XML is at the end of the comment.

Code looks good. A couple of issues:
 - a task with no parent should not have the button
 - signals need to be added for handling task modifications (new parents..)
 - of course, multiparent support.

<?xml version="1.0" ?>
<project>
 <task id="0@1" status="Active" tags="" uuid="89a7b71c-12b2-4806-8941-12870e42f47a">
  <title>
   Getting started with GTG
  </title>
  <modified>
   2011-04-03T23:56:57
  </modified>
  <subtask>
   6@1
  </subtask>
  <content>
   → &lt;subtask&gt;4@1&lt;/subtask&gt;

→ &lt;subtask&gt;6@1&lt;/subtask&gt;

  </content>
  <task-remote-ids/>
 </task>
 <task id="4@1" status="Active" tags="" uuid="2b3d128f-c3ad-4387-aac6-c8df3f3b331e">
  <title>
   Learn how to use Plugins
  </title>
  <modified>
   2011-04-03T23:57:14
  </modified>
  <subtask>
   5@1
  </subtask>
  <content>

→ multi-parents task

  </content>
  <task-remote-ids/>
 </task>
 <task id="5@1" status="Active" tags="" uuid="86e2c05b-d3da-4f31-aadb-18d441fc3536">
  <title>
   multi-parents task
  </title>
  <modified>
   2011-04-03T23:57:02
  </modified>
  <task-remote-ids/>
 </task>
 <task id="6@1" status="Active" tags="" uuid="d994bbe2-c8cf-4540-8dc4-69327518a7ee">
  <title>
   Learn how to use the QuickAdd Entry
  </title>
  <modified>
   2011-04-03T23:57:08
  </modified>
  <subtask>
   5@1
  </subtask>
  <subtask>
   4@1
  </subtask>
  <content>

→ multi-parents task

  </content>
  <task-remote-ids/>
 </task>
</project>

review: Needs Fixing

[Izidor Matušov (izidor)]

> Code looks good. A couple of issues:
> - a task with no parent should not have the button

Or the button could be disabled (It wouldn't mess UI)

[lp:~cyberone-mail/gtg/fix-316922]

933. By A. S. Popov on 2011-04-06

Now parentless tasks have "go to parent" button disaled.

[Izidor Matušov (izidor)]

Hi, I found a traceback:

Traceback (most recent call last):
  File "/home/iyo/downloads/fix-316922/GTG/gtk/editor/taskview.py", line 1279, in _tag_event
    self.open_task(anchor)
  File "/home/iyo/downloads/fix-316922/GTG/gtk/manager.py", line 168, in open_task
    clipboard = self.clipboard)
  File "/home/iyo/downloads/fix-316922/GTG/gtk/editor/editor.py", line 168, in __init__
    self.refresh_editor()
  File "/home/iyo/downloads/fix-316922/GTG/gtk/editor/editor.py", line 352, in refresh_editor
    mi = gtk.MenuItem(label = t.get_title(), use_underline=False)
AttributeError: 'NoneType' object has no attribute 'get_title'

Which prevents me from opening a task with multiple parents. It is probably a bug of other parts of GTG.

Otherwise it works good!

[Izidor Matušov (izidor)]

There was no further activity in more than a year, there is still a discussion how to solve this problem (see comments in the bug). Closing this merge request as rejected. Feel free to finish your patch and reopen it.

review: Disapprove

Unmerged revisions

933. By A. S. Popov on 2011-04-06

Now parentless tasks have "go to parent" button disaled.

932. By A. S. Popov on 2011-03-30

Reworked to support miltiple tasks. Needs testing

931. By A. S. Popov on 2011-03-28

Assigned stock image to icon

930. By A. S. Popov on 2011-03-27

Made taskeditor.glade change more minor.

929. By A. S. Popov on 2011-03-26

Ctrl-P to go to parent rocks.

928. By A. S. Popov on 2011-03-26

About to make a link to parent task.

=== modified file 'GTG/gtk/editor/editor.py'
--- GTG/gtk/editor/editor.py	2010-09-15 05:02:01 +0000
+++ GTG/gtk/editor/editor.py	2011-04-06 01:31:42 +0000
@@ -16,6 +16,8 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
+from GTG.core.datastore import DataStore
+from GTG.core import CoreConfig
 """
 This is the TaskEditor
 
@@ -72,6 +74,7 @@
         self.subtask_button.set_tooltip_text(GnomeConfig.SUBTASK_TOOLTIP)
         self.inserttag_button = self.builder.get_object("inserttag")
         self.inserttag_button.set_tooltip_text(GnomeConfig.TAG_TOOLTIP)
+        self.gotoparent_button = self.builder.get_object("gotoparent")
         #Create our dictionary and connect it
         dic = {
                 "mark_as_done_clicked"      : self.change_status,
@@ -93,6 +96,7 @@
                 "on_insert_subtask_clicked" : self.insert_subtask,
                 "on_inserttag_clicked"      : self.inserttag_clicked,
                 "on_move"                   : self.on_move,
+                "on_gotoparent_clicked"     : self.goto_first_parent,
         }
         self.builder.connect_signals(dic)
         self.window         = self.builder.get_object("TaskEditor")
@@ -338,6 +342,21 @@
                 menu.append(mi)
         if tag_count > 0 :
             self.inserttag_button.set_menu(menu)
+        
+        self.gotoparent_button.set_sensitive(len(self.task.get_parents()) >= 1)
+        if len(self.task.get_parents()) > 1:
+            menu = gtk.Menu()
+            ds = DataStore(CoreConfig())
+            for i in self.task.get_parents():
+                t = ds.get_task(i)
+                mi = gtk.MenuItem(label = t.get_title(), use_underline=False)
+                mi.connect("activate", self.goto_parent, i)
+                mi.activate()
+                mi.show()
+                menu.append(mi)
+                # TODO: Connect signal with a task
+                pass
+            self.gotoparent_button.set_menu(menu)
 
         if refreshtext:
             self.textview.modified(refresheditor=False)
@@ -546,6 +565,13 @@
 
     def get_window(self):
         return self.window
-
-
+    
+    def goto_first_parent(self, event):
+        parent = self.task.get_parent()
+        if parent != None:
+            tid = parent
+            self.vmanager.open_task(tid)
+
+    def goto_parent(self, widget, tid):
+        self.vmanager.open_task(tid)
 

=== modified file 'GTG/gtk/editor/taskeditor.glade'
--- GTG/gtk/editor/taskeditor.glade	2010-09-16 14:12:35 +0000
+++ GTG/gtk/editor/taskeditor.glade	2011-04-06 01:31:42 +0000
@@ -85,6 +85,23 @@
               </packing>
             </child>
             <child>
+              <object class="GtkMenuToolButton" id="gotoparent">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes">Go to parent task</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">Go to parent task</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-go-up</property>
+                <accelerator key="p" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+                <signal name="clicked" handler="on_gotoparent_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>            
+            <child>
               <object class="GtkSeparatorToolItem" id="separator_note">
                 <property name="visible">True</property>
               </object>