aboutsummaryrefslogtreecommitdiffstats
path: root/keymgmt.cpp
diff options
context:
space:
mode:
authornils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2011-11-01 23:39:30 +0000
committernils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2011-11-01 23:39:30 +0000
commit9116c2ddb9b677a914d499ac1d81b9a41eb36ac2 (patch)
tree1c0a43957c1594188803a8233f12c2d46dee860f /keymgmt.cpp
parentsave key management size and position, even if it closed via quit in menu (BU... (diff)
downloadgpg4usb-9116c2ddb9b677a914d499ac1d81b9a41eb36ac2.tar.gz
gpg4usb-9116c2ddb9b677a914d499ac1d81b9a41eb36ac2.zip
added import toolbutton with popup-menu to keymanagement (but why it's colored red?)
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@594 34ebc366-c3a9-4b3c-9f84-69acf7962910
Diffstat (limited to 'keymgmt.cpp')
-rwxr-xr-xkeymgmt.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/keymgmt.cpp b/keymgmt.cpp
index 85552aa..716fcd8 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -136,14 +136,23 @@ void KeyMgmt::createToolBars()
{
QToolBar *keyToolBar = addToolBar(tr("Key"));
keyToolBar->setObjectName("keytoolbar");
- keyToolBar->addAction(importKeyFromFileAct);
- keyToolBar->addAction(importKeyFromClipboardAct);
- keyToolBar->addAction(importKeyFromKeyServerAct);
+
+ // add button with popup menu for import
+ QToolButton* toolButton = new QToolButton(this);
+ toolButton->setMenu(importKeyMenu);
+ toolButton->setPopupMode(QToolButton::InstantPopup);
+ toolButton->setIcon(QIcon(mIconPath + "key_import.png"));
+ toolButton->setToolTip("Import key");
+ toolButton->setText("Import key from");
+ toolButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+ keyToolBar->addWidget(toolButton);
+
keyToolBar->addSeparator();
keyToolBar->addAction(deleteCheckedKeysAct);
keyToolBar->addSeparator();
keyToolBar->addAction(exportKeyToFileAct);
keyToolBar->addAction(exportKeyToClipboardAct);
+
}
void KeyMgmt::importKeyFromFile()