/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-01 14:46:23 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110801144623-ldjf0bu7kyi5bxzu
Updated commit to gtk3.

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