# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: izidor.matusov@gmail.com-20100409183244-\
#   zjhl0xu0aogcleyo
# target_branch: http://bazaar.launchpad.net/~gtg/gtg/trunk/
# testament_sha1: 39cda2b45e26bdedb1f91366ee15a90f8ef1ada6
# timestamp: 2010-04-09 20:33:05 +0200
# base_revision_id: bertrand.rousseau@gmail.com-20100407192531-\
#   arit8k3zhaf7w6px
# 
# Begin patch
=== modified file 'GTG/core/firstrun_tasks.py'
--- GTG/core/firstrun_tasks.py	2010-03-12 13:56:19 +0000
+++ GTG/core/firstrun_tasks.py	2010-04-09 18:32:44 +0000
@@ -27,7 +27,7 @@
     https://bugs.launchpad.net/gtg
 
 Thank you for trying out GTG :-)""")
-    t1 = addtask(doc, "0@1", title1, text1, ["1@1", "2@1", "3@1", "4@1", "5@1", "6@1"])
+    t1 = addtask(doc, "0@1", title1, text1, [], ["1@1", "2@1", "3@1", "4@1", "5@1", "6@1"])
     root.appendChild(t1)
     
     #Task 1@1: Learn to use subtasks
@@ -41,7 +41,7 @@
 Some concepts come with subtasks: for example, a subtask's due date can never be after its parent's due date.
 
 Also, marking a parent as done will mark all the subtasks as done.""")
-    t2 = addtask(doc, "1@1", title2, text2, [])
+    t2 = addtask(doc, "1@1", title2, text2, [], [])
     root.appendChild(t2)
     
     #Task 2@1: Learn to use tags
@@ -59,7 +59,7 @@
 If you right click on a tag in the sidebar you can also set its color. It will allow you to have a more colorful list of tasks, if you want it that way.
 
 A new tag is only added to the current task. There's no recursion and the tag is not applied to subtasks. But when you create a new subtask, this subtask will inherit the tags of its parent as a good primary default (it will also be the case if you add a tag to a parent just after creating a subtask). Of course, you can modify at any time the tags of this particular subtask. It will never be changed by the parent.""")
-    t3 = addtask(doc, "2@1", title3, text3, [])
+    t3 = addtask(doc, "2@1", title3, text3, ["to_pay", "money"], [])
     root.appendChild(t3)
     
     #Task 3@1: Using the Workview
@@ -75,7 +75,7 @@
 Thus, the workview will only show you tasks you should do right now.
 
 If you use tags, you can right click on a tag in the sidebar and choose to hide tasks assigned to this particular tag in the workview. It's very useful if you have a tag like "someday" that you use for tasks you would like to do but are not particularly urgent.""")
-    t4 = addtask(doc, "3@1", title4, text4, [])
+    t4 = addtask(doc, "3@1", title4, text4, [], [])
     root.appendChild(t4)
     
     #Task 5@1: Plugins
@@ -85,7 +85,7 @@
 Some examples of the current plugins are Syncing with Remember the Milk and Evolution, Tomboy/Gnote integration and Geolocalized Tasks.
 You can find the Plugin Manager by selecting Edit in the Menu Bar, then clicking Preferences. You will then see a tab labeled Plugins.""")
     
-    t5 = addtask(doc, "4@1", title5, text5, [])
+    t5 = addtask(doc, "4@1", title5, text5, [], [])
     root.appendChild(t5)
 
     #Task 5@1: Reporting bugs
@@ -99,7 +99,7 @@
 
 If you have some trouble with GTG, we might be able to help you or to solve your problem really quickly.""")
     
-    t6 = addtask(doc, "5@1", title6, text6, [])
+    t6 = addtask(doc, "5@1", title6, text6, [], [])
     root.appendChild(t6)
     
     #Task 6@1: Learn how to use the QuickAdd Entry
@@ -116,17 +116,20 @@
 Attributes which are added in this way apply but do not appear in the title.
 If a word begins with @, it is interpreted as a tag.""")
 
-    t7 = addtask(doc, "6@1", title7, text7, [])
+    t7 = addtask(doc, "6@1", title7, text7, [], [])
     root.appendChild(t7)
 
     return doc
     
 
-def addtask(doc, ze_id, title, text, childs):
+def addtask(doc, ze_id, title, text, tags, childs):
     t_xml = doc.createElement("task")
     t_xml.setAttribute("id", ze_id)
     t_xml.setAttribute("status", "Active")
-    t_xml.setAttribute("tags", "")
+
+    tagsWithPrefix = map(lambda x: "@"+x, tags)
+    t_xml.setAttribute("tags", ",".join(tagsWithPrefix))
+
     cleanxml.addTextNode(doc, t_xml, "title", title)
     for c in childs:
         cleanxml.addTextNode(doc, t_xml, "subtask", c)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVwkb64AAjPflEAQUG//93Ii
UIq////wIAACAFAEmDWrDVvQF1s7nCSSNCZJsAjQZNU9PSm0aRoyAaZAySaYARoqfpqemonpPSZA
0AyGgAxI0gmE9EaaU9IP1Rso9Ro0ehBpkBzAJgBMAAJgACYAAkoTFPRJ4mpkeo9R5RpkDTQAAeoM
QHvwzgMqIQI7pobgxMHYZZRiABHbLLVRCFNlLxjKOVxILEDEg3qzsw50oFIju7QR+Y0LBYKaHVB3
EZ4s1DCqLPQmFIS8ao7KKq9nl+sQToT0+0OkPDzeWfu/dcDmOFg9CAEQgB3qeVq36bedzkSROlSn
0YkNUzyiDDlLdkAI+OHHvJu06myHWEkkkgg/sQM93r003wj05PbFzoQ5TJonLPsFabDyBEBgdLff
tzdkD1p5EjGvEnM7S+Ol+rGxyd6CRGCRIvBN4bkg8phEBn3jLOG5iAUYyZWeov2PhlsrFuoQr3Hx
QnV0rs89II+VQYVjfw2uIR0rdxSqQ+qAms1uNqC67IxCA3/W4WG2Y5b1PAS3EMl1uiuVoHayya9S
sIcRR0aCAVryRS9Qtcl3Mb5PYBiNYMo8MEMBgoXNzOHnXHYFUFRp21G4kbjN7BUVUDpURQgMO6HJ
TxEFbahQtEVHQG45mDkWMLkdS5Szx1dnbXUMNReuFkE5pPGoarLjeJRvQSDcLhsP2WU1oI1GaFm7
dKY2FcrYmwlmKamWiV0RKmALbpWhtkJSswF+wxbVXBkNQ7EDVAsK3tRgYjEdC0FAyHAcvV3ObMKo
rQqSVbKaEmgaoo1FhwFFK+gxIGzhUpjRcOnNpWTuz1u7u+Az5HtJ14TSCXg3OzwHbiAS8StgGYxj
Jdjg6ySvHpr7oVtNw7JdlWPDCnZYA1WynVfWFYr0iXTdnfAMBR15EdSgCmEfmdP78yyztKdLmYf3
k2Zes2033dDtBZAVGRScaee6WaF3IXgkT+ukfItWvgQ5PXUiTO5SRKLaahEjFx9AIgOTXAa4Mm5M
dWTTuuaMbnjTXKzoXxhjwOexXE+XcQ7amlpjKq6OxtXo49ozxTL1lsuoi22K+8fKEaRTsE/VVV3T
tvxNVpAojHgUn649p4+TUFcJmfGC/XaKhDunmkQCm0WmcY28ME+D2FDyrSNxHIV4qrp5MogHRYlK
R03qEv1+gT7PDhrha0NMwZhWvY1AZvI+eReMo3Ld8W2+QDO1XA4NOpIquFeDwraE9sTdYhKSB4a9
mMNyR1kjq4mZLxwkLd79mMFm0Rg7kFxlEHhseNOanbHQUIgxMDD1RNrAyOjlF0cAKQclshoAlCKZ
YQLbTGvfBLGfTRVscy44PJrnT3xznRYLrtCqE1KAd/mKtv6GES55h7s2F5WteNDEC8BjmnquPM9K
e0rwuDNkeoswk5QpKYCqgGBnoTJDup4CikrdfXn5MkkkkklaZVPEPdxQblXcANZe+nXAEeraVFVd
lhEB4ECukMyiqGuTsHKOOUCkTFmt0yCehKtPTWgUBvB3rOXEoVGPnogrZ0jUKU1kzRw4WEMsjfdd
3vAlxFI7/U/8XckU4UJBcJG+uA==