[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kgpg2
From:       Rolf Eike Beer <kde () opensource ! sf-tec ! de>
Date:       2008-01-15 23:56:49
Message-ID: 1200441409.578173.16352.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 762049 by dakon:

Improve printing of uid name and comment


 M  +2 -4      keysmanager.cpp  
 M  +9 -0      kgpgitemnode.cpp  
 M  +1 -0      kgpgitemnode.h  


--- branches/work/kgpg2/keysmanager.cpp #762048:762049
@@ -1945,13 +1945,11 @@
     QString parentMail;
 
     signID = nd->getId();
-    parentMail = parent->getName() + " (" + parent->getEmail() + ')';
-    signMail = nd->getName() + " (" + nd->getEmail() + ')';
+    parentMail = parent->getNameComment();
+    signMail = nd->getNameComment();
 
-    parentMail = parent->getName();
     if (!parent->getEmail().isEmpty())
        parentMail += " &lt;" + parent->getEmail() + "&gt;";
-    signMail = keysList2->currentItem()->text(0);
     if (!nd->getEmail().isEmpty())
        signMail += " &lt;" + nd->getEmail() + "&gt;";
 
--- branches/work/kgpg2/kgpgitemnode.cpp #762048:762049
@@ -24,6 +24,15 @@
 		m_parent->deleteChild(this);
 }
 
+QString
+KGpgNode::getNameComment() const
+{
+	if (getComment().isEmpty())
+		return getName();
+	else
+		return i18nc("Name of uid (comment)", "%1 (%2)", getName(), getComment());
+}
+
 KGpgExpandableNode::KGpgExpandableNode(KGpgExpandableNode *parent)
 	: KGpgNode(parent)
 {
--- branches/work/kgpg2/kgpgitemnode.h #762048:762049
@@ -57,6 +57,7 @@
 		{ return QString(); }
 	virtual QString getComment() const
 		{ return QString(); }
+	virtual QString getNameComment() const;
 	KGpgExpandableNode *getParentKeyNode() const
 		{ return m_parent; }
 };
[prev in list] [next in list] [prev in thread] [next in thread]