Show subkey and certification algorithms.

Subkey algorithms are shown in a new table column.
Uid signature algorithms are shown in the tooltip text.
This commit is contained in:
SET
2020-11-14 15:03:36 +01:00
parent a721bb0225
commit 5e7df13df0
5 changed files with 11 additions and 1 deletions

View File

@@ -389,6 +389,7 @@ void K7Main::DisplaySubKeys(const WString& fullKeyID, bool secret)
m_ttbSubKeys->addColumn(TR("Expiration"), 150); m_ttbSubKeys->addColumn(TR("Expiration"), 150);
m_ttbSubKeys->addColumn(TR("Usage"), 70); m_ttbSubKeys->addColumn(TR("Usage"), 70);
m_ttbSubKeys->addColumn(TR("Secret"), 50); m_ttbSubKeys->addColumn(TR("Secret"), 50);
m_ttbSubKeys->addColumn(TR("Algorithms"), 50);
} }
WTreeTableNode * rootNode = new WTreeTableNode(fullKeyID); WTreeTableNode * rootNode = new WTreeTableNode(fullKeyID);
rootNode->setChildCountPolicy(ChildCountPolicy::Enabled); rootNode->setChildCountPolicy(ChildCountPolicy::Enabled);
@@ -420,6 +421,9 @@ void K7Main::DisplaySubKeys(const WString& fullKeyID, bool secret)
skNode->setColumnWidget(3, cpp14::make_unique<WText> (usage)); skNode->setColumnWidget(3, cpp14::make_unique<WText> (usage));
const WString isSecret = sk.isSecret() ? TR("Yes") : TR("No"); const WString isSecret = sk.isSecret() ? TR("Yes") : TR("No");
skNode->setColumnWidget(4, cpp14::make_unique<WText> (isSecret)); skNode->setColumnWidget(4, cpp14::make_unique<WText> (isSecret));
const WString algos = sk.publicKeyAlgorithmAsString() + _SPACE_ + _DASH_
+ _SPACE_ + sk.algoName();
skNode->setColumnWidget(5, cpp14::make_unique<WText> (algos));
rootNode->addChildNode(unique_ptr<WTreeTableNode> (skNode)); rootNode->addChildNode(unique_ptr<WTreeTableNode> (skNode));
} }
m_ttbSubKeys->show(); m_ttbSubKeys->show();

View File

@@ -88,7 +88,8 @@ WString Tools::GetSigStatus(const GpgME::UserID::Signature& sig)
status += WString(WString::tr("SigStatusIsInvalid")) + sep + TexttualBool(sig.isInvalid()) + nl; status += WString(WString::tr("SigStatusIsInvalid")) + sep + TexttualBool(sig.isInvalid()) + nl;
status += WString(WString::tr("SigStatusIsExportable")) + sep + TexttualBool(sig.isExportable()) + nl; status += WString(WString::tr("SigStatusIsExportable")) + sep + TexttualBool(sig.isExportable()) + nl;
status += WString(WString::tr("SigStatusIsExpired")) + sep + TexttualBool(sig.isExpired()) + nl; status += WString(WString::tr("SigStatusIsExpired")) + sep + TexttualBool(sig.isExpired()) + nl;
status += WString(WString::tr("SigStatusIsRevokation")) + sep + TexttualBool(sig.isRevokation()); status += WString(WString::tr("SigStatusIsRevokation")) + sep + TexttualBool(sig.isRevokation()) + nl;
status += WString(WString::tr("Algorithm")) + sep + WString(sig.algorithmAsString());
return status; return status;
} }

View File

@@ -54,6 +54,8 @@
<message id='SubKeys'>Subkeys</message> <message id='SubKeys'>Subkeys</message>
<message id='Ids'>IDs</message> <message id='Ids'>IDs</message>
<message id='Usage'>Usage</message> <message id='Usage'>Usage</message>
<message id='Algorithm'>Algorithm</message>
<message id='Algorithms'>Algorithms</message>
<message id='Yes'>Yes</message> <message id='Yes'>Yes</message>
<message id='No'>No</message> <message id='No'>No</message>

View File

@@ -54,6 +54,8 @@
<message id='SubKeys'>Sous-clés</message> <message id='SubKeys'>Sous-clés</message>
<message id='Ids'>IDs</message> <message id='Ids'>IDs</message>
<message id='Usage'>Utilisation</message> <message id='Usage'>Utilisation</message>
<message id='Algorithm'>Algorithme</message>
<message id='Algorithms'>Algorithmes</message>
<message id='Yes'>Oui</message> <message id='Yes'>Oui</message>
<message id='No'>Non</message> <message id='No'>Non</message>

View File

@@ -20,6 +20,7 @@ const WString _APPNAME_("K7");
const WString _APPVERSION_("2"); const WString _APPVERSION_("2");
const WString _SPACE_(" "); const WString _SPACE_(" ");
const WString _COLON_(":"); const WString _COLON_(":");
const WString _DASH_("-");
const WString _BRACKET_OPEN_("("); const WString _BRACKET_OPEN_("(");
const WString _BRACKET_CLOSE_(")"); const WString _BRACKET_CLOSE_(")");
const WString _ANGLE_BRACKET_OPEN_("<"); const WString _ANGLE_BRACKET_OPEN_("<");