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
- browse files at revision 511.5.6
- compare with another revision
- download diff
- download tarball
- view history from revision 511.5.6
- Committer: Jelmer Vernooij
- Date: 2008-06-29 18:12:29 UTC
- mto: This revision was merged to the branch mainline in revision 519.
- Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.
- files added:
- olive.glade
- files removed:
- bzr-notify
- files modified:
- .bzrignore
added
removed
revisionview.py
22
22
import gobject
23
23
import webbrowser
24
24
25
from bzrlib import trace
25
from bzrlib.plugins.gtk import icon_path
26
26
from bzrlib.osutils import format_date
27
27
from bzrlib.util.bencode import bdecode
28
from bzrlib.testament import Testament
29
30
from bzrlib.plugins.gtk import icon_path
31
28
32
29
try:
33
30
from bzrlib.plugins.gtk import seahorse
223
220
"This revision has not been signed.")
224
221
225
222
def show_signature(self, crypttext):
226
(cleartext, key) = seahorse.verify(crypttext)
227
228
assert cleartext is not None
229
230
inv = self.repository.get_inventory(self.revision.revision_id)
231
expected_testament = Testament(self.revision, inv).as_short_text()
232
if expected_testament != cleartext:
233
self.signature_image.set_from_file(icon_path("sign-bad.png"))
234
self.signature_label.set_markup("<b>Signature does not match repository data</b>\n" +
235
"The signature plaintext is different from the expected testament plaintext.")
236
return
223
key = seahorse.verify(crypttext)
237
224
238
225
if key and key.is_available():
239
226
if key.is_trusted():
335
322
self._create_general()
336
323
self._create_relations()
337
324
# Disabled because testaments aren't verified yet:
338
if has_seahorse:
339
self._create_signature()
325
# if has_seahorse:
326
# self._create_signature()
340
327
self._create_file_info_view()
341
328
self._create_bugs()
342
329
416
403
self.timestamp.set_text(format_date(revision.timestamp,
417
404
revision.timezone))
418
405
try:
419
self.branchnick.show()
420
self.branchnick_label.show()
421
self.branchnick.set_text(revision.properties['branch-nick'])
406
self.branchnick_label.set_text(revision.properties['branch-nick'])
422
407
except KeyError:
423
self.branchnick.hide()
424
self.branchnick_label.hide()
408
self.branchnick_label.set_text("")
425
409
426
410
self._add_parents_or_children(revision.parent_ids,
427
411
self.parents_widgets,
428
412
self.parents_table)
429
413
430
414
file_info = revision.properties.get('file-info', None)
431
415
if file_info is not None:
432
try:
433
file_info = bdecode(file_info.encode('UTF-8'))
434
except ValueError:
435
trace.note('Invalid per-file info for revision:%s, value: %r',
436
revision.revision_id, file_info)
437
file_info = None
416
file_info = bdecode(file_info.encode('UTF-8'))
438
417
439
418
if file_info:
440
419
if self._file_id is None:
518
497
table.resize(max(len(revids), 1), 2)
519
498
520
499
for idx, revid in enumerate(revids):
521
align = gtk.Alignment(0.0, 0.0, 1, 1)
500
align = gtk.Alignment(0.0, 0.0)
522
501
widgets.append(align)
523
502
table.attach(align, 1, 2, idx, idx + 1,
524
503
gtk.EXPAND | gtk.FILL, gtk.FILL)
541
520
hbox.pack_start(button, expand=False, fill=True)
542
521
button.show()
543
522
544
button = gtk.Button()
545
revid_label = gtk.Label(str(revid))
546
revid_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
547
revid_label.set_alignment(0.0, 0.5)
548
button.add(revid_label)
523
button = gtk.Button(revid)
549
524
button.connect("clicked",
550
525
lambda w, r: self.set_revision(self._repository.get_revision(r)), revid)
551
526
button.set_use_underline(False)
552
hbox.pack_start(button, expand=True, fill=True)
553
button.show_all()
527
hbox.pack_start(button, expand=False, fill=True)
528
button.show()
554
529
555
530
def _create_general(self):
556
531
vbox = gtk.VBox(False, 6)
579
554
self.table.set_col_spacings(6)
580
555
self.table.show()
581
556
582
row = 0
583
557
align = gtk.Alignment(1.0, 0.5)
584
558
label = gtk.Label()
585
label.set_alignment(1.0, 0.5)
586
559
label.set_markup("<b>Revision Id:</b>")
587
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
560
align.add(label)
561
self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
562
align.show()
588
563
label.show()
589
564
565
align = gtk.Alignment(0.0, 0.5)
590
566
revision_id = gtk.Label()
591
revision_id.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
592
revision_id.set_alignment(0.0, 0.5)
593
567
revision_id.set_selectable(True)
594
568
self.connect('notify::revision',
595
569
lambda w, p: revision_id.set_text(self._revision.revision_id))
596
self.table.attach(revision_id, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
570
align.add(revision_id)
571
self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
572
align.show()
597
573
revision_id.show()
598
574
599
row += 1
575
align = gtk.Alignment(1.0, 0.5)
600
576
self.author_label = gtk.Label()
601
self.author_label.set_alignment(1.0, 0.5)
602
577
self.author_label.set_markup("<b>Author:</b>")
603
self.table.attach(self.author_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
578
align.add(self.author_label)
579
self.table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
580
align.show()
604
581
self.author_label.show()
605
582
583
align = gtk.Alignment(0.0, 0.5)
606
584
self.author = gtk.Label()
607
self.author.set_ellipsize(pango.ELLIPSIZE_END)
608
self.author.set_alignment(0.0, 0.5)
609
585
self.author.set_selectable(True)
610
self.table.attach(self.author, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
586
align.add(self.author)
587
self.table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
588
align.show()
611
589
self.author.show()
612
590
self.author.hide()
613
591
614
row += 1
592
align = gtk.Alignment(1.0, 0.5)
615
593
label = gtk.Label()
616
label.set_alignment(1.0, 0.5)
617
594
label.set_markup("<b>Committer:</b>")
618
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
595
align.add(label)
596
self.table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
597
align.show()
619
598
label.show()
620
599
600
align = gtk.Alignment(0.0, 0.5)
621
601
self.committer = gtk.Label()
622
self.committer.set_ellipsize(pango.ELLIPSIZE_END)
623
self.committer.set_alignment(0.0, 0.5)
624
602
self.committer.set_selectable(True)
625
self.table.attach(self.committer, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
603
align.add(self.committer)
604
self.table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
605
align.show()
626
606
self.committer.show()
627
607
628
row += 1
608
align = gtk.Alignment(0.0, 0.5)
609
label = gtk.Label()
610
label.set_markup("<b>Branch nick:</b>")
611
align.add(label)
612
self.table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
613
label.show()
614
align.show()
615
616
align = gtk.Alignment(0.0, 0.5)
629
617
self.branchnick_label = gtk.Label()
630
self.branchnick_label.set_alignment(1.0, 0.5)
631
self.branchnick_label.set_markup("<b>Branch nick:</b>")
632
self.table.attach(self.branchnick_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
618
self.branchnick_label.set_selectable(True)
619
align.add(self.branchnick_label)
620
self.table.attach(align, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
633
621
self.branchnick_label.show()
634
635
self.branchnick = gtk.Label()
636
self.branchnick.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
637
self.branchnick.set_alignment(0.0, 0.5)
638
self.branchnick.set_selectable(True)
639
self.table.attach(self.branchnick, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
640
self.branchnick.show()
641
642
row += 1
622
align.show()
623
624
align = gtk.Alignment(1.0, 0.5)
643
625
label = gtk.Label()
644
label.set_alignment(1.0, 0.5)
645
626
label.set_markup("<b>Timestamp:</b>")
646
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
627
align.add(label)
628
self.table.attach(align, 0, 1, 4, 5, gtk.FILL, gtk.FILL)
629
align.show()
647
630
label.show()
648
631
632
align = gtk.Alignment(0.0, 0.5)
649
633
self.timestamp = gtk.Label()
650
self.timestamp.set_ellipsize(pango.ELLIPSIZE_END)
651
self.timestamp.set_alignment(0.0, 0.5)
652
634
self.timestamp.set_selectable(True)
653
self.table.attach(self.timestamp, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
635
align.add(self.timestamp)
636
self.table.attach(align, 1, 2, 4, 5, gtk.EXPAND | gtk.FILL, gtk.FILL)
637
align.show()
654
638
self.timestamp.show()
655
639
656
row += 1
640
align = gtk.Alignment(1.0, 0.5)
657
641
self.tags_label = gtk.Label()
658
self.tags_label.set_alignment(1.0, 0.5)
659
642
self.tags_label.set_markup("<b>Tags:</b>")
660
self.table.attach(self.tags_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
643
align.add(self.tags_label)
644
align.show()
645
self.table.attach(align, 0, 1, 5, 6, gtk.FILL, gtk.FILL)
661
646
self.tags_label.show()
662
647
648
align = gtk.Alignment(0.0, 0.5)
663
649
self.tags_list = gtk.Label()
664
self.tags_list.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
665
self.tags_list.set_alignment(0.0, 0.5)
666
self.table.attach(self.tags_list, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
650
align.add(self.tags_list)
651
self.table.attach(align, 1, 2, 5, 6, gtk.EXPAND | gtk.FILL, gtk.FILL)
652
align.show()
667
653
self.tags_list.show()
668
654
669
655
self.connect('notify::revision', self._add_tags)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0