/b-gtk/fix-viz

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

« back to all changes in this revision

Viewing changes to revisionview.py

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
 
import pygtk
19
 
pygtk.require("2.0")
20
 
import gtk
21
 
import pango
22
 
import gobject
 
18
from gi.repository import Gtk
 
19
from gi.repository import Pango
 
20
from gi.repository import GObject
 
21
import webbrowser
23
22
 
 
23
from bzrlib import trace
24
24
from bzrlib.osutils import format_date
25
 
from bzrlib.util.bencode import bdecode
26
 
 
27
 
class RevisionView(gtk.Notebook):
 
25
from bzrlib.bencode import bdecode
 
26
from bzrlib.testament import Testament
 
27
 
 
28
from bzrlib.plugins.gtk import icon_path
 
29
 
 
30
from bzrlib.plugins.gtk.avatarsbox import AvatarsBox
 
31
 
 
32
try:
 
33
    from bzrlib.plugins.gtk import seahorse
 
34
except ImportError:
 
35
    has_seahorse = False
 
36
else:
 
37
    has_seahorse = True
 
38
 
 
39
PAGE_GENERAL = 0
 
40
PAGE_RELATIONS = 1
 
41
PAGE_SIGNATURE = 2
 
42
PAGE_BUGS = 3
 
43
 
 
44
 
 
45
def _open_link(widget, uri):
 
46
    for cmd in ['sensible-browser', 'xdg-open']:
 
47
        if webbrowser._iscommand(cmd):
 
48
            webbrowser._tryorder.insert(0, '%s "%%s"' % cmd)
 
49
    webbrowser.open(uri)
 
50
 
 
51
 
 
52
class BugsTab(Gtk.VBox):
 
53
 
 
54
    def __init__(self):
 
55
        super(BugsTab, self).__init__(homogeneous=False, spacing=6)
 
56
 
 
57
        table = Gtk.Table(rows=2, columns=2)
 
58
 
 
59
        table.set_row_spacings(6)
 
60
        table.set_col_spacing(0, 16)
 
61
 
 
62
        image = Gtk.Image()
 
63
        image.set_from_file(icon_path("bug.png"))
 
64
        table.attach(image, 0, 1, 0, 1, Gtk.AttachOptions.FILL)
 
65
 
 
66
        align = Gtk.Alignment.new(0.0, 0.1, 0, 0)
 
67
        self.label = Gtk.Label()
 
68
        align.add(self.label)
 
69
        table.attach(align, 1, 2, 0, 1, Gtk.AttachOptions.FILL)
 
70
 
 
71
        treeview = self.construct_treeview()
 
72
        table.attach(treeview, 1, 2, 1, 2, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND)
 
73
 
 
74
        self.set_border_width(6)
 
75
        self.pack_start(table, False, True, 0)
 
76
 
 
77
        self.clear()
 
78
        self.show_all()
 
79
 
 
80
    def set_revision(self, revision):
 
81
        if revision is None:
 
82
            return
 
83
 
 
84
        self.clear()
 
85
        bugs_text = revision.properties.get('bugs', '')
 
86
        for bugline in bugs_text.splitlines():
 
87
                (url, status) = bugline.split(" ")
 
88
                if status == "fixed":
 
89
                    self.add_bug(url, status)
 
90
 
 
91
        if self.num_bugs == 0:
 
92
            return
 
93
        elif self.num_bugs == 1:
 
94
            label = "bug"
 
95
        else:
 
96
            label = "bugs"
 
97
 
 
98
        self.label.set_markup("<b>Bugs fixed</b>\n" +
 
99
                              "This revision claims to fix " +
 
100
                              "%d %s." % (self.num_bugs, label))
 
101
 
 
102
    def construct_treeview(self):
 
103
        self.bugs = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING)
 
104
        self.treeview = Gtk.TreeView(model=self.bugs)
 
105
        self.treeview.set_headers_visible(False)
 
106
 
 
107
        uri_column = Gtk.TreeViewColumn('Bug URI', Gtk.CellRendererText(), text=0)
 
108
        self.treeview.append_column(uri_column)
 
109
 
 
110
        self.treeview.connect('row-activated', self.on_row_activated)
 
111
 
 
112
        win = Gtk.ScrolledWindow()
 
113
        win.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
114
        win.set_shadow_type(Gtk.ShadowType.IN)
 
115
        win.add(self.treeview)
 
116
 
 
117
        return win
 
118
 
 
119
    def clear(self):
 
120
        self.num_bugs = 0
 
121
        self.bugs.clear()
 
122
        self.set_sensitive(False)
 
123
        self.label.set_markup("<b>No bugs fixed</b>\n" +
 
124
                              "This revision does not claim to fix any bugs.")
 
125
 
 
126
    def add_bug(self, url, status):
 
127
        self.num_bugs += 1
 
128
        self.bugs.append([url, status])
 
129
        self.set_sensitive(True)
 
130
 
 
131
    def get_num_bugs(self):
 
132
        return self.num_bugs
 
133
 
 
134
    def on_row_activated(self, treeview, path, column):
 
135
        uri = self.bugs.get_value(self.bugs.get_iter(path), 0)
 
136
        _open_link(self, uri)
 
137
 
 
138
 
 
139
class SignatureTab(Gtk.VBox):
 
140
 
 
141
    def __init__(self, repository):
 
142
        self.key = None
 
143
        self.revision = None
 
144
        self.repository = repository
 
145
 
 
146
        super(SignatureTab, self).__init__(homogeneous=False, spacing=6)
 
147
        signature_box = Gtk.Table(rows=3, columns=3)
 
148
        signature_box.set_col_spacing(0, 16)
 
149
        signature_box.set_col_spacing(1, 12)
 
150
        signature_box.set_row_spacings(6)
 
151
 
 
152
        self.signature_image = Gtk.Image()
 
153
        signature_box.attach(self.signature_image, 0, 1, 0, 1, Gtk.AttachOptions.FILL)
 
154
 
 
155
        align = Gtk.Alignment.new(0.0, 0.1, 0.0, 0.0)
 
156
        self.signature_label = Gtk.Label()
 
157
        align.add(self.signature_label)
 
158
        signature_box.attach(align, 1, 3, 0, 1, Gtk.AttachOptions.FILL)
 
159
 
 
160
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
161
        self.signature_key_id_label = Gtk.Label()
 
162
        self.signature_key_id_label.set_markup("<b>Key Id:</b>")
 
163
        align.add(self.signature_key_id_label)
 
164
        signature_box.attach(align, 1, 2, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
165
 
 
166
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
167
        self.signature_key_id = Gtk.Label()
 
168
        self.signature_key_id.set_selectable(True)
 
169
        align.add(self.signature_key_id)
 
170
        signature_box.attach(align, 2, 3, 1, 2, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
171
 
 
172
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
173
        self.signature_fingerprint_label = Gtk.Label()
 
174
        self.signature_fingerprint_label.set_markup("<b>Fingerprint:</b>")
 
175
        align.add(self.signature_fingerprint_label)
 
176
        signature_box.attach(align, 1, 2, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
177
 
 
178
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
179
        self.signature_fingerprint = Gtk.Label()
 
180
        self.signature_fingerprint.set_selectable(True)
 
181
        align.add(self.signature_fingerprint)
 
182
        signature_box.attach(align, 2, 3, 2, 3, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
183
 
 
184
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
185
        self.signature_trust_label = Gtk.Label()
 
186
        self.signature_trust_label.set_markup("<b>Trust:</b>")
 
187
        align.add(self.signature_trust_label)
 
188
        signature_box.attach(align, 1, 2, 3, 4, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
189
 
 
190
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
191
        self.signature_trust = Gtk.Label()
 
192
        self.signature_trust.set_selectable(True)
 
193
        align.add(self.signature_trust)
 
194
        signature_box.attach(align, 2, 3, 3, 4, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
195
 
 
196
        self.set_border_width(6)
 
197
        self.pack_start(signature_box, False, True, 0)
 
198
        self.show_all()
 
199
 
 
200
    def set_revision(self, revision):
 
201
        self.revision = revision
 
202
        revid = revision.revision_id
 
203
 
 
204
        if self.repository.has_signature_for_revision_id(revid):
 
205
            crypttext = self.repository.get_signature_text(revid)
 
206
            self.show_signature(crypttext)
 
207
        else:
 
208
            self.show_no_signature()
 
209
 
 
210
    def show_no_signature(self):
 
211
        self.signature_key_id_label.hide()
 
212
        self.signature_key_id.set_text("")
 
213
 
 
214
        self.signature_fingerprint_label.hide()
 
215
        self.signature_fingerprint.set_text("")
 
216
 
 
217
        self.signature_trust_label.hide()
 
218
        self.signature_trust.set_text("")
 
219
 
 
220
        self.signature_image.set_from_file(icon_path("sign-unknown.png"))
 
221
        self.signature_label.set_markup("<b>Authenticity unknown</b>\n" +
 
222
                                        "This revision has not been signed.")
 
223
 
 
224
    def show_signature(self, 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
 
236
 
 
237
        if key and key.is_available():
 
238
            if key.is_trusted():
 
239
                if key.get_display_name() == self.revision.committer:
 
240
                    self.signature_image.set_from_file(icon_path("sign-ok.png"))
 
241
                    self.signature_label.set_markup("<b>Authenticity confirmed</b>\n" +
 
242
                                                    "This revision has been signed with " +
 
243
                                                    "a trusted key.")
 
244
                else:
 
245
                    self.signature_image.set_from_file(icon_path("sign-bad.png"))
 
246
                    self.signature_label.set_markup("<b>Authenticity cannot be confirmed</b>\n" +
 
247
                                                    "Revision committer is not the same as signer.")
 
248
            else:
 
249
                self.signature_image.set_from_file(icon_path("sign-bad.png"))
 
250
                self.signature_label.set_markup("<b>Authenticity cannot be confirmed</b>\n" +
 
251
                                                "This revision has been signed, but the " +
 
252
                                                "key is not trusted.")
 
253
        else:
 
254
            self.show_no_signature()
 
255
            self.signature_image.set_from_file(icon_path("sign-bad.png"))
 
256
            self.signature_label.set_markup("<b>Authenticity cannot be confirmed</b>\n" +
 
257
                                            "Signature key not available.")
 
258
            return
 
259
 
 
260
        trust = key.get_trust()
 
261
 
 
262
        if trust <= seahorse.TRUST_NEVER:
 
263
            trust_text = 'never trusted'
 
264
        elif trust == seahorse.TRUST_UNKNOWN:
 
265
            trust_text = 'not trusted'
 
266
        elif trust == seahorse.TRUST_MARGINAL:
 
267
            trust_text = 'marginally trusted'
 
268
        elif trust == seahorse.TRUST_FULL:
 
269
            trust_text = 'fully trusted'
 
270
        elif trust == seahorse.TRUST_ULTIMATE:
 
271
            trust_text = 'ultimately trusted'
 
272
 
 
273
        self.signature_key_id_label.show()
 
274
        self.signature_key_id.set_text(key.get_id())
 
275
 
 
276
        fingerprint = key.get_fingerprint()
 
277
        if fingerprint == "":
 
278
            fingerprint = '<span foreground="dim grey">N/A</span>'
 
279
 
 
280
        self.signature_fingerprint_label.show()
 
281
        self.signature_fingerprint.set_markup(fingerprint)
 
282
 
 
283
        self.signature_trust_label.show()
 
284
        self.signature_trust.set_text('This key is ' + trust_text)
 
285
 
 
286
 
 
287
class RevisionView(Gtk.Notebook):
28
288
    """ Custom widget for commit log details.
29
289
 
30
290
    A variety of bzr tools may need to implement such a thing. This is a
33
293
 
34
294
    __gproperties__ = {
35
295
        'branch': (
36
 
            gobject.TYPE_PYOBJECT,
 
296
            GObject.TYPE_PYOBJECT,
37
297
            'Branch',
38
298
            'The branch holding the revision being displayed',
39
 
            gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE
 
299
            GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE
40
300
        ),
41
301
 
42
302
        'revision': (
43
 
            gobject.TYPE_PYOBJECT,
 
303
            GObject.TYPE_PYOBJECT,
44
304
            'Revision',
45
305
            'The revision being displayed',
46
 
            gobject.PARAM_READWRITE
 
306
            GObject.PARAM_READWRITE
47
307
        ),
48
308
 
49
309
        'children': (
50
 
            gobject.TYPE_PYOBJECT,
 
310
            GObject.TYPE_PYOBJECT,
51
311
            'Children',
52
312
            'Child revisions',
53
 
            gobject.PARAM_READWRITE
 
313
            GObject.PARAM_READWRITE
54
314
        ),
55
315
 
56
316
        'file-id': (
57
 
            gobject.TYPE_PYOBJECT,
 
317
            GObject.TYPE_PYOBJECT,
58
318
            'File Id',
59
319
            'The file id',
60
 
            gobject.PARAM_READWRITE
 
320
            GObject.PARAM_READWRITE
61
321
        )
62
322
    }
63
323
 
 
324
    def __init__(self, branch=None, repository=None):
 
325
        super(RevisionView, self).__init__()
64
326
 
65
 
    def __init__(self, branch=None):
66
 
        gtk.Notebook.__init__(self)
 
327
        self._revision = None
 
328
        self._branch = branch
 
329
        if branch is not None:
 
330
            self._repository = branch.repository
 
331
        else:
 
332
            self._repository = repository
 
333
        self.signature_table = None
67
334
 
68
335
        self._create_general()
69
336
        self._create_relations()
 
337
        # Disabled because testaments aren't verified yet:
 
338
        if has_seahorse:
 
339
            self._create_signature()
70
340
        self._create_file_info_view()
 
341
        self._create_bugs()
71
342
 
72
 
        self.set_current_page(0)
 
343
        self.set_current_page(PAGE_GENERAL)
 
344
        self.connect_after('switch-page', self._switch_page_cb)
73
345
        
74
346
        self._show_callback = None
75
347
        self._clicked_callback = None
125
397
 
126
398
    def _set_revision(self, revision):
127
399
        if revision is None: return
128
 
 
 
400
        
 
401
        self.avatarsbox.reset()
 
402
        
129
403
        self._revision = revision
130
404
        if revision.committer is not None:
131
405
            self.committer.set_text(revision.committer)
 
406
            self.avatarsbox.add(revision.committer, "committer")
132
407
        else:
133
408
            self.committer.set_text("")
 
409
            self.avatarsbox.hide()
134
410
        author = revision.properties.get('author', '')
 
411
        self.avatarsbox.merge(revision.get_apparent_authors(), "author")
135
412
        if author != '':
136
413
            self.author.set_text(author)
137
414
            self.author.show()
144
421
            self.timestamp.set_text(format_date(revision.timestamp,
145
422
                                                revision.timezone))
146
423
        try:
147
 
            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'])
148
427
        except KeyError:
149
 
            self.branchnick_label.set_text("")
 
428
            self.branchnick.hide()
 
429
            self.branchnick_label.hide()
150
430
 
151
431
        self._add_parents_or_children(revision.parent_ids,
152
432
                                      self.parents_widgets,
153
433
                                      self.parents_table)
154
 
        
 
434
 
155
435
        file_info = revision.properties.get('file-info', None)
156
436
        if file_info is not None:
157
 
            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
158
443
 
159
444
        if file_info:
160
445
            if self._file_id is None:
184
469
 
185
470
        self._add_tags()
186
471
 
 
472
    def _update_signature(self, widget, param):
 
473
        if not has_seahorse:
 
474
            return
 
475
        if self.get_current_page() == PAGE_SIGNATURE:
 
476
            self.signature_table.set_revision(self._revision)
 
477
 
 
478
    def _update_bugs(self, widget, param):
 
479
        self.bugs_page.set_revision(self._revision)
 
480
        label = self.get_tab_label(self.bugs_page)
 
481
        label.set_sensitive(self.bugs_page.get_num_bugs() != 0)
 
482
 
187
483
    def set_children(self, children):
188
484
        self._add_parents_or_children(children,
189
485
                                      self.children_widgets,
190
486
                                      self.children_table)
191
487
 
 
488
    def _switch_page_cb(self, notebook, page, page_num):
 
489
        if not has_seahorse:
 
490
            return
 
491
        if page_num == PAGE_SIGNATURE:
 
492
            self.signature_table.set_revision(self._revision)
 
493
 
 
494
 
 
495
 
192
496
    def _show_clicked_cb(self, widget, revid, parentid):
193
497
        """Callback for when the show button for a parent is clicked."""
194
498
        self._show_callback(revid, parentid)
197
501
        """Callback for when the go button for a parent is clicked."""
198
502
 
199
503
    def _add_tags(self, *args):
200
 
        if self._revision is None: return
 
504
        if self._revision is None:
 
505
            return
201
506
 
202
507
        if self._tagdict.has_key(self._revision.revision_id):
203
508
            tags = self._tagdict[self._revision.revision_id]
222
527
        table.resize(max(len(revids), 1), 2)
223
528
 
224
529
        for idx, revid in enumerate(revids):
225
 
            align = gtk.Alignment(0.0, 0.0)
 
530
            align = Gtk.Alignment.new(0.0, 0.0, 1, 1)
226
531
            widgets.append(align)
227
532
            table.attach(align, 1, 2, idx, idx + 1,
228
 
                                      gtk.EXPAND | gtk.FILL, gtk.FILL)
 
533
                                      Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
229
534
            align.show()
230
535
 
231
 
            hbox = gtk.HBox(False, spacing=6)
 
536
            hbox = Gtk.HBox(homogeneous=False, spacing=6)
232
537
            align.add(hbox)
233
538
            hbox.show()
234
539
 
235
 
            image = gtk.Image()
 
540
            image = Gtk.Image()
236
541
            image.set_from_stock(
237
 
                gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
 
542
                Gtk.STOCK_FIND, Gtk.IconSize.SMALL_TOOLBAR)
238
543
            image.show()
239
544
 
240
545
            if self._show_callback is not None:
241
 
                button = gtk.Button()
 
546
                button = Gtk.Button()
242
547
                button.add(image)
243
548
                button.connect("clicked", self._show_clicked_cb,
244
549
                               self._revision.revision_id, revid)
245
 
                hbox.pack_start(button, expand=False, fill=True)
 
550
                hbox.pack_start(button, False, True, 0)
246
551
                button.show()
247
552
 
248
 
            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)
249
558
            button.connect("clicked",
250
 
                    lambda w, r: self.set_revision(self._branch.repository.get_revision(r)), revid)
 
559
                    lambda w, r: self.set_revision(
 
560
                        self._repository.get_revision(r)), revid)
251
561
            button.set_use_underline(False)
252
 
            hbox.pack_start(button, expand=False, fill=True)
253
 
            button.show()
 
562
            hbox.pack_start(button, True, True, 0)
 
563
            button.show_all()
254
564
 
255
565
    def _create_general(self):
256
 
        vbox = gtk.VBox(False, 6)
 
566
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
257
567
        vbox.set_border_width(6)
258
 
        vbox.pack_start(self._create_headers(), expand=False, fill=True)
259
 
        vbox.pack_start(self._create_message_view())
260
 
        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"))
261
571
        vbox.show()
262
572
 
263
573
    def _create_relations(self):
264
 
        vbox = gtk.VBox(False, 6)
 
574
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
265
575
        vbox.set_border_width(6)
266
 
        vbox.pack_start(self._create_parents(), expand=False, fill=True)
267
 
        vbox.pack_start(self._create_children(), expand=False, fill=True)
268
 
        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"))
269
579
        vbox.show()
270
580
 
 
581
    def _create_signature(self):
 
582
        self.signature_table = SignatureTab(self._repository)
 
583
        self.append_page(
 
584
            self.signature_table, Gtk.Label(label='Signature'))
 
585
        self.connect_after('notify::revision', self._update_signature)
 
586
 
271
587
    def _create_headers(self):
272
 
        self.table = gtk.Table(rows=5, columns=2)
 
588
        self.avatarsbox = AvatarsBox()
 
589
        
 
590
        self.table = Gtk.Table(rows=5, columns=2)
273
591
        self.table.set_row_spacings(6)
274
592
        self.table.set_col_spacings(6)
275
593
        self.table.show()
276
 
 
277
 
        align = gtk.Alignment(1.0, 0.5)
278
 
        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)
279
602
        label.set_markup("<b>Revision Id:</b>")
280
 
        align.add(label)
281
 
        self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
282
 
        align.show()
 
603
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
283
604
        label.show()
284
605
 
285
 
        align = gtk.Alignment(0.0, 0.5)
286
 
        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)
287
609
        revision_id.set_selectable(True)
288
610
        self.connect('notify::revision', 
289
611
                lambda w, p: revision_id.set_text(self._revision.revision_id))
290
 
        align.add(revision_id)
291
 
        self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
292
 
        align.show()
 
612
        self.table.attach(revision_id, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
293
613
        revision_id.show()
294
614
 
295
 
        align = gtk.Alignment(1.0, 0.5)
296
 
        self.author_label = gtk.Label()
 
615
        row += 1
 
616
        self.author_label = Gtk.Label()
 
617
        self.author_label.set_alignment(1.0, 0.5)
297
618
        self.author_label.set_markup("<b>Author:</b>")
298
 
        align.add(self.author_label)
299
 
        self.table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
300
 
        align.show()
 
619
        self.table.attach(self.author_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
301
620
        self.author_label.show()
302
621
 
303
 
        align = gtk.Alignment(0.0, 0.5)
304
 
        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)
305
625
        self.author.set_selectable(True)
306
 
        align.add(self.author)
307
 
        self.table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
308
 
        align.show()
 
626
        self.table.attach(self.author, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
309
627
        self.author.show()
310
628
        self.author.hide()
311
629
 
312
 
        align = gtk.Alignment(1.0, 0.5)
313
 
        label = gtk.Label()
 
630
        row += 1
 
631
        label = Gtk.Label()
 
632
        label.set_alignment(1.0, 0.5)
314
633
        label.set_markup("<b>Committer:</b>")
315
 
        align.add(label)
316
 
        self.table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
317
 
        align.show()
 
634
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
318
635
        label.show()
319
636
 
320
 
        align = gtk.Alignment(0.0, 0.5)
321
 
        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)
322
640
        self.committer.set_selectable(True)
323
 
        align.add(self.committer)
324
 
        self.table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
325
 
        align.show()
 
641
        self.table.attach(self.committer, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
326
642
        self.committer.show()
327
643
 
328
 
        align = gtk.Alignment(0.0, 0.5)
329
 
        label = gtk.Label()
330
 
        label.set_markup("<b>Branch nick:</b>")
331
 
        align.add(label)
332
 
        self.table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
333
 
        label.show()
334
 
        align.show()
335
 
 
336
 
        align = gtk.Alignment(0.0, 0.5)
337
 
        self.branchnick_label = gtk.Label()
338
 
        self.branchnick_label.set_selectable(True)
339
 
        align.add(self.branchnick_label)
340
 
        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)
341
649
        self.branchnick_label.show()
342
 
        align.show()
343
 
 
344
 
        align = gtk.Alignment(1.0, 0.5)
345
 
        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)
346
661
        label.set_markup("<b>Timestamp:</b>")
347
 
        align.add(label)
348
 
        self.table.attach(align, 0, 1, 4, 5, gtk.FILL, gtk.FILL)
349
 
        align.show()
 
662
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
350
663
        label.show()
351
664
 
352
 
        align = gtk.Alignment(0.0, 0.5)
353
 
        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)
354
668
        self.timestamp.set_selectable(True)
355
 
        align.add(self.timestamp)
356
 
        self.table.attach(align, 1, 2, 4, 5, gtk.EXPAND | gtk.FILL, gtk.FILL)
357
 
        align.show()
 
669
        self.table.attach(self.timestamp, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
358
670
        self.timestamp.show()
359
671
 
360
 
        align = gtk.Alignment(1.0, 0.5)
361
 
        self.tags_label = gtk.Label()
 
672
        row += 1
 
673
        self.tags_label = Gtk.Label()
 
674
        self.tags_label.set_alignment(1.0, 0.5)
362
675
        self.tags_label.set_markup("<b>Tags:</b>")
363
 
        align.add(self.tags_label)
364
 
        align.show()
365
 
        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)
366
677
        self.tags_label.show()
367
678
 
368
 
        align = gtk.Alignment(0.0, 0.5)
369
 
        self.tags_list = gtk.Label()
370
 
        align.add(self.tags_list)
371
 
        self.table.attach(align, 1, 2, 5, 6, gtk.EXPAND | gtk.FILL, gtk.FILL)
372
 
        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)
373
683
        self.tags_list.show()
374
684
 
375
685
        self.connect('notify::revision', self._add_tags)
376
686
 
377
 
        return self.table
378
 
 
 
687
        return self.avatarsbox
379
688
    
380
689
    def _create_parents(self):
381
 
        hbox = gtk.HBox(True, 3)
 
690
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
382
691
        
383
692
        self.parents_table = self._create_parents_or_children_table(
384
693
            "<b>Parents:</b>")
385
694
        self.parents_widgets = []
386
 
        hbox.pack_start(self.parents_table)
 
695
        hbox.pack_start(self.parents_table, True, True, 0)
387
696
 
388
697
        hbox.show()
389
698
        return hbox
390
699
 
391
700
    def _create_children(self):
392
 
        hbox = gtk.HBox(True, 3)
 
701
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
393
702
        self.children_table = self._create_parents_or_children_table(
394
703
            "<b>Children:</b>")
395
704
        self.children_widgets = []
396
 
        hbox.pack_start(self.children_table)
 
705
        hbox.pack_start(self.children_table, True, True, 0)
397
706
        hbox.show()
398
707
        return hbox
399
708
        
400
709
    def _create_parents_or_children_table(self, text):
401
 
        table = gtk.Table(rows=1, columns=2)
 
710
        table = Gtk.Table(rows=1, columns=2)
402
711
        table.set_row_spacings(3)
403
712
        table.set_col_spacings(6)
404
713
        table.show()
405
714
 
406
 
        label = gtk.Label()
 
715
        label = Gtk.Label()
407
716
        label.set_markup(text)
408
 
        align = gtk.Alignment(0.0, 0.5)
 
717
        align = Gtk.Alignment.new(0.0, 0.5, 0, 0)
409
718
        align.add(label)
410
 
        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)
411
720
        label.show()
412
721
        align.show()
413
722
 
414
723
        return table
415
724
 
416
725
    def _create_message_view(self):
417
 
        msg_buffer = gtk.TextBuffer()
 
726
        msg_buffer = Gtk.TextBuffer()
418
727
        self.connect('notify::revision',
419
728
                lambda w, p: msg_buffer.set_text(self._revision.message))
420
 
        window = gtk.ScrolledWindow()
421
 
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
422
 
        window.set_shadow_type(gtk.SHADOW_IN)
423
 
        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)
424
733
        tv.set_editable(False)
425
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
426
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
734
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
 
735
 
 
736
        tv.modify_font(Pango.FontDescription("Monospace"))
427
737
        tv.show()
428
738
        window.add(tv)
429
739
        window.show()
430
740
        return window
431
741
 
 
742
    def _create_bugs(self):
 
743
        self.bugs_page = BugsTab()
 
744
        self.connect_after('notify::revision', self._update_bugs) 
 
745
        self.append_page(self.bugs_page, Gtk.Label(label='Bugs'))
 
746
 
432
747
    def _create_file_info_view(self):
433
 
        self.file_info_box = gtk.VBox(False, 6)
 
748
        self.file_info_box = Gtk.VBox(homogeneous=False, spacing=6)
434
749
        self.file_info_box.set_border_width(6)
435
 
        self.file_info_buffer = gtk.TextBuffer()
436
 
        window = gtk.ScrolledWindow()
437
 
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
438
 
        window.set_shadow_type(gtk.SHADOW_IN)
439
 
        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)
440
755
        tv.set_editable(False)
441
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
442
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
756
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
 
757
        tv.modify_font(Pango.FontDescription("Monospace"))
443
758
        tv.show()
444
759
        window.add(tv)
445
760
        window.show()
446
 
        self.file_info_box.pack_start(window)
 
761
        self.file_info_box.pack_start(window, True, True, 0)
447
762
        self.file_info_box.hide() # Only shown when there are per-file messages
448
 
        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'))
449
764