diff options
| -rw-r--r-- | TODO | 13 | ||||
| -rw-r--r-- | gpgwin.cpp | 53 | ||||
| -rw-r--r-- | gpgwin.h | 19 | ||||
| -rw-r--r-- | release/keydb/pubring.gpg | bin | 1166 -> 5352 bytes |
4 files changed, 75 insertions, 10 deletions
@@ -2,12 +2,14 @@ TODO: ----- Release 0.1.1: -- Import Key from Clipboard -- Import-Key Dialog connected with Import-Key Button (like kgpg) +- Import Key from Clipboard <DONE> +- Import-Key Dialog connected with Import-Key Button (like kgpg) <DONE> - Sort Keys (QListView -> TableView) - find start of GPG-Block and insert "\n" if needed, to prevent "No Data" error - Mac Build - decide, which glibc-version to support on linux, prevent newer dependencies + --> decision done, support from debian Sarge (released jun. 2005) +onwards Later: @@ -21,11 +23,10 @@ Later: - Encrypt to self (problem: who is self?) - on windows an empty directory gnupg in application-data is created, find out how to disable +- Open File from command Line -- Keyimport, first: function Keyimport should use QByteArray, then: - - More Keymanagement (new popup window?) including: - - copy a public-keyfile into the editor-window and enable importing it -> same as "Import Key from Clipboard?" - - Import Key from Clipboard +- More Keymanagement (new popup window?) including: + - copy a public-keyfile into the editor-window and enable importing it -> same as "Import Key from Clipboard?" - export public key - export private key - generate new key @@ -31,6 +31,7 @@ #include <QStringList> #include <QIcon> #include <QMessageBox> +#include <QVBoxLayout> #include "context.h" #include "gpgwin.h" @@ -161,6 +162,11 @@ void GpgWin::createActions() importKeyFromClipboardAct->setIcon(QIcon(iconPath + "importkey_editor.png")); importKeyFromClipboardAct->setStatusTip(tr("Import New Key From Clipboard")); connect(importKeyFromClipboardAct, SIGNAL(triggered()), this, SLOT(importKeyFromClipboard())); + + importKeyDialogAct = new QAction(tr("Import Key"), this); + importKeyDialogAct->setIcon(QIcon(iconPath + "importkey_editor.png")); + importKeyDialogAct->setStatusTip(tr("Import New Key")); + connect(importKeyDialogAct, SIGNAL(triggered()), this, SLOT(importKeyDialog())); /** About Menu */ aboutAct = new QAction(tr("&About"), this); @@ -201,9 +207,12 @@ void GpgWin::createMenus() void GpgWin::createToolBars() { - fileToolBar = addToolBar(tr("File")); - fileToolBar->addAction(encryptAct); - fileToolBar->addAction(decryptAct); + cryptToolBar = addToolBar(tr("Crypt")); + cryptToolBar->addAction(encryptAct); + cryptToolBar->addAction(decryptAct); + cryptToolBar->addAction(importKeyDialogAct); + + editToolBar = addToolBar(tr("Edit")); editToolBar->addAction(copyAct); @@ -425,3 +434,41 @@ void GpgWin::importKeyFromFile() } } +void GpgWin::importKeyDialog() { + + QDialog *dialog = new QDialog(); + + dialog->setWindowTitle(tr("Import Key")); + dialog->setModal(true); + + QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel); + + connect(buttonBox,SIGNAL(accepted()),dialog, SLOT(accept())); + connect(buttonBox,SIGNAL(rejected()), dialog, SLOT(reject())); + + QGroupBox *groupBox = new QGroupBox(tr("Import Key From...")); + QRadioButton *radio1 = new QRadioButton(tr("&File")); + QRadioButton *radio2 = new QRadioButton(tr("&Editor")); + QRadioButton *radio3 = new QRadioButton(tr("&Clipboard")); + radio1->setChecked(true); + + QVBoxLayout *vbox1 = new QVBoxLayout(); + vbox1->addWidget(radio1); + vbox1->addWidget(radio2); + vbox1->addWidget(radio3); + + groupBox->setLayout(vbox1); + + QVBoxLayout *vbox2 = new QVBoxLayout(); + vbox2->addWidget(groupBox); + vbox2->addWidget(buttonBox); + + dialog->setLayout(vbox2); + + if(dialog->exec() == QDialog::Accepted ) { + if (radio1->isChecked()) importKeyFromFile(); + if (radio2->isChecked()) importKeyFromEdit(); + if (radio3->isChecked()) importKeyFromClipboard(); + } + +} @@ -28,6 +28,11 @@ class QAction; class QMenu; class QPlainTextEdit; +class QComboBox; +class QPushButton; +class QRadioButton; +class QButtonGroup; + class GpgWin : public QMainWindow { @@ -50,6 +55,8 @@ public slots: bool save(); bool saveAs(); void open(); + void importKeyDialog(); + //void browse(); private: void createActions(); @@ -69,8 +76,14 @@ private: QMenu *cryptMenu; QMenu *helpMenu; QMenu *importKeyMenu; - QToolBar *fileToolBar; + QToolBar *cryptToolBar; QToolBar *editToolBar; + QPushButton *browseButton; + QWidget *keywindow; + QGroupBox *prStyGroup; + QRadioButton *prsty1; + QRadioButton *prsty2; + QAction *openAct; QAction *saveAct; QAction *saveAsAct; @@ -78,6 +91,7 @@ private: QAction *quitAct; QAction *encryptAct; QAction *decryptAct; + QAction *importKeyDialogAct; QAction *importKeyFromFileAct; QAction *importKeyFromEditAct; QAction *importKeyFromClipboardAct; @@ -93,3 +107,6 @@ private: GpgME::Context *myCtx; QString iconPath; }; + + + diff --git a/release/keydb/pubring.gpg b/release/keydb/pubring.gpg Binary files differindex acb4872..4465092 100644 --- a/release/keydb/pubring.gpg +++ b/release/keydb/pubring.gpg |