better openfile dialogs / make dialogs explicit modal

2 files changed, 13 insertions, 0 deletions

diff --git a/pwmanager/pwmanager/addentrywndimpl.cpp b/pwmanager/pwmanager/addentrywndimpl.cpp
index 9e0fde9..73ba36c 100644
--- a/pwmanager/pwmanager/addentrywndimpl.cpp
+++ b/pwmanager/pwmanager/addentrywndimpl.cpp
@@ -23,32 +23,35 @@
 #include "addentrywndimpl.h"
 #include "pwmexception.h"
 #include "pwgenwndimpl.h"
 #ifndef PWM_EMBEDDED
 #include "advcommeditimpl.h"
 #endif
 #include "htmlgen.h"
 
 #include <kmessagebox.h>
 #include <klocale.h>
 
 #include <qpushbutton.h>
 #include <qlabel.h>
 
 
 AddEntryWndImpl::AddEntryWndImpl()
+#ifdef PWM_EMBEDDED
+  : addEntryWnd( 0, "AddEntryWndImpl", TRUE)
+#endif
 {
         editAdvCommentButton = 0;
         commentTextEdit = 0;
         switchComment(false);
         pwGen = new PwGenWndImpl(this);
 }
 
 AddEntryWndImpl::~AddEntryWndImpl()
 {
         delete_ifnot_null(editAdvCommentButton);
         delete_ifnot_null(commentTextEdit);
         delete pwGen;
 }
 
 void AddEntryWndImpl::okButton_slot()
 {
diff --git a/pwmanager/pwmanager/configwndimpl.cpp b/pwmanager/pwmanager/configwndimpl.cpp
index 5aa38d4..595a6e7 100644
--- a/pwmanager/pwmanager/configwndimpl.cpp
+++ b/pwmanager/pwmanager/configwndimpl.cpp
@@ -24,54 +24,64 @@
 
 #include <qfileinfo.h>
 #include <qlineedit.h>
 
 #include <kstandarddirs.h>
 #include <kfiledialog.h>
 #include <klocale.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 
 #ifdef PWM_EMBEDDED
 #include <kfontdialog.h>
 #endif
 
 ConfigWndImpl::ConfigWndImpl()
+#ifdef PWM_EMBEDDED
+    : configWnd(0, "ConfigWndImpl", TRUE)
+#endif
+
 {
 }
 
 ConfigWndImpl::~ConfigWndImpl()
 {
 }
 
 void ConfigWndImpl::okButton_slot()
 {
         done(0);
 }
 
 void ConfigWndImpl::cancelButton_slot()
 {
         done(1);
 }
 
 void ConfigWndImpl::browseAutoStButton_slot()
 {
+#ifndef PWM_EMBEDDED
         QString path(KFileDialog::getOpenFileName(QString::null,
                                                   i18n("*.pwm|PwM Password file\n"
                                                        "*|All files"), this));
+#else
+        QString path = locateLocal( "data", KGlobal::getAppName() + "/*.pwm");
+        path = KFileDialog::getOpenFileName(filename,
+                                                i18n("password filename(*.pwm)"), this);
+#endif
         if (path != QString::null)
                 autoStartLineEdit->setText(path);
 }
 
 void ConfigWndImpl::selEntrFontButton_slot()
 {
         bool ok;
 #ifndef PWM_EMBEDDED
         QFont fnt = QFontDialog::getFont(&ok, currentEntryFont, this);
 #else
         QFont fnt = KFontDialog::getFont(currentEntryFont, ok);
 #endif
         if (!ok)
                 return;
         currEntrFont->setFont(fnt);
         currEntrFont->setText(fnt.family());