/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: 2012-09-02 19:29:42 UTC
  • mfrom: (794.1.1 get_style_context)
  • Revision ID: sinzui.is@verizon.net-20120902192942-cwtww9wxvznx0wod
Do not call deprecated get_style(); use get_style_context().

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