Hi,
Attached is the merge directive for the bug report below:
https://bugs.edge.launchpad.net/bzr-gtk/+bug/245642
regards,
Vincent
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# idg75z1ucp6m5aol
# target_branch: lp:bzr-gtk
# testament_sha1: eed0b5b21b3eded4dd826148aa0cadfeff09ea7b
# timestamp: 2008-07-08 23:59:07 +0200
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'status.py'
--- status.py 2008-05-05 18:16:46 +0000
+++ status.py 2008-07-08 21:40:38 +0000
@@ -28,12 +28,13 @@
""" Display Status window and perform the needed actions. """
def __init__(self, wt, wtpath, revision=None):
""" Initialize the Status window. """
- super(StatusDialog, self).__init__(flags=gtk.DIALOG_MODAL,
buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
+ super(StatusDialog, self).__init__(flags=gtk.DIALOG_MODAL,
buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
self.set_title("Working tree changes")
+ self.set_default_response(gtk.RESPONSE_CLOSE)
self._create()
self.wt = wt
self.wtpath = wtpath
-
+
if revision is None:
revision = self.wt.branch.last_revision()
@@ -44,13 +45,22 @@
def _create(self):
self.set_default_size(400, 300)
- scrolledwindow = gtk.ScrolledWindow()
- scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+ self.set_has_separator(False)
+ sw = gtk.ScrolledWindow()
+ sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+ sw.set_shadow_type(gtk.SHADOW_IN)
self.treeview = gtk.TreeView()
- scrolledwindow.add(self.treeview)
- self.vbox.pack_start(scrolledwindow, True, True)
+ sw.add(self.treeview)
+ self.vbox.pack_start(sw, True, True)
self.vbox.show_all()
+ # sane border and spacing widths (as recommended by GNOME HIG)
+ self.set_border_width(5)
+ sw.set_border_width(5)
+ self.vbox.set_spacing(2)
+ self.action_area.set_border_width(5)
+
+
def row_diff(self, tv, path, tvc):
file = self.model[path][1]
if file is None:
@@ -61,6 +71,7 @@
window.set_file(file)
window.show()
+
def _generate_status(self):
""" Generate 'bzr status' output. """
self.model = gtk.TreeStore(str, str)
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUrCd3oAAfvfgEQQWX///3/v
36C//9/wUATbrG8Hre7lPT0r3raYaRMCFHptT0JplPSaPUyPUNADINBoNABKJT1Mm00NBTahoADQ
AANMgAyAGSaT1NJplNqb1TIzSAAD1BoAA0yAAYoieUxGoyep6nqbSGJ6hoZADQ0AGg2oElNAgFPK
eU8hJvVGypofqGk9RtT1PKNPUaANG9RykFDC4Kb0cQkDIEy5BDDBrT5lDkvoZ653WywQqlNh7YCD
RspyY1rYr1MtsgxoEF5JzU6BHCJx32kEic2QFh8SOqvuWoNFnyILqXWdoIJJZVkd91ftHFsiSP0M
StU4XqnYZOtUfswcbUsUeuOLYMiEwyRe8QuSAeB9Wd2aytzYJWmqmIjnnxhAAu+YKpdZUhHxI4Qo
vbUuXFpZgkVAbl7Mna3Hw4Ww+DV0OFAmFCCwAjyAqxcu+SxlsXYAKZnPIn4SOngNeMBjnlCBh1xm
IilnkyVTp4BuhN3CDlMwQcFAfpM4G6CBw8RMUyqsce2ZaWntclbawzPeW1HrtUFKM7Py+0k2AthI
YLsz3V9ZMkTOQqhpcc8QVgsweSGdgMaLvV1peRCzMcdxrfOqyTW89JPFhh+hs74PKW05mICtoKSJ
yLJvpeyCYxQPMC7Iup1HmHSZE7Cg2plZUYs+txDmc64G5HEVYWGnUJAsvzj0lHtwFVN4mLEcU36h
MKNmoYkYoks5AlzlArb6VaYQpsSsBOGYUSkoomSwHjy8qMnxeMFYwWo1YiQQ1S2yLYEK3xlPCge1
CaeS+4MZhUyVxBvDB4CKqzgyOW0pMDk9PXKOsXKpyiJjYZmLhQu/lplyo7KMOB07latGYxFUMF7F
BgrEYjZe+4SQdXmGmRg1XdBgOKVIbMcY3kviZDy2nXEx+RYfv8ujhf6GQ7VxSwPe7X4O3vD0+PBd
B2KqkOIx7/YfWi8h2z5isH+CXXFkD8jSwrkpG9QjMdFqoR7UKEc0TG07egiR5nEw9Pgel4dvuA/1
3kUn4mRebTdsQbog53mSjbIXZGUSY49XiXP6zeeJNTJJolATp2jAUktOok5VANQFIMQzMTWFAeN8
k27oag5pEUh4p3mxjSGVWmhQA94tve8hD8/o8insqSn9TijMDksKwK1JEZFrscKE9RiDR2jJToU1
MCGMQJUqW2N4GBoeghmHOVH7b/P6+lh3q/WA6l0ochmBxAvJeSyzp0MkCQXxQfkbYpIx3hjLcdCB
svLEbPqqC4WYUHnoOOaXUomXKaXeHhhmrtmsKdgVuBqkGPCGTvv2mi9md5YgdeHWZjlvAdGcmKiE
y1ABz1eaWnP/MqhdheTcB4ydYvM4QTj9X5SHAqJ7T+pQRFyWo8CScGLmgwRdF5FIe5DjGw0tSZgb
H4SBBqw4AWOZiHEYyMJtmR5npl1tUSCkwlkeqlE1VttqXjHTpUhrvbbdc4WSJHg8jczOvsLyEvAi
ziEqlbOeQlGy1KFYG01BUzRfURPKGQZgybu3ZPkwbdYWDgING07VfXTuf8Q4uMPNuAcMrwFimRRl
AbCKQW5Thz1jcDnsWZQrhXrMRJarpJOI/tZzqEvF+NxLeGdpA6bUE1bWFy4bGVLlfopiuiabjurw
8BfSpme+uZgLDgoHTiaZK5V/9qapzwN11AriKV1zeLKOkSm5dhCtAuAOeqWAxrM03+LuSKcKEglY
Tu9A
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
