/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: Daniel Schierbeck
  • Date: 2008-03-15 20:42:00 UTC
  • mto: (450.1.11 trunk) (399.1.17 signatures)
  • mto: This revision was merged to the branch mainline in revision 458.
  • Revision ID: daniel.schierbeck@gmail.com-20080315204200-xtbkppagzh434n38
Added signature icons.

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
 
from gi.repository import Gtk
19
 
from gi.repository import Pango
20
 
from gi.repository import GObject
21
 
import webbrowser
 
18
import pygtk
 
19
pygtk.require("2.0")
 
20
import gtk
 
21
import gobject
 
22
import pango
 
23
from gpg import GPGSubprocess
22
24
 
23
 
from bzrlib import trace
24
25
from bzrlib.osutils import format_date
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):
 
26
from bzrlib.util.bencode import bdecode
 
27
 
 
28
gpg = GPGSubprocess()
 
29
 
 
30
class RevisionView(gtk.Notebook):
288
31
    """ Custom widget for commit log details.
289
32
 
290
33
    A variety of bzr tools may need to implement such a thing. This is a
293
36
 
294
37
    __gproperties__ = {
295
38
        'branch': (
296
 
            GObject.TYPE_PYOBJECT,
 
39
            gobject.TYPE_PYOBJECT,
297
40
            'Branch',
298
41
            'The branch holding the revision being displayed',
299
 
            GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE
 
42
            gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE
300
43
        ),
301
44
 
302
45
        'revision': (
303
 
            GObject.TYPE_PYOBJECT,
 
46
            gobject.TYPE_PYOBJECT,
304
47
            'Revision',
305
48
            'The revision being displayed',
306
 
            GObject.PARAM_READWRITE
 
49
            gobject.PARAM_READWRITE
307
50
        ),
308
51
 
309
52
        'children': (
310
 
            GObject.TYPE_PYOBJECT,
 
53
            gobject.TYPE_PYOBJECT,
311
54
            'Children',
312
55
            'Child revisions',
313
 
            GObject.PARAM_READWRITE
 
56
            gobject.PARAM_READWRITE
314
57
        ),
315
58
 
316
59
        'file-id': (
317
 
            GObject.TYPE_PYOBJECT,
 
60
            gobject.TYPE_PYOBJECT,
318
61
            'File Id',
319
62
            'The file id',
320
 
            GObject.PARAM_READWRITE
 
63
            gobject.PARAM_READWRITE
321
64
        )
322
65
    }
323
66
 
324
 
    def __init__(self, branch=None, repository=None):
325
 
        super(RevisionView, self).__init__()
326
67
 
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
 
68
    def __init__(self, branch=None):
 
69
        gtk.Notebook.__init__(self)
334
70
 
335
71
        self._create_general()
336
72
        self._create_relations()
337
 
        # Disabled because testaments aren't verified yet:
338
 
        if has_seahorse:
339
 
            self._create_signature()
 
73
        self._create_signature()
340
74
        self._create_file_info_view()
341
 
        self._create_bugs()
342
75
 
343
 
        self.set_current_page(PAGE_GENERAL)
344
 
        self.connect_after('switch-page', self._switch_page_cb)
 
76
        self.set_current_page(0)
345
77
        
346
78
        self._show_callback = None
347
79
        self._clicked_callback = None
348
80
 
349
81
        self._revision = None
350
82
        self._branch = branch
 
83
        self._repository = branch.repository
351
84
 
352
 
        self.update_tags()
 
85
        if self._branch is not None and self._branch.supports_tags():
 
86
            self._tagdict = self._branch.tags.get_reverse_tag_dict()
 
87
        else:
 
88
            self._tagdict = {}
353
89
 
354
90
        self.set_file_id(None)
355
91
 
395
131
    def get_revision(self):
396
132
        return self.get_property('revision')
397
133
 
 
134
    def set_children(self, children):
 
135
        self._add_parents_or_children(children,
 
136
                                      self.children_widgets,
 
137
                                      self.children_table)
 
138
 
398
139
    def _set_revision(self, revision):
399
140
        if revision is None: return
400
 
        
401
 
        self.avatarsbox.reset()
402
 
        
 
141
 
403
142
        self._revision = revision
404
143
        if revision.committer is not None:
405
144
            self.committer.set_text(revision.committer)
406
 
            self.avatarsbox.add(revision.committer, "committer")
407
145
        else:
408
146
            self.committer.set_text("")
409
 
            self.avatarsbox.hide()
410
147
        author = revision.properties.get('author', '')
411
 
        self.avatarsbox.merge(revision.get_apparent_authors(), "author")
412
148
        if author != '':
413
149
            self.author.set_text(author)
414
150
            self.author.show()
421
157
            self.timestamp.set_text(format_date(revision.timestamp,
422
158
                                                revision.timezone))
423
159
        try:
424
 
            self.branchnick.show()
425
 
            self.branchnick_label.show()
426
 
            self.branchnick.set_text(revision.properties['branch-nick'])
 
160
            self.branchnick_label.set_text(revision.properties['branch-nick'])
427
161
        except KeyError:
428
 
            self.branchnick.hide()
429
 
            self.branchnick_label.hide()
 
162
            self.branchnick_label.set_text("")
430
163
 
431
164
        self._add_parents_or_children(revision.parent_ids,
432
165
                                      self.parents_widgets,
433
166
                                      self.parents_table)
434
 
 
 
167
        
435
168
        file_info = revision.properties.get('file-info', None)
436
169
        if file_info is not None:
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
 
170
            file_info = bdecode(file_info.encode('UTF-8'))
443
171
 
444
172
        if file_info:
445
173
            if self._file_id is None:
461
189
        else:
462
190
            self.file_info_box.hide()
463
191
 
464
 
    def update_tags(self):
465
 
        if self._branch is not None and self._branch.supports_tags():
466
 
            self._tagdict = self._branch.tags.get_reverse_tag_dict()
467
 
        else:
468
 
            self._tagdict = {}
469
 
 
470
 
        self._add_tags()
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
 
 
483
 
    def set_children(self, children):
484
 
        self._add_parents_or_children(children,
485
 
                                      self.children_widgets,
486
 
                                      self.children_table)
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
 
 
496
192
    def _show_clicked_cb(self, widget, revid, parentid):
497
193
        """Callback for when the show button for a parent is clicked."""
498
194
        self._show_callback(revid, parentid)
501
197
        """Callback for when the go button for a parent is clicked."""
502
198
 
503
199
    def _add_tags(self, *args):
504
 
        if self._revision is None:
505
 
            return
506
 
 
507
200
        if self._tagdict.has_key(self._revision.revision_id):
508
201
            tags = self._tagdict[self._revision.revision_id]
509
202
        else:
527
220
        table.resize(max(len(revids), 1), 2)
528
221
 
529
222
        for idx, revid in enumerate(revids):
530
 
            align = Gtk.Alignment.new(0.0, 0.0, 1, 1)
 
223
            align = gtk.Alignment(0.0, 0.0)
531
224
            widgets.append(align)
532
225
            table.attach(align, 1, 2, idx, idx + 1,
533
 
                                      Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
226
                                      gtk.EXPAND | gtk.FILL, gtk.FILL)
534
227
            align.show()
535
228
 
536
 
            hbox = Gtk.HBox(homogeneous=False, spacing=6)
 
229
            hbox = gtk.HBox(False, spacing=6)
537
230
            align.add(hbox)
538
231
            hbox.show()
539
232
 
540
 
            image = Gtk.Image()
 
233
            image = gtk.Image()
541
234
            image.set_from_stock(
542
 
                Gtk.STOCK_FIND, Gtk.IconSize.SMALL_TOOLBAR)
 
235
                gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
543
236
            image.show()
544
237
 
545
238
            if self._show_callback is not None:
546
 
                button = Gtk.Button()
 
239
                button = gtk.Button()
547
240
                button.add(image)
548
241
                button.connect("clicked", self._show_clicked_cb,
549
242
                               self._revision.revision_id, revid)
550
 
                hbox.pack_start(button, False, True, 0)
 
243
                hbox.pack_start(button, expand=False, fill=True)
551
244
                button.show()
552
245
 
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)
 
246
            button = gtk.Button(revid)
558
247
            button.connect("clicked",
559
 
                    lambda w, r: self.set_revision(
560
 
                        self._repository.get_revision(r)), revid)
 
248
                    lambda w, r: self.set_revision(self._branch.repository.get_revision(r)), revid)
561
249
            button.set_use_underline(False)
562
 
            hbox.pack_start(button, True, True, 0)
563
 
            button.show_all()
 
250
            hbox.pack_start(button, expand=False, fill=True)
 
251
            button.show()
564
252
 
565
253
    def _create_general(self):
566
 
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
 
254
        vbox = gtk.VBox(False, 6)
567
255
        vbox.set_border_width(6)
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"))
 
256
        vbox.pack_start(self._create_headers(), expand=False, fill=True)
 
257
        vbox.pack_start(self._create_message_view())
 
258
        self.append_page(vbox, tab_label=gtk.Label("General"))
571
259
        vbox.show()
572
260
 
573
261
    def _create_relations(self):
574
 
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
 
262
        vbox = gtk.VBox(False, 6)
575
263
        vbox.set_border_width(6)
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"))
 
264
        vbox.pack_start(self._create_parents(), expand=False, fill=True)
 
265
        vbox.pack_start(self._create_children(), expand=False, fill=True)
 
266
        self.append_page(vbox, tab_label=gtk.Label("Relations"))
579
267
        vbox.show()
580
268
 
581
269
    def _create_signature(self):
582
 
        self.signature_table = SignatureTab(self._repository)
583
 
        self.append_page(
584
 
            self.signature_table, Gtk.Label(label='Signature'))
 
270
        signature_box = gtk.Table(rows=1, columns=2)
 
271
        signature_box.set_col_spacing(0, 12)
 
272
 
 
273
        self.signature_image = gtk.Image()
 
274
        signature_box.attach(self.signature_image, 0, 1, 0, 1, gtk.FILL)
 
275
 
 
276
        self.signature_label = gtk.Label()
 
277
        signature_box.attach(self.signature_label, 1, 2, 0, 1, gtk.FILL)
 
278
 
 
279
        signature_info = gtk.Table(rows=1, columns=2)
 
280
        signature_info.set_row_spacings(6)
 
281
        signature_info.set_col_spacings(6)
 
282
 
 
283
        align = gtk.Alignment(1.0, 0.5)
 
284
        label = gtk.Label()
 
285
        label.set_markup("<b>Key Id:</b>")
 
286
        align.add(label)
 
287
        signature_info.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
 
288
 
 
289
        align = gtk.Alignment(0.0, 0.5)
 
290
        self.signature_key_id = gtk.Label()
 
291
        self.signature_key_id.set_selectable(True)
 
292
        align.add(self.signature_key_id)
 
293
        signature_info.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
294
 
 
295
        box = gtk.VBox(False, 6)
 
296
        box.set_border_width(6)
 
297
        box.pack_start(signature_box, expand=False)
 
298
        box.pack_start(signature_info, expand=False)
 
299
        box.show_all()
 
300
        self.append_page(box, tab_label=gtk.Label("Signature"))
 
301
 
585
302
        self.connect_after('notify::revision', self._update_signature)
586
303
 
587
304
    def _create_headers(self):
588
 
        self.avatarsbox = AvatarsBox()
589
 
        
590
 
        self.table = Gtk.Table(rows=5, columns=2)
 
305
        self.table = gtk.Table(rows=5, columns=2)
591
306
        self.table.set_row_spacings(6)
592
307
        self.table.set_col_spacings(6)
593
308
        self.table.show()
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)
 
309
 
 
310
        align = gtk.Alignment(1.0, 0.5)
 
311
        label = gtk.Label()
602
312
        label.set_markup("<b>Revision Id:</b>")
603
 
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
313
        align.add(label)
 
314
        self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
 
315
        align.show()
604
316
        label.show()
605
317
 
606
 
        revision_id = Gtk.Label()
607
 
        revision_id.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
608
 
        revision_id.set_alignment(0.0, 0.5)
 
318
        align = gtk.Alignment(0.0, 0.5)
 
319
        revision_id = gtk.Label()
609
320
        revision_id.set_selectable(True)
610
321
        self.connect('notify::revision', 
611
322
                lambda w, p: revision_id.set_text(self._revision.revision_id))
612
 
        self.table.attach(revision_id, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
323
        align.add(revision_id)
 
324
        self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
325
        align.show()
613
326
        revision_id.show()
614
327
 
615
 
        row += 1
616
 
        self.author_label = Gtk.Label()
617
 
        self.author_label.set_alignment(1.0, 0.5)
 
328
        align = gtk.Alignment(1.0, 0.5)
 
329
        self.author_label = gtk.Label()
618
330
        self.author_label.set_markup("<b>Author:</b>")
619
 
        self.table.attach(self.author_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
331
        align.add(self.author_label)
 
332
        self.table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
 
333
        align.show()
620
334
        self.author_label.show()
621
335
 
622
 
        self.author = Gtk.Label()
623
 
        self.author.set_ellipsize(Pango.EllipsizeMode.END)
624
 
        self.author.set_alignment(0.0, 0.5)
 
336
        align = gtk.Alignment(0.0, 0.5)
 
337
        self.author = gtk.Label()
625
338
        self.author.set_selectable(True)
626
 
        self.table.attach(self.author, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
339
        align.add(self.author)
 
340
        self.table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
341
        align.show()
627
342
        self.author.show()
628
343
        self.author.hide()
629
344
 
630
 
        row += 1
631
 
        label = Gtk.Label()
632
 
        label.set_alignment(1.0, 0.5)
 
345
        align = gtk.Alignment(1.0, 0.5)
 
346
        label = gtk.Label()
633
347
        label.set_markup("<b>Committer:</b>")
634
 
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
348
        align.add(label)
 
349
        self.table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
 
350
        align.show()
635
351
        label.show()
636
352
 
637
 
        self.committer = Gtk.Label()
638
 
        self.committer.set_ellipsize(Pango.EllipsizeMode.END)
639
 
        self.committer.set_alignment(0.0, 0.5)
 
353
        align = gtk.Alignment(0.0, 0.5)
 
354
        self.committer = gtk.Label()
640
355
        self.committer.set_selectable(True)
641
 
        self.table.attach(self.committer, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
356
        align.add(self.committer)
 
357
        self.table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
358
        align.show()
642
359
        self.committer.show()
643
360
 
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)
 
361
        align = gtk.Alignment(0.0, 0.5)
 
362
        label = gtk.Label()
 
363
        label.set_markup("<b>Branch nick:</b>")
 
364
        align.add(label)
 
365
        self.table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
 
366
        label.show()
 
367
        align.show()
 
368
 
 
369
        align = gtk.Alignment(0.0, 0.5)
 
370
        self.branchnick_label = gtk.Label()
 
371
        self.branchnick_label.set_selectable(True)
 
372
        align.add(self.branchnick_label)
 
373
        self.table.attach(align, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
649
374
        self.branchnick_label.show()
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)
 
375
        align.show()
 
376
 
 
377
        align = gtk.Alignment(1.0, 0.5)
 
378
        label = gtk.Label()
661
379
        label.set_markup("<b>Timestamp:</b>")
662
 
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
380
        align.add(label)
 
381
        self.table.attach(align, 0, 1, 4, 5, gtk.FILL, gtk.FILL)
 
382
        align.show()
663
383
        label.show()
664
384
 
665
 
        self.timestamp = Gtk.Label()
666
 
        self.timestamp.set_ellipsize(Pango.EllipsizeMode.END)
667
 
        self.timestamp.set_alignment(0.0, 0.5)
 
385
        align = gtk.Alignment(0.0, 0.5)
 
386
        self.timestamp = gtk.Label()
668
387
        self.timestamp.set_selectable(True)
669
 
        self.table.attach(self.timestamp, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
388
        align.add(self.timestamp)
 
389
        self.table.attach(align, 1, 2, 4, 5, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
390
        align.show()
670
391
        self.timestamp.show()
671
392
 
672
 
        row += 1
673
 
        self.tags_label = Gtk.Label()
674
 
        self.tags_label.set_alignment(1.0, 0.5)
 
393
        align = gtk.Alignment(1.0, 0.5)
 
394
        self.tags_label = gtk.Label()
675
395
        self.tags_label.set_markup("<b>Tags:</b>")
676
 
        self.table.attach(self.tags_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
396
        align.add(self.tags_label)
 
397
        align.show()
 
398
        self.table.attach(align, 0, 1, 5, 6, gtk.FILL, gtk.FILL)
677
399
        self.tags_label.show()
678
400
 
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)
 
401
        align = gtk.Alignment(0.0, 0.5)
 
402
        self.tags_list = gtk.Label()
 
403
        align.add(self.tags_list)
 
404
        self.table.attach(align, 1, 2, 5, 6, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
405
        align.show()
683
406
        self.tags_list.show()
684
407
 
685
408
        self.connect('notify::revision', self._add_tags)
686
409
 
687
 
        return self.avatarsbox
 
410
        return self.table
688
411
    
689
412
    def _create_parents(self):
690
 
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
 
413
        hbox = gtk.HBox(True, 3)
691
414
        
692
415
        self.parents_table = self._create_parents_or_children_table(
693
416
            "<b>Parents:</b>")
694
417
        self.parents_widgets = []
695
 
        hbox.pack_start(self.parents_table, True, True, 0)
 
418
        hbox.pack_start(self.parents_table)
696
419
 
697
420
        hbox.show()
698
421
        return hbox
699
422
 
700
423
    def _create_children(self):
701
 
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
 
424
        hbox = gtk.HBox(True, 3)
702
425
        self.children_table = self._create_parents_or_children_table(
703
426
            "<b>Children:</b>")
704
427
        self.children_widgets = []
705
 
        hbox.pack_start(self.children_table, True, True, 0)
 
428
        hbox.pack_start(self.children_table)
706
429
        hbox.show()
707
430
        return hbox
708
431
        
709
432
    def _create_parents_or_children_table(self, text):
710
 
        table = Gtk.Table(rows=1, columns=2)
 
433
        table = gtk.Table(rows=1, columns=2)
711
434
        table.set_row_spacings(3)
712
435
        table.set_col_spacings(6)
713
436
        table.show()
714
437
 
715
 
        label = Gtk.Label()
 
438
        label = gtk.Label()
716
439
        label.set_markup(text)
717
 
        align = Gtk.Alignment.new(0.0, 0.5, 0, 0)
 
440
        align = gtk.Alignment(0.0, 0.5)
718
441
        align.add(label)
719
 
        table.attach(align, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
442
        table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
720
443
        label.show()
721
444
        align.show()
722
445
 
723
446
        return table
724
447
 
725
448
    def _create_message_view(self):
726
 
        msg_buffer = Gtk.TextBuffer()
 
449
        msg_buffer = gtk.TextBuffer()
727
450
        self.connect('notify::revision',
728
451
                lambda w, p: msg_buffer.set_text(self._revision.message))
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)
 
452
        window = gtk.ScrolledWindow()
 
453
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
454
        window.set_shadow_type(gtk.SHADOW_IN)
 
455
        tv = gtk.TextView(msg_buffer)
733
456
        tv.set_editable(False)
734
 
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
735
 
 
736
 
        tv.modify_font(Pango.FontDescription("Monospace"))
 
457
        tv.set_wrap_mode(gtk.WRAP_WORD)
 
458
        tv.modify_font(pango.FontDescription("Monospace"))
737
459
        tv.show()
738
460
        window.add(tv)
739
461
        window.show()
740
462
        return window
741
463
 
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
 
 
747
464
    def _create_file_info_view(self):
748
 
        self.file_info_box = Gtk.VBox(homogeneous=False, spacing=6)
 
465
        self.file_info_box = gtk.VBox(False, 6)
749
466
        self.file_info_box.set_border_width(6)
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)
 
467
        self.file_info_buffer = gtk.TextBuffer()
 
468
        window = gtk.ScrolledWindow()
 
469
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
470
        window.set_shadow_type(gtk.SHADOW_IN)
 
471
        tv = gtk.TextView(self.file_info_buffer)
755
472
        tv.set_editable(False)
756
 
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
757
 
        tv.modify_font(Pango.FontDescription("Monospace"))
 
473
        tv.set_wrap_mode(gtk.WRAP_WORD)
 
474
        tv.modify_font(pango.FontDescription("Monospace"))
758
475
        tv.show()
759
476
        window.add(tv)
760
477
        window.show()
761
 
        self.file_info_box.pack_start(window, True, True, 0)
 
478
        self.file_info_box.pack_start(window)
762
479
        self.file_info_box.hide() # Only shown when there are per-file messages
763
 
        self.append_page(self.file_info_box, Gtk.Label(label='Per-file'))
 
480
        self.append_page(self.file_info_box, tab_label=gtk.Label('Per-file'))
 
481
 
 
482
    def _update_signature(self, widget, param):
 
483
        revid = self._revision.revision_id
 
484
 
 
485
        if self._repository.has_signature_for_revision_id(revid):
 
486
            signature_text = self._repository.get_signature_text(revid)
 
487
            signature = gpg.verify(signature_text)
 
488
 
 
489
            if signature.key_id is not None:
 
490
                self.signature_key_id.set_text(signature.key_id)
 
491
 
 
492
            if signature.is_valid():
 
493
                self.signature_image.set_from_file("icons/sign-ok.png")
 
494
                self.signature_label.set_text("This revision has been signed.")
 
495
            else:
 
496
                self.signature_image.set_from_file("icons/sign-bad.png")
 
497
                self.signature_label.set_text("This revision has been signed, " + 
 
498
                        "but the authenticity of the signature cannot be verified.")
 
499
        else:
 
500
            self.signature_key_id.set_text("")
 
501
            self.signature_image.set_from_file("icons/sign-unknown.png")
 
502
            self.signature_label.set_text("This revision has not been signed.")
 
503
 
764
504