From 6e6c6ba937e311dec41766f1c81c26e5354ceb28 Mon Sep 17 00:00:00 2001
From: nils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>
Date: Thu, 6 Oct 2011 18:34:13 +0000
Subject: added list for signinginformation and minor bugfix

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@540 34ebc366-c3a9-4b3c-9f84-69acf7962910
---
 TODO                               |  5 +++--
 context.h                          | 13 +++++++++++++
 gpg4usb_class_dependencies.graphml | 37 ++++++++++++-------------------------
 gpgwin.h                           |  9 +++------
 keymgmt.cpp                        |  2 +-
 5 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/TODO b/TODO
index 4ac3548..5bcec96 100644
--- a/TODO
+++ b/TODO
@@ -18,8 +18,9 @@ Release 0.3.1
 - keydetailsdialog should have a parent [DONE]
 - Verifynotification margin left [DONE]
 - remove doubled functions (e.g. beautifyfingerprint and keymgmt functions like import)
-- take care of warnings in compiling
-- also export public key on export of private key
+- take care of warnings in compiling [DONE]
+- export public key on export of private key too
+- put keydetails to keylist
 
 BUGS: 
 - Sometimes two or more stars are shown at modified documents
diff --git a/context.h b/context.h
index e15eabb..3b834e4 100644
--- a/context.h
+++ b/context.h
@@ -51,6 +51,19 @@ public:
 
 typedef QLinkedList< GpgKey > GpgKeyList;
 
+class GpgSignature
+{
+public:
+    QString fpr;
+    QString name;
+    QString email;
+    gpgme_error_t signStatusCode;
+    QString signStatusString;
+    bool presentInKeyList;
+};
+
+typedef QLinkedList< GpgSignature > GpgSignatureList;
+
 namespace GpgME
 {
 
diff --git a/gpg4usb_class_dependencies.graphml b/gpg4usb_class_dependencies.graphml
index f35460d..8d815fb 100644
--- a/gpg4usb_class_dependencies.graphml
+++ b/gpg4usb_class_dependencies.graphml
@@ -333,20 +333,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e10" source="n17" target="n2">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="15.0" tx="-60.0" ty="-15.0">
-            <y:Point x="447.0" y="380.0"/>
-            <y:Point x="670.5" y="380.0"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="standard"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e11" source="n13" target="n3">
+    <edge id="e10" source="n13" target="n3">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="-31.25" sy="15.0" tx="0.0" ty="-15.0">
@@ -359,7 +346,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e12" source="n13" target="n17">
+    <edge id="e11" source="n13" target="n17">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="31.25" sy="15.0" tx="0.0" ty="-15.0"/>
@@ -369,7 +356,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e13" source="n14" target="n15">
+    <edge id="e12" source="n14" target="n15">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="0.0" sy="15.0" tx="0.0" ty="-15.0"/>
@@ -379,7 +366,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e14" source="n15" target="n8">
+    <edge id="e13" source="n15" target="n8">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="35.25" sy="15.0" tx="38.625" ty="-15.0">
@@ -392,7 +379,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e15" source="n15" target="n10">
+    <edge id="e14" source="n15" target="n10">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="-35.25" sy="15.0" tx="39.75" ty="-15.0">
@@ -405,7 +392,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e16" source="n16" target="n14">
+    <edge id="e15" source="n16" target="n14">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="0.0" sy="15.0" tx="0.0" ty="-15.0"/>
@@ -415,7 +402,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e17" source="n5" target="n0">
+    <edge id="e16" source="n5" target="n0">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="-62.5" sy="15.0" tx="0.0" ty="-15.0">
@@ -428,7 +415,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e18" source="n5" target="n9">
+    <edge id="e17" source="n5" target="n9">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="12.5" sy="15.0" tx="0.0" ty="-15.0">
@@ -441,7 +428,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e19" source="n5" target="n13">
+    <edge id="e18" source="n5" target="n13">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="-37.5" sy="15.0" tx="0.0" ty="-15.0">
@@ -454,7 +441,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e20" source="n5" target="n4">
+    <edge id="e19" source="n5" target="n4">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="-12.5" sy="15.0" tx="0.0" ty="-15.0">
@@ -467,7 +454,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e21" source="n5" target="n12">
+    <edge id="e20" source="n5" target="n12">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="62.5" sy="15.0" tx="0.0" ty="-15.0">
@@ -480,7 +467,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e22" source="n5" target="n16">
+    <edge id="e21" source="n5" target="n16">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="37.5" sy="15.0" tx="0.0" ty="-15.0">
diff --git a/gpgwin.h b/gpgwin.h
index a155391..8d77936 100644
--- a/gpgwin.h
+++ b/gpgwin.h
@@ -101,6 +101,8 @@ private slots:
      */
     void verify();
 
+    void showKeyDetails();
+
     /**
      * @details Import keys from currently active tab to keylist if possible.
      */
@@ -122,11 +124,6 @@ private slots:
      */
     void copyMailAddressToClipboard();
 
-    /**
-     * @details Show detail-dialog for selected key.
-     */
-    void showKeyDetails();
-
     /**
      * @details Open key management dialog.
      */
@@ -270,7 +267,6 @@ private:
 
     QAction *appendSelectedKeysAct; /**< TODO */
     QAction *copyMailAddressToClipboardAct; /**< TODO */
-    QAction *showKeyDetailsAct; /**< TODO */
     QAction *openKeyManagementAct; /**< TODO */
     QAction *copyAct; /**< TODO */
     QAction *quoteAct; /**< TODO */
@@ -284,6 +280,7 @@ private:
     QAction *openSettingsAct; /**< TODO */
     QAction *openTranslateAct; /**< TODO */
     QAction *openTutorialAct; /**< TODO */
+    QAction *showKeyDetailsAct; /** < TODO */
     QLineEdit *nameEdit; /**< TODO */
     QLineEdit *emailEdit; /**< TODO */
     QLineEdit *commentEdit; /**< TODO */
diff --git a/keymgmt.cpp b/keymgmt.cpp
index 73a85d5..60071bb 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -215,7 +215,7 @@ void KeyMgmt::showKeyDetails()
     // TODO: first...?
     gpgme_key_t key = mCtx->getKeyDetails(mKeyList->getSelected()->first());
 
-    new KeyDetailsDialog(mCtx, key, this);
+    new KeyDetailsDialog(mCtx, key);
 }
 
 void KeyMgmt::exportKeyToFile()
-- 
cgit v1.2.3