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 577.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 577.1.1
- Committer: Jasper Groenewegen
- Date: 2008-07-27 12:01:40 UTC
- mfrom: (576.3.2 improve-merge)
- mto: This revision was merged to the branch mainline in revision 579.
- Revision ID: colbrac@xs4all.nl-20080727120140-1agdlzkc9fumjk5f
Merge merge dialog improvements
- files added:
- bzr-notify
- files removed:
- olive.glade
- files renamed:
- handle-patch => bzr-handle-patch
- files modified:
- .bzrignore
added
removed
revisionview.py
20
20
import gtk
21
21
import pango
22
22
import gobject
23
import subprocess
23
import webbrowser
24
24
25
from bzrlib.plugins.gtk import icon_path
26
25
from bzrlib.osutils import format_date
27
26
from bzrlib.util.bencode import bdecode
27
from bzrlib.testament import Testament
28
29
from bzrlib.plugins.gtk import icon_path
28
30
29
31
try:
30
32
from bzrlib.plugins.gtk import seahorse
38
40
PAGE_SIGNATURE = 2
39
41
PAGE_BUGS = 3
40
42
43
41
44
def _open_link(widget, uri):
42
subprocess.Popen(['sensible-browser', uri], close_fds=True)
45
for cmd in ['sensible-browser', 'xdg-open']:
46
if webbrowser._iscommand(cmd):
47
webbrowser._tryorder.insert(0, '%s "%%s"' % cmd)
48
webbrowser.open(uri)
43
49
44
50
gtk.link_button_set_uri_hook(_open_link)
45
51
216
222
"This revision has not been signed.")
217
223
218
224
def show_signature(self, crypttext):
219
key = seahorse.verify(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
220
236
221
237
if key and key.is_available():
222
238
if key.is_trusted():
318
334
self._create_general()
319
335
self._create_relations()
320
336
# Disabled because testaments aren't verified yet:
321
# if has_seahorse:
322
# self._create_signature()
337
if has_seahorse:
338
self._create_signature()
323
339
self._create_file_info_view()
324
340
self._create_bugs()
325
341
493
509
table.resize(max(len(revids), 1), 2)
494
510
495
511
for idx, revid in enumerate(revids):
496
align = gtk.Alignment(0.0, 0.0)
512
align = gtk.Alignment(0.0, 0.0, 1, 1)
497
513
widgets.append(align)
498
514
table.attach(align, 1, 2, idx, idx + 1,
499
515
gtk.EXPAND | gtk.FILL, gtk.FILL)
516
532
hbox.pack_start(button, expand=False, fill=True)
517
533
button.show()
518
534
519
button = gtk.Button(revid)
535
button = gtk.Button()
536
revid_label = gtk.Label(str(revid))
537
revid_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
538
revid_label.set_alignment(0.0, 0.5)
539
button.add(revid_label)
520
540
button.connect("clicked",
521
541
lambda w, r: self.set_revision(self._repository.get_revision(r)), revid)
522
542
button.set_use_underline(False)
523
hbox.pack_start(button, expand=False, fill=True)
524
button.show()
543
hbox.pack_start(button, expand=True, fill=True)
544
button.show_all()
525
545
526
546
def _create_general(self):
527
547
vbox = gtk.VBox(False, 6)
550
570
self.table.set_col_spacings(6)
551
571
self.table.show()
552
572
553
align = gtk.Alignment(1.0, 0.5)
573
row = 0
574
554
575
label = gtk.Label()
576
label.set_alignment(1.0, 0.5)
555
577
label.set_markup("<b>Revision Id:</b>")
556
align.add(label)
557
self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
558
align.show()
578
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
559
579
label.show()
560
580
561
align = gtk.Alignment(0.0, 0.5)
562
581
revision_id = gtk.Label()
582
revision_id.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
583
revision_id.set_alignment(0.0, 0.5)
563
584
revision_id.set_selectable(True)
564
585
self.connect('notify::revision',
565
586
lambda w, p: revision_id.set_text(self._revision.revision_id))
566
align.add(revision_id)
567
self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
568
align.show()
587
self.table.attach(revision_id, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
569
588
revision_id.show()
570
589
571
align = gtk.Alignment(1.0, 0.5)
590
row += 1
572
591
self.author_label = gtk.Label()
592
self.author_label.set_alignment(1.0, 0.5)
573
593
self.author_label.set_markup("<b>Author:</b>")
574
align.add(self.author_label)
575
self.table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
576
align.show()
594
self.table.attach(self.author_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
577
595
self.author_label.show()
578
596
579
align = gtk.Alignment(0.0, 0.5)
580
597
self.author = gtk.Label()
598
self.author.set_ellipsize(pango.ELLIPSIZE_END)
599
self.author.set_alignment(0.0, 0.5)
581
600
self.author.set_selectable(True)
582
align.add(self.author)
583
self.table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
584
align.show()
601
self.table.attach(self.author, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
585
602
self.author.show()
586
603
self.author.hide()
587
604
588
align = gtk.Alignment(1.0, 0.5)
605
row += 1
589
606
label = gtk.Label()
607
label.set_alignment(1.0, 0.5)
590
608
label.set_markup("<b>Committer:</b>")
591
align.add(label)
592
self.table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
593
align.show()
609
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
594
610
label.show()
595
611
596
align = gtk.Alignment(0.0, 0.5)
597
612
self.committer = gtk.Label()
613
self.committer.set_ellipsize(pango.ELLIPSIZE_END)
614
self.committer.set_alignment(0.0, 0.5)
598
615
self.committer.set_selectable(True)
599
align.add(self.committer)
600
self.table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
601
align.show()
616
self.table.attach(self.committer, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
602
617
self.committer.show()
603
618
604
align = gtk.Alignment(0.0, 0.5)
619
row += 1
605
620
label = gtk.Label()
621
label.set_alignment(1.0, 0.5)
606
622
label.set_markup("<b>Branch nick:</b>")
607
align.add(label)
608
self.table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
623
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
609
624
label.show()
610
align.show()
611
625
612
align = gtk.Alignment(0.0, 0.5)
613
626
self.branchnick_label = gtk.Label()
627
self.branchnick_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
628
self.branchnick_label.set_alignment(0.0, 0.5)
614
629
self.branchnick_label.set_selectable(True)
615
align.add(self.branchnick_label)
616
self.table.attach(align, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
630
self.table.attach(self.branchnick_label, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
617
631
self.branchnick_label.show()
618
align.show()
619
632
620
align = gtk.Alignment(1.0, 0.5)
633
row += 1
621
634
label = gtk.Label()
635
label.set_alignment(1.0, 0.5)
622
636
label.set_markup("<b>Timestamp:</b>")
623
align.add(label)
624
self.table.attach(align, 0, 1, 4, 5, gtk.FILL, gtk.FILL)
625
align.show()
637
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
626
638
label.show()
627
639
628
align = gtk.Alignment(0.0, 0.5)
629
640
self.timestamp = gtk.Label()
641
self.timestamp.set_ellipsize(pango.ELLIPSIZE_END)
642
self.timestamp.set_alignment(0.0, 0.5)
630
643
self.timestamp.set_selectable(True)
631
align.add(self.timestamp)
632
self.table.attach(align, 1, 2, 4, 5, gtk.EXPAND | gtk.FILL, gtk.FILL)
633
align.show()
644
self.table.attach(self.timestamp, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
634
645
self.timestamp.show()
635
646
636
align = gtk.Alignment(1.0, 0.5)
647
row += 1
637
648
self.tags_label = gtk.Label()
649
self.tags_label.set_alignment(1.0, 0.5)
638
650
self.tags_label.set_markup("<b>Tags:</b>")
639
align.add(self.tags_label)
640
align.show()
641
self.table.attach(align, 0, 1, 5, 6, gtk.FILL, gtk.FILL)
651
self.table.attach(self.tags_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
642
652
self.tags_label.show()
643
653
644
align = gtk.Alignment(0.0, 0.5)
645
654
self.tags_list = gtk.Label()
646
align.add(self.tags_list)
647
self.table.attach(align, 1, 2, 5, 6, gtk.EXPAND | gtk.FILL, gtk.FILL)
648
align.show()
655
self.tags_list.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
656
self.tags_list.set_alignment(0.0, 0.5)
657
self.table.attach(self.tags_list, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
649
658
self.tags_list.show()
650
659
651
660
self.connect('notify::revision', self._add_tags)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0