focus is kept on main window when closing settingsdialog, filecrypt. Added some ifndefs

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

1 files changed, 3 insertions, 3 deletions

diff --git a/gpgwin.cpp b/gpgwin.cpp
index 8f43d0b..db1448d 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -494,7 +494,7 @@ void GpgWin::importKeyFromFile()
     QFile file;
     QByteArray inBuffer;
 
-    QString fileName = QFileDialog::getOpenFileName(this, tr("Open Key"), "", tr("Key Files") + " (*.asc *.txt);;All Files (*)");
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Open Key"), "", tr("Key Files") + " (*.asc *.txt);;"+tr("All Files")+" (*)");
     if (! fileName.isNull()) {
         file.setFileName(fileName);
         if (!file.open(QIODevice::ReadOnly)) {
@@ -570,13 +570,13 @@ void GpgWin::appendSelectedKeys()
 
 void GpgWin::fileEncryption()
 {
-    new FileEncryptionDialog(mCtx, iconPath);
+    new FileEncryptionDialog(mCtx, iconPath, this);
 
 }
 void GpgWin::openSettingsDialog()
 {
 	QSettings settings;
-	new SettingsDialog();
+	new SettingsDialog(this);
 //	restoreSettings();
 	// Iconsize
 	QSize iconSize = settings.value("toolbar/iconsize", QSize(32, 32)).toSize();