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
22
22
import gobject
23
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
41
webbrowser.register('sensible-browser', None, webbrowser.GenericBrowser('sensible-browser'), -1)
42
webbrowser.register('xdg-open', None, webbrowser.GenericBrowser('xdg-open'), -1)
43
43
44
44
def _open_link(widget, uri):
45
for cmd in ['sensible-browser', 'xdg-open']:
46
if webbrowser._iscommand(cmd):
47
webbrowser._tryorder.insert(0, '%s "%%s"' % cmd)
45
48
webbrowser.open(uri)
46
49
47
50
gtk.link_button_set_uri_hook(_open_link)
219
222
"This revision has not been signed.")
220
223
221
224
def show_signature(self, crypttext):
222
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
223
236
224
237
if key and key.is_available():
225
238
if key.is_trusted():
321
334
self._create_general()
322
335
self._create_relations()
323
336
# Disabled because testaments aren't verified yet:
324
# if has_seahorse:
325
# self._create_signature()
337
if has_seahorse:
338
self._create_signature()
326
339
self._create_file_info_view()
327
340
self._create_bugs()
328
341
496
509
table.resize(max(len(revids), 1), 2)
497
510
498
511
for idx, revid in enumerate(revids):
499
align = gtk.Alignment(0.0, 0.0)
512
align = gtk.Alignment(0.0, 0.0, 1, 1)
500
513
widgets.append(align)
501
514
table.attach(align, 1, 2, idx, idx + 1,
502
515
gtk.EXPAND | gtk.FILL, gtk.FILL)
519
532
hbox.pack_start(button, expand=False, fill=True)
520
533
button.show()
521
534
522
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)
523
540
button.connect("clicked",
524
541
lambda w, r: self.set_revision(self._repository.get_revision(r)), revid)
525
542
button.set_use_underline(False)
526
hbox.pack_start(button, expand=False, fill=True)
527
button.show()
543
hbox.pack_start(button, expand=True, fill=True)
544
button.show_all()
528
545
529
546
def _create_general(self):
530
547
vbox = gtk.VBox(False, 6)
553
570
self.table.set_col_spacings(6)
554
571
self.table.show()
555
572
556
align = gtk.Alignment(1.0, 0.5)
573
row = 0
574
557
575
label = gtk.Label()
576
label.set_alignment(1.0, 0.5)
558
577
label.set_markup("<b>Revision Id:</b>")
559
align.add(label)
560
self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
561
align.show()
578
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
562
579
label.show()
563
580
564
align = gtk.Alignment(0.0, 0.5)
565
581
revision_id = gtk.Label()
582
revision_id.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
583
revision_id.set_alignment(0.0, 0.5)
566
584
revision_id.set_selectable(True)
567
585
self.connect('notify::revision',
568
586
lambda w, p: revision_id.set_text(self._revision.revision_id))
569
align.add(revision_id)
570
self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
571
align.show()
587
self.table.attach(revision_id, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
572
588
revision_id.show()
573
589
574
align = gtk.Alignment(1.0, 0.5)
590
row += 1
575
591
self.author_label = gtk.Label()
592
self.author_label.set_alignment(1.0, 0.5)
576
593
self.author_label.set_markup("<b>Author:</b>")
577
align.add(self.author_label)
578
self.table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
579
align.show()
594
self.table.attach(self.author_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
580
595
self.author_label.show()
581
596
582
align = gtk.Alignment(0.0, 0.5)
583
597
self.author = gtk.Label()
598
self.author.set_ellipsize(pango.ELLIPSIZE_END)
599
self.author.set_alignment(0.0, 0.5)
584
600
self.author.set_selectable(True)
585
align.add(self.author)
586
self.table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
587
align.show()
601
self.table.attach(self.author, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
588
602
self.author.show()
589
603
self.author.hide()
590
604
591
align = gtk.Alignment(1.0, 0.5)
605
row += 1
592
606
label = gtk.Label()
607
label.set_alignment(1.0, 0.5)
593
608
label.set_markup("<b>Committer:</b>")
594
align.add(label)
595
self.table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
596
align.show()
609
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
597
610
label.show()
598
611
599
align = gtk.Alignment(0.0, 0.5)
600
612
self.committer = gtk.Label()
613
self.committer.set_ellipsize(pango.ELLIPSIZE_END)
614
self.committer.set_alignment(0.0, 0.5)
601
615
self.committer.set_selectable(True)
602
align.add(self.committer)
603
self.table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
604
align.show()
616
self.table.attach(self.committer, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
605
617
self.committer.show()
606
618
607
align = gtk.Alignment(0.0, 0.5)
619
row += 1
608
620
label = gtk.Label()
621
label.set_alignment(1.0, 0.5)
609
622
label.set_markup("<b>Branch nick:</b>")
610
align.add(label)
611
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)
612
624
label.show()
613
align.show()
614
625
615
align = gtk.Alignment(0.0, 0.5)
616
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)
617
629
self.branchnick_label.set_selectable(True)
618
align.add(self.branchnick_label)
619
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)
620
631
self.branchnick_label.show()
621
align.show()
622
632
623
align = gtk.Alignment(1.0, 0.5)
633
row += 1
624
634
label = gtk.Label()
635
label.set_alignment(1.0, 0.5)
625
636
label.set_markup("<b>Timestamp:</b>")
626
align.add(label)
627
self.table.attach(align, 0, 1, 4, 5, gtk.FILL, gtk.FILL)
628
align.show()
637
self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
629
638
label.show()
630
639
631
align = gtk.Alignment(0.0, 0.5)
632
640
self.timestamp = gtk.Label()
641
self.timestamp.set_ellipsize(pango.ELLIPSIZE_END)
642
self.timestamp.set_alignment(0.0, 0.5)
633
643
self.timestamp.set_selectable(True)
634
align.add(self.timestamp)
635
self.table.attach(align, 1, 2, 4, 5, gtk.EXPAND | gtk.FILL, gtk.FILL)
636
align.show()
644
self.table.attach(self.timestamp, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
637
645
self.timestamp.show()
638
646
639
align = gtk.Alignment(1.0, 0.5)
647
row += 1
640
648
self.tags_label = gtk.Label()
649
self.tags_label.set_alignment(1.0, 0.5)
641
650
self.tags_label.set_markup("<b>Tags:</b>")
642
align.add(self.tags_label)
643
align.show()
644
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)
645
652
self.tags_label.show()
646
653
647
align = gtk.Alignment(0.0, 0.5)
648
654
self.tags_list = gtk.Label()
649
align.add(self.tags_list)
650
self.table.attach(align, 1, 2, 5, 6, gtk.EXPAND | gtk.FILL, gtk.FILL)
651
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)
652
658
self.tags_list.show()
653
659
654
660
self.connect('notify::revision', self._add_tags)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0