/b-gtk/fix-viz

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

« back to all changes in this revision

Viewing changes to revisionview.py

  • Committer: Curtis Hovey
  • Date: 2011-08-13 01:12:20 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110813011220-qj1u0dvft7jk0x6m
Updated gpush to gtk3.

Show diffs side-by-side

added added

removed removed

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