author | ulf69 <ulf69> | 2004-09-15 22:40:33 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-09-15 22:40:33 (UTC) |
commit | 56450c0322c2335a59ae8d8796e41397cdb09329 (patch) (unidiff) | |
tree | f2b331be957fc022fe7110671f7434755f21eca3 | |
parent | 610cf2a6c7aaf9855b54cd0453f347edf9c1a855 (diff) | |
download | kdepimpi-56450c0322c2335a59ae8d8796e41397cdb09329.zip kdepimpi-56450c0322c2335a59ae8d8796e41397cdb09329.tar.gz kdepimpi-56450c0322c2335a59ae8d8796e41397cdb09329.tar.bz2 |
better openfile dialogs / make dialogs explicit modal
-rw-r--r-- | pwmanager/pwmanager/addentrywndimpl.cpp | 3 | ||||
-rw-r--r-- | pwmanager/pwmanager/configwndimpl.cpp | 10 |
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 | |||
@@ -31,16 +31,19 @@ | |||
31 | #include <kmessagebox.h> | 31 | #include <kmessagebox.h> |
32 | #include <klocale.h> | 32 | #include <klocale.h> |
33 | 33 | ||
34 | #include <qpushbutton.h> | 34 | #include <qpushbutton.h> |
35 | #include <qlabel.h> | 35 | #include <qlabel.h> |
36 | 36 | ||
37 | 37 | ||
38 | AddEntryWndImpl::AddEntryWndImpl() | 38 | AddEntryWndImpl::AddEntryWndImpl() |
39 | #ifdef PWM_EMBEDDED | ||
40 | : addEntryWnd( 0, "AddEntryWndImpl", TRUE) | ||
41 | #endif | ||
39 | { | 42 | { |
40 | editAdvCommentButton = 0; | 43 | editAdvCommentButton = 0; |
41 | commentTextEdit = 0; | 44 | commentTextEdit = 0; |
42 | switchComment(false); | 45 | switchComment(false); |
43 | pwGen = new PwGenWndImpl(this); | 46 | pwGen = new PwGenWndImpl(this); |
44 | } | 47 | } |
45 | 48 | ||
46 | AddEntryWndImpl::~AddEntryWndImpl() | 49 | AddEntryWndImpl::~AddEntryWndImpl() |
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 | |||
@@ -32,16 +32,20 @@ | |||
32 | #include <stdlib.h> | 32 | #include <stdlib.h> |
33 | #include <stdio.h> | 33 | #include <stdio.h> |
34 | 34 | ||
35 | #ifdef PWM_EMBEDDED | 35 | #ifdef PWM_EMBEDDED |
36 | #include <kfontdialog.h> | 36 | #include <kfontdialog.h> |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | ConfigWndImpl::ConfigWndImpl() | 39 | ConfigWndImpl::ConfigWndImpl() |
40 | #ifdef PWM_EMBEDDED | ||
41 | : configWnd(0, "ConfigWndImpl", TRUE) | ||
42 | #endif | ||
43 | |||
40 | { | 44 | { |
41 | } | 45 | } |
42 | 46 | ||
43 | ConfigWndImpl::~ConfigWndImpl() | 47 | ConfigWndImpl::~ConfigWndImpl() |
44 | { | 48 | { |
45 | } | 49 | } |
46 | 50 | ||
47 | void ConfigWndImpl::okButton_slot() | 51 | void ConfigWndImpl::okButton_slot() |
@@ -51,19 +55,25 @@ void ConfigWndImpl::okButton_slot() | |||
51 | 55 | ||
52 | void ConfigWndImpl::cancelButton_slot() | 56 | void ConfigWndImpl::cancelButton_slot() |
53 | { | 57 | { |
54 | done(1); | 58 | done(1); |
55 | } | 59 | } |
56 | 60 | ||
57 | void ConfigWndImpl::browseAutoStButton_slot() | 61 | void ConfigWndImpl::browseAutoStButton_slot() |
58 | { | 62 | { |
63 | #ifndef PWM_EMBEDDED | ||
59 | QString path(KFileDialog::getOpenFileName(QString::null, | 64 | QString path(KFileDialog::getOpenFileName(QString::null, |
60 | i18n("*.pwm|PwM Password file\n" | 65 | i18n("*.pwm|PwM Password file\n" |
61 | "*|All files"), this)); | 66 | "*|All files"), this)); |
67 | #else | ||
68 | QString path = locateLocal( "data", KGlobal::getAppName() + "/*.pwm"); | ||
69 | path = KFileDialog::getOpenFileName(filename, | ||
70 | i18n("password filename(*.pwm)"), this); | ||
71 | #endif | ||
62 | if (path != QString::null) | 72 | if (path != QString::null) |
63 | autoStartLineEdit->setText(path); | 73 | autoStartLineEdit->setText(path); |
64 | } | 74 | } |
65 | 75 | ||
66 | void ConfigWndImpl::selEntrFontButton_slot() | 76 | void ConfigWndImpl::selEntrFontButton_slot() |
67 | { | 77 | { |
68 | bool ok; | 78 | bool ok; |
69 | #ifndef PWM_EMBEDDED | 79 | #ifndef PWM_EMBEDDED |