diff --git a/K7Main.cpp b/K7Main.cpp index 2475049..51381b4 100644 --- a/K7Main.cpp +++ b/K7Main.cpp @@ -47,6 +47,13 @@ K7Main::K7Main(const WEnvironment& env) UidValidities[UserID::Validity::Ultimate] = TR("UidUltimate"); UidValidities[UserID::Validity::Undefined] = TR("UidUndefined"); UidValidities[UserID::Validity::Unknown] = TR("UidUnknown"); + + OwnerTrustLevel[GpgME::Key::OwnerTrust::Full] = TR("UidFull"); + OwnerTrustLevel[GpgME::Key::OwnerTrust::Marginal] = TR("UidMarginal"); + OwnerTrustLevel[GpgME::Key::OwnerTrust::Never] = TR("UidNever"); + OwnerTrustLevel[GpgME::Key::OwnerTrust::Ultimate] = TR("UidUltimate"); + OwnerTrustLevel[GpgME::Key::OwnerTrust::Undefined] = TR("UidUndefined"); + OwnerTrustLevel[GpgME::Key::OwnerTrust::Unknown] = TR("UidUnknown"); m_uploader = NULL; m_deleter = NULL; } @@ -202,6 +209,7 @@ void K7Main::Search() if (m_ttbKeys->columnCount() == 1) { m_ttbKeys->addColumn(TR("ID"), 120); + m_ttbKeys->addColumn(TR("OwnerTrust"), 210); m_ttbKeys->addColumn(TR("Fpr"), 300); } // The previous tree root is auto deleted by the use of smart pointers !! @@ -247,7 +255,8 @@ void K7Main::DisplayKeys(const vector& kList, const WString& grpLabe anc->setAttributeValue("hasSecret", k.hasSecret() ? "1" : "0"); anc->clicked().connect(std::bind(&K7Main::OnKeyAnchorClicked, this, anc)); keyNode->setColumnWidget(1, unique_ptr (anc)); - keyNode->setColumnWidget(2, cpp14::make_unique (k.primaryFingerprint())); + keyNode->setColumnWidget(2, cpp14::make_unique (OwnerTrustLevel[k.ownerTrust()])); + keyNode->setColumnWidget(3, cpp14::make_unique (k.primaryFingerprint())); grpNode->addChildNode(unique_ptr (keyNode)); } if (expand) diff --git a/K7Main.h b/K7Main.h index 2355a0b..373e00c 100644 --- a/K7Main.h +++ b/K7Main.h @@ -41,6 +41,8 @@ private: */ typedef map UidValidityMap; UidValidityMap UidValidities; + typedef map OwnerTrustMap; + OwnerTrustMap OwnerTrustLevel; AppConfig * m_config; WGridLayout * m_grlMain; WContainerWidget * m_cwMain; diff --git a/WTAPPROOT/K7/K7.xml b/WTAPPROOT/K7/K7.xml index 16e24ba..698cb5e 100644 --- a/WTAPPROOT/K7/K7.xml +++ b/WTAPPROOT/K7/K7.xml @@ -29,6 +29,7 @@ Secret Secret Fingerprint + Certification trust ID User ID diff --git a/WTAPPROOT/K7/K7_fr.xml b/WTAPPROOT/K7/K7_fr.xml index 282e907..6f0ef8c 100644 --- a/WTAPPROOT/K7/K7_fr.xml +++ b/WTAPPROOT/K7/K7_fr.xml @@ -29,6 +29,7 @@ Secrète Secrètes Empreinte + Confiance dans la certification Identifiant Identifiant utilisateur diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 6d7f00e..a277f02 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -7,7 +7,10 @@ + file:/home/user/Documents/published/K7/WTAPPROOT/K7/K7_fr.xml file:/home/user/Documents/published/K7/K7Main.cpp + file:/home/user/Documents/published/K7/K7Main.h + file:/home/user/Documents/published/K7/WTAPPROOT/K7/K7.xml