diff --git a/K7Main.cpp b/K7Main.cpp index ab52862..7a61e4b 100644 --- a/K7Main.cpp +++ b/K7Main.cpp @@ -389,6 +389,7 @@ void K7Main::DisplaySubKeys(const WString& fullKeyID, bool secret) m_ttbSubKeys->addColumn(TR("Expiration"), 150); m_ttbSubKeys->addColumn(TR("Usage"), 70); m_ttbSubKeys->addColumn(TR("Secret"), 50); + m_ttbSubKeys->addColumn(TR("Algorithms"), 50); } WTreeTableNode * rootNode = new WTreeTableNode(fullKeyID); rootNode->setChildCountPolicy(ChildCountPolicy::Enabled); @@ -420,6 +421,9 @@ void K7Main::DisplaySubKeys(const WString& fullKeyID, bool secret) skNode->setColumnWidget(3, cpp14::make_unique (usage)); const WString isSecret = sk.isSecret() ? TR("Yes") : TR("No"); skNode->setColumnWidget(4, cpp14::make_unique (isSecret)); + const WString algos = sk.publicKeyAlgorithmAsString() + _SPACE_ + _DASH_ + + _SPACE_ + sk.algoName(); + skNode->setColumnWidget(5, cpp14::make_unique (algos)); rootNode->addChildNode(unique_ptr (skNode)); } m_ttbSubKeys->show(); diff --git a/Tools.cpp b/Tools.cpp index 4fa4f67..b4d5466 100644 --- a/Tools.cpp +++ b/Tools.cpp @@ -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("SigStatusIsExportable")) + sep + TexttualBool(sig.isExportable()) + 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; } diff --git a/WTAPPROOT/K7/K7.xml b/WTAPPROOT/K7/K7.xml index 55907b0..d6f53bd 100644 --- a/WTAPPROOT/K7/K7.xml +++ b/WTAPPROOT/K7/K7.xml @@ -54,6 +54,8 @@ Subkeys IDs Usage + Algorithm + Algorithms Yes No diff --git a/WTAPPROOT/K7/K7_fr.xml b/WTAPPROOT/K7/K7_fr.xml index e7bb674..b01c13b 100644 --- a/WTAPPROOT/K7/K7_fr.xml +++ b/WTAPPROOT/K7/K7_fr.xml @@ -54,6 +54,8 @@ Sous-clés IDs Utilisation + Algorithme + Algorithmes Oui Non diff --git a/global.h b/global.h index 3ea4306..87fb2b1 100644 --- a/global.h +++ b/global.h @@ -20,6 +20,7 @@ const WString _APPNAME_("K7"); const WString _APPVERSION_("2"); const WString _SPACE_(" "); const WString _COLON_(":"); +const WString _DASH_("-"); const WString _BRACKET_OPEN_("("); const WString _BRACKET_CLOSE_(")"); const WString _ANGLE_BRACKET_OPEN_("<");