summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--pwmanager/pwmanager/addentrywndimpl.cpp3
-rw-r--r--pwmanager/pwmanager/configwndimpl.cpp10
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
@@ -27,24 +27,27 @@
27#include "advcommeditimpl.h" 27#include "advcommeditimpl.h"
28#endif 28#endif
29#include "htmlgen.h" 29#include "htmlgen.h"
30 30
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
38AddEntryWndImpl::AddEntryWndImpl() 38AddEntryWndImpl::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
46AddEntryWndImpl::~AddEntryWndImpl() 49AddEntryWndImpl::~AddEntryWndImpl()
47{ 50{
48 delete_ifnot_null(editAdvCommentButton); 51 delete_ifnot_null(editAdvCommentButton);
49 delete_ifnot_null(commentTextEdit); 52 delete_ifnot_null(commentTextEdit);
50 delete pwGen; 53 delete pwGen;
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
@@ -28,46 +28,56 @@
28#include <kstandarddirs.h> 28#include <kstandarddirs.h>
29#include <kfiledialog.h> 29#include <kfiledialog.h>
30#include <klocale.h> 30#include <klocale.h>
31 31
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
39ConfigWndImpl::ConfigWndImpl() 39ConfigWndImpl::ConfigWndImpl()
40#ifdef PWM_EMBEDDED
41 : configWnd(0, "ConfigWndImpl", TRUE)
42#endif
43
40{ 44{
41} 45}
42 46
43ConfigWndImpl::~ConfigWndImpl() 47ConfigWndImpl::~ConfigWndImpl()
44{ 48{
45} 49}
46 50
47void ConfigWndImpl::okButton_slot() 51void ConfigWndImpl::okButton_slot()
48{ 52{
49 done(0); 53 done(0);
50} 54}
51 55
52void ConfigWndImpl::cancelButton_slot() 56void ConfigWndImpl::cancelButton_slot()
53{ 57{
54 done(1); 58 done(1);
55} 59}
56 60
57void ConfigWndImpl::browseAutoStButton_slot() 61void 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
66void ConfigWndImpl::selEntrFontButton_slot() 76void ConfigWndImpl::selEntrFontButton_slot()
67{ 77{
68 bool ok; 78 bool ok;
69#ifndef PWM_EMBEDDED 79#ifndef PWM_EMBEDDED
70 QFont fnt = QFontDialog::getFont(&ok, currentEntryFont, this); 80 QFont fnt = QFontDialog::getFont(&ok, currentEntryFont, this);
71#else 81#else
72 QFont fnt = KFontDialog::getFont(currentEntryFont, ok); 82 QFont fnt = KFontDialog::getFont(currentEntryFont, ok);
73#endif 83#endif