set/k7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix status report.

Browse Source 
Key, uid and signature status well all comparedtot IsBad(), copy/paste
woes.
Show also if key is secret.
This commit is contained in:
SET
2020-11-06 17:08:22 +01:00
parent 2ba2aadcd8
commit 9f98859099
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Tools.cpp
View File

@@ -50,11 +50,12 @@ WString Tools::GetKeyStatus(const GpgME::Key& k)
status += WString(" "); status += WString(" ");
status += WString(k.keyID()) + WString(" :") + nl + nl; status += WString(k.keyID()) + WString(" :") + nl + nl;
status += WString(WString::tr("KeyStatusIsBad")) + sep + TexttualBool(k.isBad()) + nl; status += WString(WString::tr("KeyStatusIsBad")) + sep + TexttualBool(k.isBad()) + nl;
status += WString(WString::tr("KeyStatusIsNull")) + sep + TexttualBool(k.isBad()) + nl; status += WString(WString::tr("KeyStatusIsNull")) + sep + TexttualBool(k.isNull()) + nl;
status += WString(WString::tr("KeyStatusIsInvalid")) + sep + TexttualBool(k.isBad()) + nl; status += WString(WString::tr("KeyStatusIsInvalid")) + sep + TexttualBool(k.isInvalid()) + nl;
status += WString(WString::tr("KeyStatusIsDisabled")) + sep + TexttualBool(k.isBad()) + nl; status += WString(WString::tr("KeyStatusIsDisabled")) + sep + TexttualBool(k.isDisabled()) + nl;
status += WString(WString::tr("KeyStatusIsExpired")) + sep + TexttualBool(k.isBad()) + nl; status += WString(WString::tr("KeyStatusIsExpired")) + sep + TexttualBool(k.isExpired()) + nl;
status += WString(WString::tr("KeyStatusIsRevoked")) + sep + TexttualBool(k.isBad()); status += WString(WString::tr("KeyStatusIsRevoked")) + sep + TexttualBool(k.isRevoked()) + nl + nl;
status += WString(WString::tr("KeyTypeIsSecret")) + sep + TexttualBool(k.isSecret());
return status; return status;
} }
@@ -66,9 +67,9 @@ WString Tools::GetUidStatus(const GpgME::UserID& uid)
WString status(WString::tr("UserStatus")); WString status(WString::tr("UserStatus"));
status += WString(" :") + nl + nl; status += WString(" :") + nl + nl;
status += WString(WString::tr("UserStatusIsBad")) + sep + TexttualBool(uid.isBad()) + nl; status += WString(WString::tr("UserStatusIsBad")) + sep + TexttualBool(uid.isBad()) + nl;
status += WString(WString::tr("UserStatusIsNull")) + sep + TexttualBool(uid.isBad()) + nl; status += WString(WString::tr("UserStatusIsNull")) + sep + TexttualBool(uid.isNull()) + nl;
status += WString(WString::tr("UserStatusIsInvalid")) + sep + TexttualBool(uid.isBad()) + nl; status += WString(WString::tr("UserStatusIsInvalid")) + sep + TexttualBool(uid.isInvalid()) + nl;
status += WString(WString::tr("UserStatusIsRevoked")) + sep + TexttualBool(uid.isBad()); status += WString(WString::tr("UserStatusIsRevoked")) + sep + TexttualBool(uid.isRevoked());
return status; return status;
} }
@@ -80,11 +81,11 @@ WString Tools::GetSigStatus(const GpgME::UserID::Signature& sig)
WString status(WString::tr("SigStatus")); WString status(WString::tr("SigStatus"));
status += WString(" :") + nl + nl; status += WString(" :") + nl + nl;
status += WString(WString::tr("SigStatusIsBad")) + sep + TexttualBool(sig.isBad()) + nl; status += WString(WString::tr("SigStatusIsBad")) + sep + TexttualBool(sig.isBad()) + nl;
status += WString(WString::tr("SigStatusIsNull")) + sep + TexttualBool(sig.isBad()) + nl; status += WString(WString::tr("SigStatusIsNull")) + sep + TexttualBool(sig.isNull()) + nl;
status += WString(WString::tr("SigStatusIsInvalid")) + sep + TexttualBool(sig.isBad()) + nl; status += WString(WString::tr("SigStatusIsInvalid")) + sep + TexttualBool(sig.isInvalid()) + nl;
status += WString(WString::tr("SigStatusIsExportable")) + sep + TexttualBool(sig.isBad()) + nl; status += WString(WString::tr("SigStatusIsExportable")) + sep + TexttualBool(sig.isExportable()) + nl;
status += WString(WString::tr("SigStatusIsExpired")) + sep + TexttualBool(sig.isBad()) + nl; status += WString(WString::tr("SigStatusIsExpired")) + sep + TexttualBool(sig.isExpired()) + nl;
status += WString(WString::tr("SigStatusIsRevokation")) + sep + TexttualBool(sig.isBad()); status += WString(WString::tr("SigStatusIsRevokation")) + sep + TexttualBool(sig.isRevokation());
return status; return status;
} }

3
WTAPPROOT/K7/K7.xml
View File

@@ -89,6 +89,7 @@
<message id='KeyStatusIsDisabled'>Disabled</message> <message id='KeyStatusIsDisabled'>Disabled</message>
<message id='KeyStatusIsExpired'>Expired</message> <message id='KeyStatusIsExpired'>Expired</message>
<message id='KeyStatusIsRevoked'>Revoked</message> <message id='KeyStatusIsRevoked'>Revoked</message>
<message id='KeyTypeIsSecret'>Secret</message>
<message id='UserStatus'>User status</message> <message id='UserStatus'>User status</message>
<message id='UserStatusIsBad'>Bad</message> <message id='UserStatusIsBad'>Bad</message>
@@ -102,6 +103,6 @@
<message id='SigStatusIsInvalid'>Invalid</message> <message id='SigStatusIsInvalid'>Invalid</message>
<message id='SigStatusIsExportable'>Exportable</message> <message id='SigStatusIsExportable'>Exportable</message>
<message id='SigStatusIsExpired'>Expired</message> <message id='SigStatusIsExpired'>Expired</message>
<message id='SigStatusIsRevokation'>Revokation</message> <message id='SigStatusIsRevokation'>Revocation</message>
</messages> </messages>

1
WTAPPROOT/K7/K7_fr.xml
View File

@@ -89,6 +89,7 @@
<message id='KeyStatusIsDisabled'>Désactivé</message> <message id='KeyStatusIsDisabled'>Désactivé</message>
<message id='KeyStatusIsExpired'>Expiré</message> <message id='KeyStatusIsExpired'>Expiré</message>
<message id='KeyStatusIsRevoked'>Revoqué</message> <message id='KeyStatusIsRevoked'>Revoqué</message>
<message id='KeyTypeIsSecret'>Secret</message>
<message id='UserStatus'>État de l'utilisateur</message> <message id='UserStatus'>État de l'utilisateur</message>
<message id='UserStatusIsBad'>Mauvais</message> <message id='UserStatusIsBad'>Mauvais</message>