aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2011-10-17 22:32:06 +0000
committernils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2011-10-17 22:32:06 +0000
commitcd92564311626e9b0966cdf53d05bc782548bd5e (patch)
tree471d0ef1b4eeb8ba7fe0ab29fca3fd7eb9742fff
parentalso export public key on private key export, but error handling still needs ... (diff)
downloadgpg4usb-cd92564311626e9b0966cdf53d05bc782548bd5e.tar.gz
gpg4usb-cd92564311626e9b0966cdf53d05bc782548bd5e.zip
added keyserverimport with icon to toolbar in keymgmt
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@556 34ebc366-c3a9-4b3c-9f84-69acf7962910
-rwxr-xr-xkeymgmt.cpp2
-rw-r--r--release/icons/import_key_from_server.pngbin0 -> 3068 bytes
2 files changed, 2 insertions, 0 deletions
diff --git a/keymgmt.cpp b/keymgmt.cpp
index 7b2f7c2..751587f 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -83,6 +83,7 @@ void KeyMgmt::createActions()
connect(importKeyFromClipboardAct, SIGNAL(triggered()), this, SLOT(importKeyFromClipboard()));
importKeyFromKeyServerAct = new QAction(tr("&Keyserver"), this);
+ importKeyFromKeyServerAct->setIcon(QIcon(mIconPath + "import_key_from_server.png"));
importKeyFromKeyServerAct->setToolTip(tr("Import New Key From Keyserver"));
connect(importKeyFromKeyServerAct, SIGNAL(triggered()), this, SLOT(importKeyFromKeyServer()));
@@ -139,6 +140,7 @@ void KeyMgmt::createToolBars()
keyToolBar->setObjectName("keytoolbar");
keyToolBar->addAction(importKeyFromFileAct);
keyToolBar->addAction(importKeyFromClipboardAct);
+ keyToolBar->addAction(importKeyFromKeyServerAct);
keyToolBar->addSeparator();
keyToolBar->addAction(deleteCheckedKeysAct);
keyToolBar->addSeparator();
diff --git a/release/icons/import_key_from_server.png b/release/icons/import_key_from_server.png
new file mode 100644
index 0000000..5d88ab5
--- /dev/null
+++ b/release/icons/import_key_from_server.png
Binary files differ