set toolbuttonstyle for import from and for file cryption dropdown toolbutton

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@784 34ebc366-c3a9-4b3c-9f84-69acf7962910

3 files changed, 13 insertions, 8 deletions

diff --git a/TODO b/TODO
index 9c2fca4..619f7ae 100644
--- a/TODO
+++ b/TODO
@@ -51,10 +51,10 @@ Release 0.3.2
 	- resize dropdown button, cause letter are cut at the bottom  
 - Change file encryption to single dialog for en- and decryption [DONE]
 	- change docu on file de- and encryption
-- qDebug messages with tr() (?)
+- replace qDebug messages with tr() by messagebox (?)
 
 BUGS:
-- import key toolbar dropdown shows text, even if only icon should be shown
+- import key toolbar dropdown shows text, even if only icon should be shown [DONE]
 
 Release 0.3.3
 - Change private key password 
@@ -63,6 +63,7 @@ Release 0.3.3
 - create revocation file 
 	- on key generation
 	- later
+- add posibility to add keyserver in settings
 - set gpgme error language to chosen language (context.cpp:49)
 - Add default key functionality 
 - encrypt and sign, decrypt and verify (?)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index cf5ba0d..da185c3 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -118,6 +118,8 @@ void MainWindow::restoreSettings()
     // Iconstyle
     Qt::ToolButtonStyle buttonStyle = static_cast<Qt::ToolButtonStyle>(settings.value("toolbar/iconstyle", Qt::ToolButtonTextUnderIcon).toUInt());
     this->setToolButtonStyle(buttonStyle);
+    importButton->setToolButtonStyle(buttonStyle);
+    fileEncButton->setToolButtonStyle(buttonStyle);
 
     // Checked Keys
     if (settings.value("keys/keySave").toBool()) {
@@ -475,17 +477,16 @@ void MainWindow::createToolBars()
     viewMenu->addAction(specialEditToolBar->toggleViewAction());
 
     // Add dropdown menu for key import to keytoolbar
-    QToolButton* importButton = new QToolButton();
+    importButton = new QToolButton();
     importButton->setMenu(importKeyMenu);
     importButton->setPopupMode(QToolButton::InstantPopup);
     importButton->setIcon(QIcon(":key_import.png"));
-    importButton->setToolTip("Import key");
-    importButton->setText("Import key..");
-    importButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+    importButton->setToolTip("Import key from...");
+    importButton->setText("Import key...");
     keyToolBar->addWidget(importButton);
 
     // Add dropdown menu for file encryption/decryption to crypttoolbar
-    QToolButton* fileEncButton = new QToolButton();
+    fileEncButton = new QToolButton();
     QMenu* fileEncMenu = new QMenu();
     fileEncMenu->addAction(fileEncryptAct);
     fileEncMenu->addAction(fileDecryptAct);
@@ -494,7 +495,6 @@ void MainWindow::createToolBars()
     fileEncButton->setIcon(QIcon(":fileencryption.png"));
     fileEncButton->setToolTip("Encrypt or decrypt File");
     fileEncButton->setText("File..");
-    fileEncButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
 
     cryptToolBar->addWidget(fileEncButton);
 
@@ -889,6 +889,8 @@ void MainWindow::openSettingsDialog()
     // Iconstyle
     Qt::ToolButtonStyle buttonStyle = static_cast<Qt::ToolButtonStyle>(settings.value("toolbar/iconstyle", Qt::ToolButtonTextUnderIcon).toUInt());
     this->setToolButtonStyle(buttonStyle);
+    importButton->setToolButtonStyle(buttonStyle);
+    fileEncButton->setToolButtonStyle(buttonStyle);
 
     if(settings.value("mime/parseMime").toBool()) {
         createAttachmentDock();
diff --git a/mainwindow.h b/mainwindow.h
index e84b7be..d55be93 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -253,6 +253,8 @@ private:
     QToolBar *editToolBar; /** Toolbar holding edit actions */
     QToolBar *specialEditToolBar; /** Toolbar holding special edit actions */
     QToolBar *keyToolBar; /** Toolbar holding key operations */
+    QToolButton* importButton; /** Toolbutton for import dropdown menu in toolbar */
+    QToolButton* fileEncButton; /** Toolbutton for file cryption dropdown menu in toolbar */
     QDockWidget *keylistDock; /** Encrypt Dock*/
     QDockWidget *attachmentDock; /** Attachment Dock */
     QDialog *genkeyDialog; /** Dialog for key generation */