From 55d683a52d5014cd2e377bc0d8453cac5db930b9 Mon Sep 17 00:00:00 2001
From: nils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>
Date: Wed, 4 Jan 2012 21:58:08 +0000
Subject: show fingerprint instead of keyid in import detail dialog

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@726 34ebc366-c3a9-4b3c-9f84-69acf7962910
---
 TODO                                |  5 +++--
 keyimportdetaildialog.cpp           |  6 +++---
 release/help/docu_decrypt_file.html | 10 ++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/TODO b/TODO
index 1842e32..1d0a058 100644
--- a/TODO
+++ b/TODO
@@ -37,16 +37,17 @@ Release 0.3.2
 - show message, when key export is successful (statusbar)
 - encrypt and sign, decrypt and verify (?)
 - Add buttonto copy fingerprint to clipboard in details dialog 
-	- or set margin to make it easier selectable?
+	- or set margin to make it easier selectable (via css?) ?
 	- remove whitespaces on copy
-- Add default key functionality 
 - fix translation file for "SettingsDialog" as it says two times English, and the comment is on the wrong one.
+- should images be included in paragraph (?)
 
 BUGS:
 - import key toolbar dropdown shows text, even if only icon should be shown
 - investigate special characters in passphrase in windows
 
 Release 0.3.3
+- Add default key functionality 
 - create revocation file on key generation
 - optionally open new tab after encryption/decrytion 
 - import from keyserver doesn't end, if network-connection is available, but no connection to keyserver  (?)
diff --git a/keyimportdetaildialog.cpp b/keyimportdetaildialog.cpp
index 23c3d7a..4072d80 100644
--- a/keyimportdetaildialog.cpp
+++ b/keyimportdetaildialog.cpp
@@ -26,7 +26,7 @@ KeyImportDetailDialog::KeyImportDetailDialog(GpgME::GpgContext* ctx, GpgImportIn
 {
     mCtx = ctx;
     mResult = result;
-    // If no key for import found, just ahow a message
+    // If no key for import found, just show a message
     if (mResult.considered == 0) {
         QMessageBox::information(0, tr("Key import details"), tr("No keys found to import"));
         return;
@@ -96,7 +96,7 @@ void KeyImportDetailDialog::createKeysTable()
     keysTable->setSelectionMode(QAbstractItemView::NoSelection);
 
     QStringList headerLabels;
-    headerLabels  << tr("Name") << tr("Email") << tr("KeyID") << tr("Status");
+    headerLabels  << tr("Name") << tr("Email") << tr("Fingerprint") << tr("Status");
     keysTable->horizontalHeader()->setResizeMode(0, QHeaderView::ResizeToContents);
     keysTable->horizontalHeader()->setStretchLastSection(true);
 
@@ -108,7 +108,7 @@ void KeyImportDetailDialog::createKeysTable()
         GpgKey key = mCtx->getKeyByFpr(impKey.fpr);
         keysTable->setItem(row, 0, new QTableWidgetItem(key.name));
         keysTable->setItem(row, 1, new QTableWidgetItem(key.email));
-        keysTable->setItem(row, 2, new QTableWidgetItem(key.id));
+        keysTable->setItem(row, 2, new QTableWidgetItem(impKey.fpr));
         keysTable->setItem(row,3,new QTableWidgetItem(getStatusString(impKey.importStatus)));
         row++;
     }
diff --git a/release/help/docu_decrypt_file.html b/release/help/docu_decrypt_file.html
index c933f46..ff29ed1 100644
--- a/release/help/docu_decrypt_file.html
+++ b/release/help/docu_decrypt_file.html
@@ -47,32 +47,42 @@ There are five steps to decrypt a file. We assume, that Alice wants to decrypt a
 <p>
 First Alice chooses the file cryption dialog in the menu. Alternatively, she could just hit the "File-Cryption"-button in the toolbar. 
 </p>
+<p>
 <IMG SRC="img/docu/cryptfile_menu.jpg" alt="open file cryption dialog">
+</p>
 
 <h4>STEP 2: Choose decrypt</h4>
 <p>
 Secondly she chooses decrypt. 
 </p>
+<p>
 <IMG SRC="img/docu/decryptfile_choose_decrypt.jpg" alt="choose decrypt">
+</p>
 
 
 <h4>STEP 3: Choose input-/outputfile</h4>
 <p>
 Now she chooses the input- and outputfile. The inputfile has to be the encrypted file
 </p>
+<p>
 <IMG SRC="img/docu/decryptfile_input_outputfile.jpg" alt="choose the input- and outputfile">
+</p>
 
 <h4>STEP 4: Hit ok</h4>
 <p>
 Now she hits the ok-button
 </p>
+<p>
 <IMG SRC="img/docu/decryptfile_hit_ok.jpg" alt="hit ok">
+</p>
 
 <h4>STEP 5: Enter passphrase</h4>
 <p>
 Now she enters the passphrase of her key and hits the ok-button.
 </p>
+<p>
 <IMG SRC="img/docu/decryptfile_password.jpg" alt="enter passphrase">
+</p>
 <p>
 Afterwards the ok-message is displayed<p>
 </p>
-- 
cgit v1.2.3