On Wed, 2008-04-02 at 11:50 -0400, Aaron Bentley wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Jelmer Vernooij wrote: > > On Mi, 2008-04-02 at 17:33 +0200, Daniel Schierbeck wrote: > >> Where should I place the attribution? > > I guess just mentioning where the art comes from in the commit message > > that adds it should be sufficient. Just as long as we have some way to > > find the original source in the future should be sufficient. > > What about AUTHORS? > > Aaron > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.6 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org > > iD8DBQFH86tc0F+nu1YWqI0RArluAJ4wef7hY85muR/fpHgvSEevFXVJMACePJe4 > zoicepS3I28GJX7z69szmQs= > =e2PO > -----END PGP SIGNATURE-----
Done. Cheers, Daniel
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# 74e59l7irxo50ju5
# target_branch: file:///home/daniel/Projects/bzr-gtk/trunk/
# testament_sha1: 4b89fe432230e6a4b7069843ba477b60658e83e1
# timestamp: 2008-04-02 17:54:54 +0200
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'AUTHORS'
--- AUTHORS 2006-10-14 19:14:14 +0000
+++ AUTHORS 2008-04-02 15:54:41 +0000
@@ -13,5 +13,7 @@
Olive was written by Szilveszter Farkas <[EMAIL PROTECTED]>.
+The tag icon was created by Jakub Steiner.
+
Numerous other people have contributed useful patches. See the Bazaar history
of this branch for a full list of authors.
=== added file 'icons/tag-16.png'
Binary files icons/tag-16.png 1970-01-01 00:00:00 +0000 and icons/tag-16.png 2008-04-02 00:31:14 +0000 differ
=== modified file 'viz/branchwin.py'
--- viz/branchwin.py 2008-03-28 19:12:27 +0000
+++ viz/branchwin.py 2008-04-02 00:31:14 +0000
@@ -14,6 +14,7 @@
import pango
from bzrlib.plugins.gtk.window import Window
+from bzrlib.plugins.gtk import icon_path
from bzrlib.plugins.gtk.tags import AddTagDialog
from bzrlib.plugins.gtk.preferences import PreferencesWindow
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
@@ -177,7 +178,10 @@
go_menu_next = self.next_rev_action.create_menu_item()
go_menu_prev = self.prev_rev_action.create_menu_item()
- self.go_menu_tags = gtk.MenuItem("_Tags")
+ tag_image = gtk.Image()
+ tag_image.set_from_file(icon_path("tag-16.png"))
+ self.go_menu_tags = gtk.ImageMenuItem("_Tags")
+ self.go_menu_tags.set_image(tag_image)
self._update_tags()
go_menu.add(go_menu_next)
@@ -435,7 +439,10 @@
tags.sort()
tags.reverse()
for tag, revid in tags:
- tag_item = gtk.MenuItem(tag, use_underline=False)
+ tag_image = gtk.Image()
+ tag_image.set_from_file(icon_path('tag-16.png'))
+ tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
+ tag_item.set_image(tag_image)
tag_item.connect('activate', self._tag_selected_cb, revid)
menu.add(tag_item)
self.go_menu_tags.set_submenu(menu)
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUJChCIABRN/////////////
//////////////++//+v///dru/fu//f4AqHyg9AAAAHDYAAAAA4AVCRoh5J6nqbRMnppqaeibER
oNMJk9TymNExpMnlPUYNQNoMp6gNPU9RiNHqepmoPSNNGahpoaD1NPU09E0NDajTTNT0J6TTCPRP
RGg0ZqbFBqVPQgmnkjZqJ+k9I1G0anlHqbKB6gM0R6jQ8mp6RpoaGJkA9RkABgBNMmmgAyMRo0aM
hpoyaDQ2ppkNAZAGEGgwmIgAAADQA0AAAAAGgAAAGTQGQAAAaAAAAAAAAAAAAAAAAADJoCKmURgA
BNMAaAACYABMAAAAEwAAAAABMAEwARgTTBGEyYIwATAAAmmAACAAAANADQAAAAAaAAAAZNAZAAAB
oAAAAAAAAAAAAAAAAAMmgEkhAIGmgEYmgI0aZT0FPT1U36TCelNqbT1GlMwp6NTT9U8ifqhpofqT
Ro2JP1NRvSeom1MR4oZAGmj1MmjRoNAAbSDTQB6g0DanqbUALD29MMO59M6OhIMKhZCBBAfpMQID
tPzxB9qLQrDgCSUzXxjnMAVuvlr/L5d8OgXgrFF5dyiAARDbZ7fF+mFQAYKCavXfvyFwOYFzm1Bs
jx0Ah6bC1ZeWFBhp+92+uu/VHgUeBOazFlmZPhYNLx7Ip0MKAx9Qc13wJrhRdijUGJUke5kpagjf
EQdYpgnwfGT3PubkkIVbPX3uFqbAVvQ8mBNP9KGB6bCKxFwoLtGpU1XHs3EwjyYyPuajvKGPpYtP
W1tHX5hlDVFHypoE0Ky953H13I+V3zH9HM8D1lnjAKuBwpqj2vLLvVR25yhkzMyPM8sUXblx0Y3P
dzmDn0bzx7Tb0JIQTeJHM+X6k8Ov4p8Lxw7APPeC3zyvmwPM79p8BWiK6fgM/OLR3ofTbKjjrSKQ
Y/AZH37A0ZFRFKRiKO5Gm/x9P8f9L3Hx+lp6mjbu+7IGlwY6rWm/y6JczVhnNie6GvloyJKqOSyZ
CIOwwAzG19w3xP9+xs916P83ruf5Xq+IVi79OFA4I2TvrOEMQQOEeB8HAF9QoUogSgLCORgKCixD
tEG9ZufXGq1Lpj7kADPtdhwC8YXci9MaHRMy7M5J5vHgBkEjcJGAmgc4gJbxqHmb8Mp7QI5+zYiU
3m7gb4C5ZTD7oWvzakTKqYBREtz0PQ+VtI53UO1mrZHJzndMR30VvATgs7tnKEB2IzxIxjABQZ4O
CCHADBGOAwEo8SnkO2cCURbhEDPcEY3QnCSiCEo5yEhE9FEmMdKMUHv51WN60RGQYCtn/YLXuIP7
eC5FiBKWwLn5pulMQSB3mDc72a+EpcEpnhKSGdOV8RaJbxPifhCKlSQUswlnIosV6ZqxQYa5XAtX
SqMctYrD/cWJ7dwiIy1GVEsRY4VeKeiyci4SfnuRETYFcpHGv83+XFLSo3g8ugF8EDA8JnF1gKiQ
cWyOyVPI9iIukDCWIWx2fFWrEshFajHgo5S5jMWO2QKSamYsliu+vWLIlCy6LGxAr04yZPLBdsKY
hkqqornhWitfuEauuNA7+5JfV9yArZidwJYSCLgFdzhpCbCxPfAmHRkkCQikIsJFMYkeRRnlSNg4
3ImLJSVpbZeGAslY1v3vkK7CJnuolxhC8yfeKD1wEhGGbK50hO99BSWwIFEYiRTGBOvgY2HEdgkz
MPOo6EUB7ZB1ijRI4IeZCwGk1ooHZxoSlnrRvVc+jRaITE16gdeJzle+hIapNNcgL8vsoycVslKx
SMZ2+HxpjshLt+OGp/rOVs7HYIZHEmHnMrZf1iO+Z5FfNCiua4ERYMtJFQMSExAijJ9MrIIE85KR
k2IDHQJMJXYpIxrYktKxbqjddtPlYlI/NhFXKCIcXSAXER+pOKRkshUPK5yja1Vks++9KzKVMNU+
lZTP1FEZInQMMxbHiWQjJx5OurLIPnJjz9qAHxqO07UvjzIUg7p5yfWCyyGRUgfUi6Ii6fxOxzzt
mPk63/PBOkG2Med7mZ6R94MGb9v0v78X/HU+T2gQ++G4DF0HIzbo5ONMYZiJh7Fk9ngPWI4xgHkg
4JhhxbgXvS1fIi8EBWhew/+0P/Pn9TcMPqjBi5nWC5hbTPin6vqK+UWcJmBjS7iAZK55/a/h/kep
/p6vbfB4PcfAb2NBiLPqirdM2eaEJPX+6yHkDHzLMt7HMODPKOQaer4X0P2hqtZHs9dICxqwkAcg
R5B0E1DJcGIWLAjDgoJDOpoOqkTNYq+THiHwTqK1AClPBAa0O5mi9+6N9TanjuAuCdxD8Mv4vslA
LAxBGwKU1gcBWSImymaPAjB2GCBPXkOClBeZfwfA8pGqXbM5FeRaqBrshABoR6c4CzCsm3p2qIhQ
E5kWly+GhMGuJ7m7XAYEi8xIgDBW0KQ5gxJt6Wpwx+IbRqqunFVqd89meelCm39qkV3UUGkchGAC
kBoLgwBRBRRoCAIAwUBgL4Dq9Fjp60nhMzBzyT7KX+fn7v1vWF1TmG8e2LIL25V4iiObw4umbi4w
l4Zo9GxORKS34/O3y1DPSDMIygx1RD+a1aAC9v6uQWmiMJRd2XwFfvr2VKSbcK6KYKmsZtA8vW3H
1YR72M4w6ELbiBZFvDjNKXYy7fEL2VXEXrWp9mEC3qWUhtbgVxi4PLRSXCTR5Y8oLhNo3YiYmMhD
FAoMaucwnAT1EEpLGOAUvQ6YCvESBtu9IF+cv5RrZxXFglLIsBMgffgFhC4fRv+1Mqqyocd8mT3p
2XGb5lLfyOCi1yfh62E21x8948YJWInjNhKasZqk/ZM2Qx5uu8v7EleXXnA2CgzmOPgGJ0XA1ZwY
LTz/2unCJrF6kpELHRhdJgkItQQuGdcTw4FsjNkTIXtB469WvSkQqBCo90aADwgEQxEEyQXICIF8
yXzEOxGnfMY8gXwyHINgm4fDx0FBolgIiuigrF1HjLmGVbCoyOAfA1+AGhp+fhUyGWQThyMRqnr2
7v0+zGByGELX9N84BXzkmaNfOH4Ap38fK19Opw469GwbMHAubIskBCrxDlmEfQoeDzctcFjKTB4B
ubgayREIXZiFWDWRZLgC4aRIBEFBtrRENxbePj0+9OWG0Rk5ZKzJBz+QBxjXSC7bOSPkWdkbQyaB
kZPOOB5X9XvdNVMMDALwdCs+kRxdPS1BLSEvo8PUNoBMAtvCBkiA5UYEGUZGHCobdeEBbZbCY8nw
+JMSbqYYSG+k/734Fk+rGExtgKVFIuCyWcWhdA2iYIzJQSnc8BEfi+C6MBkyCqpyRtopJxRpEBjM
YUMQEJ8GYlEOZJeGMOOZwBJwjr8B/jAbuzYOJn922ABMMUJhhmSTJjojk9BwytWEcpJyXJLxBK52
l/6WxlVjzr/8mMxrSNI0UGop0ZrQGhepZEVzYoKAYiXWo/cx9L7awXM3Jyh8W5GxcVIkwDxHSE4Q
oQNKyPSVNRvBhV0YTyhKfNNk+fElDTUWICQiTAzB3hhAel8HBgttyhuHVKQJywDH4vqH7od2Lcwg
KM1XBYHIrFxGEcWBcQZCgqyCwBIIg35Xset5fI6AfaWa6vEEsBukQbX67edq2yYYxivruDqe7O8l
hj+FAc5Z5mCpUBTuY94bKWgLwRrWwhANnEigSfXEXxmCdkSMgoJ1woBrgRC1d3g2trxQmCvviVg4
tC+99G2d1Sd9nSCX7LCOZqpBpeI7pW+y0N339ynonQTsglYL4S+25bsvw/8+AYENiA0bwiuJYK8R
bG5aY70eewed1UGzVwtG9qCXCUApNm12PW+F5O41wxqXkU5ahIQuPgsYniwhEE6ldKvFmaZou3SZ
LclhiEkMnJ2CLbmRPtYabxTjQZX4RAGDOYwxBs0A3FEklxSQ3rWqyAZUrpe31IVnvrlju6snKfrO
2KRFWTD8qwqnI5j1UfhI7qoyNYEVklzvoj/nzu5OHIgWGT+UCu+TFT7bqyFH/fMoc9oTmDHryLm2
uBE0wLColEEvyZ+K20A3L42B/lbgrZtpqxvidP2TpGDfyfY9atjawaKP7y6kdUxgvd9yGW/Ezx0V
Drx59SywIzJfesYsAZmssoF21RuwLWY5vhLHL6yiRugVRzKsAcdQx0zIG695tlBu16FkXw5Gkbu/
DKMP6xynvpSiNwnOoRSX7KaO9aRcWtghqxnLqbzEtI7u8RhVD5wMkiZj3MniKjZ22G34ZDHn/zS8
lb7o3028spiLx5nkfBUMct4y4inNoGQYOEUcVLPri7r/i7kinChIISFCEQA=
signature.asc
Description: This is a digitally signed message part
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
