/b-gtk/fix-viz

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

« back to all changes in this revision

Viewing changes to revisionview.py

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
 
import pygtk
19
 
pygtk.require("2.0")
20
 
import gtk
21
 
import pango
22
 
import gobject
23
 
import subprocess
 
18
from gi.repository import Gtk
 
19
from gi.repository import Pango
 
20
from gi.repository import GObject
 
21
import webbrowser
24
22
 
 
23
from bzrlib import trace
25
24
from bzrlib.osutils import format_date
26
 
from bzrlib.util.bencode import bdecode
 
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
 
27
44
 
28
45
def _open_link(widget, uri):
29
 
    subprocess.Popen(['sensible-browser', uri], close_fds=True)
30
 
 
31
 
gtk.link_button_set_uri_hook(_open_link)
32
 
 
33
 
class BugsTab(gtk.Table):
 
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
 
34
54
    def __init__(self):
35
 
        super(BugsTab, self).__init__(rows=5, columns=2)
36
 
        self.set_row_spacings(6)
37
 
        self.set_col_spacings(6)
38
 
        self.clear()
 
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
39
118
 
40
119
    def clear(self):
41
 
        for c in self.get_children():
42
 
            self.remove(c)
43
 
        self.count = 0
44
 
        self.hide_all() # Only shown when there are bugs
 
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.")
45
125
 
46
126
    def add_bug(self, url, status):
47
 
        button = gtk.LinkButton(url, url)
48
 
        self.attach(button, 0, 1, self.count, self.count + 1,
49
 
                              gtk.EXPAND | gtk.FILL, gtk.FILL)
50
 
        status_label = gtk.Label(status)
51
 
        self.attach(status_label, 1, 2, self.count, self.count + 1,
52
 
                              gtk.EXPAND | gtk.FILL, gtk.FILL)
53
 
        self.count += 1
54
 
        self.show_all()
55
 
 
56
 
 
57
 
class SignatureTab(gtk.VBox):
58
 
    def __init__(self):
59
 
        from gpg import GPGSubprocess
60
 
        self.gpg = GPGSubprocess()
61
 
        super(SignatureTab, self).__init__(False, 6)
62
 
        signature_box = gtk.Table(rows=1, columns=2)
63
 
        signature_box.set_col_spacing(0, 12)
64
 
 
65
 
        self.signature_image = gtk.Image()
66
 
        signature_box.attach(self.signature_image, 0, 1, 0, 1, gtk.FILL)
67
 
 
68
 
        self.signature_label = gtk.Label()
69
 
        signature_box.attach(self.signature_label, 1, 2, 0, 1, gtk.FILL)
70
 
 
71
 
        signature_info = gtk.Table(rows=1, columns=2)
72
 
        signature_info.set_row_spacings(6)
73
 
        signature_info.set_col_spacings(6)
74
 
 
75
 
        align = gtk.Alignment(1.0, 0.5)
76
 
        label = gtk.Label()
77
 
        label.set_markup("<b>Key Id:</b>")
78
 
        align.add(label)
79
 
        signature_info.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
80
 
 
81
 
        align = gtk.Alignment(0.0, 0.5)
82
 
        self.signature_key_id = gtk.Label()
 
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()
83
168
        self.signature_key_id.set_selectable(True)
84
169
        align.add(self.signature_key_id)
85
 
        signature_info.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
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)
86
195
 
87
196
        self.set_border_width(6)
88
 
        self.pack_start(signature_box, expand=False)
89
 
        self.pack_start(signature_info, expand=False)
 
197
        self.pack_start(signature_box, False, True, 0)
90
198
        self.show_all()
91
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
 
92
210
    def show_no_signature(self):
 
211
        self.signature_key_id_label.hide()
93
212
        self.signature_key_id.set_text("")
94
 
        self.signature_image.set_from_file("icons/sign-unknown.png")
95
 
        self.signature_label.set_text("This revision has not been signed.")
96
 
 
97
 
    def show_signature(self, text):
98
 
        signature = self.gpg.verify(text)
99
 
 
100
 
        if signature.key_id is not None:
101
 
            self.signature_key_id.set_text(signature.key_id)
102
 
 
103
 
        if signature.is_valid():
104
 
            self.signature_image.set_from_file("icons/sign-ok.png")
105
 
            self.signature_label.set_text("This revision has been signed.")
 
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.")
106
253
        else:
107
 
            self.signature_image.set_from_file("icons/sign-bad.png")
108
 
            self.signature_label.set_text("This revision has been signed, " + 
109
 
                    "but the authenticity of the signature cannot be verified.")
110
 
 
111
 
 
112
 
class RevisionView(gtk.Notebook):
 
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):
113
288
    """ Custom widget for commit log details.
114
289
 
115
290
    A variety of bzr tools may need to implement such a thing. This is a
118
293
 
119
294
    __gproperties__ = {
120
295
        'branch': (
121
 
            gobject.TYPE_PYOBJECT,
 
296
            GObject.TYPE_PYOBJECT,
122
297
            'Branch',
123
298
            'The branch holding the revision being displayed',
124
 
            gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE
 
299
            GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE
125
300
        ),
126
301
 
127
302
        'revision': (
128
 
            gobject.TYPE_PYOBJECT,
 
303
            GObject.TYPE_PYOBJECT,
129
304
            'Revision',
130
305
            'The revision being displayed',
131
 
            gobject.PARAM_READWRITE
 
306
            GObject.PARAM_READWRITE
132
307
        ),
133
308
 
134
309
        'children': (
135
 
            gobject.TYPE_PYOBJECT,
 
310
            GObject.TYPE_PYOBJECT,
136
311
            'Children',
137
312
            'Child revisions',
138
 
            gobject.PARAM_READWRITE
 
313
            GObject.PARAM_READWRITE
139
314
        ),
140
315
 
141
316
        'file-id': (
142
 
            gobject.TYPE_PYOBJECT,
 
317
            GObject.TYPE_PYOBJECT,
143
318
            'File Id',
144
319
            'The file id',
145
 
            gobject.PARAM_READWRITE
 
320
            GObject.PARAM_READWRITE
146
321
        )
147
322
    }
148
323
 
 
324
    def __init__(self, branch=None, repository=None):
 
325
        super(RevisionView, self).__init__()
149
326
 
150
 
    def __init__(self, branch=None):
151
 
        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
152
334
 
153
335
        self._create_general()
154
336
        self._create_relations()
155
 
        self._create_signature()
 
337
        # Disabled because testaments aren't verified yet:
 
338
        if has_seahorse:
 
339
            self._create_signature()
156
340
        self._create_file_info_view()
157
341
        self._create_bugs()
158
342
 
159
 
        self.set_current_page(0)
 
343
        self.set_current_page(PAGE_GENERAL)
 
344
        self.connect_after('switch-page', self._switch_page_cb)
160
345
        
161
346
        self._show_callback = None
162
347
        self._clicked_callback = None
212
397
 
213
398
    def _set_revision(self, revision):
214
399
        if revision is None: return
215
 
 
 
400
        
 
401
        self.avatarsbox.reset()
 
402
        
216
403
        self._revision = revision
217
404
        if revision.committer is not None:
218
405
            self.committer.set_text(revision.committer)
 
406
            self.avatarsbox.add(revision.committer, "committer")
219
407
        else:
220
408
            self.committer.set_text("")
 
409
            self.avatarsbox.hide()
221
410
        author = revision.properties.get('author', '')
 
411
        self.avatarsbox.merge(revision.get_apparent_authors(), "author")
222
412
        if author != '':
223
413
            self.author.set_text(author)
224
414
            self.author.show()
231
421
            self.timestamp.set_text(format_date(revision.timestamp,
232
422
                                                revision.timezone))
233
423
        try:
234
 
            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'])
235
427
        except KeyError:
236
 
            self.branchnick_label.set_text("")
 
428
            self.branchnick.hide()
 
429
            self.branchnick_label.hide()
237
430
 
238
431
        self._add_parents_or_children(revision.parent_ids,
239
432
                                      self.parents_widgets,
240
433
                                      self.parents_table)
241
 
        
 
434
 
242
435
        file_info = revision.properties.get('file-info', None)
243
436
        if file_info is not None:
244
 
            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
245
443
 
246
444
        if file_info:
247
445
            if self._file_id is None:
263
461
        else:
264
462
            self.file_info_box.hide()
265
463
 
266
 
        self.bugs_table.clear()
267
 
        bugs_text = revision.properties.get('bugs', None)
268
 
        if bugs_text:
269
 
            for bugline in bugs_text.splitlines():
270
 
                (url, status) = bugline.split(" ")
271
 
                self.bugs_table.add_bug(url, status)
272
 
 
273
464
    def update_tags(self):
274
465
        if self._branch is not None and self._branch.supports_tags():
275
466
            self._tagdict = self._branch.tags.get_reverse_tag_dict()
279
470
        self._add_tags()
280
471
 
281
472
    def _update_signature(self, widget, param):
282
 
        revid = self._revision.revision_id
 
473
        if not has_seahorse:
 
474
            return
 
475
        if self.get_current_page() == PAGE_SIGNATURE:
 
476
            self.signature_table.set_revision(self._revision)
283
477
 
284
 
        if self._branch.repository.has_signature_for_revision_id(revid):
285
 
            signature_text = self._branch.repository.get_signature_text(revid)
286
 
            self.signature_table.show_signature(signature_text)
287
 
        else:
288
 
            self.signature_table.show_no_signature()
 
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)
289
482
 
290
483
    def set_children(self, children):
291
484
        self._add_parents_or_children(children,
292
485
                                      self.children_widgets,
293
486
                                      self.children_table)
294
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
 
295
496
    def _show_clicked_cb(self, widget, revid, parentid):
296
497
        """Callback for when the show button for a parent is clicked."""
297
498
        self._show_callback(revid, parentid)
326
527
        table.resize(max(len(revids), 1), 2)
327
528
 
328
529
        for idx, revid in enumerate(revids):
329
 
            align = gtk.Alignment(0.0, 0.0)
 
530
            align = Gtk.Alignment.new(0.0, 0.0, 1, 1)
330
531
            widgets.append(align)
331
532
            table.attach(align, 1, 2, idx, idx + 1,
332
 
                                      gtk.EXPAND | gtk.FILL, gtk.FILL)
 
533
                                      Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
333
534
            align.show()
334
535
 
335
 
            hbox = gtk.HBox(False, spacing=6)
 
536
            hbox = Gtk.HBox(homogeneous=False, spacing=6)
336
537
            align.add(hbox)
337
538
            hbox.show()
338
539
 
339
 
            image = gtk.Image()
 
540
            image = Gtk.Image()
340
541
            image.set_from_stock(
341
 
                gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
 
542
                Gtk.STOCK_FIND, Gtk.IconSize.SMALL_TOOLBAR)
342
543
            image.show()
343
544
 
344
545
            if self._show_callback is not None:
345
 
                button = gtk.Button()
 
546
                button = Gtk.Button()
346
547
                button.add(image)
347
548
                button.connect("clicked", self._show_clicked_cb,
348
549
                               self._revision.revision_id, revid)
349
 
                hbox.pack_start(button, expand=False, fill=True)
 
550
                hbox.pack_start(button, False, True, 0)
350
551
                button.show()
351
552
 
352
 
            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)
353
558
            button.connect("clicked",
354
 
                    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)
355
561
            button.set_use_underline(False)
356
 
            hbox.pack_start(button, expand=False, fill=True)
357
 
            button.show()
 
562
            hbox.pack_start(button, True, True, 0)
 
563
            button.show_all()
358
564
 
359
565
    def _create_general(self):
360
 
        vbox = gtk.VBox(False, 6)
 
566
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
361
567
        vbox.set_border_width(6)
362
 
        vbox.pack_start(self._create_headers(), expand=False, fill=True)
363
 
        vbox.pack_start(self._create_message_view())
364
 
        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"))
365
571
        vbox.show()
366
572
 
367
573
    def _create_relations(self):
368
 
        vbox = gtk.VBox(False, 6)
 
574
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
369
575
        vbox.set_border_width(6)
370
 
        vbox.pack_start(self._create_parents(), expand=False, fill=True)
371
 
        vbox.pack_start(self._create_children(), expand=False, fill=True)
372
 
        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"))
373
579
        vbox.show()
374
580
 
375
581
    def _create_signature(self):
376
 
        try:
377
 
            self.signature_table = SignatureTab()
378
 
        except ImportError: # No GPG module installed
379
 
            self.signature_table = None
380
 
            return
381
 
        self.append_page(self.signature_table, tab_label=gtk.Label('Signature'))
 
582
        self.signature_table = SignatureTab(self._repository)
 
583
        self.append_page(
 
584
            self.signature_table, Gtk.Label(label='Signature'))
382
585
        self.connect_after('notify::revision', self._update_signature)
383
586
 
384
587
    def _create_headers(self):
385
 
        self.table = gtk.Table(rows=5, columns=2)
 
588
        self.avatarsbox = AvatarsBox()
 
589
        
 
590
        self.table = Gtk.Table(rows=5, columns=2)
386
591
        self.table.set_row_spacings(6)
387
592
        self.table.set_col_spacings(6)
388
593
        self.table.show()
389
 
 
390
 
        align = gtk.Alignment(1.0, 0.5)
391
 
        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)
392
602
        label.set_markup("<b>Revision Id:</b>")
393
 
        align.add(label)
394
 
        self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
395
 
        align.show()
 
603
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
396
604
        label.show()
397
605
 
398
 
        align = gtk.Alignment(0.0, 0.5)
399
 
        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)
400
609
        revision_id.set_selectable(True)
401
610
        self.connect('notify::revision', 
402
611
                lambda w, p: revision_id.set_text(self._revision.revision_id))
403
 
        align.add(revision_id)
404
 
        self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
405
 
        align.show()
 
612
        self.table.attach(revision_id, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
406
613
        revision_id.show()
407
614
 
408
 
        align = gtk.Alignment(1.0, 0.5)
409
 
        self.author_label = gtk.Label()
 
615
        row += 1
 
616
        self.author_label = Gtk.Label()
 
617
        self.author_label.set_alignment(1.0, 0.5)
410
618
        self.author_label.set_markup("<b>Author:</b>")
411
 
        align.add(self.author_label)
412
 
        self.table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
413
 
        align.show()
 
619
        self.table.attach(self.author_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
414
620
        self.author_label.show()
415
621
 
416
 
        align = gtk.Alignment(0.0, 0.5)
417
 
        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)
418
625
        self.author.set_selectable(True)
419
 
        align.add(self.author)
420
 
        self.table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
421
 
        align.show()
 
626
        self.table.attach(self.author, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
422
627
        self.author.show()
423
628
        self.author.hide()
424
629
 
425
 
        align = gtk.Alignment(1.0, 0.5)
426
 
        label = gtk.Label()
 
630
        row += 1
 
631
        label = Gtk.Label()
 
632
        label.set_alignment(1.0, 0.5)
427
633
        label.set_markup("<b>Committer:</b>")
428
 
        align.add(label)
429
 
        self.table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
430
 
        align.show()
 
634
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
431
635
        label.show()
432
636
 
433
 
        align = gtk.Alignment(0.0, 0.5)
434
 
        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)
435
640
        self.committer.set_selectable(True)
436
 
        align.add(self.committer)
437
 
        self.table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
438
 
        align.show()
 
641
        self.table.attach(self.committer, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
439
642
        self.committer.show()
440
643
 
441
 
        align = gtk.Alignment(0.0, 0.5)
442
 
        label = gtk.Label()
443
 
        label.set_markup("<b>Branch nick:</b>")
444
 
        align.add(label)
445
 
        self.table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
446
 
        label.show()
447
 
        align.show()
448
 
 
449
 
        align = gtk.Alignment(0.0, 0.5)
450
 
        self.branchnick_label = gtk.Label()
451
 
        self.branchnick_label.set_selectable(True)
452
 
        align.add(self.branchnick_label)
453
 
        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)
454
649
        self.branchnick_label.show()
455
 
        align.show()
456
 
 
457
 
        align = gtk.Alignment(1.0, 0.5)
458
 
        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)
459
661
        label.set_markup("<b>Timestamp:</b>")
460
 
        align.add(label)
461
 
        self.table.attach(align, 0, 1, 4, 5, gtk.FILL, gtk.FILL)
462
 
        align.show()
 
662
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
463
663
        label.show()
464
664
 
465
 
        align = gtk.Alignment(0.0, 0.5)
466
 
        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)
467
668
        self.timestamp.set_selectable(True)
468
 
        align.add(self.timestamp)
469
 
        self.table.attach(align, 1, 2, 4, 5, gtk.EXPAND | gtk.FILL, gtk.FILL)
470
 
        align.show()
 
669
        self.table.attach(self.timestamp, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
471
670
        self.timestamp.show()
472
671
 
473
 
        align = gtk.Alignment(1.0, 0.5)
474
 
        self.tags_label = gtk.Label()
 
672
        row += 1
 
673
        self.tags_label = Gtk.Label()
 
674
        self.tags_label.set_alignment(1.0, 0.5)
475
675
        self.tags_label.set_markup("<b>Tags:</b>")
476
 
        align.add(self.tags_label)
477
 
        align.show()
478
 
        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)
479
677
        self.tags_label.show()
480
678
 
481
 
        align = gtk.Alignment(0.0, 0.5)
482
 
        self.tags_list = gtk.Label()
483
 
        align.add(self.tags_list)
484
 
        self.table.attach(align, 1, 2, 5, 6, gtk.EXPAND | gtk.FILL, gtk.FILL)
485
 
        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)
486
683
        self.tags_list.show()
487
684
 
488
685
        self.connect('notify::revision', self._add_tags)
489
686
 
490
 
        return self.table
 
687
        return self.avatarsbox
491
688
    
492
689
    def _create_parents(self):
493
 
        hbox = gtk.HBox(True, 3)
 
690
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
494
691
        
495
692
        self.parents_table = self._create_parents_or_children_table(
496
693
            "<b>Parents:</b>")
497
694
        self.parents_widgets = []
498
 
        hbox.pack_start(self.parents_table)
 
695
        hbox.pack_start(self.parents_table, True, True, 0)
499
696
 
500
697
        hbox.show()
501
698
        return hbox
502
699
 
503
700
    def _create_children(self):
504
 
        hbox = gtk.HBox(True, 3)
 
701
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
505
702
        self.children_table = self._create_parents_or_children_table(
506
703
            "<b>Children:</b>")
507
704
        self.children_widgets = []
508
 
        hbox.pack_start(self.children_table)
 
705
        hbox.pack_start(self.children_table, True, True, 0)
509
706
        hbox.show()
510
707
        return hbox
511
708
        
512
709
    def _create_parents_or_children_table(self, text):
513
 
        table = gtk.Table(rows=1, columns=2)
 
710
        table = Gtk.Table(rows=1, columns=2)
514
711
        table.set_row_spacings(3)
515
712
        table.set_col_spacings(6)
516
713
        table.show()
517
714
 
518
 
        label = gtk.Label()
 
715
        label = Gtk.Label()
519
716
        label.set_markup(text)
520
 
        align = gtk.Alignment(0.0, 0.5)
 
717
        align = Gtk.Alignment.new(0.0, 0.5, 0, 0)
521
718
        align.add(label)
522
 
        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)
523
720
        label.show()
524
721
        align.show()
525
722
 
526
723
        return table
527
724
 
528
725
    def _create_message_view(self):
529
 
        msg_buffer = gtk.TextBuffer()
 
726
        msg_buffer = Gtk.TextBuffer()
530
727
        self.connect('notify::revision',
531
728
                lambda w, p: msg_buffer.set_text(self._revision.message))
532
 
        window = gtk.ScrolledWindow()
533
 
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
534
 
        window.set_shadow_type(gtk.SHADOW_IN)
535
 
        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)
536
733
        tv.set_editable(False)
537
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
 
734
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
538
735
 
539
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
736
        tv.modify_font(Pango.FontDescription("Monospace"))
540
737
        tv.show()
541
738
        window.add(tv)
542
739
        window.show()
543
740
        return window
544
741
 
545
742
    def _create_bugs(self):
546
 
        self.bugs_table = BugsTab()
547
 
        self.append_page(self.bugs_table, tab_label=gtk.Label('Bugs'))
 
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'))
548
746
 
549
747
    def _create_file_info_view(self):
550
 
        self.file_info_box = gtk.VBox(False, 6)
 
748
        self.file_info_box = Gtk.VBox(homogeneous=False, spacing=6)
551
749
        self.file_info_box.set_border_width(6)
552
 
        self.file_info_buffer = gtk.TextBuffer()
553
 
        window = gtk.ScrolledWindow()
554
 
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
555
 
        window.set_shadow_type(gtk.SHADOW_IN)
556
 
        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)
557
755
        tv.set_editable(False)
558
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
559
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
756
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
 
757
        tv.modify_font(Pango.FontDescription("Monospace"))
560
758
        tv.show()
561
759
        window.add(tv)
562
760
        window.show()
563
 
        self.file_info_box.pack_start(window)
 
761
        self.file_info_box.pack_start(window, True, True, 0)
564
762
        self.file_info_box.hide() # Only shown when there are per-file messages
565
 
        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'))
566
764