From ac3479aa25a024a319174e0649a021047725bc81 Mon Sep 17 00:00:00 2001 From: nils Date: Wed, 28 Sep 2011 19:58:06 +0000 Subject: removed doubled keyimport functions and actions from gpgwin git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@539 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- keymgmt.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'keymgmt.cpp') 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(); -- cgit v1.2.3