matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update signature states to use new Icon class

Browse Source
This commit is contained in:
Roberto Rosario
2012-09-16 03:57:08 -04:00
parent 6f585a2836
commit 0d382a7dd8
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/django_gpg/api.py
View File

@@ -17,6 +17,8 @@ import gnupg
from .exceptions import (GPGVerificationError, GPGSigningError,
GPGDecryptionError, KeyDeleteError, KeyGenerationError,
KeyFetchingError, KeyDoesNotExist, KeyImportError)
from .icons import (icon_bad_signature, icon_no_signature, icon_signature_error,
icon_no_public_key, icon_good_signature, icon_valid_signature)
logger = logging.getLogger(__name__)
@@ -51,27 +53,27 @@ SIGNATURE_STATE_VALID = 'signature valid'
SIGNATURE_STATES = {
SIGNATURE_STATE_BAD: {
'text': _(u'Bad signature.'),
'icon': 'cross.png'
'icon': icon_bad_signature
},
SIGNATURE_STATE_NONE: {
'text': _(u'Document not signed or invalid signature.'),
'icon': 'cross.png'
'icon': icon_no_signature
},
SIGNATURE_STATE_ERROR: {
'text': _(u'Signature error.'),
'icon': 'cross.png'
'icon': icon_signature_error
},
SIGNATURE_STATE_NO_PUBLIC_KEY: {
'text': _(u'Document is signed but no public key is available for verification.'),
'icon': 'user_silhouette.png'
'icon': icon_no_public_key
},
SIGNATURE_STATE_GOOD: {
'text': _(u'Document is signed, and signature is good.'),
'icon': 'document_signature.png'
'icon': icon_good_signature
},
SIGNATURE_STATE_VALID: {
'text': _(u'Document is signed with a valid signature.'),
'icon': 'document_signature.png'
'icon': icon_valid_signature
},
}

9
apps/django_gpg/icons.py
View File

@@ -1,7 +1,7 @@
from __future__ import absolute_import
from icons.literals import (DOCUMENT_SIGNATURE, KEY, KEY_DELETE, KEY_ADD,
ZOOM, LIGHTNING)
ZOOM, LIGHTNING, CROSS, USER_SILHOUETTE)
from icons import Icon
icon_private_keys = Icon(KEY)
@@ -11,3 +11,10 @@ icon_key_query = Icon(ZOOM)
icon_key_receive = Icon(KEY_ADD)
icon_key_setup = Icon(KEY)
icon_document_signature = Icon(DOCUMENT_SIGNATURE)
icon_bad_signature = Icon(CROSS)
icon_no_signature = Icon(CROSS)
icon_signature_error = Icon(CROSS)
icon_no_public_key = Icon(USER_SILHOUETTE)
icon_good_signature = Icon(DOCUMENT_SIGNATURE)
icon_valid_signature = Icon(DOCUMENT_SIGNATURE)