/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-14 02:19:21 UTC
  • mto: (452.2.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 453.
  • Revision ID: jelmer@samba.org-20080314021921-2dgptk62dhp7pd91
Honor child_submit_to in the submit_branch if no email address was specified.
Consistent with the changes in bzr.dev.

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
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
 
 
 
26
from bzrlib.util.bencode import bdecode
44
27
 
45
28
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
 
 
 
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):
54
34
    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
 
35
        super(BugsTab, self).__init__(rows=5, columns=2)
 
36
        self.set_row_spacings(6)
 
37
        self.set_col_spacings(6)
 
38
        self.clear()
118
39
 
119
40
    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.")
 
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
125
45
 
126
46
    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)
 
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
198
54
        self.show_all()
199
55
 
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):
 
56
 
 
57
class RevisionView(gtk.Notebook):
288
58
    """ Custom widget for commit log details.
289
59
 
290
60
    A variety of bzr tools may need to implement such a thing. This is a
293
63
 
294
64
    __gproperties__ = {
295
65
        'branch': (
296
 
            GObject.TYPE_PYOBJECT,
 
66
            gobject.TYPE_PYOBJECT,
297
67
            'Branch',
298
68
            'The branch holding the revision being displayed',
299
 
            GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE
 
69
            gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE
300
70
        ),
301
71
 
302
72
        'revision': (
303
 
            GObject.TYPE_PYOBJECT,
 
73
            gobject.TYPE_PYOBJECT,
304
74
            'Revision',
305
75
            'The revision being displayed',
306
 
            GObject.PARAM_READWRITE
 
76
            gobject.PARAM_READWRITE
307
77
        ),
308
78
 
309
79
        'children': (
310
 
            GObject.TYPE_PYOBJECT,
 
80
            gobject.TYPE_PYOBJECT,
311
81
            'Children',
312
82
            'Child revisions',
313
 
            GObject.PARAM_READWRITE
 
83
            gobject.PARAM_READWRITE
314
84
        ),
315
85
 
316
86
        'file-id': (
317
 
            GObject.TYPE_PYOBJECT,
 
87
            gobject.TYPE_PYOBJECT,
318
88
            'File Id',
319
89
            'The file id',
320
 
            GObject.PARAM_READWRITE
 
90
            gobject.PARAM_READWRITE
321
91
        )
322
92
    }
323
93
 
324
 
    def __init__(self, branch=None, repository=None):
325
 
        super(RevisionView, self).__init__()
326
94
 
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
 
95
    def __init__(self, branch=None):
 
96
        gtk.Notebook.__init__(self)
334
97
 
335
98
        self._create_general()
336
99
        self._create_relations()
337
 
        # Disabled because testaments aren't verified yet:
338
 
        if has_seahorse:
339
 
            self._create_signature()
340
100
        self._create_file_info_view()
341
101
        self._create_bugs()
342
102
 
343
 
        self.set_current_page(PAGE_GENERAL)
344
 
        self.connect_after('switch-page', self._switch_page_cb)
 
103
        self.set_current_page(0)
345
104
        
346
105
        self._show_callback = None
347
106
        self._clicked_callback = None
397
156
 
398
157
    def _set_revision(self, revision):
399
158
        if revision is None: return
400
 
        
401
 
        self.avatarsbox.reset()
402
 
        
 
159
 
403
160
        self._revision = revision
404
161
        if revision.committer is not None:
405
162
            self.committer.set_text(revision.committer)
406
 
            self.avatarsbox.add(revision.committer, "committer")
407
163
        else:
408
164
            self.committer.set_text("")
409
 
            self.avatarsbox.hide()
410
165
        author = revision.properties.get('author', '')
411
 
        self.avatarsbox.merge(revision.get_apparent_authors(), "author")
412
166
        if author != '':
413
167
            self.author.set_text(author)
414
168
            self.author.show()
421
175
            self.timestamp.set_text(format_date(revision.timestamp,
422
176
                                                revision.timezone))
423
177
        try:
424
 
            self.branchnick.show()
425
 
            self.branchnick_label.show()
426
 
            self.branchnick.set_text(revision.properties['branch-nick'])
 
178
            self.branchnick_label.set_text(revision.properties['branch-nick'])
427
179
        except KeyError:
428
 
            self.branchnick.hide()
429
 
            self.branchnick_label.hide()
 
180
            self.branchnick_label.set_text("")
430
181
 
431
182
        self._add_parents_or_children(revision.parent_ids,
432
183
                                      self.parents_widgets,
433
184
                                      self.parents_table)
434
 
 
 
185
        
435
186
        file_info = revision.properties.get('file-info', None)
436
187
        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
 
188
            file_info = bdecode(file_info.encode('UTF-8'))
443
189
 
444
190
        if file_info:
445
191
            if self._file_id is None:
461
207
        else:
462
208
            self.file_info_box.hide()
463
209
 
 
210
        self.bugs_table.clear()
 
211
        bugs_text = revision.properties.get('bugs', None)
 
212
        if bugs_text:
 
213
            for bugline in bugs_text.splitlines():
 
214
                (url, status) = bugline.split(" ")
 
215
                self.bugs_table.add_bug(url, status)
 
216
 
464
217
    def update_tags(self):
465
218
        if self._branch is not None and self._branch.supports_tags():
466
219
            self._tagdict = self._branch.tags.get_reverse_tag_dict()
469
222
 
470
223
        self._add_tags()
471
224
 
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
225
    def set_children(self, children):
484
226
        self._add_parents_or_children(children,
485
227
                                      self.children_widgets,
486
228
                                      self.children_table)
487
229
 
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
230
    def _show_clicked_cb(self, widget, revid, parentid):
497
231
        """Callback for when the show button for a parent is clicked."""
498
232
        self._show_callback(revid, parentid)
501
235
        """Callback for when the go button for a parent is clicked."""
502
236
 
503
237
    def _add_tags(self, *args):
504
 
        if self._revision is None:
505
 
            return
 
238
        if self._revision is None: return
506
239
 
507
240
        if self._tagdict.has_key(self._revision.revision_id):
508
241
            tags = self._tagdict[self._revision.revision_id]
527
260
        table.resize(max(len(revids), 1), 2)
528
261
 
529
262
        for idx, revid in enumerate(revids):
530
 
            align = Gtk.Alignment.new(0.0, 0.0, 1, 1)
 
263
            align = gtk.Alignment(0.0, 0.0)
531
264
            widgets.append(align)
532
265
            table.attach(align, 1, 2, idx, idx + 1,
533
 
                                      Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
266
                                      gtk.EXPAND | gtk.FILL, gtk.FILL)
534
267
            align.show()
535
268
 
536
 
            hbox = Gtk.HBox(homogeneous=False, spacing=6)
 
269
            hbox = gtk.HBox(False, spacing=6)
537
270
            align.add(hbox)
538
271
            hbox.show()
539
272
 
540
 
            image = Gtk.Image()
 
273
            image = gtk.Image()
541
274
            image.set_from_stock(
542
 
                Gtk.STOCK_FIND, Gtk.IconSize.SMALL_TOOLBAR)
 
275
                gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
543
276
            image.show()
544
277
 
545
278
            if self._show_callback is not None:
546
 
                button = Gtk.Button()
 
279
                button = gtk.Button()
547
280
                button.add(image)
548
281
                button.connect("clicked", self._show_clicked_cb,
549
282
                               self._revision.revision_id, revid)
550
 
                hbox.pack_start(button, False, True, 0)
 
283
                hbox.pack_start(button, expand=False, fill=True)
551
284
                button.show()
552
285
 
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)
 
286
            button = gtk.Button(revid)
558
287
            button.connect("clicked",
559
 
                    lambda w, r: self.set_revision(
560
 
                        self._repository.get_revision(r)), revid)
 
288
                    lambda w, r: self.set_revision(self._branch.repository.get_revision(r)), revid)
561
289
            button.set_use_underline(False)
562
 
            hbox.pack_start(button, True, True, 0)
563
 
            button.show_all()
 
290
            hbox.pack_start(button, expand=False, fill=True)
 
291
            button.show()
564
292
 
565
293
    def _create_general(self):
566
 
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
 
294
        vbox = gtk.VBox(False, 6)
567
295
        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"))
 
296
        vbox.pack_start(self._create_headers(), expand=False, fill=True)
 
297
        vbox.pack_start(self._create_message_view())
 
298
        self.append_page(vbox, tab_label=gtk.Label("General"))
571
299
        vbox.show()
572
300
 
573
301
    def _create_relations(self):
574
 
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
 
302
        vbox = gtk.VBox(False, 6)
575
303
        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"))
 
304
        vbox.pack_start(self._create_parents(), expand=False, fill=True)
 
305
        vbox.pack_start(self._create_children(), expand=False, fill=True)
 
306
        self.append_page(vbox, tab_label=gtk.Label("Relations"))
579
307
        vbox.show()
580
308
 
581
 
    def _create_signature(self):
582
 
        self.signature_table = SignatureTab(self._repository)
583
 
        self.append_page(
584
 
            self.signature_table, Gtk.Label(label='Signature'))
585
 
        self.connect_after('notify::revision', self._update_signature)
586
 
 
587
309
    def _create_headers(self):
588
 
        self.avatarsbox = AvatarsBox()
589
 
        
590
 
        self.table = Gtk.Table(rows=5, columns=2)
 
310
        self.table = gtk.Table(rows=5, columns=2)
591
311
        self.table.set_row_spacings(6)
592
312
        self.table.set_col_spacings(6)
593
313
        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)
 
314
 
 
315
        align = gtk.Alignment(1.0, 0.5)
 
316
        label = gtk.Label()
602
317
        label.set_markup("<b>Revision Id:</b>")
603
 
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
318
        align.add(label)
 
319
        self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
 
320
        align.show()
604
321
        label.show()
605
322
 
606
 
        revision_id = Gtk.Label()
607
 
        revision_id.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
608
 
        revision_id.set_alignment(0.0, 0.5)
 
323
        align = gtk.Alignment(0.0, 0.5)
 
324
        revision_id = gtk.Label()
609
325
        revision_id.set_selectable(True)
610
326
        self.connect('notify::revision', 
611
327
                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)
 
328
        align.add(revision_id)
 
329
        self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
330
        align.show()
613
331
        revision_id.show()
614
332
 
615
 
        row += 1
616
 
        self.author_label = Gtk.Label()
617
 
        self.author_label.set_alignment(1.0, 0.5)
 
333
        align = gtk.Alignment(1.0, 0.5)
 
334
        self.author_label = gtk.Label()
618
335
        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)
 
336
        align.add(self.author_label)
 
337
        self.table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
 
338
        align.show()
620
339
        self.author_label.show()
621
340
 
622
 
        self.author = Gtk.Label()
623
 
        self.author.set_ellipsize(Pango.EllipsizeMode.END)
624
 
        self.author.set_alignment(0.0, 0.5)
 
341
        align = gtk.Alignment(0.0, 0.5)
 
342
        self.author = gtk.Label()
625
343
        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)
 
344
        align.add(self.author)
 
345
        self.table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
346
        align.show()
627
347
        self.author.show()
628
348
        self.author.hide()
629
349
 
630
 
        row += 1
631
 
        label = Gtk.Label()
632
 
        label.set_alignment(1.0, 0.5)
 
350
        align = gtk.Alignment(1.0, 0.5)
 
351
        label = gtk.Label()
633
352
        label.set_markup("<b>Committer:</b>")
634
 
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
353
        align.add(label)
 
354
        self.table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
 
355
        align.show()
635
356
        label.show()
636
357
 
637
 
        self.committer = Gtk.Label()
638
 
        self.committer.set_ellipsize(Pango.EllipsizeMode.END)
639
 
        self.committer.set_alignment(0.0, 0.5)
 
358
        align = gtk.Alignment(0.0, 0.5)
 
359
        self.committer = gtk.Label()
640
360
        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)
 
361
        align.add(self.committer)
 
362
        self.table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
363
        align.show()
642
364
        self.committer.show()
643
365
 
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)
 
366
        align = gtk.Alignment(0.0, 0.5)
 
367
        label = gtk.Label()
 
368
        label.set_markup("<b>Branch nick:</b>")
 
369
        align.add(label)
 
370
        self.table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
 
371
        label.show()
 
372
        align.show()
 
373
 
 
374
        align = gtk.Alignment(0.0, 0.5)
 
375
        self.branchnick_label = gtk.Label()
 
376
        self.branchnick_label.set_selectable(True)
 
377
        align.add(self.branchnick_label)
 
378
        self.table.attach(align, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
649
379
        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)
 
380
        align.show()
 
381
 
 
382
        align = gtk.Alignment(1.0, 0.5)
 
383
        label = gtk.Label()
661
384
        label.set_markup("<b>Timestamp:</b>")
662
 
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
385
        align.add(label)
 
386
        self.table.attach(align, 0, 1, 4, 5, gtk.FILL, gtk.FILL)
 
387
        align.show()
663
388
        label.show()
664
389
 
665
 
        self.timestamp = Gtk.Label()
666
 
        self.timestamp.set_ellipsize(Pango.EllipsizeMode.END)
667
 
        self.timestamp.set_alignment(0.0, 0.5)
 
390
        align = gtk.Alignment(0.0, 0.5)
 
391
        self.timestamp = gtk.Label()
668
392
        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)
 
393
        align.add(self.timestamp)
 
394
        self.table.attach(align, 1, 2, 4, 5, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
395
        align.show()
670
396
        self.timestamp.show()
671
397
 
672
 
        row += 1
673
 
        self.tags_label = Gtk.Label()
674
 
        self.tags_label.set_alignment(1.0, 0.5)
 
398
        align = gtk.Alignment(1.0, 0.5)
 
399
        self.tags_label = gtk.Label()
675
400
        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)
 
401
        align.add(self.tags_label)
 
402
        align.show()
 
403
        self.table.attach(align, 0, 1, 5, 6, gtk.FILL, gtk.FILL)
677
404
        self.tags_label.show()
678
405
 
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)
 
406
        align = gtk.Alignment(0.0, 0.5)
 
407
        self.tags_list = gtk.Label()
 
408
        align.add(self.tags_list)
 
409
        self.table.attach(align, 1, 2, 5, 6, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
410
        align.show()
683
411
        self.tags_list.show()
684
412
 
685
413
        self.connect('notify::revision', self._add_tags)
686
414
 
687
 
        return self.avatarsbox
 
415
        return self.table
 
416
 
688
417
    
689
418
    def _create_parents(self):
690
 
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
 
419
        hbox = gtk.HBox(True, 3)
691
420
        
692
421
        self.parents_table = self._create_parents_or_children_table(
693
422
            "<b>Parents:</b>")
694
423
        self.parents_widgets = []
695
 
        hbox.pack_start(self.parents_table, True, True, 0)
 
424
        hbox.pack_start(self.parents_table)
696
425
 
697
426
        hbox.show()
698
427
        return hbox
699
428
 
700
429
    def _create_children(self):
701
 
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
 
430
        hbox = gtk.HBox(True, 3)
702
431
        self.children_table = self._create_parents_or_children_table(
703
432
            "<b>Children:</b>")
704
433
        self.children_widgets = []
705
 
        hbox.pack_start(self.children_table, True, True, 0)
 
434
        hbox.pack_start(self.children_table)
706
435
        hbox.show()
707
436
        return hbox
708
437
        
709
438
    def _create_parents_or_children_table(self, text):
710
 
        table = Gtk.Table(rows=1, columns=2)
 
439
        table = gtk.Table(rows=1, columns=2)
711
440
        table.set_row_spacings(3)
712
441
        table.set_col_spacings(6)
713
442
        table.show()
714
443
 
715
 
        label = Gtk.Label()
 
444
        label = gtk.Label()
716
445
        label.set_markup(text)
717
 
        align = Gtk.Alignment.new(0.0, 0.5, 0, 0)
 
446
        align = gtk.Alignment(0.0, 0.5)
718
447
        align.add(label)
719
 
        table.attach(align, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
448
        table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
720
449
        label.show()
721
450
        align.show()
722
451
 
723
452
        return table
724
453
 
725
454
    def _create_message_view(self):
726
 
        msg_buffer = Gtk.TextBuffer()
 
455
        msg_buffer = gtk.TextBuffer()
727
456
        self.connect('notify::revision',
728
457
                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)
 
458
        window = gtk.ScrolledWindow()
 
459
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
460
        window.set_shadow_type(gtk.SHADOW_IN)
 
461
        tv = gtk.TextView(msg_buffer)
733
462
        tv.set_editable(False)
734
 
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
735
 
 
736
 
        tv.modify_font(Pango.FontDescription("Monospace"))
 
463
        tv.set_wrap_mode(gtk.WRAP_WORD)
 
464
        tv.modify_font(pango.FontDescription("Monospace"))
737
465
        tv.show()
738
466
        window.add(tv)
739
467
        window.show()
740
468
        return window
741
469
 
742
470
    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'))
 
471
        self.bugs_table = BugsTab()
 
472
        self.append_page(self.bugs_table, tab_label=gtk.Label('Bugs'))
746
473
 
747
474
    def _create_file_info_view(self):
748
 
        self.file_info_box = Gtk.VBox(homogeneous=False, spacing=6)
 
475
        self.file_info_box = gtk.VBox(False, 6)
749
476
        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)
 
477
        self.file_info_buffer = gtk.TextBuffer()
 
478
        window = gtk.ScrolledWindow()
 
479
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
480
        window.set_shadow_type(gtk.SHADOW_IN)
 
481
        tv = gtk.TextView(self.file_info_buffer)
755
482
        tv.set_editable(False)
756
 
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
757
 
        tv.modify_font(Pango.FontDescription("Monospace"))
 
483
        tv.set_wrap_mode(gtk.WRAP_WORD)
 
484
        tv.modify_font(pango.FontDescription("Monospace"))
758
485
        tv.show()
759
486
        window.add(tv)
760
487
        window.show()
761
 
        self.file_info_box.pack_start(window, True, True, 0)
 
488
        self.file_info_box.pack_start(window)
762
489
        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'))
 
490
        self.append_page(self.file_info_box, tab_label=gtk.Label('Per-file'))
764
491