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