Rev 415: Move logic showing images to the SignatureTab widget. in file:///data/jelmer/bzr-gtk/signatures/

Jelmer Vernooij jelmer at samba.org
Sun Mar 30 16:40:30 BST 2008


At file:///data/jelmer/bzr-gtk/signatures/

------------------------------------------------------------
revno: 415
revision-id: jelmer at samba.org-20080330154016-cu5xcv6a5er7e92x
parent: jelmer at samba.org-20080330153426-yivyja2p89rh2200
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: signatures
timestamp: Sun 2008-03-30 17:40:16 +0200
message:
  Move logic showing images to the SignatureTab widget.
modified:
  revisionview.py                logview.py-20051024072750-4d5c28cb73611027
=== modified file 'revisionview.py'
--- a/revisionview.py	2008-03-30 15:34:26 +0000
+++ b/revisionview.py	2008-03-30 15:40:16 +0000
@@ -89,6 +89,25 @@
         self.pack_start(signature_info, expand=False)
         self.show_all()
 
+    def show_no_signature(self):
+        self.signature_key_id.set_text("")
+        self.signature_image.set_from_file("icons/sign-unknown.png")
+        self.signature_label.set_text("This revision has not been signed.")
+
+    def show_signature(self, text):
+        signature = self.gpg.verify(text)
+
+        if signature.key_id is not None:
+            self.signature_key_id.set_text(signature.key_id)
+
+        if signature.is_valid():
+            self.signature_image.set_from_file("icons/sign-ok.png")
+            self.signature_label.set_text("This revision has been signed.")
+        else:
+            self.signature_image.set_from_file("icons/sign-bad.png")
+            self.signature_label.set_text("This revision has been signed, " + 
+                    "but the authenticity of the signature cannot be verified.")
+
 
 class RevisionView(gtk.Notebook):
     """ Custom widget for commit log details.
@@ -264,22 +283,9 @@
 
         if self._branch.repository.has_signature_for_revision_id(revid):
             signature_text = self._branch.repository.get_signature_text(revid)
-            signature = self.signature_table.gpg.verify(signature_text)
-
-            if signature.key_id is not None:
-                self.signature_key_id.set_text(signature.key_id)
-
-            if signature.is_valid():
-                self.signature_image.set_from_file("icons/sign-ok.png")
-                self.signature_label.set_text("This revision has been signed.")
-            else:
-                self.signature_image.set_from_file("icons/sign-bad.png")
-                self.signature_label.set_text("This revision has been signed, " + 
-                        "but the authenticity of the signature cannot be verified.")
+            self.signature_table.show_signature(signature_text)
         else:
-            self.signature_key_id.set_text("")
-            self.signature_image.set_from_file("icons/sign-unknown.png")
-            self.signature_label.set_text("This revision has not been signed.")
+            self.signature_table.show_no_signature()
 
     def set_children(self, children):
         self._add_parents_or_children(children,




More information about the bazaar-commits mailing list