From c9defdc02a64e15b8e901d10ac0cd156949b2074 Mon Sep 17 00:00:00 2001
From: SET <nmset@yandex.com>
Date: Sun, 22 Nov 2020 22:36:41 +0100
Subject: [PATCH] Apply some CSS makeup.

Bad keys, subkeys, identities and signatures are tagged in red.
A secret key not owned by the user is shown in bold.
Application name is bold and bigger.
Popup background color is changed to floralwhite.
---
 K7Main.cpp          | 16 ++++++++++++++--
 WTAPPROOT/K7/K7.css | 12 +++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/K7Main.cpp b/K7Main.cpp
index 502d383..6ca86eb 100644
--- a/K7Main.cpp
+++ b/K7Main.cpp
@@ -83,7 +83,9 @@ K7Main::Create()
     WContainerWidget * cwHeader = new WContainerWidget();
     WHBoxLayout * hblHeader = new WHBoxLayout();
     cwHeader->setLayout(unique_ptr<WHBoxLayout> (hblHeader));
-    hblHeader->addWidget(cpp14::make_unique<WText>(_APPNAME_));
+    WText * lblTitle =
+            hblHeader->addWidget(cpp14::make_unique<WText>(_APPNAME_));
+    lblTitle->setStyleClass("title");
     // Error messages will go here
     m_tmwMessage = new TransientMessageWidget();
     m_tmwMessage->setTextAlignment(AlignmentFlag::Right);
@@ -294,6 +296,10 @@ void K7Main::DisplayKeys(const vector<GpgME::Key>& kList, const WString& grpLabe
         }
         keyNode->setColumnWidget(2, unique_ptr<WText> (lblOwnerTrust));
         TreeTableNodeText * ttntFpr = new TreeTableNodeText(k.primaryFingerprint(), keyNode, 3);
+        if (k.isBad())
+            ttntFpr->addStyleClass("red", true);
+        if (!k.hasSecret() && Tools::KeyHasSecret(k.primaryFingerprint()))
+            ttntFpr->addStyleClass("bold", true);
         keyNode->setColumnWidget(3, unique_ptr<TreeTableNodeText> (ttntFpr));
         grpNode->addChildNode(unique_ptr<WTreeTableNode> (keyNode));
     }
@@ -355,6 +361,8 @@ void K7Main::DisplayUids(const WString& fullKeyID, bool secret)
             lblUidEmail->setToolTip(TR("TTTDoubleCLick"));
             lblUidEmail->doubleClicked().connect(std::bind(&KeyEdit::OnUidEmailClicked, m_keyEdit, uidNode, WString(k.primaryFingerprint())));
         }
+        if (uid.isBad())
+            lblUidEmail->setStyleClass("red");
         uidNode->setColumnWidget(1, unique_ptr<WText> (lblUidEmail));
         // Show key certify popup on double click
         WText * lblUidValidity = new WText(UidValidities[uid.validity()]);
@@ -376,6 +384,8 @@ void K7Main::DisplayUids(const WString& fullKeyID, bool secret)
             WTreeTableNode * sigNode = new WTreeTableNode(signer);
             sigNode->setToolTip(Tools::GetSigStatus(sig));
             TreeTableNodeText * ttntEmail = new TreeTableNodeText(sig.signerEmail(), sigNode, 1);
+            if (sig.isBad())
+                ttntEmail->addStyleClass("red", true);
             sigNode->setColumnWidget(1, unique_ptr<TreeTableNodeText> (ttntEmail));
             WString exp = TR("Expiration") + _SPACE_ + _COLON_ + _SPACE_;
             exp += sig.neverExpires() ? TR("Never") : MakeDateTimeLabel(sig.expirationTime());
@@ -422,6 +432,8 @@ void K7Main::DisplaySubKeys(const WString& fullKeyID, bool secret)
         WTreeTableNode * skNode = new WTreeTableNode(sk.keyID());
         skNode->setToolTip(Tools::GetKeyStatus(k));
         TreeTableNodeText * ttntFpr = new TreeTableNodeText(sk.fingerprint(), skNode, 1);
+        if (sk.isBad())
+            ttntFpr->setStyleClass("red");
         skNode->setColumnWidget(1, unique_ptr<TreeTableNodeText> (ttntFpr));
         WString exp = sk.neverExpires() ? TR("Never") : MakeDateTimeLabel(sk.expirationTime());
         WText * lblExpiry = new WText(exp);
@@ -429,7 +441,7 @@ void K7Main::DisplaySubKeys(const WString& fullKeyID, bool secret)
         {
             lblExpiry->setToolTip(TR("TTTDoubleCLick"));
             lblExpiry->doubleClicked().connect(std::bind(&KeyEdit::OnExpiryClicked,
-                                                         m_keyEdit, skNode, 
+                                                         m_keyEdit, skNode,
                                                          WString(k.primaryFingerprint()),
                                                          WString(sk.fingerprint())));
         }
diff --git a/WTAPPROOT/K7/K7.css b/WTAPPROOT/K7/K7.css
index 2e289cf..c7d6113 100644
--- a/WTAPPROOT/K7/K7.css
+++ b/WTAPPROOT/K7/K7.css
@@ -6,5 +6,15 @@
  *  are all 0.
 */
 div.popup {
-    background-color: lavender;
+    background-color: floralwhite;
 } 
+div.red {
+    color: red;
+}
+div.bold {
+    font-weight: bold;
+}
+span.title {
+    font-size: 125%;
+    font-weight: bold;
+}