/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

Commit messages never contain config options

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