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