/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to revisionview.py

  • Committer: Jelmer Vernooij
  • Date: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
 
import pygtk
19
 
pygtk.require("2.0")
20
 
import gtk
21
 
import pango
22
 
import gobject
23
 
import subprocess
 
18
from gi.repository import Gtk
 
19
from gi.repository import Pango
 
20
from gi.repository import GObject
 
21
import webbrowser
24
22
 
 
23
from bzrlib import trace
25
24
from bzrlib.osutils import format_date
26
 
from bzrlib.util.bencode import bdecode
 
25
from bzrlib.bencode import bdecode
 
26
from bzrlib.testament import Testament
 
27
 
 
28
from bzrlib.plugins.gtk import icon_path
 
29
 
 
30
from bzrlib.plugins.gtk.avatarsbox import AvatarsBox
 
31
 
 
32
try:
 
33
    from bzrlib.plugins.gtk import seahorse
 
34
except ImportError:
 
35
    has_seahorse = False
 
36
else:
 
37
    has_seahorse = True
 
38
 
 
39
PAGE_GENERAL = 0
 
40
PAGE_RELATIONS = 1
 
41
PAGE_SIGNATURE = 2
 
42
PAGE_BUGS = 3
 
43
 
27
44
 
28
45
def _open_link(widget, uri):
29
 
    subprocess.Popen(['sensible-browser', uri], close_fds=True)
30
 
 
31
 
gtk.link_button_set_uri_hook(_open_link)
32
 
 
33
 
class BugsTab(gtk.Table):
 
46
    for cmd in ['sensible-browser', 'xdg-open']:
 
47
        if webbrowser._iscommand(cmd):
 
48
            webbrowser._tryorder.insert(0, '%s "%%s"' % cmd)
 
49
    webbrowser.open(uri)
 
50
 
 
51
 
 
52
class BugsTab(Gtk.VBox):
 
53
 
34
54
    def __init__(self):
35
 
        super(BugsTab, self).__init__(rows=5, columns=2)
36
 
        self.set_row_spacings(6)
37
 
        self.set_col_spacings(6)
38
 
        self.clear()
 
55
        super(BugsTab, self).__init__(homogeneous=False, spacing=6)
 
56
 
 
57
        table = Gtk.Table(rows=2, columns=2)
 
58
 
 
59
        table.set_row_spacings(6)
 
60
        table.set_col_spacing(0, 16)
 
61
 
 
62
        image = Gtk.Image()
 
63
        image.set_from_file(icon_path("bug.png"))
 
64
        table.attach(image, 0, 1, 0, 1, Gtk.AttachOptions.FILL)
 
65
 
 
66
        align = Gtk.Alignment.new(0.0, 0.1, 0, 0)
 
67
        self.label = Gtk.Label()
 
68
        align.add(self.label)
 
69
        table.attach(align, 1, 2, 0, 1, Gtk.AttachOptions.FILL)
 
70
 
 
71
        treeview = self.construct_treeview()
 
72
        table.attach(treeview, 1, 2, 1, 2, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND)
 
73
 
 
74
        self.set_border_width(6)
 
75
        self.pack_start(table, False, True, 0)
 
76
 
 
77
        self.clear()
 
78
        self.show_all()
 
79
 
 
80
    def set_revision(self, revision):
 
81
        if revision is None:
 
82
            return
 
83
 
 
84
        self.clear()
 
85
        bugs_text = revision.properties.get('bugs', '')
 
86
        for bugline in bugs_text.splitlines():
 
87
                (url, status) = bugline.split(" ")
 
88
                if status == "fixed":
 
89
                    self.add_bug(url, status)
 
90
 
 
91
        if self.num_bugs == 0:
 
92
            return
 
93
        elif self.num_bugs == 1:
 
94
            label = "bug"
 
95
        else:
 
96
            label = "bugs"
 
97
 
 
98
        self.label.set_markup("<b>Bugs fixed</b>\n" +
 
99
                              "This revision claims to fix " +
 
100
                              "%d %s." % (self.num_bugs, label))
 
101
 
 
102
    def construct_treeview(self):
 
103
        self.bugs = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING)
 
104
        self.treeview = Gtk.TreeView(model=self.bugs)
 
105
        self.treeview.set_headers_visible(False)
 
106
 
 
107
        uri_column = Gtk.TreeViewColumn('Bug URI', Gtk.CellRendererText(), text=0)
 
108
        self.treeview.append_column(uri_column)
 
109
 
 
110
        self.treeview.connect('row-activated', self.on_row_activated)
 
111
 
 
112
        win = Gtk.ScrolledWindow()
 
113
        win.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
114
        win.set_shadow_type(Gtk.ShadowType.IN)
 
115
        win.add(self.treeview)
 
116
 
 
117
        return win
39
118
 
40
119
    def clear(self):
41
 
        for c in self.get_children():
42
 
            self.remove(c)
43
 
        self.count = 0
44
 
        self.hide_all() # Only shown when there are bugs
 
120
        self.num_bugs = 0
 
121
        self.bugs.clear()
 
122
        self.set_sensitive(False)
 
123
        self.label.set_markup("<b>No bugs fixed</b>\n" +
 
124
                              "This revision does not claim to fix any bugs.")
45
125
 
46
126
    def add_bug(self, url, status):
47
 
        button = gtk.LinkButton(url, url)
48
 
        self.attach(button, 0, 1, self.count, self.count + 1,
49
 
                              gtk.EXPAND | gtk.FILL, gtk.FILL)
50
 
        status_label = gtk.Label(status)
51
 
        self.attach(status_label, 1, 2, self.count, self.count + 1,
52
 
                              gtk.EXPAND | gtk.FILL, gtk.FILL)
53
 
        self.count += 1
 
127
        self.num_bugs += 1
 
128
        self.bugs.append([url, status])
 
129
        self.set_sensitive(True)
 
130
 
 
131
    def get_num_bugs(self):
 
132
        return self.num_bugs
 
133
 
 
134
    def on_row_activated(self, treeview, path, column):
 
135
        uri = self.bugs.get_value(self.bugs.get_iter(path), 0)
 
136
        _open_link(self, uri)
 
137
 
 
138
 
 
139
class SignatureTab(Gtk.VBox):
 
140
 
 
141
    def __init__(self, repository):
 
142
        self.key = None
 
143
        self.revision = None
 
144
        self.repository = repository
 
145
 
 
146
        super(SignatureTab, self).__init__(homogeneous=False, spacing=6)
 
147
        signature_box = Gtk.Table(rows=3, columns=3)
 
148
        signature_box.set_col_spacing(0, 16)
 
149
        signature_box.set_col_spacing(1, 12)
 
150
        signature_box.set_row_spacings(6)
 
151
 
 
152
        self.signature_image = Gtk.Image()
 
153
        signature_box.attach(self.signature_image, 0, 1, 0, 1, Gtk.AttachOptions.FILL)
 
154
 
 
155
        align = Gtk.Alignment.new(0.0, 0.1, 0.0, 0.0)
 
156
        self.signature_label = Gtk.Label()
 
157
        align.add(self.signature_label)
 
158
        signature_box.attach(align, 1, 3, 0, 1, Gtk.AttachOptions.FILL)
 
159
 
 
160
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
161
        self.signature_key_id_label = Gtk.Label()
 
162
        self.signature_key_id_label.set_markup("<b>Key Id:</b>")
 
163
        align.add(self.signature_key_id_label)
 
164
        signature_box.attach(align, 1, 2, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
165
 
 
166
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
167
        self.signature_key_id = Gtk.Label()
 
168
        self.signature_key_id.set_selectable(True)
 
169
        align.add(self.signature_key_id)
 
170
        signature_box.attach(align, 2, 3, 1, 2, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
171
 
 
172
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
173
        self.signature_fingerprint_label = Gtk.Label()
 
174
        self.signature_fingerprint_label.set_markup("<b>Fingerprint:</b>")
 
175
        align.add(self.signature_fingerprint_label)
 
176
        signature_box.attach(align, 1, 2, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
177
 
 
178
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
179
        self.signature_fingerprint = Gtk.Label()
 
180
        self.signature_fingerprint.set_selectable(True)
 
181
        align.add(self.signature_fingerprint)
 
182
        signature_box.attach(align, 2, 3, 2, 3, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
183
 
 
184
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
185
        self.signature_trust_label = Gtk.Label()
 
186
        self.signature_trust_label.set_markup("<b>Trust:</b>")
 
187
        align.add(self.signature_trust_label)
 
188
        signature_box.attach(align, 1, 2, 3, 4, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
189
 
 
190
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
191
        self.signature_trust = Gtk.Label()
 
192
        self.signature_trust.set_selectable(True)
 
193
        align.add(self.signature_trust)
 
194
        signature_box.attach(align, 2, 3, 3, 4, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
195
 
 
196
        self.set_border_width(6)
 
197
        self.pack_start(signature_box, False, True, 0)
54
198
        self.show_all()
55
199
 
56
 
 
57
 
class RevisionView(gtk.Notebook):
 
200
    def set_revision(self, revision):
 
201
        self.revision = revision
 
202
        revid = revision.revision_id
 
203
 
 
204
        if self.repository.has_signature_for_revision_id(revid):
 
205
            crypttext = self.repository.get_signature_text(revid)
 
206
            self.show_signature(crypttext)
 
207
        else:
 
208
            self.show_no_signature()
 
209
 
 
210
    def show_no_signature(self):
 
211
        self.signature_key_id_label.hide()
 
212
        self.signature_key_id.set_text("")
 
213
 
 
214
        self.signature_fingerprint_label.hide()
 
215
        self.signature_fingerprint.set_text("")
 
216
 
 
217
        self.signature_trust_label.hide()
 
218
        self.signature_trust.set_text("")
 
219
 
 
220
        self.signature_image.set_from_file(icon_path("sign-unknown.png"))
 
221
        self.signature_label.set_markup("<b>Authenticity unknown</b>\n" +
 
222
                                        "This revision has not been signed.")
 
223
 
 
224
    def show_signature(self, crypttext):
 
225
        (cleartext, key) = seahorse.verify(crypttext)
 
226
 
 
227
        assert cleartext is not None
 
228
 
 
229
        inv = self.repository.get_inventory(self.revision.revision_id)
 
230
        expected_testament = Testament(self.revision, inv).as_short_text()
 
231
        if expected_testament != cleartext:
 
232
            self.signature_image.set_from_file(icon_path("sign-bad.png"))
 
233
            self.signature_label.set_markup("<b>Signature does not match repository data</b>\n" +
 
234
                        "The signature plaintext is different from the expected testament plaintext.")
 
235
            return
 
236
 
 
237
        if key and key.is_available():
 
238
            if key.is_trusted():
 
239
                if key.get_display_name() == self.revision.committer:
 
240
                    self.signature_image.set_from_file(icon_path("sign-ok.png"))
 
241
                    self.signature_label.set_markup("<b>Authenticity confirmed</b>\n" +
 
242
                                                    "This revision has been signed with " +
 
243
                                                    "a trusted key.")
 
244
                else:
 
245
                    self.signature_image.set_from_file(icon_path("sign-bad.png"))
 
246
                    self.signature_label.set_markup("<b>Authenticity cannot be confirmed</b>\n" +
 
247
                                                    "Revision committer is not the same as signer.")
 
248
            else:
 
249
                self.signature_image.set_from_file(icon_path("sign-bad.png"))
 
250
                self.signature_label.set_markup("<b>Authenticity cannot be confirmed</b>\n" +
 
251
                                                "This revision has been signed, but the " +
 
252
                                                "key is not trusted.")
 
253
        else:
 
254
            self.show_no_signature()
 
255
            self.signature_image.set_from_file(icon_path("sign-bad.png"))
 
256
            self.signature_label.set_markup("<b>Authenticity cannot be confirmed</b>\n" +
 
257
                                            "Signature key not available.")
 
258
            return
 
259
 
 
260
        trust = key.get_trust()
 
261
 
 
262
        if trust <= seahorse.TRUST_NEVER:
 
263
            trust_text = 'never trusted'
 
264
        elif trust == seahorse.TRUST_UNKNOWN:
 
265
            trust_text = 'not trusted'
 
266
        elif trust == seahorse.TRUST_MARGINAL:
 
267
            trust_text = 'marginally trusted'
 
268
        elif trust == seahorse.TRUST_FULL:
 
269
            trust_text = 'fully trusted'
 
270
        elif trust == seahorse.TRUST_ULTIMATE:
 
271
            trust_text = 'ultimately trusted'
 
272
 
 
273
        self.signature_key_id_label.show()
 
274
        self.signature_key_id.set_text(key.get_id())
 
275
 
 
276
        fingerprint = key.get_fingerprint()
 
277
        if fingerprint == "":
 
278
            fingerprint = '<span foreground="dim grey">N/A</span>'
 
279
 
 
280
        self.signature_fingerprint_label.show()
 
281
        self.signature_fingerprint.set_markup(fingerprint)
 
282
 
 
283
        self.signature_trust_label.show()
 
284
        self.signature_trust.set_text('This key is ' + trust_text)
 
285
 
 
286
 
 
287
class RevisionView(Gtk.Notebook):
58
288
    """ Custom widget for commit log details.
59
289
 
60
290
    A variety of bzr tools may need to implement such a thing. This is a
63
293
 
64
294
    __gproperties__ = {
65
295
        'branch': (
66
 
            gobject.TYPE_PYOBJECT,
 
296
            GObject.TYPE_PYOBJECT,
67
297
            'Branch',
68
298
            'The branch holding the revision being displayed',
69
 
            gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE
 
299
            GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE
70
300
        ),
71
301
 
72
302
        'revision': (
73
 
            gobject.TYPE_PYOBJECT,
 
303
            GObject.TYPE_PYOBJECT,
74
304
            'Revision',
75
305
            'The revision being displayed',
76
 
            gobject.PARAM_READWRITE
 
306
            GObject.PARAM_READWRITE
77
307
        ),
78
308
 
79
309
        'children': (
80
 
            gobject.TYPE_PYOBJECT,
 
310
            GObject.TYPE_PYOBJECT,
81
311
            'Children',
82
312
            'Child revisions',
83
 
            gobject.PARAM_READWRITE
 
313
            GObject.PARAM_READWRITE
84
314
        ),
85
315
 
86
316
        'file-id': (
87
 
            gobject.TYPE_PYOBJECT,
 
317
            GObject.TYPE_PYOBJECT,
88
318
            'File Id',
89
319
            'The file id',
90
 
            gobject.PARAM_READWRITE
 
320
            GObject.PARAM_READWRITE
91
321
        )
92
322
    }
93
323
 
 
324
    def __init__(self, branch=None, repository=None):
 
325
        super(RevisionView, self).__init__()
94
326
 
95
 
    def __init__(self, branch=None):
96
 
        gtk.Notebook.__init__(self)
 
327
        self._revision = None
 
328
        self._branch = branch
 
329
        if branch is not None:
 
330
            self._repository = branch.repository
 
331
        else:
 
332
            self._repository = repository
 
333
        self.signature_table = None
97
334
 
98
335
        self._create_general()
99
336
        self._create_relations()
 
337
        # Disabled because testaments aren't verified yet:
 
338
        if has_seahorse:
 
339
            self._create_signature()
100
340
        self._create_file_info_view()
101
341
        self._create_bugs()
102
342
 
103
 
        self.set_current_page(0)
 
343
        self.set_current_page(PAGE_GENERAL)
 
344
        self.connect_after('switch-page', self._switch_page_cb)
104
345
        
105
346
        self._show_callback = None
106
347
        self._clicked_callback = None
156
397
 
157
398
    def _set_revision(self, revision):
158
399
        if revision is None: return
159
 
 
 
400
        
 
401
        self.avatarsbox.reset()
 
402
        
160
403
        self._revision = revision
161
404
        if revision.committer is not None:
162
405
            self.committer.set_text(revision.committer)
 
406
            self.avatarsbox.add(revision.committer, "committer")
163
407
        else:
164
408
            self.committer.set_text("")
 
409
            self.avatarsbox.hide()
165
410
        author = revision.properties.get('author', '')
 
411
        self.avatarsbox.merge(revision.get_apparent_authors(), "author")
166
412
        if author != '':
167
413
            self.author.set_text(author)
168
414
            self.author.show()
175
421
            self.timestamp.set_text(format_date(revision.timestamp,
176
422
                                                revision.timezone))
177
423
        try:
178
 
            self.branchnick_label.set_text(revision.properties['branch-nick'])
 
424
            self.branchnick.show()
 
425
            self.branchnick_label.show()
 
426
            self.branchnick.set_text(revision.properties['branch-nick'])
179
427
        except KeyError:
180
 
            self.branchnick_label.set_text("")
 
428
            self.branchnick.hide()
 
429
            self.branchnick_label.hide()
181
430
 
182
431
        self._add_parents_or_children(revision.parent_ids,
183
432
                                      self.parents_widgets,
184
433
                                      self.parents_table)
185
 
        
 
434
 
186
435
        file_info = revision.properties.get('file-info', None)
187
436
        if file_info is not None:
188
 
            file_info = bdecode(file_info.encode('UTF-8'))
 
437
            try:
 
438
                file_info = bdecode(file_info.encode('UTF-8'))
 
439
            except ValueError:
 
440
                trace.note('Invalid per-file info for revision:%s, value: %r',
 
441
                           revision.revision_id, file_info)
 
442
                file_info = None
189
443
 
190
444
        if file_info:
191
445
            if self._file_id is None:
207
461
        else:
208
462
            self.file_info_box.hide()
209
463
 
210
 
        self.bugs_table.clear()
211
 
        bugs_text = revision.properties.get('bugs', None)
212
 
        if bugs_text:
213
 
            for bugline in bugs_text.splitlines():
214
 
                (url, status) = bugline.split(" ")
215
 
                self.bugs_table.add_bug(url, status)
216
 
 
217
464
    def update_tags(self):
218
465
        if self._branch is not None and self._branch.supports_tags():
219
466
            self._tagdict = self._branch.tags.get_reverse_tag_dict()
222
469
 
223
470
        self._add_tags()
224
471
 
 
472
    def _update_signature(self, widget, param):
 
473
        if not has_seahorse:
 
474
            return
 
475
        if self.get_current_page() == PAGE_SIGNATURE:
 
476
            self.signature_table.set_revision(self._revision)
 
477
 
 
478
    def _update_bugs(self, widget, param):
 
479
        self.bugs_page.set_revision(self._revision)
 
480
        label = self.get_tab_label(self.bugs_page)
 
481
        label.set_sensitive(self.bugs_page.get_num_bugs() != 0)
 
482
 
225
483
    def set_children(self, children):
226
484
        self._add_parents_or_children(children,
227
485
                                      self.children_widgets,
228
486
                                      self.children_table)
229
487
 
 
488
    def _switch_page_cb(self, notebook, page, page_num):
 
489
        if not has_seahorse:
 
490
            return
 
491
        if page_num == PAGE_SIGNATURE:
 
492
            self.signature_table.set_revision(self._revision)
 
493
 
 
494
 
 
495
 
230
496
    def _show_clicked_cb(self, widget, revid, parentid):
231
497
        """Callback for when the show button for a parent is clicked."""
232
498
        self._show_callback(revid, parentid)
235
501
        """Callback for when the go button for a parent is clicked."""
236
502
 
237
503
    def _add_tags(self, *args):
238
 
        if self._revision is None: return
 
504
        if self._revision is None:
 
505
            return
239
506
 
240
507
        if self._tagdict.has_key(self._revision.revision_id):
241
508
            tags = self._tagdict[self._revision.revision_id]
260
527
        table.resize(max(len(revids), 1), 2)
261
528
 
262
529
        for idx, revid in enumerate(revids):
263
 
            align = gtk.Alignment(0.0, 0.0)
 
530
            align = Gtk.Alignment.new(0.0, 0.0, 1, 1)
264
531
            widgets.append(align)
265
532
            table.attach(align, 1, 2, idx, idx + 1,
266
 
                                      gtk.EXPAND | gtk.FILL, gtk.FILL)
 
533
                                      Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
267
534
            align.show()
268
535
 
269
 
            hbox = gtk.HBox(False, spacing=6)
 
536
            hbox = Gtk.HBox(homogeneous=False, spacing=6)
270
537
            align.add(hbox)
271
538
            hbox.show()
272
539
 
273
 
            image = gtk.Image()
 
540
            image = Gtk.Image()
274
541
            image.set_from_stock(
275
 
                gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
 
542
                Gtk.STOCK_FIND, Gtk.IconSize.SMALL_TOOLBAR)
276
543
            image.show()
277
544
 
278
545
            if self._show_callback is not None:
279
 
                button = gtk.Button()
 
546
                button = Gtk.Button()
280
547
                button.add(image)
281
548
                button.connect("clicked", self._show_clicked_cb,
282
549
                               self._revision.revision_id, revid)
283
 
                hbox.pack_start(button, expand=False, fill=True)
 
550
                hbox.pack_start(button, False, True, 0)
284
551
                button.show()
285
552
 
286
 
            button = gtk.Button(revid)
 
553
            button = Gtk.Button()
 
554
            revid_label = Gtk.Label(label=str(revid))
 
555
            revid_label.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
556
            revid_label.set_alignment(0.0, 0.5)
 
557
            button.add(revid_label)
287
558
            button.connect("clicked",
288
 
                    lambda w, r: self.set_revision(self._branch.repository.get_revision(r)), revid)
 
559
                    lambda w, r: self.set_revision(
 
560
                        self._repository.get_revision(r)), revid)
289
561
            button.set_use_underline(False)
290
 
            hbox.pack_start(button, expand=False, fill=True)
291
 
            button.show()
 
562
            hbox.pack_start(button, True, True, 0)
 
563
            button.show_all()
292
564
 
293
565
    def _create_general(self):
294
 
        vbox = gtk.VBox(False, 6)
 
566
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
295
567
        vbox.set_border_width(6)
296
 
        vbox.pack_start(self._create_headers(), expand=False, fill=True)
297
 
        vbox.pack_start(self._create_message_view())
298
 
        self.append_page(vbox, tab_label=gtk.Label("General"))
 
568
        vbox.pack_start(self._create_headers(), False, True, 0)
 
569
        vbox.pack_start(self._create_message_view(), True, True, 0)
 
570
        self.append_page(vbox, Gtk.Label(label="General"))
299
571
        vbox.show()
300
572
 
301
573
    def _create_relations(self):
302
 
        vbox = gtk.VBox(False, 6)
 
574
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
303
575
        vbox.set_border_width(6)
304
 
        vbox.pack_start(self._create_parents(), expand=False, fill=True)
305
 
        vbox.pack_start(self._create_children(), expand=False, fill=True)
306
 
        self.append_page(vbox, tab_label=gtk.Label("Relations"))
 
576
        vbox.pack_start(self._create_parents(), False, True, 0)
 
577
        vbox.pack_start(self._create_children(), False, True, 0)
 
578
        self.append_page(vbox, Gtk.Label(label="Relations"))
307
579
        vbox.show()
308
580
 
 
581
    def _create_signature(self):
 
582
        self.signature_table = SignatureTab(self._repository)
 
583
        self.append_page(
 
584
            self.signature_table, Gtk.Label(label='Signature'))
 
585
        self.connect_after('notify::revision', self._update_signature)
 
586
 
309
587
    def _create_headers(self):
310
 
        self.table = gtk.Table(rows=5, columns=2)
 
588
        self.avatarsbox = AvatarsBox()
 
589
        
 
590
        self.table = Gtk.Table(rows=5, columns=2)
311
591
        self.table.set_row_spacings(6)
312
592
        self.table.set_col_spacings(6)
313
593
        self.table.show()
314
 
 
315
 
        align = gtk.Alignment(1.0, 0.5)
316
 
        label = gtk.Label()
 
594
        
 
595
        self.avatarsbox.pack_start(self.table, True, True, 0)
 
596
        self.avatarsbox.show()
 
597
 
 
598
        row = 0
 
599
 
 
600
        label = Gtk.Label()
 
601
        label.set_alignment(1.0, 0.5)
317
602
        label.set_markup("<b>Revision Id:</b>")
318
 
        align.add(label)
319
 
        self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
320
 
        align.show()
 
603
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
321
604
        label.show()
322
605
 
323
 
        align = gtk.Alignment(0.0, 0.5)
324
 
        revision_id = gtk.Label()
 
606
        revision_id = Gtk.Label()
 
607
        revision_id.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
608
        revision_id.set_alignment(0.0, 0.5)
325
609
        revision_id.set_selectable(True)
326
610
        self.connect('notify::revision', 
327
611
                lambda w, p: revision_id.set_text(self._revision.revision_id))
328
 
        align.add(revision_id)
329
 
        self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
330
 
        align.show()
 
612
        self.table.attach(revision_id, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
331
613
        revision_id.show()
332
614
 
333
 
        align = gtk.Alignment(1.0, 0.5)
334
 
        self.author_label = gtk.Label()
 
615
        row += 1
 
616
        self.author_label = Gtk.Label()
 
617
        self.author_label.set_alignment(1.0, 0.5)
335
618
        self.author_label.set_markup("<b>Author:</b>")
336
 
        align.add(self.author_label)
337
 
        self.table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
338
 
        align.show()
 
619
        self.table.attach(self.author_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
339
620
        self.author_label.show()
340
621
 
341
 
        align = gtk.Alignment(0.0, 0.5)
342
 
        self.author = gtk.Label()
 
622
        self.author = Gtk.Label()
 
623
        self.author.set_ellipsize(Pango.EllipsizeMode.END)
 
624
        self.author.set_alignment(0.0, 0.5)
343
625
        self.author.set_selectable(True)
344
 
        align.add(self.author)
345
 
        self.table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
346
 
        align.show()
 
626
        self.table.attach(self.author, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
347
627
        self.author.show()
348
628
        self.author.hide()
349
629
 
350
 
        align = gtk.Alignment(1.0, 0.5)
351
 
        label = gtk.Label()
 
630
        row += 1
 
631
        label = Gtk.Label()
 
632
        label.set_alignment(1.0, 0.5)
352
633
        label.set_markup("<b>Committer:</b>")
353
 
        align.add(label)
354
 
        self.table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
355
 
        align.show()
 
634
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
356
635
        label.show()
357
636
 
358
 
        align = gtk.Alignment(0.0, 0.5)
359
 
        self.committer = gtk.Label()
 
637
        self.committer = Gtk.Label()
 
638
        self.committer.set_ellipsize(Pango.EllipsizeMode.END)
 
639
        self.committer.set_alignment(0.0, 0.5)
360
640
        self.committer.set_selectable(True)
361
 
        align.add(self.committer)
362
 
        self.table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
363
 
        align.show()
 
641
        self.table.attach(self.committer, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
364
642
        self.committer.show()
365
643
 
366
 
        align = gtk.Alignment(0.0, 0.5)
367
 
        label = gtk.Label()
368
 
        label.set_markup("<b>Branch nick:</b>")
369
 
        align.add(label)
370
 
        self.table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
371
 
        label.show()
372
 
        align.show()
373
 
 
374
 
        align = gtk.Alignment(0.0, 0.5)
375
 
        self.branchnick_label = gtk.Label()
376
 
        self.branchnick_label.set_selectable(True)
377
 
        align.add(self.branchnick_label)
378
 
        self.table.attach(align, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
644
        row += 1
 
645
        self.branchnick_label = Gtk.Label()
 
646
        self.branchnick_label.set_alignment(1.0, 0.5)
 
647
        self.branchnick_label.set_markup("<b>Branch nick:</b>")
 
648
        self.table.attach(self.branchnick_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
379
649
        self.branchnick_label.show()
380
 
        align.show()
381
 
 
382
 
        align = gtk.Alignment(1.0, 0.5)
383
 
        label = gtk.Label()
 
650
 
 
651
        self.branchnick = Gtk.Label()
 
652
        self.branchnick.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
653
        self.branchnick.set_alignment(0.0, 0.5)
 
654
        self.branchnick.set_selectable(True)
 
655
        self.table.attach(self.branchnick, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
656
        self.branchnick.show()
 
657
 
 
658
        row += 1
 
659
        label = Gtk.Label()
 
660
        label.set_alignment(1.0, 0.5)
384
661
        label.set_markup("<b>Timestamp:</b>")
385
 
        align.add(label)
386
 
        self.table.attach(align, 0, 1, 4, 5, gtk.FILL, gtk.FILL)
387
 
        align.show()
 
662
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
388
663
        label.show()
389
664
 
390
 
        align = gtk.Alignment(0.0, 0.5)
391
 
        self.timestamp = gtk.Label()
 
665
        self.timestamp = Gtk.Label()
 
666
        self.timestamp.set_ellipsize(Pango.EllipsizeMode.END)
 
667
        self.timestamp.set_alignment(0.0, 0.5)
392
668
        self.timestamp.set_selectable(True)
393
 
        align.add(self.timestamp)
394
 
        self.table.attach(align, 1, 2, 4, 5, gtk.EXPAND | gtk.FILL, gtk.FILL)
395
 
        align.show()
 
669
        self.table.attach(self.timestamp, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
396
670
        self.timestamp.show()
397
671
 
398
 
        align = gtk.Alignment(1.0, 0.5)
399
 
        self.tags_label = gtk.Label()
 
672
        row += 1
 
673
        self.tags_label = Gtk.Label()
 
674
        self.tags_label.set_alignment(1.0, 0.5)
400
675
        self.tags_label.set_markup("<b>Tags:</b>")
401
 
        align.add(self.tags_label)
402
 
        align.show()
403
 
        self.table.attach(align, 0, 1, 5, 6, gtk.FILL, gtk.FILL)
 
676
        self.table.attach(self.tags_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
404
677
        self.tags_label.show()
405
678
 
406
 
        align = gtk.Alignment(0.0, 0.5)
407
 
        self.tags_list = gtk.Label()
408
 
        align.add(self.tags_list)
409
 
        self.table.attach(align, 1, 2, 5, 6, gtk.EXPAND | gtk.FILL, gtk.FILL)
410
 
        align.show()
 
679
        self.tags_list = Gtk.Label()
 
680
        self.tags_list.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
681
        self.tags_list.set_alignment(0.0, 0.5)
 
682
        self.table.attach(self.tags_list, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
411
683
        self.tags_list.show()
412
684
 
413
685
        self.connect('notify::revision', self._add_tags)
414
686
 
415
 
        return self.table
416
 
 
 
687
        return self.avatarsbox
417
688
    
418
689
    def _create_parents(self):
419
 
        hbox = gtk.HBox(True, 3)
 
690
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
420
691
        
421
692
        self.parents_table = self._create_parents_or_children_table(
422
693
            "<b>Parents:</b>")
423
694
        self.parents_widgets = []
424
 
        hbox.pack_start(self.parents_table)
 
695
        hbox.pack_start(self.parents_table, True, True, 0)
425
696
 
426
697
        hbox.show()
427
698
        return hbox
428
699
 
429
700
    def _create_children(self):
430
 
        hbox = gtk.HBox(True, 3)
 
701
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
431
702
        self.children_table = self._create_parents_or_children_table(
432
703
            "<b>Children:</b>")
433
704
        self.children_widgets = []
434
 
        hbox.pack_start(self.children_table)
 
705
        hbox.pack_start(self.children_table, True, True, 0)
435
706
        hbox.show()
436
707
        return hbox
437
708
        
438
709
    def _create_parents_or_children_table(self, text):
439
 
        table = gtk.Table(rows=1, columns=2)
 
710
        table = Gtk.Table(rows=1, columns=2)
440
711
        table.set_row_spacings(3)
441
712
        table.set_col_spacings(6)
442
713
        table.show()
443
714
 
444
 
        label = gtk.Label()
 
715
        label = Gtk.Label()
445
716
        label.set_markup(text)
446
 
        align = gtk.Alignment(0.0, 0.5)
 
717
        align = Gtk.Alignment.new(0.0, 0.5, 0, 0)
447
718
        align.add(label)
448
 
        table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
 
719
        table.attach(align, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
449
720
        label.show()
450
721
        align.show()
451
722
 
452
723
        return table
453
724
 
454
725
    def _create_message_view(self):
455
 
        msg_buffer = gtk.TextBuffer()
 
726
        msg_buffer = Gtk.TextBuffer()
456
727
        self.connect('notify::revision',
457
728
                lambda w, p: msg_buffer.set_text(self._revision.message))
458
 
        window = gtk.ScrolledWindow()
459
 
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
460
 
        window.set_shadow_type(gtk.SHADOW_IN)
461
 
        tv = gtk.TextView(msg_buffer)
 
729
        window = Gtk.ScrolledWindow()
 
730
        window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
 
731
        window.set_shadow_type(Gtk.ShadowType.IN)
 
732
        tv = Gtk.TextView(buffer=msg_buffer)
462
733
        tv.set_editable(False)
463
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
464
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
734
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
 
735
 
 
736
        tv.modify_font(Pango.FontDescription("Monospace"))
465
737
        tv.show()
466
738
        window.add(tv)
467
739
        window.show()
468
740
        return window
469
741
 
470
742
    def _create_bugs(self):
471
 
        self.bugs_table = BugsTab()
472
 
        self.append_page(self.bugs_table, tab_label=gtk.Label('Bugs'))
 
743
        self.bugs_page = BugsTab()
 
744
        self.connect_after('notify::revision', self._update_bugs) 
 
745
        self.append_page(self.bugs_page, Gtk.Label(label='Bugs'))
473
746
 
474
747
    def _create_file_info_view(self):
475
 
        self.file_info_box = gtk.VBox(False, 6)
 
748
        self.file_info_box = Gtk.VBox(homogeneous=False, spacing=6)
476
749
        self.file_info_box.set_border_width(6)
477
 
        self.file_info_buffer = gtk.TextBuffer()
478
 
        window = gtk.ScrolledWindow()
479
 
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
480
 
        window.set_shadow_type(gtk.SHADOW_IN)
481
 
        tv = gtk.TextView(self.file_info_buffer)
 
750
        self.file_info_buffer = Gtk.TextBuffer()
 
751
        window = Gtk.ScrolledWindow()
 
752
        window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
 
753
        window.set_shadow_type(Gtk.ShadowType.IN)
 
754
        tv = Gtk.TextView(buffer=self.file_info_buffer)
482
755
        tv.set_editable(False)
483
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
484
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
756
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
 
757
        tv.modify_font(Pango.FontDescription("Monospace"))
485
758
        tv.show()
486
759
        window.add(tv)
487
760
        window.show()
488
 
        self.file_info_box.pack_start(window)
 
761
        self.file_info_box.pack_start(window, True, True, 0)
489
762
        self.file_info_box.hide() # Only shown when there are per-file messages
490
 
        self.append_page(self.file_info_box, tab_label=gtk.Label('Per-file'))
 
763
        self.append_page(self.file_info_box, Gtk.Label(label='Per-file'))
491
764