aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TODO1
-rw-r--r--gpgwin.cpp61
-rw-r--r--gpgwin.h19
-rwxr-xr-xkeymgmt.cpp15
-rwxr-xr-xkeymgmt.h8
5 files changed, 23 insertions, 81 deletions
diff --git a/TODO b/TODO
index 14983d6..4ac3548 100644
--- a/TODO
+++ b/TODO
@@ -19,6 +19,7 @@ Release 0.3.1
- 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
BUGS:
- Sometimes two or more stars are shown at modified documents
diff --git a/gpgwin.cpp b/gpgwin.cpp
index a03ec14..1ee8b7f 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -24,7 +24,6 @@
GpgWin::GpgWin()
{
mCtx = new GpgME::Context();
- keyMgmt = NULL; // initialized on first key-management-window open
/* get path were app was started */
QString appPath = qApp->applicationDirPath();
@@ -42,6 +41,9 @@ GpgWin::GpgWin()
/* List of binary Attachments */
mAttachments = new Attachments(iconPath);
+ keyMgmt = new KeyMgmt(mCtx, iconPath);
+ keyMgmt->hide();
+
/* test attachmentdir for files alll 15s */
QTimer *timer = new QTimer(this);
connect(timer, SIGNAL(timeout()), this, SLOT(checkAttachmentFolder()));
@@ -257,25 +259,12 @@ void GpgWin::createActions()
/* Key Menu
*/
- importKeyFromFileAct = new QAction(tr("&File"), this);
- importKeyFromFileAct->setIcon(QIcon(iconPath + "misc_doc.png"));
- importKeyFromFileAct->setToolTip(tr("Import New Key From File"));
- connect(importKeyFromFileAct, SIGNAL(triggered()), this, SLOT(importKeyFromFile()));
importKeyFromEditAct = new QAction(tr("&Editor"), this);
importKeyFromEditAct->setIcon(QIcon(iconPath + "txt.png"));
importKeyFromEditAct->setToolTip(tr("Import New Key From Editor"));
connect(importKeyFromEditAct, SIGNAL(triggered()), this, SLOT(importKeyFromEdit()));
- importKeyFromClipboardAct = new QAction(tr("&Clipboard"), this);
- importKeyFromClipboardAct->setIcon(QIcon(iconPath + "button_paste.png"));
- importKeyFromClipboardAct->setToolTip(tr("Import New Key From Clipboard"));
- connect(importKeyFromClipboardAct, SIGNAL(triggered()), this, SLOT(importKeyFromClipboard()));
-
- importKeyFromKeyServerAct = new QAction(tr("&Keyserver"), this);
- importKeyFromKeyServerAct->setToolTip(tr("Import New Key From Keyserver"));
- connect(importKeyFromKeyServerAct, SIGNAL(triggered()), this, SLOT(importKeyFromKeyServer()));
-
openKeyManagementAct = new QAction(tr("Key Management"), this);
openKeyManagementAct->setIcon(QIcon(iconPath + "keymgmt.png"));
openKeyManagementAct->setToolTip(tr("Open Keymanagement"));
@@ -369,10 +358,11 @@ void GpgWin::createMenus()
keyMenu = menuBar()->addMenu(tr("&Keys"));
importKeyMenu = keyMenu->addMenu(tr("&Import Key From..."));
importKeyMenu->setIcon(QIcon(iconPath + "key_import.png"));
- importKeyMenu->addAction(importKeyFromFileAct);
+ importKeyMenu->addAction(keyMgmt->importKeyFromFileAct);
importKeyMenu->addAction(importKeyFromEditAct);
- importKeyMenu->addAction(importKeyFromClipboardAct);
- importKeyMenu->addAction(importKeyFromKeyServerAct);
+ importKeyMenu->addAction(keyMgmt->importKeyFromClipboardAct);
+ importKeyMenu->addAction(keyMgmt->importKeyFromKeyServerAct);
+ importKeyMenu->addAction(keyMgmt->importKeyFromKeyServerAct);
keyMenu->addAction(openKeyManagementAct);
viewMenu = menuBar()->addMenu(tr("&View"));
@@ -596,39 +586,8 @@ void GpgWin::importKeyFromEdit()
mCtx->importKey(edit->curTextPage()->toPlainText().toAscii());
}
-void GpgWin::importKeyFromClipboard()
-{
- QClipboard *cb = QApplication::clipboard();
- mCtx->importKey(cb->text(QClipboard::Clipboard).toAscii());
-}
-
-void GpgWin::importKeyFromKeyServer()
-{
- importDialog = new KeyServerImportDialog(mCtx, this);
- importDialog->show();
-}
-
-void GpgWin::importKeyFromFile()
-{
- QFile file;
- QByteArray inBuffer;
-
- QString fileName = QFileDialog::getOpenFileName(this, tr("Open Key"), "", tr("Key Files") + " (*.asc *.txt);;" + tr("All Files") + " (*)");
- if (! fileName.isNull()) {
- file.setFileName(fileName);
- if (!file.open(QIODevice::ReadOnly)) {
- qDebug() << tr("couldn't open file: ") + fileName;
- }
- QByteArray inBuffer = file.readAll();
- mCtx->importKey(inBuffer);
- }
-}
-
void GpgWin::openKeyManagement()
{
- if (!keyMgmt) {
- keyMgmt = new KeyMgmt(mCtx, iconPath);
- }
keyMgmt->show();
keyMgmt->raise();
keyMgmt->activateWindow();
@@ -818,10 +777,10 @@ void GpgWin::importKeyDialog()
dialog->setLayout(vbox2);
if (dialog->exec() == QDialog::Accepted) {
- if (radio1->isChecked()) importKeyFromFile();
+ if (radio1->isChecked()) keyMgmt->importKeyFromFile();
if (radio2->isChecked()) importKeyFromEdit();
- if (radio3->isChecked()) importKeyFromClipboard();
- if (radio4->isChecked()) importKeyFromKeyServer();
+ if (radio3->isChecked()) keyMgmt->importKeyFromClipboard();
+ if (radio4->isChecked()) keyMgmt->importKeyFromKeyServer();
}
}
diff --git a/gpgwin.h b/gpgwin.h
index e56cbde..a155391 100644
--- a/gpgwin.h
+++ b/gpgwin.h
@@ -102,27 +102,11 @@ private slots:
void verify();
/**
- * @details Open File-Dialog and import the keys from the choosen file
- * to keylist if possible.
- */
- void importKeyFromFile();
-
- /**
* @details Import keys from currently active tab to keylist if possible.
*/
void importKeyFromEdit();
/**
- * @details Import keys from clipboard to keylist if possible.
- */
- void importKeyFromClipboard();
-
- /**
- * @details Open an "Import key from keyserver"-dialog.
- */
- void importKeyFromKeyServer();
-
- /**
* @details Open a dialog, in which you can choose, where keys should be imported from.
*/
void importKeyDialog();
@@ -281,10 +265,7 @@ private:
QAction *signAct; /**< TODO */
QAction *verifyAct; /**< TODO */
QAction *importKeyDialogAct; /**< TODO */
- QAction *importKeyFromFileAct; /**< TODO */
QAction *importKeyFromEditAct; /**< TODO */
- QAction *importKeyFromClipboardAct; /**< TODO */
- QAction *importKeyFromKeyServerAct; /**< TODO */
QAction *cleanDoubleLinebreaksAct; /**< TODO */
QAction *appendSelectedKeysAct; /**< TODO */
diff --git a/keymgmt.cpp b/keymgmt.cpp
index 3ef369d..73a85d5 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -70,14 +70,14 @@ void KeyMgmt::createActions()
closeAct->setShortcut(tr("Ctrl+Q"));
closeAct->setIcon(QIcon(mIconPath + "exit.png"));
closeAct->setToolTip(tr("Close Key Management"));
- connect(closeAct, SIGNAL(triggered()), this, SLOT(close()));
+ connect(closeAct, SIGNAL(triggered()), this, SLOT(hide()));
- importKeyFromFileAct = new QAction(tr("Import From &File"), this);
+ importKeyFromFileAct = new QAction(tr("&File"), this);
importKeyFromFileAct->setIcon(QIcon(mIconPath + "import_key_from_file.png"));
importKeyFromFileAct->setToolTip(tr("Import New Key From File"));
connect(importKeyFromFileAct, SIGNAL(triggered()), this, SLOT(importKeyFromFile()));
- importKeyFromClipboardAct = new QAction(tr("Import From &Clipboard"), this);
+ importKeyFromClipboardAct = new QAction(tr("&Clipboard"), this);
importKeyFromClipboardAct->setIcon(QIcon(mIconPath + "import_key_from_clipboard.png"));
importKeyFromClipboardAct->setToolTip(tr("Import New Key From Clipboard"));
connect(importKeyFromClipboardAct, SIGNAL(triggered()), this, SLOT(importKeyFromClipboard()));
@@ -121,10 +121,11 @@ void KeyMgmt::createMenus()
fileMenu->addAction(closeAct);
keyMenu = menuBar()->addMenu(tr("&Key"));
- keyMenu->addAction(importKeyFromFileAct);
- keyMenu->addAction(importKeyFromClipboardAct);
- keyMenu->addAction(importKeyFromKeyServerAct);
- keyMenu->addSeparator();
+ importKeyMenu = keyMenu->addMenu(tr("&Import Key From..."));
+// importKeyMenu->setIcon(QIcon(mIconPath + "key_import.png"));
+ importKeyMenu->addAction(importKeyFromFileAct);
+ importKeyMenu->addAction(importKeyFromClipboardAct);
+ importKeyMenu->addAction(importKeyFromKeyServerAct);
keyMenu->addAction(exportKeyToFileAct);
keyMenu->addAction(exportKeyToClipboardAct);
keyMenu->addSeparator();
diff --git a/keymgmt.h b/keymgmt.h
index 1f9e4a3..a81863c 100755
--- a/keymgmt.h
+++ b/keymgmt.h
@@ -49,6 +49,9 @@ class KeyMgmt : public QMainWindow
public:
KeyMgmt(GpgME::Context* ctx, QString iconpath);
+ QAction *importKeyFromClipboardAct;
+ QAction *importKeyFromFileAct;
+ QAction *importKeyFromKeyServerAct;
public slots:
void importKeyFromFile();
@@ -79,11 +82,8 @@ private:
GpgME::Context *mCtx;
QMenu *fileMenu;
QMenu *keyMenu;
+ QMenu *importKeyMenu;
QDialog *genkeyDialog;
- QAction *importKeyFromFileAct;
- QAction *importKeyFromEditAct;
- QAction *importKeyFromClipboardAct;
- QAction *importKeyFromKeyServerAct;
QAction *exportKeyToFileAct;
QAction *exportKeyToClipboardAct;
QAction *deleteCheckedKeysAct;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-17 20:21:17 +0000