/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: Jelmer Vernooij
  • Date: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

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