/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-05 03:44:26 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110905034426-p98pxnay9rmzkr99
Fix the initializer for many classes.
Replace Gtk.Dialog.vbox with .get_content_area().

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
 
        super(BugsTab, self).__init__(False, 6)
60
 
    
61
 
        table = gtk.Table(rows=2, columns=2)
 
60
        super(BugsTab, self).__init__(homogeneous=False, spacing=6)
 
61
 
 
62
        table = Gtk.Table(rows=2, columns=2)
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, 0, 0)
 
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(model=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
147
148
        self.revision = None
148
149
        self.repository = repository
149
150
 
150
 
        super(SignatureTab, self).__init__(False, 6)
151
 
        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)
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, 0.0, 0.0)
 
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, 0.0, 0.0)
 
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, 0.0, 0.0)
 
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, 0.0, 0.0)
 
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, 0.0, 0.0)
 
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, 0.0, 0.0)
 
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, 0.0, 0.0)
 
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
        super(RevisionView, self).__init__()
330
331
 
331
332
        self._revision = None
332
333
        self._branch = branch
334
335
            self._repository = branch.repository
335
336
        else:
336
337
            self._repository = repository
 
338
        self.signature_table = None
337
339
 
338
340
        self._create_general()
339
341
        self._create_relations()
400
402
 
401
403
    def _set_revision(self, revision):
402
404
        if revision is None: return
403
 
 
 
405
        
 
406
        self.avatarsbox.reset()
 
407
        
404
408
        self._revision = revision
405
409
        if revision.committer is not None:
406
410
            self.committer.set_text(revision.committer)
 
411
            self.avatarsbox.add(revision.committer, "committer")
407
412
        else:
408
413
            self.committer.set_text("")
 
414
            self.avatarsbox.hide()
409
415
        author = revision.properties.get('author', '')
 
416
        self.avatarsbox.merge(revision.get_apparent_authors(), "author")
410
417
        if author != '':
411
418
            self.author.set_text(author)
412
419
            self.author.show()
468
475
        self._add_tags()
469
476
 
470
477
    def _update_signature(self, widget, param):
 
478
        if not has_seahorse:
 
479
            return
471
480
        if self.get_current_page() == PAGE_SIGNATURE:
472
481
            self.signature_table.set_revision(self._revision)
473
482
 
482
491
                                      self.children_table)
483
492
 
484
493
    def _switch_page_cb(self, notebook, page, page_num):
 
494
        if not has_seahorse:
 
495
            return
485
496
        if page_num == PAGE_SIGNATURE:
486
497
            self.signature_table.set_revision(self._revision)
487
498
 
521
532
        table.resize(max(len(revids), 1), 2)
522
533
 
523
534
        for idx, revid in enumerate(revids):
524
 
            align = gtk.Alignment(0.0, 0.0, 1, 1)
 
535
            align = Gtk.Alignment.new(0.0, 0.0, 1, 1)
525
536
            widgets.append(align)
526
537
            table.attach(align, 1, 2, idx, idx + 1,
527
 
                                      gtk.EXPAND | gtk.FILL, gtk.FILL)
 
538
                                      Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
528
539
            align.show()
529
540
 
530
 
            hbox = gtk.HBox(False, spacing=6)
 
541
            hbox = Gtk.HBox(homogeneous=False, spacing=6)
531
542
            align.add(hbox)
532
543
            hbox.show()
533
544
 
534
 
            image = gtk.Image()
 
545
            image = Gtk.Image()
535
546
            image.set_from_stock(
536
 
                gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
 
547
                Gtk.STOCK_FIND, Gtk.IconSize.SMALL_TOOLBAR)
537
548
            image.show()
538
549
 
539
550
            if self._show_callback is not None:
540
 
                button = gtk.Button()
 
551
                button = Gtk.Button()
541
552
                button.add(image)
542
553
                button.connect("clicked", self._show_clicked_cb,
543
554
                               self._revision.revision_id, revid)
544
 
                hbox.pack_start(button, expand=False, fill=True)
 
555
                hbox.pack_start(button, False, True, 0)
545
556
                button.show()
546
557
 
547
 
            button = gtk.Button()
548
 
            revid_label = gtk.Label(str(revid))
549
 
            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)
550
561
            revid_label.set_alignment(0.0, 0.5)
551
562
            button.add(revid_label)
552
563
            button.connect("clicked",
553
 
                    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)
554
566
            button.set_use_underline(False)
555
 
            hbox.pack_start(button, expand=True, fill=True)
 
567
            hbox.pack_start(button, True, True, 0)
556
568
            button.show_all()
557
569
 
558
570
    def _create_general(self):
559
 
        vbox = gtk.VBox(False, 6)
 
571
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
560
572
        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"))
 
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"))
564
576
        vbox.show()
565
577
 
566
578
    def _create_relations(self):
567
 
        vbox = gtk.VBox(False, 6)
 
579
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
568
580
        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"))
 
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"))
572
584
        vbox.show()
573
585
 
574
586
    def _create_signature(self):
575
587
        self.signature_table = SignatureTab(self._repository)
576
 
        self.append_page(self.signature_table, tab_label=gtk.Label('Signature'))
 
588
        self.append_page(
 
589
            self.signature_table, Gtk.Label(label='Signature'))
577
590
        self.connect_after('notify::revision', self._update_signature)
578
591
 
579
592
    def _create_headers(self):
580
 
        self.table = gtk.Table(rows=5, columns=2)
 
593
        self.avatarsbox = AvatarsBox()
 
594
        
 
595
        self.table = Gtk.Table(rows=5, columns=2)
581
596
        self.table.set_row_spacings(6)
582
597
        self.table.set_col_spacings(6)
583
598
        self.table.show()
 
599
        
 
600
        self.avatarsbox.pack_start(self.table, True, True, 0)
 
601
        self.avatarsbox.show()
584
602
 
585
603
        row = 0
586
604
 
587
 
        label = gtk.Label()
 
605
        label = Gtk.Label()
588
606
        label.set_alignment(1.0, 0.5)
589
607
        label.set_markup("<b>Revision Id:</b>")
590
 
        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)
591
609
        label.show()
592
610
 
593
 
        revision_id = gtk.Label()
594
 
        revision_id.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
 
611
        revision_id = Gtk.Label()
 
612
        revision_id.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
595
613
        revision_id.set_alignment(0.0, 0.5)
596
614
        revision_id.set_selectable(True)
597
615
        self.connect('notify::revision', 
598
616
                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)
 
617
        self.table.attach(revision_id, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
600
618
        revision_id.show()
601
619
 
602
620
        row += 1
603
 
        self.author_label = gtk.Label()
 
621
        self.author_label = Gtk.Label()
604
622
        self.author_label.set_alignment(1.0, 0.5)
605
623
        self.author_label.set_markup("<b>Author:</b>")
606
 
        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)
607
625
        self.author_label.show()
608
626
 
609
 
        self.author = gtk.Label()
610
 
        self.author.set_ellipsize(pango.ELLIPSIZE_END)
 
627
        self.author = Gtk.Label()
 
628
        self.author.set_ellipsize(Pango.EllipsizeMode.END)
611
629
        self.author.set_alignment(0.0, 0.5)
612
630
        self.author.set_selectable(True)
613
 
        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)
614
632
        self.author.show()
615
633
        self.author.hide()
616
634
 
617
635
        row += 1
618
 
        label = gtk.Label()
 
636
        label = Gtk.Label()
619
637
        label.set_alignment(1.0, 0.5)
620
638
        label.set_markup("<b>Committer:</b>")
621
 
        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)
622
640
        label.show()
623
641
 
624
 
        self.committer = gtk.Label()
625
 
        self.committer.set_ellipsize(pango.ELLIPSIZE_END)
 
642
        self.committer = Gtk.Label()
 
643
        self.committer.set_ellipsize(Pango.EllipsizeMode.END)
626
644
        self.committer.set_alignment(0.0, 0.5)
627
645
        self.committer.set_selectable(True)
628
 
        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)
629
647
        self.committer.show()
630
648
 
631
649
        row += 1
632
 
        self.branchnick_label = gtk.Label()
 
650
        self.branchnick_label = Gtk.Label()
633
651
        self.branchnick_label.set_alignment(1.0, 0.5)
634
652
        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)
 
653
        self.table.attach(self.branchnick_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
636
654
        self.branchnick_label.show()
637
655
 
638
 
        self.branchnick = gtk.Label()
639
 
        self.branchnick.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
 
656
        self.branchnick = Gtk.Label()
 
657
        self.branchnick.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
640
658
        self.branchnick.set_alignment(0.0, 0.5)
641
659
        self.branchnick.set_selectable(True)
642
 
        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)
643
661
        self.branchnick.show()
644
662
 
645
663
        row += 1
646
 
        label = gtk.Label()
 
664
        label = Gtk.Label()
647
665
        label.set_alignment(1.0, 0.5)
648
666
        label.set_markup("<b>Timestamp:</b>")
649
 
        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)
650
668
        label.show()
651
669
 
652
 
        self.timestamp = gtk.Label()
653
 
        self.timestamp.set_ellipsize(pango.ELLIPSIZE_END)
 
670
        self.timestamp = Gtk.Label()
 
671
        self.timestamp.set_ellipsize(Pango.EllipsizeMode.END)
654
672
        self.timestamp.set_alignment(0.0, 0.5)
655
673
        self.timestamp.set_selectable(True)
656
 
        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)
657
675
        self.timestamp.show()
658
676
 
659
677
        row += 1
660
 
        self.tags_label = gtk.Label()
 
678
        self.tags_label = Gtk.Label()
661
679
        self.tags_label.set_alignment(1.0, 0.5)
662
680
        self.tags_label.set_markup("<b>Tags:</b>")
663
 
        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)
664
682
        self.tags_label.show()
665
683
 
666
 
        self.tags_list = gtk.Label()
667
 
        self.tags_list.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
 
684
        self.tags_list = Gtk.Label()
 
685
        self.tags_list.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
668
686
        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)
 
687
        self.table.attach(self.tags_list, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
670
688
        self.tags_list.show()
671
689
 
672
690
        self.connect('notify::revision', self._add_tags)
673
691
 
674
 
        return self.table
 
692
        return self.avatarsbox
675
693
    
676
694
    def _create_parents(self):
677
 
        hbox = gtk.HBox(True, 3)
 
695
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
678
696
        
679
697
        self.parents_table = self._create_parents_or_children_table(
680
698
            "<b>Parents:</b>")
681
699
        self.parents_widgets = []
682
 
        hbox.pack_start(self.parents_table)
 
700
        hbox.pack_start(self.parents_table, True, True, 0)
683
701
 
684
702
        hbox.show()
685
703
        return hbox
686
704
 
687
705
    def _create_children(self):
688
 
        hbox = gtk.HBox(True, 3)
 
706
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
689
707
        self.children_table = self._create_parents_or_children_table(
690
708
            "<b>Children:</b>")
691
709
        self.children_widgets = []
692
 
        hbox.pack_start(self.children_table)
 
710
        hbox.pack_start(self.children_table, True, True, 0)
693
711
        hbox.show()
694
712
        return hbox
695
713
        
696
714
    def _create_parents_or_children_table(self, text):
697
 
        table = gtk.Table(rows=1, columns=2)
 
715
        table = Gtk.Table(rows=1, columns=2)
698
716
        table.set_row_spacings(3)
699
717
        table.set_col_spacings(6)
700
718
        table.show()
701
719
 
702
 
        label = gtk.Label()
 
720
        label = Gtk.Label()
703
721
        label.set_markup(text)
704
 
        align = gtk.Alignment(0.0, 0.5)
 
722
        align = Gtk.Alignment.new(0.0, 0.5, 0, 0)
705
723
        align.add(label)
706
 
        table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
 
724
        table.attach(align, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
707
725
        label.show()
708
726
        align.show()
709
727
 
710
728
        return table
711
729
 
712
730
    def _create_message_view(self):
713
 
        msg_buffer = gtk.TextBuffer()
 
731
        msg_buffer = Gtk.TextBuffer()
714
732
        self.connect('notify::revision',
715
733
                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)
 
734
        window = Gtk.ScrolledWindow()
 
735
        window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
 
736
        window.set_shadow_type(Gtk.ShadowType.IN)
 
737
        tv = Gtk.TextView(buffer=msg_buffer)
720
738
        tv.set_editable(False)
721
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
 
739
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
722
740
 
723
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
741
        tv.modify_font(Pango.FontDescription("Monospace"))
724
742
        tv.show()
725
743
        window.add(tv)
726
744
        window.show()
729
747
    def _create_bugs(self):
730
748
        self.bugs_page = BugsTab()
731
749
        self.connect_after('notify::revision', self._update_bugs) 
732
 
        self.append_page(self.bugs_page, tab_label=gtk.Label('Bugs'))
 
750
        self.append_page(self.bugs_page, Gtk.Label(label='Bugs'))
733
751
 
734
752
    def _create_file_info_view(self):
735
 
        self.file_info_box = gtk.VBox(False, 6)
 
753
        self.file_info_box = Gtk.VBox(homogeneous=False, spacing=6)
736
754
        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)
 
755
        self.file_info_buffer = Gtk.TextBuffer()
 
756
        window = Gtk.ScrolledWindow()
 
757
        window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
 
758
        window.set_shadow_type(Gtk.ShadowType.IN)
 
759
        tv = Gtk.TextView(buffer=self.file_info_buffer)
742
760
        tv.set_editable(False)
743
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
744
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
761
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
 
762
        tv.modify_font(Pango.FontDescription("Monospace"))
745
763
        tv.show()
746
764
        window.add(tv)
747
765
        window.show()
748
 
        self.file_info_box.pack_start(window)
 
766
        self.file_info_box.pack_start(window, True, True, 0)
749
767
        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'))
 
768
        self.append_page(self.file_info_box, Gtk.Label(label='Per-file'))
751
769