/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to revisionview.py

  • Committer: Curtis Hovey
  • Date: 2011-09-05 03:44:26 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110905034426-p98pxnay9rmzkr99
Fix the initializer for many classes.
Replace Gtk.Dialog.vbox with .get_content_area().

Show diffs side-by-side

added added

removed removed

Lines of Context:
revisionview.py
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
 
import pygtk
19
 
pygtk.require("2.0")
20
 
import gtk
21
 
import pango
22
 
import gobject
 
18
from gi.repository import Gtk
 
19
from gi.repository import Pango
 
20
from gi.repository import GObject
23
21
import webbrowser
24
22
 
 
23
from bzrlib import trace
25
24
from bzrlib.osutils import format_date
26
 
from bzrlib.util.bencode import bdecode
 
25
try:
 
26
    from bzrlib.bencode import bdecode
 
27
except ImportError:
 
28
    from bzrlib.util.bencode import bdecode
27
29
from bzrlib.testament import Testament
28
30
 
29
31
from bzrlib.plugins.gtk import icon_path
30
32
 
 
33
from bzrlib.plugins.gtk.avatarsbox import AvatarsBox
 
34
 
31
35
try:
32
36
    from bzrlib.plugins.gtk import seahorse
33
37
except ImportError:
47
51
            webbrowser._tryorder.insert(0, '%s "%%s"' % cmd)
48
52
    webbrowser.open(uri)
49
53
 
50
 
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)
51
56
 
52
 
class BugsTab(gtk.VBox):
 
57
class BugsTab(Gtk.VBox):
53
58
 
54
59
    def __init__(self):
55
 
        super(BugsTab, self).__init__(False, 6)
56
 
    
57
 
        table = gtk.Table(rows=2, columns=2)
 
60
        super(BugsTab, self).__init__(homogeneous=False, spacing=6)
 
61
 
 
62
        table = Gtk.Table(rows=2, columns=2)
58
63
 
59
64
        table.set_row_spacings(6)
60
65
        table.set_col_spacing(0, 16)
61
66
 
62
 
        image = gtk.Image()
 
67
        image = Gtk.Image()
63
68
        image.set_from_file(icon_path("bug.png"))
64
 
        table.attach(image, 0, 1, 0, 1, gtk.FILL)
 
69
        table.attach(image, 0, 1, 0, 1, Gtk.AttachOptions.FILL)
65
70
 
66
 
        align = gtk.Alignment(0.0, 0.1)
67
 
        self.label = gtk.Label()
 
71
        align = Gtk.Alignment.new(0.0, 0.1, 0, 0)
 
72
        self.label = Gtk.Label()
68
73
        align.add(self.label)
69
 
        table.attach(align, 1, 2, 0, 1, gtk.FILL)
 
74
        table.attach(align, 1, 2, 0, 1, Gtk.AttachOptions.FILL)
70
75
 
71
76
        treeview = self.construct_treeview()
72
 
        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)
73
78
 
74
79
        self.set_border_width(6)
75
 
        self.pack_start(table, expand=False)
 
80
        self.pack_start(table, False, True, 0)
76
81
 
77
82
        self.clear()
78
83
        self.show_all()
87
92
                (url, status) = bugline.split(" ")
88
93
                if status == "fixed":
89
94
                    self.add_bug(url, status)
90
 
        
 
95
 
91
96
        if self.num_bugs == 0:
92
97
            return
93
98
        elif self.num_bugs == 1:
100
105
                              "%d %s." % (self.num_bugs, label))
101
106
 
102
107
    def construct_treeview(self):
103
 
        self.bugs = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
104
 
        self.treeview = gtk.TreeView(self.bugs)
 
108
        self.bugs = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING)
 
109
        self.treeview = Gtk.TreeView(model=self.bugs)
105
110
        self.treeview.set_headers_visible(False)
106
111
 
107
 
        uri_column = gtk.TreeViewColumn('Bug URI', gtk.CellRendererText(), text=0)
 
112
        uri_column = Gtk.TreeViewColumn('Bug URI', Gtk.CellRendererText(), text=0)
108
113
        self.treeview.append_column(uri_column)
109
114
 
110
115
        self.treeview.connect('row-activated', self.on_row_activated)
111
116
 
112
 
        win = gtk.ScrolledWindow()
113
 
        win.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
114
 
        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)
115
120
        win.add(self.treeview)
116
121
 
117
122
        return win
136
141
        _open_link(self, uri)
137
142
 
138
143
 
139
 
class SignatureTab(gtk.VBox):
 
144
class SignatureTab(Gtk.VBox):
140
145
 
141
146
    def __init__(self, repository):
142
147
        self.key = None
143
148
        self.revision = None
144
149
        self.repository = repository
145
150
 
146
 
        super(SignatureTab, self).__init__(False, 6)
147
 
        signature_box = gtk.Table(rows=3, columns=3)
 
151
        super(SignatureTab, self).__init__(homogeneous=False, spacing=6)
 
152
        signature_box = Gtk.Table(rows=3, columns=3)
148
153
        signature_box.set_col_spacing(0, 16)
149
154
        signature_box.set_col_spacing(1, 12)
150
155
        signature_box.set_row_spacings(6)
151
156
 
152
 
        self.signature_image = gtk.Image()
153
 
        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)
154
159
 
155
 
        align = gtk.Alignment(0.0, 0.1)
156
 
        self.signature_label = gtk.Label()
 
160
        align = Gtk.Alignment.new(0.0, 0.1, 0.0, 0.0)
 
161
        self.signature_label = Gtk.Label()
157
162
        align.add(self.signature_label)
158
 
        signature_box.attach(align, 1, 3, 0, 1, gtk.FILL)
 
163
        signature_box.attach(align, 1, 3, 0, 1, Gtk.AttachOptions.FILL)
159
164
 
160
 
        align = gtk.Alignment(0.0, 0.5)
161
 
        self.signature_key_id_label = gtk.Label()
 
165
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
166
        self.signature_key_id_label = Gtk.Label()
162
167
        self.signature_key_id_label.set_markup("<b>Key Id:</b>")
163
168
        align.add(self.signature_key_id_label)
164
 
        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)
165
170
 
166
 
        align = gtk.Alignment(0.0, 0.5)
167
 
        self.signature_key_id = gtk.Label()
 
171
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
172
        self.signature_key_id = Gtk.Label()
168
173
        self.signature_key_id.set_selectable(True)
169
174
        align.add(self.signature_key_id)
170
 
        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)
171
176
 
172
 
        align = gtk.Alignment(0.0, 0.5)
173
 
        self.signature_fingerprint_label = gtk.Label()
 
177
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
178
        self.signature_fingerprint_label = Gtk.Label()
174
179
        self.signature_fingerprint_label.set_markup("<b>Fingerprint:</b>")
175
180
        align.add(self.signature_fingerprint_label)
176
 
        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)
177
182
 
178
 
        align = gtk.Alignment(0.0, 0.5)
179
 
        self.signature_fingerprint = gtk.Label()
 
183
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
184
        self.signature_fingerprint = Gtk.Label()
180
185
        self.signature_fingerprint.set_selectable(True)
181
186
        align.add(self.signature_fingerprint)
182
 
        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)
183
188
 
184
 
        align = gtk.Alignment(0.0, 0.5)
185
 
        self.signature_trust_label = gtk.Label()
 
189
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
190
        self.signature_trust_label = Gtk.Label()
186
191
        self.signature_trust_label.set_markup("<b>Trust:</b>")
187
192
        align.add(self.signature_trust_label)
188
 
        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)
189
194
 
190
 
        align = gtk.Alignment(0.0, 0.5)
191
 
        self.signature_trust = gtk.Label()
 
195
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
196
        self.signature_trust = Gtk.Label()
192
197
        self.signature_trust.set_selectable(True)
193
198
        align.add(self.signature_trust)
194
 
        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)
195
200
 
196
201
        self.set_border_width(6)
197
 
        self.pack_start(signature_box, expand=False)
 
202
        self.pack_start(signature_box, False, True, 0)
198
203
        self.show_all()
199
204
 
200
205
    def set_revision(self, revision):
284
289
        self.signature_trust.set_text('This key is ' + trust_text)
285
290
 
286
291
 
287
 
class RevisionView(gtk.Notebook):
 
292
class RevisionView(Gtk.Notebook):
288
293
    """ Custom widget for commit log details.
289
294
 
290
295
    A variety of bzr tools may need to implement such a thing. This is a
293
298
 
294
299
    __gproperties__ = {
295
300
        'branch': (
296
 
            gobject.TYPE_PYOBJECT,
 
301
            GObject.TYPE_PYOBJECT,
297
302
            'Branch',
298
303
            'The branch holding the revision being displayed',
299
 
            gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE
 
304
            GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE
300
305
        ),
301
306
 
302
307
        'revision': (
303
 
            gobject.TYPE_PYOBJECT,
 
308
            GObject.TYPE_PYOBJECT,
304
309
            'Revision',
305
310
            'The revision being displayed',
306
 
            gobject.PARAM_READWRITE
 
311
            GObject.PARAM_READWRITE
307
312
        ),
308
313
 
309
314
        'children': (
310
 
            gobject.TYPE_PYOBJECT,
 
315
            GObject.TYPE_PYOBJECT,
311
316
            'Children',
312
317
            'Child revisions',
313
 
            gobject.PARAM_READWRITE
 
318
            GObject.PARAM_READWRITE
314
319
        ),
315
320
 
316
321
        'file-id': (
317
 
            gobject.TYPE_PYOBJECT,
 
322
            GObject.TYPE_PYOBJECT,
318
323
            'File Id',
319
324
            'The file id',
320
 
            gobject.PARAM_READWRITE
 
325
            GObject.PARAM_READWRITE
321
326
        )
322
327
    }
323
328
 
324
329
    def __init__(self, branch=None, repository=None):
325
 
        gtk.Notebook.__init__(self)
 
330
        super(RevisionView, self).__init__()
326
331
 
327
332
        self._revision = None
328
333
        self._branch = branch
330
335
            self._repository = branch.repository
331
336
        else:
332
337
            self._repository = repository
 
338
        self.signature_table = None
333
339
 
334
340
        self._create_general()
335
341
        self._create_relations()
396
402
 
397
403
    def _set_revision(self, revision):
398
404
        if revision is None: return
399
 
 
 
405
        
 
406
        self.avatarsbox.reset()
 
407
        
400
408
        self._revision = revision
401
409
        if revision.committer is not None:
402
410
            self.committer.set_text(revision.committer)
 
411
            self.avatarsbox.add(revision.committer, "committer")
403
412
        else:
404
413
            self.committer.set_text("")
 
414
            self.avatarsbox.hide()
405
415
        author = revision.properties.get('author', '')
 
416
        self.avatarsbox.merge(revision.get_apparent_authors(), "author")
406
417
        if author != '':
407
418
            self.author.set_text(author)
408
419
            self.author.show()
415
426
            self.timestamp.set_text(format_date(revision.timestamp,
416
427
                                                revision.timezone))
417
428
        try:
418
 
            self.branchnick_label.set_text(revision.properties['branch-nick'])
 
429
            self.branchnick.show()
 
430
            self.branchnick_label.show()
 
431
            self.branchnick.set_text(revision.properties['branch-nick'])
419
432
        except KeyError:
420
 
            self.branchnick_label.set_text("")
 
433
            self.branchnick.hide()
 
434
            self.branchnick_label.hide()
421
435
 
422
436
        self._add_parents_or_children(revision.parent_ids,
423
437
                                      self.parents_widgets,
424
438
                                      self.parents_table)
425
 
        
 
439
 
426
440
        file_info = revision.properties.get('file-info', None)
427
441
        if file_info is not None:
428
 
            file_info = bdecode(file_info.encode('UTF-8'))
 
442
            try:
 
443
                file_info = bdecode(file_info.encode('UTF-8'))
 
444
            except ValueError:
 
445
                trace.note('Invalid per-file info for revision:%s, value: %r',
 
446
                           revision.revision_id, file_info)
 
447
                file_info = None
429
448
 
430
449
        if file_info:
431
450
            if self._file_id is None:
456
475
        self._add_tags()
457
476
 
458
477
    def _update_signature(self, widget, param):
 
478
        if not has_seahorse:
 
479
            return
459
480
        if self.get_current_page() == PAGE_SIGNATURE:
460
481
            self.signature_table.set_revision(self._revision)
461
482
 
470
491
                                      self.children_table)
471
492
 
472
493
    def _switch_page_cb(self, notebook, page, page_num):
 
494
        if not has_seahorse:
 
495
            return
473
496
        if page_num == PAGE_SIGNATURE:
474
497
            self.signature_table.set_revision(self._revision)
475
498
 
509
532
        table.resize(max(len(revids), 1), 2)
510
533
 
511
534
        for idx, revid in enumerate(revids):
512
 
            align = gtk.Alignment(0.0, 0.0)
 
535
            align = Gtk.Alignment.new(0.0, 0.0, 1, 1)
513
536
            widgets.append(align)
514
537
            table.attach(align, 1, 2, idx, idx + 1,
515
 
                                      gtk.EXPAND | gtk.FILL, gtk.FILL)
 
538
                                      Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
516
539
            align.show()
517
540
 
518
 
            hbox = gtk.HBox(False, spacing=6)
 
541
            hbox = Gtk.HBox(homogeneous=False, spacing=6)
519
542
            align.add(hbox)
520
543
            hbox.show()
521
544
 
522
 
            image = gtk.Image()
 
545
            image = Gtk.Image()
523
546
            image.set_from_stock(
524
 
                gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
 
547
                Gtk.STOCK_FIND, Gtk.IconSize.SMALL_TOOLBAR)
525
548
            image.show()
526
549
 
527
550
            if self._show_callback is not None:
528
 
                button = gtk.Button()
 
551
                button = Gtk.Button()
529
552
                button.add(image)
530
553
                button.connect("clicked", self._show_clicked_cb,
531
554
                               self._revision.revision_id, revid)
532
 
                hbox.pack_start(button, expand=False, fill=True)
 
555
                hbox.pack_start(button, False, True, 0)
533
556
                button.show()
534
557
 
535
 
            button = gtk.Button(revid)
 
558
            button = Gtk.Button()
 
559
            revid_label = Gtk.Label(label=str(revid))
 
560
            revid_label.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
561
            revid_label.set_alignment(0.0, 0.5)
 
562
            button.add(revid_label)
536
563
            button.connect("clicked",
537
 
                    lambda w, r: self.set_revision(self._repository.get_revision(r)), revid)
 
564
                    lambda w, r: self.set_revision(
 
565
                        self._repository.get_revision(r)), revid)
538
566
            button.set_use_underline(False)
539
 
            hbox.pack_start(button, expand=False, fill=True)
540
 
            button.show()
 
567
            hbox.pack_start(button, True, True, 0)
 
568
            button.show_all()
541
569
 
542
570
    def _create_general(self):
543
 
        vbox = gtk.VBox(False, 6)
 
571
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
544
572
        vbox.set_border_width(6)
545
 
        vbox.pack_start(self._create_headers(), expand=False, fill=True)
546
 
        vbox.pack_start(self._create_message_view())
547
 
        self.append_page(vbox, tab_label=gtk.Label("General"))
 
573
        vbox.pack_start(self._create_headers(), False, True, 0)
 
574
        vbox.pack_start(self._create_message_view(), True, True, 0)
 
575
        self.append_page(vbox, Gtk.Label(label="General"))
548
576
        vbox.show()
549
577
 
550
578
    def _create_relations(self):
551
 
        vbox = gtk.VBox(False, 6)
 
579
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
552
580
        vbox.set_border_width(6)
553
 
        vbox.pack_start(self._create_parents(), expand=False, fill=True)
554
 
        vbox.pack_start(self._create_children(), expand=False, fill=True)
555
 
        self.append_page(vbox, tab_label=gtk.Label("Relations"))
 
581
        vbox.pack_start(self._create_parents(), False, True, 0)
 
582
        vbox.pack_start(self._create_children(), False, True, 0)
 
583
        self.append_page(vbox, Gtk.Label(label="Relations"))
556
584
        vbox.show()
557
585
 
558
586
    def _create_signature(self):
559
587
        self.signature_table = SignatureTab(self._repository)
560
 
        self.append_page(self.signature_table, tab_label=gtk.Label('Signature'))
 
588
        self.append_page(
 
589
            self.signature_table, Gtk.Label(label='Signature'))
561
590
        self.connect_after('notify::revision', self._update_signature)
562
591
 
563
592
    def _create_headers(self):
564
 
        self.table = gtk.Table(rows=5, columns=2)
 
593
        self.avatarsbox = AvatarsBox()
 
594
        
 
595
        self.table = Gtk.Table(rows=5, columns=2)
565
596
        self.table.set_row_spacings(6)
566
597
        self.table.set_col_spacings(6)
567
598
        self.table.show()
568
 
 
569
 
        align = gtk.Alignment(1.0, 0.5)
570
 
        label = gtk.Label()
 
599
        
 
600
        self.avatarsbox.pack_start(self.table, True, True, 0)
 
601
        self.avatarsbox.show()
 
602
 
 
603
        row = 0
 
604
 
 
605
        label = Gtk.Label()
 
606
        label.set_alignment(1.0, 0.5)
571
607
        label.set_markup("<b>Revision Id:</b>")
572
 
        align.add(label)
573
 
        self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
574
 
        align.show()
 
608
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
575
609
        label.show()
576
610
 
577
 
        align = gtk.Alignment(0.0, 0.5)
578
 
        revision_id = gtk.Label()
 
611
        revision_id = Gtk.Label()
 
612
        revision_id.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
613
        revision_id.set_alignment(0.0, 0.5)
579
614
        revision_id.set_selectable(True)
580
615
        self.connect('notify::revision', 
581
616
                lambda w, p: revision_id.set_text(self._revision.revision_id))
582
 
        align.add(revision_id)
583
 
        self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
584
 
        align.show()
 
617
        self.table.attach(revision_id, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
585
618
        revision_id.show()
586
619
 
587
 
        align = gtk.Alignment(1.0, 0.5)
588
 
        self.author_label = gtk.Label()
 
620
        row += 1
 
621
        self.author_label = Gtk.Label()
 
622
        self.author_label.set_alignment(1.0, 0.5)
589
623
        self.author_label.set_markup("<b>Author:</b>")
590
 
        align.add(self.author_label)
591
 
        self.table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
592
 
        align.show()
 
624
        self.table.attach(self.author_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
593
625
        self.author_label.show()
594
626
 
595
 
        align = gtk.Alignment(0.0, 0.5)
596
 
        self.author = gtk.Label()
 
627
        self.author = Gtk.Label()
 
628
        self.author.set_ellipsize(Pango.EllipsizeMode.END)
 
629
        self.author.set_alignment(0.0, 0.5)
597
630
        self.author.set_selectable(True)
598
 
        align.add(self.author)
599
 
        self.table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
600
 
        align.show()
 
631
        self.table.attach(self.author, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
601
632
        self.author.show()
602
633
        self.author.hide()
603
634
 
604
 
        align = gtk.Alignment(1.0, 0.5)
605
 
        label = gtk.Label()
 
635
        row += 1
 
636
        label = Gtk.Label()
 
637
        label.set_alignment(1.0, 0.5)
606
638
        label.set_markup("<b>Committer:</b>")
607
 
        align.add(label)
608
 
        self.table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
609
 
        align.show()
 
639
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
610
640
        label.show()
611
641
 
612
 
        align = gtk.Alignment(0.0, 0.5)
613
 
        self.committer = gtk.Label()
 
642
        self.committer = Gtk.Label()
 
643
        self.committer.set_ellipsize(Pango.EllipsizeMode.END)
 
644
        self.committer.set_alignment(0.0, 0.5)
614
645
        self.committer.set_selectable(True)
615
 
        align.add(self.committer)
616
 
        self.table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
617
 
        align.show()
 
646
        self.table.attach(self.committer, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
618
647
        self.committer.show()
619
648
 
620
 
        align = gtk.Alignment(0.0, 0.5)
621
 
        label = gtk.Label()
622
 
        label.set_markup("<b>Branch nick:</b>")
623
 
        align.add(label)
624
 
        self.table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
625
 
        label.show()
626
 
        align.show()
627
 
 
628
 
        align = gtk.Alignment(0.0, 0.5)
629
 
        self.branchnick_label = gtk.Label()
630
 
        self.branchnick_label.set_selectable(True)
631
 
        align.add(self.branchnick_label)
632
 
        self.table.attach(align, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
649
        row += 1
 
650
        self.branchnick_label = Gtk.Label()
 
651
        self.branchnick_label.set_alignment(1.0, 0.5)
 
652
        self.branchnick_label.set_markup("<b>Branch nick:</b>")
 
653
        self.table.attach(self.branchnick_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
633
654
        self.branchnick_label.show()
634
 
        align.show()
635
 
 
636
 
        align = gtk.Alignment(1.0, 0.5)
637
 
        label = gtk.Label()
 
655
 
 
656
        self.branchnick = Gtk.Label()
 
657
        self.branchnick.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
658
        self.branchnick.set_alignment(0.0, 0.5)
 
659
        self.branchnick.set_selectable(True)
 
660
        self.table.attach(self.branchnick, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
661
        self.branchnick.show()
 
662
 
 
663
        row += 1
 
664
        label = Gtk.Label()
 
665
        label.set_alignment(1.0, 0.5)
638
666
        label.set_markup("<b>Timestamp:</b>")
639
 
        align.add(label)
640
 
        self.table.attach(align, 0, 1, 4, 5, gtk.FILL, gtk.FILL)
641
 
        align.show()
 
667
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
642
668
        label.show()
643
669
 
644
 
        align = gtk.Alignment(0.0, 0.5)
645
 
        self.timestamp = gtk.Label()
 
670
        self.timestamp = Gtk.Label()
 
671
        self.timestamp.set_ellipsize(Pango.EllipsizeMode.END)
 
672
        self.timestamp.set_alignment(0.0, 0.5)
646
673
        self.timestamp.set_selectable(True)
647
 
        align.add(self.timestamp)
648
 
        self.table.attach(align, 1, 2, 4, 5, gtk.EXPAND | gtk.FILL, gtk.FILL)
649
 
        align.show()
 
674
        self.table.attach(self.timestamp, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
650
675
        self.timestamp.show()
651
676
 
652
 
        align = gtk.Alignment(1.0, 0.5)
653
 
        self.tags_label = gtk.Label()
 
677
        row += 1
 
678
        self.tags_label = Gtk.Label()
 
679
        self.tags_label.set_alignment(1.0, 0.5)
654
680
        self.tags_label.set_markup("<b>Tags:</b>")
655
 
        align.add(self.tags_label)
656
 
        align.show()
657
 
        self.table.attach(align, 0, 1, 5, 6, gtk.FILL, gtk.FILL)
 
681
        self.table.attach(self.tags_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
658
682
        self.tags_label.show()
659
683
 
660
 
        align = gtk.Alignment(0.0, 0.5)
661
 
        self.tags_list = gtk.Label()
662
 
        align.add(self.tags_list)
663
 
        self.table.attach(align, 1, 2, 5, 6, gtk.EXPAND | gtk.FILL, gtk.FILL)
664
 
        align.show()
 
684
        self.tags_list = Gtk.Label()
 
685
        self.tags_list.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
 
686
        self.tags_list.set_alignment(0.0, 0.5)
 
687
        self.table.attach(self.tags_list, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
665
688
        self.tags_list.show()
666
689
 
667
690
        self.connect('notify::revision', self._add_tags)
668
691
 
669
 
        return self.table
 
692
        return self.avatarsbox
670
693
    
671
694
    def _create_parents(self):
672
 
        hbox = gtk.HBox(True, 3)
 
695
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
673
696
        
674
697
        self.parents_table = self._create_parents_or_children_table(
675
698
            "<b>Parents:</b>")
676
699
        self.parents_widgets = []
677
 
        hbox.pack_start(self.parents_table)
 
700
        hbox.pack_start(self.parents_table, True, True, 0)
678
701
 
679
702
        hbox.show()
680
703
        return hbox
681
704
 
682
705
    def _create_children(self):
683
 
        hbox = gtk.HBox(True, 3)
 
706
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
684
707
        self.children_table = self._create_parents_or_children_table(
685
708
            "<b>Children:</b>")
686
709
        self.children_widgets = []
687
 
        hbox.pack_start(self.children_table)
 
710
        hbox.pack_start(self.children_table, True, True, 0)
688
711
        hbox.show()
689
712
        return hbox
690
713
        
691
714
    def _create_parents_or_children_table(self, text):
692
 
        table = gtk.Table(rows=1, columns=2)
 
715
        table = Gtk.Table(rows=1, columns=2)
693
716
        table.set_row_spacings(3)
694
717
        table.set_col_spacings(6)
695
718
        table.show()
696
719
 
697
 
        label = gtk.Label()
 
720
        label = Gtk.Label()
698
721
        label.set_markup(text)
699
 
        align = gtk.Alignment(0.0, 0.5)
 
722
        align = Gtk.Alignment.new(0.0, 0.5, 0, 0)
700
723
        align.add(label)
701
 
        table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
 
724
        table.attach(align, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
702
725
        label.show()
703
726
        align.show()
704
727
 
705
728
        return table
706
729
 
707
730
    def _create_message_view(self):
708
 
        msg_buffer = gtk.TextBuffer()
 
731
        msg_buffer = Gtk.TextBuffer()
709
732
        self.connect('notify::revision',
710
733
                lambda w, p: msg_buffer.set_text(self._revision.message))
711
 
        window = gtk.ScrolledWindow()
712
 
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
713
 
        window.set_shadow_type(gtk.SHADOW_IN)
714
 
        tv = gtk.TextView(msg_buffer)
 
734
        window = Gtk.ScrolledWindow()
 
735
        window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
 
736
        window.set_shadow_type(Gtk.ShadowType.IN)
 
737
        tv = Gtk.TextView(buffer=msg_buffer)
715
738
        tv.set_editable(False)
716
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
 
739
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
717
740
 
718
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
741
        tv.modify_font(Pango.FontDescription("Monospace"))
719
742
        tv.show()
720
743
        window.add(tv)
721
744
        window.show()
724
747
    def _create_bugs(self):
725
748
        self.bugs_page = BugsTab()
726
749
        self.connect_after('notify::revision', self._update_bugs) 
727
 
        self.append_page(self.bugs_page, tab_label=gtk.Label('Bugs'))
 
750
        self.append_page(self.bugs_page, Gtk.Label(label='Bugs'))
728
751
 
729
752
    def _create_file_info_view(self):
730
 
        self.file_info_box = gtk.VBox(False, 6)
 
753
        self.file_info_box = Gtk.VBox(homogeneous=False, spacing=6)
731
754
        self.file_info_box.set_border_width(6)
732
 
        self.file_info_buffer = gtk.TextBuffer()
733
 
        window = gtk.ScrolledWindow()
734
 
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
735
 
        window.set_shadow_type(gtk.SHADOW_IN)
736
 
        tv = gtk.TextView(self.file_info_buffer)
 
755
        self.file_info_buffer = Gtk.TextBuffer()
 
756
        window = Gtk.ScrolledWindow()
 
757
        window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
 
758
        window.set_shadow_type(Gtk.ShadowType.IN)
 
759
        tv = Gtk.TextView(buffer=self.file_info_buffer)
737
760
        tv.set_editable(False)
738
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
739
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
761
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
 
762
        tv.modify_font(Pango.FontDescription("Monospace"))
740
763
        tv.show()
741
764
        window.add(tv)
742
765
        window.show()
743
 
        self.file_info_box.pack_start(window)
 
766
        self.file_info_box.pack_start(window, True, True, 0)
744
767
        self.file_info_box.hide() # Only shown when there are per-file messages
745
 
        self.append_page(self.file_info_box, tab_label=gtk.Label('Per-file'))
 
768
        self.append_page(self.file_info_box, Gtk.Label(label='Per-file'))
746
769