/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
 
 
23
from bzrlib import trace
 
24
from bzrlib.osutils import format_date
 
25
try:
 
26
    from bzrlib.bencode import bdecode
 
27
except ImportError:
 
28
    from bzrlib.util.bencode import bdecode
 
29
from bzrlib.testament import Testament
 
30
 
25
31
from bzrlib.plugins.gtk import icon_path
26
 
from bzrlib.osutils import format_date
27
 
from bzrlib.util.bencode import bdecode
 
32
 
 
33
from bzrlib.plugins.gtk.avatarsbox import AvatarsBox
28
34
 
29
35
try:
30
36
    from bzrlib.plugins.gtk import seahorse
45
51
            webbrowser._tryorder.insert(0, '%s "%%s"' % cmd)
46
52
    webbrowser.open(uri)
47
53
 
48
 
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)
49
56
 
50
 
class BugsTab(gtk.VBox):
 
57
class BugsTab(Gtk.VBox):
51
58
 
52
59
    def __init__(self):
53
60
        super(BugsTab, self).__init__(False, 6)
54
 
    
55
 
        table = gtk.Table(rows=2, columns=2)
 
61
 
 
62
        table = Gtk.Table(rows=2, columns=2)
56
63
 
57
64
        table.set_row_spacings(6)
58
65
        table.set_col_spacing(0, 16)
59
66
 
60
 
        image = gtk.Image()
 
67
        image = Gtk.Image()
61
68
        image.set_from_file(icon_path("bug.png"))
62
 
        table.attach(image, 0, 1, 0, 1, gtk.FILL)
 
69
        table.attach(image, 0, 1, 0, 1, Gtk.AttachOptions.FILL)
63
70
 
64
 
        align = gtk.Alignment(0.0, 0.1)
65
 
        self.label = gtk.Label()
 
71
        align = Gtk.Alignment.new(0.0, 0.1)
 
72
        self.label = Gtk.Label()
66
73
        align.add(self.label)
67
 
        table.attach(align, 1, 2, 0, 1, gtk.FILL)
 
74
        table.attach(align, 1, 2, 0, 1, Gtk.AttachOptions.FILL)
68
75
 
69
76
        treeview = self.construct_treeview()
70
 
        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)
71
78
 
72
79
        self.set_border_width(6)
73
 
        self.pack_start(table, expand=False)
 
80
        self.pack_start(table, False, True, 0)
74
81
 
75
82
        self.clear()
76
83
        self.show_all()
85
92
                (url, status) = bugline.split(" ")
86
93
                if status == "fixed":
87
94
                    self.add_bug(url, status)
88
 
        
 
95
 
89
96
        if self.num_bugs == 0:
90
97
            return
91
98
        elif self.num_bugs == 1:
98
105
                              "%d %s." % (self.num_bugs, label))
99
106
 
100
107
    def construct_treeview(self):
101
 
        self.bugs = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
102
 
        self.treeview = gtk.TreeView(self.bugs)
 
108
        self.bugs = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING)
 
109
        self.treeview = Gtk.TreeView(self.bugs)
103
110
        self.treeview.set_headers_visible(False)
104
111
 
105
 
        uri_column = gtk.TreeViewColumn('Bug URI', gtk.CellRendererText(), text=0)
 
112
        uri_column = Gtk.TreeViewColumn('Bug URI', Gtk.CellRendererText(), text=0)
106
113
        self.treeview.append_column(uri_column)
107
114
 
108
115
        self.treeview.connect('row-activated', self.on_row_activated)
109
116
 
110
 
        win = gtk.ScrolledWindow()
111
 
        win.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
112
 
        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)
113
120
        win.add(self.treeview)
114
121
 
115
122
        return win
134
141
        _open_link(self, uri)
135
142
 
136
143
 
137
 
class SignatureTab(gtk.VBox):
 
144
class SignatureTab(Gtk.VBox):
138
145
 
139
146
    def __init__(self, repository):
140
147
        self.key = None
142
149
        self.repository = repository
143
150
 
144
151
        super(SignatureTab, self).__init__(False, 6)
145
 
        signature_box = gtk.Table(rows=3, columns=3)
 
152
        signature_box = Gtk.Table(rows=3, columns=3)
146
153
        signature_box.set_col_spacing(0, 16)
147
154
        signature_box.set_col_spacing(1, 12)
148
155
        signature_box.set_row_spacings(6)
149
156
 
150
 
        self.signature_image = gtk.Image()
151
 
        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)
152
159
 
153
 
        align = gtk.Alignment(0.0, 0.1)
154
 
        self.signature_label = gtk.Label()
 
160
        align = Gtk.Alignment.new(0.0, 0.1)
 
161
        self.signature_label = Gtk.Label()
155
162
        align.add(self.signature_label)
156
 
        signature_box.attach(align, 1, 3, 0, 1, gtk.FILL)
 
163
        signature_box.attach(align, 1, 3, 0, 1, Gtk.AttachOptions.FILL)
157
164
 
158
 
        align = gtk.Alignment(0.0, 0.5)
159
 
        self.signature_key_id_label = gtk.Label()
 
165
        align = Gtk.Alignment.new(0.0, 0.5)
 
166
        self.signature_key_id_label = Gtk.Label()
160
167
        self.signature_key_id_label.set_markup("<b>Key Id:</b>")
161
168
        align.add(self.signature_key_id_label)
162
 
        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)
163
170
 
164
 
        align = gtk.Alignment(0.0, 0.5)
165
 
        self.signature_key_id = gtk.Label()
 
171
        align = Gtk.Alignment.new(0.0, 0.5)
 
172
        self.signature_key_id = Gtk.Label()
166
173
        self.signature_key_id.set_selectable(True)
167
174
        align.add(self.signature_key_id)
168
 
        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)
169
176
 
170
 
        align = gtk.Alignment(0.0, 0.5)
171
 
        self.signature_fingerprint_label = gtk.Label()
 
177
        align = Gtk.Alignment.new(0.0, 0.5)
 
178
        self.signature_fingerprint_label = Gtk.Label()
172
179
        self.signature_fingerprint_label.set_markup("<b>Fingerprint:</b>")
173
180
        align.add(self.signature_fingerprint_label)
174
 
        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)
175
182
 
176
 
        align = gtk.Alignment(0.0, 0.5)
177
 
        self.signature_fingerprint = gtk.Label()
 
183
        align = Gtk.Alignment.new(0.0, 0.5)
 
184
        self.signature_fingerprint = Gtk.Label()
178
185
        self.signature_fingerprint.set_selectable(True)
179
186
        align.add(self.signature_fingerprint)
180
 
        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)
181
188
 
182
 
        align = gtk.Alignment(0.0, 0.5)
183
 
        self.signature_trust_label = gtk.Label()
 
189
        align = Gtk.Alignment.new(0.0, 0.5)
 
190
        self.signature_trust_label = Gtk.Label()
184
191
        self.signature_trust_label.set_markup("<b>Trust:</b>")
185
192
        align.add(self.signature_trust_label)
186
 
        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)
187
194
 
188
 
        align = gtk.Alignment(0.0, 0.5)
189
 
        self.signature_trust = gtk.Label()
 
195
        align = Gtk.Alignment.new(0.0, 0.5)
 
196
        self.signature_trust = Gtk.Label()
190
197
        self.signature_trust.set_selectable(True)
191
198
        align.add(self.signature_trust)
192
 
        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)
193
200
 
194
201
        self.set_border_width(6)
195
 
        self.pack_start(signature_box, expand=False)
 
202
        self.pack_start(signature_box, False, True, 0)
196
203
        self.show_all()
197
204
 
198
205
    def set_revision(self, revision):
220
227
                                        "This revision has not been signed.")
221
228
 
222
229
    def show_signature(self, crypttext):
223
 
        key = seahorse.verify(crypttext)
 
230
        (cleartext, key) = seahorse.verify(crypttext)
 
231
 
 
232
        assert cleartext is not None
 
233
 
 
234
        inv = self.repository.get_inventory(self.revision.revision_id)
 
235
        expected_testament = Testament(self.revision, inv).as_short_text()
 
236
        if expected_testament != cleartext:
 
237
            self.signature_image.set_from_file(icon_path("sign-bad.png"))
 
238
            self.signature_label.set_markup("<b>Signature does not match repository data</b>\n" +
 
239
                        "The signature plaintext is different from the expected testament plaintext.")
 
240
            return
224
241
 
225
242
        if key and key.is_available():
226
243
            if key.is_trusted():
272
289
        self.signature_trust.set_text('This key is ' + trust_text)
273
290
 
274
291
 
275
 
class RevisionView(gtk.Notebook):
 
292
class RevisionView(Gtk.Notebook):
276
293
    """ Custom widget for commit log details.
277
294
 
278
295
    A variety of bzr tools may need to implement such a thing. This is a
281
298
 
282
299
    __gproperties__ = {
283
300
        'branch': (
284
 
            gobject.TYPE_PYOBJECT,
 
301
            GObject.TYPE_PYOBJECT,
285
302
            'Branch',
286
303
            'The branch holding the revision being displayed',
287
 
            gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE
 
304
            GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE
288
305
        ),
289
306
 
290
307
        'revision': (
291
 
            gobject.TYPE_PYOBJECT,
 
308
            GObject.TYPE_PYOBJECT,
292
309
            'Revision',
293
310
            'The revision being displayed',
294
 
            gobject.PARAM_READWRITE
 
311
            GObject.PARAM_READWRITE
295
312
        ),
296
313
 
297
314
        'children': (
298
 
            gobject.TYPE_PYOBJECT,
 
315
            GObject.TYPE_PYOBJECT,
299
316
            'Children',
300
317
            'Child revisions',
301
 
            gobject.PARAM_READWRITE
 
318
            GObject.PARAM_READWRITE
302
319
        ),
303
320
 
304
321
        'file-id': (
305
 
            gobject.TYPE_PYOBJECT,
 
322
            GObject.TYPE_PYOBJECT,
306
323
            'File Id',
307
324
            'The file id',
308
 
            gobject.PARAM_READWRITE
 
325
            GObject.PARAM_READWRITE
309
326
        )
310
327
    }
311
328
 
312
329
    def __init__(self, branch=None, repository=None):
313
 
        gtk.Notebook.__init__(self)
 
330
        GObject.GObject.__init__(self)
314
331
 
315
332
        self._revision = None
316
333
        self._branch = branch
322
339
        self._create_general()
323
340
        self._create_relations()
324
341
        # Disabled because testaments aren't verified yet:
325
 
        # if has_seahorse:
326
 
        #    self._create_signature()
 
342
        if has_seahorse:
 
343
            self._create_signature()
327
344
        self._create_file_info_view()
328
345
        self._create_bugs()
329
346
 
384
401
 
385
402
    def _set_revision(self, revision):
386
403
        if revision is None: return
387
 
 
 
404
        
 
405
        self.avatarsbox.reset()
 
406
        
388
407
        self._revision = revision
389
408
        if revision.committer is not None:
390
409
            self.committer.set_text(revision.committer)
 
410
            self.avatarsbox.add(revision.committer, "committer")
391
411
        else:
392
412
            self.committer.set_text("")
 
413
            self.avatarsbox.hide()
393
414
        author = revision.properties.get('author', '')
 
415
        self.avatarsbox.merge(revision.get_apparent_authors(), "author")
394
416
        if author != '':
395
417
            self.author.set_text(author)
396
418
            self.author.show()
403
425
            self.timestamp.set_text(format_date(revision.timestamp,
404
426
                                                revision.timezone))
405
427
        try:
406
 
            self.branchnick_label.set_text(revision.properties['branch-nick'])
 
428
            self.branchnick.show()
 
429
            self.branchnick_label.show()
 
430
            self.branchnick.set_text(revision.properties['branch-nick'])
407
431
        except KeyError:
408
 
            self.branchnick_label.set_text("")
 
432
            self.branchnick.hide()
 
433
            self.branchnick_label.hide()
409
434
 
410
435
        self._add_parents_or_children(revision.parent_ids,
411
436
                                      self.parents_widgets,
412
437
                                      self.parents_table)
413
 
        
 
438
 
414
439
        file_info = revision.properties.get('file-info', None)
415
440
        if file_info is not None:
416
 
            file_info = bdecode(file_info.encode('UTF-8'))
 
441
            try:
 
442
                file_info = bdecode(file_info.encode('UTF-8'))
 
443
            except ValueError:
 
444
                trace.note('Invalid per-file info for revision:%s, value: %r',
 
445
                           revision.revision_id, file_info)
 
446
                file_info = None
417
447
 
418
448
        if file_info:
419
449
            if self._file_id is None:
497
527
        table.resize(max(len(revids), 1), 2)
498
528
 
499
529
        for idx, revid in enumerate(revids):
500
 
            align = gtk.Alignment(0.0, 0.0)
 
530
            align = Gtk.Alignment.new(0.0, 0.0, 1, 1)
501
531
            widgets.append(align)
502
532
            table.attach(align, 1, 2, idx, idx + 1,
503
 
                                      gtk.EXPAND | gtk.FILL, gtk.FILL)
 
533
                                      Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
504
534
            align.show()
505
535
 
506
 
            hbox = gtk.HBox(False, spacing=6)
 
536
            hbox = Gtk.HBox(False, spacing=6)
507
537
            align.add(hbox)
508
538
            hbox.show()
509
539
 
510
 
            image = gtk.Image()
 
540
            image = Gtk.Image()
511
541
            image.set_from_stock(
512
 
                gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
 
542
                Gtk.STOCK_FIND, Gtk.IconSize.SMALL_TOOLBAR)
513
543
            image.show()
514
544
 
515
545
            if self._show_callback is not None:
516
 
                button = gtk.Button()
 
546
                button = Gtk.Button()
517
547
                button.add(image)
518
548
                button.connect("clicked", self._show_clicked_cb,
519
549
                               self._revision.revision_id, revid)
520
550
                hbox.pack_start(button, expand=False, fill=True)
521
551
                button.show()
522
552
 
523
 
            button = gtk.Button(revid)
 
553
            button = Gtk.Button()
 
554
            revid_label = Gtk.Label(label=str(revid))
 
555
            revid_label.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
556
            revid_label.set_alignment(0.0, 0.5)
 
557
            button.add(revid_label)
524
558
            button.connect("clicked",
525
559
                    lambda w, r: self.set_revision(self._repository.get_revision(r)), revid)
526
560
            button.set_use_underline(False)
527
 
            hbox.pack_start(button, expand=False, fill=True)
528
 
            button.show()
 
561
            hbox.pack_start(button, expand=True, fill=True)
 
562
            button.show_all()
529
563
 
530
564
    def _create_general(self):
531
 
        vbox = gtk.VBox(False, 6)
 
565
        vbox = Gtk.VBox(False, 6)
532
566
        vbox.set_border_width(6)
533
 
        vbox.pack_start(self._create_headers(), expand=False, fill=True)
534
 
        vbox.pack_start(self._create_message_view())
535
 
        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"))
536
570
        vbox.show()
537
571
 
538
572
    def _create_relations(self):
539
 
        vbox = gtk.VBox(False, 6)
 
573
        vbox = Gtk.VBox(False, 6)
540
574
        vbox.set_border_width(6)
541
 
        vbox.pack_start(self._create_parents(), expand=False, fill=True)
542
 
        vbox.pack_start(self._create_children(), expand=False, fill=True)
543
 
        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"))
544
578
        vbox.show()
545
579
 
546
580
    def _create_signature(self):
547
581
        self.signature_table = SignatureTab(self._repository)
548
 
        self.append_page(self.signature_table, tab_label=gtk.Label('Signature'))
 
582
        self.append_page(self.signature_table, tab_label=Gtk.Label(label='Signature'))
549
583
        self.connect_after('notify::revision', self._update_signature)
550
584
 
551
585
    def _create_headers(self):
552
 
        self.table = gtk.Table(rows=5, columns=2)
 
586
        self.avatarsbox = AvatarsBox()
 
587
        
 
588
        self.table = Gtk.Table(rows=5, columns=2)
553
589
        self.table.set_row_spacings(6)
554
590
        self.table.set_col_spacings(6)
555
591
        self.table.show()
556
 
 
557
 
        align = gtk.Alignment(1.0, 0.5)
558
 
        label = gtk.Label()
 
592
        
 
593
        self.avatarsbox.pack_start(self.table, True, True, 0)
 
594
        self.avatarsbox.show()
 
595
 
 
596
        row = 0
 
597
 
 
598
        label = Gtk.Label()
 
599
        label.set_alignment(1.0, 0.5)
559
600
        label.set_markup("<b>Revision Id:</b>")
560
 
        align.add(label)
561
 
        self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
562
 
        align.show()
 
601
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
563
602
        label.show()
564
603
 
565
 
        align = gtk.Alignment(0.0, 0.5)
566
 
        revision_id = gtk.Label()
 
604
        revision_id = Gtk.Label()
 
605
        revision_id.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
606
        revision_id.set_alignment(0.0, 0.5)
567
607
        revision_id.set_selectable(True)
568
608
        self.connect('notify::revision', 
569
609
                lambda w, p: revision_id.set_text(self._revision.revision_id))
570
 
        align.add(revision_id)
571
 
        self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
572
 
        align.show()
 
610
        self.table.attach(revision_id, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
573
611
        revision_id.show()
574
612
 
575
 
        align = gtk.Alignment(1.0, 0.5)
576
 
        self.author_label = gtk.Label()
 
613
        row += 1
 
614
        self.author_label = Gtk.Label()
 
615
        self.author_label.set_alignment(1.0, 0.5)
577
616
        self.author_label.set_markup("<b>Author:</b>")
578
 
        align.add(self.author_label)
579
 
        self.table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
580
 
        align.show()
 
617
        self.table.attach(self.author_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
581
618
        self.author_label.show()
582
619
 
583
 
        align = gtk.Alignment(0.0, 0.5)
584
 
        self.author = gtk.Label()
 
620
        self.author = Gtk.Label()
 
621
        self.author.set_ellipsize(Pango.EllipsizeMode.END)
 
622
        self.author.set_alignment(0.0, 0.5)
585
623
        self.author.set_selectable(True)
586
 
        align.add(self.author)
587
 
        self.table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
588
 
        align.show()
 
624
        self.table.attach(self.author, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
589
625
        self.author.show()
590
626
        self.author.hide()
591
627
 
592
 
        align = gtk.Alignment(1.0, 0.5)
593
 
        label = gtk.Label()
 
628
        row += 1
 
629
        label = Gtk.Label()
 
630
        label.set_alignment(1.0, 0.5)
594
631
        label.set_markup("<b>Committer:</b>")
595
 
        align.add(label)
596
 
        self.table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
597
 
        align.show()
 
632
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
598
633
        label.show()
599
634
 
600
 
        align = gtk.Alignment(0.0, 0.5)
601
 
        self.committer = gtk.Label()
 
635
        self.committer = Gtk.Label()
 
636
        self.committer.set_ellipsize(Pango.EllipsizeMode.END)
 
637
        self.committer.set_alignment(0.0, 0.5)
602
638
        self.committer.set_selectable(True)
603
 
        align.add(self.committer)
604
 
        self.table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
605
 
        align.show()
 
639
        self.table.attach(self.committer, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
606
640
        self.committer.show()
607
641
 
608
 
        align = gtk.Alignment(0.0, 0.5)
609
 
        label = gtk.Label()
610
 
        label.set_markup("<b>Branch nick:</b>")
611
 
        align.add(label)
612
 
        self.table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
613
 
        label.show()
614
 
        align.show()
615
 
 
616
 
        align = gtk.Alignment(0.0, 0.5)
617
 
        self.branchnick_label = gtk.Label()
618
 
        self.branchnick_label.set_selectable(True)
619
 
        align.add(self.branchnick_label)
620
 
        self.table.attach(align, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
642
        row += 1
 
643
        self.branchnick_label = Gtk.Label()
 
644
        self.branchnick_label.set_alignment(1.0, 0.5)
 
645
        self.branchnick_label.set_markup("<b>Branch nick:</b>")
 
646
        self.table.attach(self.branchnick_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
621
647
        self.branchnick_label.show()
622
 
        align.show()
623
 
 
624
 
        align = gtk.Alignment(1.0, 0.5)
625
 
        label = gtk.Label()
 
648
 
 
649
        self.branchnick = Gtk.Label()
 
650
        self.branchnick.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
651
        self.branchnick.set_alignment(0.0, 0.5)
 
652
        self.branchnick.set_selectable(True)
 
653
        self.table.attach(self.branchnick, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
654
        self.branchnick.show()
 
655
 
 
656
        row += 1
 
657
        label = Gtk.Label()
 
658
        label.set_alignment(1.0, 0.5)
626
659
        label.set_markup("<b>Timestamp:</b>")
627
 
        align.add(label)
628
 
        self.table.attach(align, 0, 1, 4, 5, gtk.FILL, gtk.FILL)
629
 
        align.show()
 
660
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
630
661
        label.show()
631
662
 
632
 
        align = gtk.Alignment(0.0, 0.5)
633
 
        self.timestamp = gtk.Label()
 
663
        self.timestamp = Gtk.Label()
 
664
        self.timestamp.set_ellipsize(Pango.EllipsizeMode.END)
 
665
        self.timestamp.set_alignment(0.0, 0.5)
634
666
        self.timestamp.set_selectable(True)
635
 
        align.add(self.timestamp)
636
 
        self.table.attach(align, 1, 2, 4, 5, gtk.EXPAND | gtk.FILL, gtk.FILL)
637
 
        align.show()
 
667
        self.table.attach(self.timestamp, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
638
668
        self.timestamp.show()
639
669
 
640
 
        align = gtk.Alignment(1.0, 0.5)
641
 
        self.tags_label = gtk.Label()
 
670
        row += 1
 
671
        self.tags_label = Gtk.Label()
 
672
        self.tags_label.set_alignment(1.0, 0.5)
642
673
        self.tags_label.set_markup("<b>Tags:</b>")
643
 
        align.add(self.tags_label)
644
 
        align.show()
645
 
        self.table.attach(align, 0, 1, 5, 6, gtk.FILL, gtk.FILL)
 
674
        self.table.attach(self.tags_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
646
675
        self.tags_label.show()
647
676
 
648
 
        align = gtk.Alignment(0.0, 0.5)
649
 
        self.tags_list = gtk.Label()
650
 
        align.add(self.tags_list)
651
 
        self.table.attach(align, 1, 2, 5, 6, gtk.EXPAND | gtk.FILL, gtk.FILL)
652
 
        align.show()
 
677
        self.tags_list = Gtk.Label()
 
678
        self.tags_list.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
679
        self.tags_list.set_alignment(0.0, 0.5)
 
680
        self.table.attach(self.tags_list, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
653
681
        self.tags_list.show()
654
682
 
655
683
        self.connect('notify::revision', self._add_tags)
656
684
 
657
 
        return self.table
 
685
        self.avatarsbox.show()
 
686
        return self.avatarsbox
658
687
    
659
688
    def _create_parents(self):
660
 
        hbox = gtk.HBox(True, 3)
 
689
        hbox = Gtk.HBox(True, 3)
661
690
        
662
691
        self.parents_table = self._create_parents_or_children_table(
663
692
            "<b>Parents:</b>")
664
693
        self.parents_widgets = []
665
 
        hbox.pack_start(self.parents_table)
 
694
        hbox.pack_start(self.parents_table, True, True, 0)
666
695
 
667
696
        hbox.show()
668
697
        return hbox
669
698
 
670
699
    def _create_children(self):
671
 
        hbox = gtk.HBox(True, 3)
 
700
        hbox = Gtk.HBox(True, 3)
672
701
        self.children_table = self._create_parents_or_children_table(
673
702
            "<b>Children:</b>")
674
703
        self.children_widgets = []
675
 
        hbox.pack_start(self.children_table)
 
704
        hbox.pack_start(self.children_table, True, True, 0)
676
705
        hbox.show()
677
706
        return hbox
678
707
        
679
708
    def _create_parents_or_children_table(self, text):
680
 
        table = gtk.Table(rows=1, columns=2)
 
709
        table = Gtk.Table(rows=1, columns=2)
681
710
        table.set_row_spacings(3)
682
711
        table.set_col_spacings(6)
683
712
        table.show()
684
713
 
685
 
        label = gtk.Label()
 
714
        label = Gtk.Label()
686
715
        label.set_markup(text)
687
 
        align = gtk.Alignment(0.0, 0.5)
 
716
        align = Gtk.Alignment.new(0.0, 0.5)
688
717
        align.add(label)
689
 
        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)
690
719
        label.show()
691
720
        align.show()
692
721
 
693
722
        return table
694
723
 
695
724
    def _create_message_view(self):
696
 
        msg_buffer = gtk.TextBuffer()
 
725
        msg_buffer = Gtk.TextBuffer()
697
726
        self.connect('notify::revision',
698
727
                lambda w, p: msg_buffer.set_text(self._revision.message))
699
 
        window = gtk.ScrolledWindow()
700
 
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
701
 
        window.set_shadow_type(gtk.SHADOW_IN)
702
 
        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)
703
732
        tv.set_editable(False)
704
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
 
733
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
705
734
 
706
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
735
        tv.modify_font(Pango.FontDescription("Monospace"))
707
736
        tv.show()
708
737
        window.add(tv)
709
738
        window.show()
712
741
    def _create_bugs(self):
713
742
        self.bugs_page = BugsTab()
714
743
        self.connect_after('notify::revision', self._update_bugs) 
715
 
        self.append_page(self.bugs_page, tab_label=gtk.Label('Bugs'))
 
744
        self.append_page(self.bugs_page, tab_label=Gtk.Label(label='Bugs'))
716
745
 
717
746
    def _create_file_info_view(self):
718
 
        self.file_info_box = gtk.VBox(False, 6)
 
747
        self.file_info_box = Gtk.VBox(False, 6)
719
748
        self.file_info_box.set_border_width(6)
720
 
        self.file_info_buffer = gtk.TextBuffer()
721
 
        window = gtk.ScrolledWindow()
722
 
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
723
 
        window.set_shadow_type(gtk.SHADOW_IN)
724
 
        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)
725
754
        tv.set_editable(False)
726
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
727
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
755
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
 
756
        tv.modify_font(Pango.FontDescription("Monospace"))
728
757
        tv.show()
729
758
        window.add(tv)
730
759
        window.show()
731
 
        self.file_info_box.pack_start(window)
 
760
        self.file_info_box.pack_start(window, True, True, 0)
732
761
        self.file_info_box.hide() # Only shown when there are per-file messages
733
 
        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'))
734
763