/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: 2010-05-25 17:09:02 UTC
  • mto: This revision was merged to the branch mainline in revision 691.
  • Revision ID: jelmer@samba.org-20100525170902-3to8g5iw7ovw79kh
Split out olive into a separate directory.

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