/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: Curtis Hovey
  • Date: 2011-08-29 14:12:30 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110829141230-6nv7h0oxjrojb1y1
Updated hacking doc.

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