/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: 2008-03-30 15:58:52 UTC
  • mto: (450.1.11 trunk)
  • mto: This revision was merged to the branch mainline in revision 458.
  • Revision ID: jelmer@samba.org-20080330155852-0btngt3srvde5pj9
Add utility function for finding icon paths.

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