/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: 2008-07-25 21:36:23 UTC
  • mfrom: (567.1.1 trunk)
  • Revision ID: jelmer@samba.org-20080725213623-44iq5k34vc0v6z7y
Merge seahorse connect improvements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
revisionview.py
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
 
from gi.repository import Gtk
19
 
from gi.repository import Pango
20
 
from gi.repository import GObject
 
18
import pygtk
 
19
pygtk.require("2.0")
 
20
import gtk
 
21
import pango
 
22
import gobject
21
23
import webbrowser
22
24
 
23
 
from bzrlib import trace
24
25
from bzrlib.osutils import format_date
25
 
from bzrlib.bencode import bdecode
 
26
from bzrlib.util.bencode import bdecode
26
27
from bzrlib.testament import Testament
27
28
 
28
29
from bzrlib.plugins.gtk import icon_path
29
30
 
30
 
from bzrlib.plugins.gtk.avatarsbox import AvatarsBox
31
 
 
32
31
try:
33
32
    from bzrlib.plugins.gtk import seahorse
34
33
except ImportError:
48
47
            webbrowser._tryorder.insert(0, '%s "%%s"' % cmd)
49
48
    webbrowser.open(uri)
50
49
 
 
50
gtk.link_button_set_uri_hook(_open_link)
51
51
 
52
 
class BugsTab(Gtk.VBox):
 
52
class BugsTab(gtk.VBox):
53
53
 
54
54
    def __init__(self):
55
 
        super(BugsTab, self).__init__(homogeneous=False, spacing=6)
56
 
 
57
 
        table = Gtk.Table(rows=2, columns=2)
 
55
        super(BugsTab, self).__init__(False, 6)
 
56
    
 
57
        table = gtk.Table(rows=2, columns=2)
58
58
 
59
59
        table.set_row_spacings(6)
60
60
        table.set_col_spacing(0, 16)
61
61
 
62
 
        image = Gtk.Image()
 
62
        image = gtk.Image()
63
63
        image.set_from_file(icon_path("bug.png"))
64
 
        table.attach(image, 0, 1, 0, 1, Gtk.AttachOptions.FILL)
 
64
        table.attach(image, 0, 1, 0, 1, gtk.FILL)
65
65
 
66
 
        align = Gtk.Alignment.new(0.0, 0.1, 0, 0)
67
 
        self.label = Gtk.Label()
 
66
        align = gtk.Alignment(0.0, 0.1)
 
67
        self.label = gtk.Label()
68
68
        align.add(self.label)
69
 
        table.attach(align, 1, 2, 0, 1, Gtk.AttachOptions.FILL)
 
69
        table.attach(align, 1, 2, 0, 1, gtk.FILL)
70
70
 
71
71
        treeview = self.construct_treeview()
72
 
        table.attach(treeview, 1, 2, 1, 2, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND)
 
72
        table.attach(treeview, 1, 2, 1, 2, gtk.FILL | gtk.EXPAND)
73
73
 
74
74
        self.set_border_width(6)
75
 
        self.pack_start(table, False, True, 0)
 
75
        self.pack_start(table, expand=False)
76
76
 
77
77
        self.clear()
78
78
        self.show_all()
87
87
                (url, status) = bugline.split(" ")
88
88
                if status == "fixed":
89
89
                    self.add_bug(url, status)
90
 
 
 
90
        
91
91
        if self.num_bugs == 0:
92
92
            return
93
93
        elif self.num_bugs == 1:
100
100
                              "%d %s." % (self.num_bugs, label))
101
101
 
102
102
    def construct_treeview(self):
103
 
        self.bugs = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING)
104
 
        self.treeview = Gtk.TreeView(model=self.bugs)
 
103
        self.bugs = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
 
104
        self.treeview = gtk.TreeView(self.bugs)
105
105
        self.treeview.set_headers_visible(False)
106
106
 
107
 
        uri_column = Gtk.TreeViewColumn('Bug URI', Gtk.CellRendererText(), text=0)
 
107
        uri_column = gtk.TreeViewColumn('Bug URI', gtk.CellRendererText(), text=0)
108
108
        self.treeview.append_column(uri_column)
109
109
 
110
110
        self.treeview.connect('row-activated', self.on_row_activated)
111
111
 
112
 
        win = Gtk.ScrolledWindow()
113
 
        win.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
114
 
        win.set_shadow_type(Gtk.ShadowType.IN)
 
112
        win = gtk.ScrolledWindow()
 
113
        win.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
114
        win.set_shadow_type(gtk.SHADOW_IN)
115
115
        win.add(self.treeview)
116
116
 
117
117
        return win
136
136
        _open_link(self, uri)
137
137
 
138
138
 
139
 
class SignatureTab(Gtk.VBox):
 
139
class SignatureTab(gtk.VBox):
140
140
 
141
141
    def __init__(self, repository):
142
142
        self.key = None
143
143
        self.revision = None
144
144
        self.repository = repository
145
145
 
146
 
        super(SignatureTab, self).__init__(homogeneous=False, spacing=6)
147
 
        signature_box = Gtk.Table(rows=3, columns=3)
 
146
        super(SignatureTab, self).__init__(False, 6)
 
147
        signature_box = gtk.Table(rows=3, columns=3)
148
148
        signature_box.set_col_spacing(0, 16)
149
149
        signature_box.set_col_spacing(1, 12)
150
150
        signature_box.set_row_spacings(6)
151
151
 
152
 
        self.signature_image = Gtk.Image()
153
 
        signature_box.attach(self.signature_image, 0, 1, 0, 1, Gtk.AttachOptions.FILL)
 
152
        self.signature_image = gtk.Image()
 
153
        signature_box.attach(self.signature_image, 0, 1, 0, 1, gtk.FILL)
154
154
 
155
 
        align = Gtk.Alignment.new(0.0, 0.1, 0.0, 0.0)
156
 
        self.signature_label = Gtk.Label()
 
155
        align = gtk.Alignment(0.0, 0.1)
 
156
        self.signature_label = gtk.Label()
157
157
        align.add(self.signature_label)
158
 
        signature_box.attach(align, 1, 3, 0, 1, Gtk.AttachOptions.FILL)
 
158
        signature_box.attach(align, 1, 3, 0, 1, gtk.FILL)
159
159
 
160
 
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
161
 
        self.signature_key_id_label = Gtk.Label()
 
160
        align = gtk.Alignment(0.0, 0.5)
 
161
        self.signature_key_id_label = gtk.Label()
162
162
        self.signature_key_id_label.set_markup("<b>Key Id:</b>")
163
163
        align.add(self.signature_key_id_label)
164
 
        signature_box.attach(align, 1, 2, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
164
        signature_box.attach(align, 1, 2, 1, 2, gtk.FILL, gtk.FILL)
165
165
 
166
 
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
167
 
        self.signature_key_id = Gtk.Label()
 
166
        align = gtk.Alignment(0.0, 0.5)
 
167
        self.signature_key_id = gtk.Label()
168
168
        self.signature_key_id.set_selectable(True)
169
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)
 
170
        signature_box.attach(align, 2, 3, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
171
171
 
172
 
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
173
 
        self.signature_fingerprint_label = Gtk.Label()
 
172
        align = gtk.Alignment(0.0, 0.5)
 
173
        self.signature_fingerprint_label = gtk.Label()
174
174
        self.signature_fingerprint_label.set_markup("<b>Fingerprint:</b>")
175
175
        align.add(self.signature_fingerprint_label)
176
 
        signature_box.attach(align, 1, 2, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
176
        signature_box.attach(align, 1, 2, 2, 3, gtk.FILL, gtk.FILL)
177
177
 
178
 
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
179
 
        self.signature_fingerprint = Gtk.Label()
 
178
        align = gtk.Alignment(0.0, 0.5)
 
179
        self.signature_fingerprint = gtk.Label()
180
180
        self.signature_fingerprint.set_selectable(True)
181
181
        align.add(self.signature_fingerprint)
182
 
        signature_box.attach(align, 2, 3, 2, 3, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
182
        signature_box.attach(align, 2, 3, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
183
183
 
184
 
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
185
 
        self.signature_trust_label = Gtk.Label()
 
184
        align = gtk.Alignment(0.0, 0.5)
 
185
        self.signature_trust_label = gtk.Label()
186
186
        self.signature_trust_label.set_markup("<b>Trust:</b>")
187
187
        align.add(self.signature_trust_label)
188
 
        signature_box.attach(align, 1, 2, 3, 4, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
188
        signature_box.attach(align, 1, 2, 3, 4, gtk.FILL, gtk.FILL)
189
189
 
190
 
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
191
 
        self.signature_trust = Gtk.Label()
 
190
        align = gtk.Alignment(0.0, 0.5)
 
191
        self.signature_trust = gtk.Label()
192
192
        self.signature_trust.set_selectable(True)
193
193
        align.add(self.signature_trust)
194
 
        signature_box.attach(align, 2, 3, 3, 4, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
194
        signature_box.attach(align, 2, 3, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
195
195
 
196
196
        self.set_border_width(6)
197
 
        self.pack_start(signature_box, False, True, 0)
 
197
        self.pack_start(signature_box, expand=False)
198
198
        self.show_all()
199
199
 
200
200
    def set_revision(self, revision):
284
284
        self.signature_trust.set_text('This key is ' + trust_text)
285
285
 
286
286
 
287
 
class RevisionView(Gtk.Notebook):
 
287
class RevisionView(gtk.Notebook):
288
288
    """ Custom widget for commit log details.
289
289
 
290
290
    A variety of bzr tools may need to implement such a thing. This is a
293
293
 
294
294
    __gproperties__ = {
295
295
        'branch': (
296
 
            GObject.TYPE_PYOBJECT,
 
296
            gobject.TYPE_PYOBJECT,
297
297
            'Branch',
298
298
            'The branch holding the revision being displayed',
299
 
            GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE
 
299
            gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE
300
300
        ),
301
301
 
302
302
        'revision': (
303
 
            GObject.TYPE_PYOBJECT,
 
303
            gobject.TYPE_PYOBJECT,
304
304
            'Revision',
305
305
            'The revision being displayed',
306
 
            GObject.PARAM_READWRITE
 
306
            gobject.PARAM_READWRITE
307
307
        ),
308
308
 
309
309
        'children': (
310
 
            GObject.TYPE_PYOBJECT,
 
310
            gobject.TYPE_PYOBJECT,
311
311
            'Children',
312
312
            'Child revisions',
313
 
            GObject.PARAM_READWRITE
 
313
            gobject.PARAM_READWRITE
314
314
        ),
315
315
 
316
316
        'file-id': (
317
 
            GObject.TYPE_PYOBJECT,
 
317
            gobject.TYPE_PYOBJECT,
318
318
            'File Id',
319
319
            'The file id',
320
 
            GObject.PARAM_READWRITE
 
320
            gobject.PARAM_READWRITE
321
321
        )
322
322
    }
323
323
 
324
324
    def __init__(self, branch=None, repository=None):
325
 
        super(RevisionView, self).__init__()
 
325
        gtk.Notebook.__init__(self)
326
326
 
327
327
        self._revision = None
328
328
        self._branch = branch
330
330
            self._repository = branch.repository
331
331
        else:
332
332
            self._repository = repository
333
 
        self.signature_table = None
334
333
 
335
334
        self._create_general()
336
335
        self._create_relations()
397
396
 
398
397
    def _set_revision(self, revision):
399
398
        if revision is None: return
400
 
        
401
 
        self.avatarsbox.reset()
402
 
        
 
399
 
403
400
        self._revision = revision
404
401
        if revision.committer is not None:
405
402
            self.committer.set_text(revision.committer)
406
 
            self.avatarsbox.add(revision.committer, "committer")
407
403
        else:
408
404
            self.committer.set_text("")
409
 
            self.avatarsbox.hide()
410
405
        author = revision.properties.get('author', '')
411
 
        self.avatarsbox.merge(revision.get_apparent_authors(), "author")
412
406
        if author != '':
413
407
            self.author.set_text(author)
414
408
            self.author.show()
421
415
            self.timestamp.set_text(format_date(revision.timestamp,
422
416
                                                revision.timezone))
423
417
        try:
424
 
            self.branchnick.show()
425
 
            self.branchnick_label.show()
426
 
            self.branchnick.set_text(revision.properties['branch-nick'])
 
418
            self.branchnick_label.set_text(revision.properties['branch-nick'])
427
419
        except KeyError:
428
 
            self.branchnick.hide()
429
 
            self.branchnick_label.hide()
 
420
            self.branchnick_label.set_text("")
430
421
 
431
422
        self._add_parents_or_children(revision.parent_ids,
432
423
                                      self.parents_widgets,
433
424
                                      self.parents_table)
434
 
 
 
425
        
435
426
        file_info = revision.properties.get('file-info', None)
436
427
        if file_info is not None:
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
 
428
            file_info = bdecode(file_info.encode('UTF-8'))
443
429
 
444
430
        if file_info:
445
431
            if self._file_id is None:
470
456
        self._add_tags()
471
457
 
472
458
    def _update_signature(self, widget, param):
473
 
        if not has_seahorse:
474
 
            return
475
459
        if self.get_current_page() == PAGE_SIGNATURE:
476
460
            self.signature_table.set_revision(self._revision)
477
461
 
486
470
                                      self.children_table)
487
471
 
488
472
    def _switch_page_cb(self, notebook, page, page_num):
489
 
        if not has_seahorse:
490
 
            return
491
473
        if page_num == PAGE_SIGNATURE:
492
474
            self.signature_table.set_revision(self._revision)
493
475
 
527
509
        table.resize(max(len(revids), 1), 2)
528
510
 
529
511
        for idx, revid in enumerate(revids):
530
 
            align = Gtk.Alignment.new(0.0, 0.0, 1, 1)
 
512
            align = gtk.Alignment(0.0, 0.0, 1, 1)
531
513
            widgets.append(align)
532
514
            table.attach(align, 1, 2, idx, idx + 1,
533
 
                                      Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
515
                                      gtk.EXPAND | gtk.FILL, gtk.FILL)
534
516
            align.show()
535
517
 
536
 
            hbox = Gtk.HBox(homogeneous=False, spacing=6)
 
518
            hbox = gtk.HBox(False, spacing=6)
537
519
            align.add(hbox)
538
520
            hbox.show()
539
521
 
540
 
            image = Gtk.Image()
 
522
            image = gtk.Image()
541
523
            image.set_from_stock(
542
 
                Gtk.STOCK_FIND, Gtk.IconSize.SMALL_TOOLBAR)
 
524
                gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
543
525
            image.show()
544
526
 
545
527
            if self._show_callback is not None:
546
 
                button = Gtk.Button()
 
528
                button = gtk.Button()
547
529
                button.add(image)
548
530
                button.connect("clicked", self._show_clicked_cb,
549
531
                               self._revision.revision_id, revid)
550
 
                hbox.pack_start(button, False, True, 0)
 
532
                hbox.pack_start(button, expand=False, fill=True)
551
533
                button.show()
552
534
 
553
 
            button = Gtk.Button()
554
 
            revid_label = Gtk.Label(label=str(revid))
555
 
            revid_label.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
535
            button = gtk.Button()
 
536
            revid_label = gtk.Label(str(revid))
 
537
            revid_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
556
538
            revid_label.set_alignment(0.0, 0.5)
557
539
            button.add(revid_label)
558
540
            button.connect("clicked",
559
 
                    lambda w, r: self.set_revision(
560
 
                        self._repository.get_revision(r)), revid)
 
541
                    lambda w, r: self.set_revision(self._repository.get_revision(r)), revid)
561
542
            button.set_use_underline(False)
562
 
            hbox.pack_start(button, True, True, 0)
 
543
            hbox.pack_start(button, expand=True, fill=True)
563
544
            button.show_all()
564
545
 
565
546
    def _create_general(self):
566
 
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
 
547
        vbox = gtk.VBox(False, 6)
567
548
        vbox.set_border_width(6)
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"))
 
549
        vbox.pack_start(self._create_headers(), expand=False, fill=True)
 
550
        vbox.pack_start(self._create_message_view())
 
551
        self.append_page(vbox, tab_label=gtk.Label("General"))
571
552
        vbox.show()
572
553
 
573
554
    def _create_relations(self):
574
 
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
 
555
        vbox = gtk.VBox(False, 6)
575
556
        vbox.set_border_width(6)
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"))
 
557
        vbox.pack_start(self._create_parents(), expand=False, fill=True)
 
558
        vbox.pack_start(self._create_children(), expand=False, fill=True)
 
559
        self.append_page(vbox, tab_label=gtk.Label("Relations"))
579
560
        vbox.show()
580
561
 
581
562
    def _create_signature(self):
582
563
        self.signature_table = SignatureTab(self._repository)
583
 
        self.append_page(
584
 
            self.signature_table, Gtk.Label(label='Signature'))
 
564
        self.append_page(self.signature_table, tab_label=gtk.Label('Signature'))
585
565
        self.connect_after('notify::revision', self._update_signature)
586
566
 
587
567
    def _create_headers(self):
588
 
        self.avatarsbox = AvatarsBox()
589
 
        
590
 
        self.table = Gtk.Table(rows=5, columns=2)
 
568
        self.table = gtk.Table(rows=5, columns=2)
591
569
        self.table.set_row_spacings(6)
592
570
        self.table.set_col_spacings(6)
593
571
        self.table.show()
594
 
        
595
 
        self.avatarsbox.pack_start(self.table, True, True, 0)
596
 
        self.avatarsbox.show()
597
572
 
598
573
        row = 0
599
574
 
600
 
        label = Gtk.Label()
 
575
        label = gtk.Label()
601
576
        label.set_alignment(1.0, 0.5)
602
577
        label.set_markup("<b>Revision Id:</b>")
603
 
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
578
        self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
604
579
        label.show()
605
580
 
606
 
        revision_id = Gtk.Label()
607
 
        revision_id.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
581
        revision_id = gtk.Label()
 
582
        revision_id.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
608
583
        revision_id.set_alignment(0.0, 0.5)
609
584
        revision_id.set_selectable(True)
610
585
        self.connect('notify::revision', 
611
586
                lambda w, p: revision_id.set_text(self._revision.revision_id))
612
 
        self.table.attach(revision_id, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
587
        self.table.attach(revision_id, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
613
588
        revision_id.show()
614
589
 
615
590
        row += 1
616
 
        self.author_label = Gtk.Label()
 
591
        self.author_label = gtk.Label()
617
592
        self.author_label.set_alignment(1.0, 0.5)
618
593
        self.author_label.set_markup("<b>Author:</b>")
619
 
        self.table.attach(self.author_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
594
        self.table.attach(self.author_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
620
595
        self.author_label.show()
621
596
 
622
 
        self.author = Gtk.Label()
623
 
        self.author.set_ellipsize(Pango.EllipsizeMode.END)
 
597
        self.author = gtk.Label()
 
598
        self.author.set_ellipsize(pango.ELLIPSIZE_END)
624
599
        self.author.set_alignment(0.0, 0.5)
625
600
        self.author.set_selectable(True)
626
 
        self.table.attach(self.author, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
601
        self.table.attach(self.author, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
627
602
        self.author.show()
628
603
        self.author.hide()
629
604
 
630
605
        row += 1
631
 
        label = Gtk.Label()
 
606
        label = gtk.Label()
632
607
        label.set_alignment(1.0, 0.5)
633
608
        label.set_markup("<b>Committer:</b>")
634
 
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
609
        self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
635
610
        label.show()
636
611
 
637
 
        self.committer = Gtk.Label()
638
 
        self.committer.set_ellipsize(Pango.EllipsizeMode.END)
 
612
        self.committer = gtk.Label()
 
613
        self.committer.set_ellipsize(pango.ELLIPSIZE_END)
639
614
        self.committer.set_alignment(0.0, 0.5)
640
615
        self.committer.set_selectable(True)
641
 
        self.table.attach(self.committer, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
616
        self.table.attach(self.committer, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
642
617
        self.committer.show()
643
618
 
644
619
        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)
 
620
        label = gtk.Label()
 
621
        label.set_alignment(1.0, 0.5)
 
622
        label.set_markup("<b>Branch nick:</b>")
 
623
        self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
 
624
        label.show()
 
625
 
 
626
        self.branchnick_label = gtk.Label()
 
627
        self.branchnick_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
 
628
        self.branchnick_label.set_alignment(0.0, 0.5)
 
629
        self.branchnick_label.set_selectable(True)
 
630
        self.table.attach(self.branchnick_label, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
649
631
        self.branchnick_label.show()
650
632
 
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
633
        row += 1
659
 
        label = Gtk.Label()
 
634
        label = gtk.Label()
660
635
        label.set_alignment(1.0, 0.5)
661
636
        label.set_markup("<b>Timestamp:</b>")
662
 
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
637
        self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
663
638
        label.show()
664
639
 
665
 
        self.timestamp = Gtk.Label()
666
 
        self.timestamp.set_ellipsize(Pango.EllipsizeMode.END)
 
640
        self.timestamp = gtk.Label()
 
641
        self.timestamp.set_ellipsize(pango.ELLIPSIZE_END)
667
642
        self.timestamp.set_alignment(0.0, 0.5)
668
643
        self.timestamp.set_selectable(True)
669
 
        self.table.attach(self.timestamp, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
644
        self.table.attach(self.timestamp, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
670
645
        self.timestamp.show()
671
646
 
672
647
        row += 1
673
 
        self.tags_label = Gtk.Label()
 
648
        self.tags_label = gtk.Label()
674
649
        self.tags_label.set_alignment(1.0, 0.5)
675
650
        self.tags_label.set_markup("<b>Tags:</b>")
676
 
        self.table.attach(self.tags_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
651
        self.table.attach(self.tags_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
677
652
        self.tags_label.show()
678
653
 
679
 
        self.tags_list = Gtk.Label()
680
 
        self.tags_list.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
654
        self.tags_list = gtk.Label()
 
655
        self.tags_list.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
681
656
        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)
 
657
        self.table.attach(self.tags_list, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
683
658
        self.tags_list.show()
684
659
 
685
660
        self.connect('notify::revision', self._add_tags)
686
661
 
687
 
        return self.avatarsbox
 
662
        return self.table
688
663
    
689
664
    def _create_parents(self):
690
 
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
 
665
        hbox = gtk.HBox(True, 3)
691
666
        
692
667
        self.parents_table = self._create_parents_or_children_table(
693
668
            "<b>Parents:</b>")
694
669
        self.parents_widgets = []
695
 
        hbox.pack_start(self.parents_table, True, True, 0)
 
670
        hbox.pack_start(self.parents_table)
696
671
 
697
672
        hbox.show()
698
673
        return hbox
699
674
 
700
675
    def _create_children(self):
701
 
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
 
676
        hbox = gtk.HBox(True, 3)
702
677
        self.children_table = self._create_parents_or_children_table(
703
678
            "<b>Children:</b>")
704
679
        self.children_widgets = []
705
 
        hbox.pack_start(self.children_table, True, True, 0)
 
680
        hbox.pack_start(self.children_table)
706
681
        hbox.show()
707
682
        return hbox
708
683
        
709
684
    def _create_parents_or_children_table(self, text):
710
 
        table = Gtk.Table(rows=1, columns=2)
 
685
        table = gtk.Table(rows=1, columns=2)
711
686
        table.set_row_spacings(3)
712
687
        table.set_col_spacings(6)
713
688
        table.show()
714
689
 
715
 
        label = Gtk.Label()
 
690
        label = gtk.Label()
716
691
        label.set_markup(text)
717
 
        align = Gtk.Alignment.new(0.0, 0.5, 0, 0)
 
692
        align = gtk.Alignment(0.0, 0.5)
718
693
        align.add(label)
719
 
        table.attach(align, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
694
        table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
720
695
        label.show()
721
696
        align.show()
722
697
 
723
698
        return table
724
699
 
725
700
    def _create_message_view(self):
726
 
        msg_buffer = Gtk.TextBuffer()
 
701
        msg_buffer = gtk.TextBuffer()
727
702
        self.connect('notify::revision',
728
703
                lambda w, p: msg_buffer.set_text(self._revision.message))
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)
 
704
        window = gtk.ScrolledWindow()
 
705
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
706
        window.set_shadow_type(gtk.SHADOW_IN)
 
707
        tv = gtk.TextView(msg_buffer)
733
708
        tv.set_editable(False)
734
 
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
 
709
        tv.set_wrap_mode(gtk.WRAP_WORD)
735
710
 
736
 
        tv.modify_font(Pango.FontDescription("Monospace"))
 
711
        tv.modify_font(pango.FontDescription("Monospace"))
737
712
        tv.show()
738
713
        window.add(tv)
739
714
        window.show()
742
717
    def _create_bugs(self):
743
718
        self.bugs_page = BugsTab()
744
719
        self.connect_after('notify::revision', self._update_bugs) 
745
 
        self.append_page(self.bugs_page, Gtk.Label(label='Bugs'))
 
720
        self.append_page(self.bugs_page, tab_label=gtk.Label('Bugs'))
746
721
 
747
722
    def _create_file_info_view(self):
748
 
        self.file_info_box = Gtk.VBox(homogeneous=False, spacing=6)
 
723
        self.file_info_box = gtk.VBox(False, 6)
749
724
        self.file_info_box.set_border_width(6)
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)
 
725
        self.file_info_buffer = gtk.TextBuffer()
 
726
        window = gtk.ScrolledWindow()
 
727
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
728
        window.set_shadow_type(gtk.SHADOW_IN)
 
729
        tv = gtk.TextView(self.file_info_buffer)
755
730
        tv.set_editable(False)
756
 
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
757
 
        tv.modify_font(Pango.FontDescription("Monospace"))
 
731
        tv.set_wrap_mode(gtk.WRAP_WORD)
 
732
        tv.modify_font(pango.FontDescription("Monospace"))
758
733
        tv.show()
759
734
        window.add(tv)
760
735
        window.show()
761
 
        self.file_info_box.pack_start(window, True, True, 0)
 
736
        self.file_info_box.pack_start(window)
762
737
        self.file_info_box.hide() # Only shown when there are per-file messages
763
 
        self.append_page(self.file_info_box, Gtk.Label(label='Per-file'))
 
738
        self.append_page(self.file_info_box, tab_label=gtk.Label('Per-file'))
764
739