/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: Szilveszter Farkas
  • Date: 2009-05-26 13:58:24 UTC
  • mto: (635.2.6 trunk)
  • mto: This revision was merged to the branch mainline in revision 639.
  • Revision ID: szilveszter.farkas@gmail.com-20090526135824-fwvt03uqtl2p6vk7
Updated the README entry about GtkSourceView.

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