diff options
| author | nils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2011-09-28 19:58:06 +0000 |
|---|---|---|
| committer | nils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2011-09-28 19:58:06 +0000 |
| commit | ac3479aa25a024a319174e0649a021047725bc81 (patch) | |
| tree | e6223f2d9e22a70ebf3f688e25f8fb84e5d851c5 /keymgmt.cpp | |
| parent | minor beautyfiyng and repaired cimpile warnings (diff) | |
| download | gpg4usb-ac3479aa25a024a319174e0649a021047725bc81.tar.gz gpg4usb-ac3479aa25a024a319174e0649a021047725bc81.zip | |
removed doubled keyimport functions and actions from gpgwin
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@539 34ebc366-c3a9-4b3c-9f84-69acf7962910
Diffstat (limited to 'keymgmt.cpp')
| -rwxr-xr-x | keymgmt.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
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(); |