set modal and parent for key details dialog. left margin for verifynotification. More doxygen

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@532 34ebc366-c3a9-4b3c-9f84-69acf7962910

24 files changed, 104 insertions, 47 deletions

diff --git a/TODO b/TODO
index 0b2b0b1..2be1be2 100644
--- a/TODO
+++ b/TODO
@@ -15,8 +15,8 @@ Release 0.3.1
 - umlaute are not handled correctly in signing [DONE]
 - beautify icons for verify and sign
 - check class / includes [DONE]
-- keydetailsdialog should have a parent
-- Verifynotification margin left
+- keydetailsdialog should have a parent [DONE]
+- Verifynotification margin left [DONE]
 
 BUGS: 
 - Sometimes two or more stars are shown at modified documents
diff --git a/attachments.h b/attachments.h
index 79bebdb..7c906fa 100644
--- a/attachments.h
+++ b/attachments.h
@@ -27,6 +27,7 @@
 #include <QtGui>
 #include <QWidget>
 
+QT_BEGIN_NAMESPACE
 class QTableView;
 class QHeaderView;
 class QVBoxLayout;
@@ -38,6 +39,7 @@ class QUrl;
 class QDesktopServices;
 class QSettings;
 class QApplication;
+QT_END_NAMESPACE
 
 class Attachments : public QWidget
 {
diff --git a/attachmenttablemodel.h b/attachmenttablemodel.h
index 560df13..6f7947d 100644
--- a/attachmenttablemodel.h
+++ b/attachmenttablemodel.h
@@ -1,12 +1,14 @@
-#ifndef ATTACHMENTTABLEMODEL_H
-#define ATTACHMENTTABLEMODEL_H
+#ifndef __ATTACHMENTTABLEMODEL_H__
+#define __ATTACHMENTTABLEMODEL_H__
 
 #include "mime.h"
 #include <QIcon>
 #include <QFile>
 #include <QAbstractTableModel>
 
+QT_BEGIN_NAMESPACE
 class QStandardItem;
+QT_END_NAMESPACE
 
 class AttachmentTableModel : public QAbstractTableModel
 {
@@ -33,4 +35,4 @@ private:
 
 };
 
-#endif // ATTACHMENTTABLEMODEL_H
+#endif // __ATTACHMENTTABLEMODEL_H__
diff --git a/context.h b/context.h
index 8be8a32..19ada4a 100644
--- a/context.h
+++ b/context.h
@@ -28,11 +28,13 @@
 #include <QLinkedList>
 #include <QtGui>
 
+QT_BEGIN_NAMESPACE
 class QMessageBox;
 class sstream;
 class QApplication;
 class QByteArray;
 class QString;
+QT_END_NAMESPACE
 
 class GpgKey
 {
diff --git a/editorpage.cpp b/editorpage.cpp
index 3ee0362..6562aa7 100644
--- a/editorpage.cpp
+++ b/editorpage.cpp
@@ -65,8 +65,3 @@ void EditorPage::hideNoteByClass(const char *className)
         }
     }
 }
-
-void setSaveState()
-{
-   // curPage()->setFilePath("");
-}
diff --git a/editorpage.h b/editorpage.h
index bea8e07..02ba5ce 100644
--- a/editorpage.h
+++ b/editorpage.h
@@ -19,16 +19,18 @@
  *      MA 02110-1301, USA.
  */
 
-#ifndef EDITORPAGE_H
-#define EDITORPAGE_H
+#ifndef __EDITORPAGE_H__
+#define __EDITORPAGE_H__
 
 #include <QPlainTextEdit>
 #include <QtGui>
 
+QT_BEGIN_NAMESPACE
 class QVBoxLayout;
 class QHBoxLayout;
 class QString;
 class QLabel;
+QT_END_NAMESPACE
 
 /**
  * @brief Class for handling a single tab of tabwidget
@@ -40,7 +42,7 @@ class EditorPage : public QWidget
 
 public:
     /**
-     * @brief
+     * @details Add layout and add plaintextedit
      *
      * @param filePath Path of the file handled in this tab
      * @param parent Pointer to the parent widget
@@ -61,7 +63,6 @@ public:
 
     /**
      * @details Return pointer tp the textedit of the currently activated tab.
-     *
      */
     QPlainTextEdit *getTextPage();
 
@@ -88,12 +89,6 @@ private:
     QMenu *verifyMenu; /** The menu in the notifiaction widget */
     QString fullFilePath; /** The path to the file handled in the tab */
     QLabel *verifyLabel; /** The label of the verify-notification widget */
-    /**
-     * @details bla
-     *
-     */
-    void setSaveState();
-
 };
 
-#endif // TEXTPAGE_H
+#endif // __TEXTPAGE_H__
diff --git a/fileencryptiondialog.h b/fileencryptiondialog.h
index 38d1da7..e5cc9e1 100755
--- a/fileencryptiondialog.h
+++ b/fileencryptiondialog.h
@@ -25,6 +25,7 @@
 #include "context.h"
 #include "keylist.h"
 
+QT_BEGIN_NAMESPACE
 class QDialog;
 class QLineEdit;
 class QWidget;
@@ -36,30 +37,70 @@ class QVBoxLayout;
 class QDebug;
 class QFileDialog;
 class QRadioButton;
+QT_END_NAMESPACE
 
+/**
+ * @brief
+ *
+ * @class FileEncryptionDialog fileencryptiondialog.h "fileencryptiondialog.h"
+ */
 class FileEncryptionDialog : public QDialog
 {
     Q_OBJECT
 
 public:
+    /**
+     * @brief
+     *
+     * @fn FileEncryptionDialog
+     * @param ctx
+     * @param iconPath
+     * @param keyList
+     * @param parent
+     */
     FileEncryptionDialog(GpgME::Context *ctx, QString iconPath, QStringList keyList , QWidget *parent = 0);
 
 public slots:
+    /**
+     * @details
+     *
+     * @fn selectInputFile
+     */
     void selectInputFile();
+    /**
+     * @brief
+     *
+     * @fn selectOutputFile
+     */
     void selectOutputFile();
+    /**
+     * @brief
+     *
+     * @fn executeAction
+     */
     void executeAction();
+    /**
+     * @brief
+     *
+     * @fn hideKeyList
+     */
     void hideKeyList();
+    /**
+     * @brief
+     *
+     * @fn showKeyList
+     */
     void showKeyList();
 
 private:
-    QLineEdit *outputFileEdit;
-    QLineEdit *inputFileEdit;
-    QRadioButton *radioEnc;
-    QRadioButton *radioDec;
+    QLineEdit *outputFileEdit; /**< TODO */
+    QLineEdit *inputFileEdit; /**< TODO */
+    QRadioButton *radioEnc; /**< TODO */
+    QRadioButton *radioDec; /**< TODO */
 
 protected:
-    GpgME::Context *mCtx;
-    KeyList *mKeyList;
+    GpgME::Context *mCtx; /**< TODO */
+    KeyList *mKeyList; /**< TODO */
 
 };
 #endif // __FILEENCRYPTIONDIALOG_H__
diff --git a/gpgwin.cpp b/gpgwin.cpp
index 212c570..82d8e11 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -860,7 +860,7 @@ void GpgWin::showKeyDetails()
 {
     // TODO: first...?
     gpgme_key_t key = mCtx->getKeyDetails(mKeyList->getSelected()->first());
-    new KeyDetailsDialog(mCtx, key);
+    new KeyDetailsDialog(mCtx, key, this);
 }
 
 
diff --git a/gpgwin.h b/gpgwin.h
index 9287e17..a9de955 100644
--- a/gpgwin.h
+++ b/gpgwin.h
@@ -35,6 +35,7 @@
 #include "verifynotification.h"
 #include "verifydetailsdialog.h"
 
+QT_BEGIN_NAMESPACE
 class QMainWindow;
 class QPlainTextEdit;
 class QWidget;
@@ -57,6 +58,7 @@ class QRadioButton;
 class QButtonGroup;
 class QApplication;
 class QDockWidget;
+QT_END_NAMESPACE
 
 
 /**
diff --git a/keydetailsdialog.cpp b/keydetailsdialog.cpp
index 7248bb1..be0a572 100644
--- a/keydetailsdialog.cpp
+++ b/keydetailsdialog.cpp
@@ -21,7 +21,8 @@
 
 #include "keydetailsdialog.h"
 
-KeyDetailsDialog::KeyDetailsDialog(GpgME::Context* ctx, gpgme_key_t key)
+KeyDetailsDialog::KeyDetailsDialog(GpgME::Context* ctx, gpgme_key_t key, QWidget *parent)
+    : QDialog(parent)
 {
 
     mCtx = ctx;
@@ -126,6 +127,7 @@ KeyDetailsDialog::KeyDetailsDialog(GpgME::Context* ctx, gpgme_key_t key)
 
     this->setLayout(mvbox);
     this->setWindowTitle(tr("Keydetails"));
+    this->setModal(true);
     this->show();
 
     exec();
diff --git a/keydetailsdialog.h b/keydetailsdialog.h
index f1150ed..241689b 100644
--- a/keydetailsdialog.h
+++ b/keydetailsdialog.h
@@ -25,6 +25,7 @@
 #include "context.h"
 #include <gpgme.h>
 
+QT_BEGIN_NAMESPACE
 class QDateTime;
 class QVBoxLayout;
 class QDialogButtonBox;
@@ -33,13 +34,14 @@ class QGroupBox;
 class QLabel;
 class QGridLayout;
 class QPushButton;
+QT_END_NAMESPACE
 
 class KeyDetailsDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    KeyDetailsDialog(GpgME::Context* ctx, gpgme_key_t key);
+    KeyDetailsDialog(GpgME::Context* ctx, gpgme_key_t key, QWidget *parent = 0);
 
 private slots:
     void exportPrivateKey();
diff --git a/keygenthread.h b/keygenthread.h
index 91aead7..ef382d8 100644
--- a/keygenthread.h
+++ b/keygenthread.h
@@ -29,7 +29,9 @@
 #include <cmath>
 #include <QtGui>
 
+QT_BEGIN_NAMESPACE
 class QMessageBox;
+QT_END_NAMESPACE
 
 class KeyGenThread : public QThread
 {
diff --git a/keylist.h b/keylist.h
index e3ae2d0..269cfb4 100644
--- a/keylist.h
+++ b/keylist.h
@@ -24,11 +24,13 @@
 
 #include "context.h"
 
+QT_BEGIN_NAMESPACE
 class QWidget;
 class QVBoxLayout;
 class QLabel;
 class QTableWidget;
 class QMenu;
+QT_END_NAMESPACE
 
 class KeyList : public QWidget
 {
diff --git a/keymgmt.cpp b/keymgmt.cpp
index 1f75d0d..3ef369d 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -214,7 +214,7 @@ void KeyMgmt::showKeyDetails()
     // TODO: first...?
     gpgme_key_t key = mCtx->getKeyDetails(mKeyList->getSelected()->first());
 
-    new KeyDetailsDialog(mCtx, key);
+    new KeyDetailsDialog(mCtx, key, this);
 }
 
 void KeyMgmt::exportKeyToFile()
diff --git a/keymgmt.h b/keymgmt.h
index 426d120..cac75cb 100755
--- a/keymgmt.h
+++ b/keymgmt.h
@@ -29,6 +29,7 @@
 #include "keyserverimportdialog.h"
 #include <QtGui>
 
+QT_BEGIN_NAMESPACE
 class QMainWindow;
 class QWidget;
 class iostream;
@@ -41,6 +42,7 @@ class QAction;
 class QMenu;
 class QApplication;
 class QSlider;
+QT_END_NAMESPACE
 
 class KeyMgmt : public QMainWindow
 {
diff --git a/keyserverimportdialog.cpp b/keyserverimportdialog.cpp
index bc76d2c..49ba6e7 100644
--- a/keyserverimportdialog.cpp
+++ b/keyserverimportdialog.cpp
@@ -220,6 +220,7 @@ void KeyServerImportDialog::import()
 void KeyServerImportDialog::import(QString keyId)
 {
     QUrl url = "http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x"+keyId+"&options=mr";
+    qDebug() << "keyid in import: " << keyId;
     importreply = qnam.get(QNetworkRequest(url));
     connect(importreply, SIGNAL(finished()),
             this, SLOT(importFinished()));
diff --git a/keyserverimportdialog.h b/keyserverimportdialog.h
index 50c2025..c1e33ed 100644
--- a/keyserverimportdialog.h
+++ b/keyserverimportdialog.h
@@ -20,8 +20,8 @@
  *      MA 02110-1301, USA.
  */
 
-#ifndef KEYSERVERIMPORTDIALOG_H
-#define KEYSERVERIMPORTDIALOG_H
+#ifndef __KEYSERVERIMPORTDIALOG_H__
+#define __KEYSERVERIMPORTDIALOG_H__
 
 #include "context.h"
 #include <QNetworkAccessManager>
@@ -83,4 +83,4 @@ private:
     QNetworkReply *searchreply;
     QNetworkReply *importreply;
 };
-#endif
+#endif // __KEYSERVERIMPORTDIALOG_H__
diff --git a/mime.h b/mime.h
index cdd6675..16b0dfe 100644
--- a/mime.h
+++ b/mime.h
@@ -25,9 +25,11 @@
 #include <QHashIterator>
 #include <QHash>
 
+QT_BEGIN_NAMESPACE
 class QByteArray;
 class QDebug;
 class QTextCodec;
+QT_END_NAMESPACE
 
 class HeadElem
 {
diff --git a/quitdialog.h b/quitdialog.h
index e805b79..8087702 100755
--- a/quitdialog.h
+++ b/quitdialog.h
@@ -25,7 +25,9 @@
 #include "context.h"
 #include <QtGui>
 
+QT_BEGIN_NAMESPACE
 class QTableWidget;
+QT_END_NAMESPACE
 
 class QuitDialog : public QDialog
 {
diff --git a/settingsdialog.h b/settingsdialog.h
index 26b14a0..f7a5d8c 100755
--- a/settingsdialog.h
+++ b/settingsdialog.h
@@ -26,6 +26,7 @@
 #include <QWidget>
 #include <QtGui>
 
+QT_BEGIN_NAMESPACE
 class QDialog;
 class QRadioButton;
 class QDialogButtonBox;
@@ -44,6 +45,7 @@ class QButtonGroup;
 class QGroupBox;
 class QFileInfo;
 class QTabWidget;
+QT_END_NAMESPACE
 
 class GeneralTab : public QWidget
  {
diff --git a/textedit.h b/textedit.h
index cef3b42..b08ab4d 100644
--- a/textedit.h
+++ b/textedit.h
@@ -25,6 +25,7 @@
 #include "editorpage.h"
 #include "quitdialog.h"
 
+QT_BEGIN_NAMESPACE
 class QDebug;
 class QtGui;
 class QFileDialog;
@@ -38,6 +39,7 @@ class QMessageBox;
 class QWidget;
 class QString;
 class QTabWidget;
+QT_END_NAMESPACE
 
 /**
  * @brief TextEdit class
@@ -256,4 +258,4 @@ protected:
      */
     bool saveFile(const QString &fileName);
 };
-#endif // TEXTEDIT
+#endif // __TEXTEDIT_H__
diff --git a/verifydetailsdialog.h b/verifydetailsdialog.h
index 58fd4f0..b5978fe 100644
--- a/verifydetailsdialog.h
+++ b/verifydetailsdialog.h
@@ -1,5 +1,5 @@
-#ifndef VERIFYDETAILSDIALOG_H
-#define VERIFYDETAILSDIALOG_H
+#ifndef __VERIFYDETAILSDIALOG_H__
+#define __VERIFYDETAILSDIALOG_H__
 
 #include "context.h"
 #include "keylist.h"
@@ -22,4 +22,4 @@ public slots:
 
 };
 
-#endif // VERIFYDETAILSDIALOG_H
+#endif // __VERIFYDETAILSDIALOG_H__
diff --git a/verifynotification.cpp b/verifynotification.cpp
index eec65f7..6564a81 100644
--- a/verifynotification.cpp
+++ b/verifynotification.cpp
@@ -41,11 +41,10 @@ VerifyNotification::VerifyNotification(QWidget *parent, GpgME::Context *ctx, Key
     importFromKeyserverAct->setVisible(false);
 
     keysNotInList = new QStringList();
-
     detailsButton = new QPushButton("Details",this);
     detailsButton->setMenu(detailMenu);
     notificationWidgetLayout = new QHBoxLayout(this);
-    notificationWidgetLayout->setContentsMargins(0,0,0,0);
+    notificationWidgetLayout->setContentsMargins(10,0,0,0);
     notificationWidgetLayout->addWidget(verifyLabel,2);
     notificationWidgetLayout->addWidget(detailsButton);
     this->setLayout(notificationWidgetLayout);
diff --git a/verifynotification.h b/verifynotification.h
index 7b79a0d..77e570f 100644
--- a/verifynotification.h
+++ b/verifynotification.h
@@ -19,8 +19,8 @@
  *      MA 02110-1301, USA.
  */
 
-#ifndef VERIFYNOTIFICATION_H
-#define VERIFYNOTIFICATION_H
+#ifndef __VERIFYNOTIFICATION_H__
+#define __VERIFYNOTIFICATION_H__
 
 #include "keyserverimportdialog.h"
 #include "context.h"
@@ -28,14 +28,15 @@
 #include <gpgme.h>
 #include <QWidget>
 
+QT_BEGIN_NAMESPACE
 class QLabel;
 class QHBoxLayout;
 class QMenu;
 class QPushButton;
+QT_END_NAMESPACE
 
 /**
  * @details Enumeration for the status of Verifylabel
- *
  */
 typedef enum
 {
@@ -47,7 +48,6 @@ typedef enum
 
 /**
  * @brief Class for handling the verifylabel shown at buttom of a textedit-page
- *
  */
 class VerifyNotification : public QWidget
 {
@@ -105,11 +105,11 @@ private:
     QPushButton *detailsButton; /** Button shown in verifynotification */
     QLabel *verifyLabel; /** Label holding the text shown in verifyNotification */
     GpgME::Context *mCtx; /** GpgME Context */
-    KeyList *mKeyList;
-    gpgme_signature_t mSignature;
+    KeyList *mKeyList; /** Table holding the keys */
+    gpgme_signature_t mSignature; /** List holding the signatures of text */
     QHBoxLayout *notificationWidgetLayout; /** Layout for verify-notification */
     QVBoxLayout *verifyDetailListLayout;  /** Layout for verify-detail-dialog */
     QVector<QString> verifyDetailStringVector; /** Vector containing the text for labels in verifydetaildialog */
     QVector<verify_label_status> verifyDetailStatusVector; /** Vector containing the status for labels in verifydetaildialog */
 };
-#endif // VERIFYNOTIFICATION_H
+#endif // __VERIFYNOTIFICATION_H__