/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: Martin Albisetti
  • Date: 2008-03-04 18:29:24 UTC
  • mfrom: (423.13.4 nautilus-fix)
  • mto: This revision was merged to the branch mainline in revision 439.
  • Revision ID: beuno@beuno-laptop-20080304182924-yvm7ds9zwpenotg5
Merge

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