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

2 files changed, 12 insertions, 4 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()
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 29917e4..8e03bfd 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -430,7 +430,6 @@ void MainWindow::createToolBars()
     toolButton->setText("Import key from");
     toolButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
         editToolBar->addWidget(toolButton);
-
 }
 
 void MainWindow::createStatusBar()