/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-09-08 03:11:06 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110908031106-c0s7grzmctdyghcm
Fixed packing args.

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