-rw-r--r-- | pwmanager/pwmanager/addentrywndimpl.cpp | 30 | ||||
-rw-r--r-- | pwmanager/pwmanager/addentrywndimpl.h | 19 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwgenwndimpl.cpp | 25 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwgenwndimpl.h | 12 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwm.cpp | 5 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmanagerE.pro | 8 |
6 files changed, 90 insertions, 9 deletions
diff --git a/pwmanager/pwmanager/addentrywndimpl.cpp b/pwmanager/pwmanager/addentrywndimpl.cpp index 73ba36c..ffd301f 100644 --- a/pwmanager/pwmanager/addentrywndimpl.cpp +++ b/pwmanager/pwmanager/addentrywndimpl.cpp | |||
@@ -21,73 +21,99 @@ | |||
21 | **************************************************************************/ | 21 | **************************************************************************/ |
22 | 22 | ||
23 | #include "addentrywndimpl.h" | 23 | #include "addentrywndimpl.h" |
24 | #include "pwmexception.h" | 24 | #include "pwmexception.h" |
25 | #include "pwgenwndimpl.h" | 25 | #include "pwgenwndimpl.h" |
26 | #ifndef PWM_EMBEDDED | 26 | #ifndef PWM_EMBEDDED |
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 | #ifndef PWM_EMBEDDED | |
38 | AddEntryWndImpl::AddEntryWndImpl() | 38 | AddEntryWndImpl::AddEntryWndImpl() |
39 | #ifdef PWM_EMBEDDED | ||
40 | : addEntryWnd( 0, "AddEntryWndImpl", TRUE) | 39 | : addEntryWnd( 0, "AddEntryWndImpl", TRUE) |
40 | #else | ||
41 | AddEntryWndImpl::AddEntryWndImpl( QWidget* parent, const char* name) | ||
42 | : addEntryWnd( parent, name) | ||
41 | #endif | 43 | #endif |
42 | { | 44 | { |
43 | editAdvCommentButton = 0; | 45 | editAdvCommentButton = 0; |
44 | commentTextEdit = 0; | 46 | commentTextEdit = 0; |
45 | switchComment(false); | 47 | switchComment(false); |
46 | pwGen = new PwGenWndImpl(this); | 48 | pwGen = new PwGenWndImpl(this); |
47 | } | 49 | } |
48 | 50 | ||
49 | AddEntryWndImpl::~AddEntryWndImpl() | 51 | AddEntryWndImpl::~AddEntryWndImpl() |
50 | { | 52 | { |
51 | delete_ifnot_null(editAdvCommentButton); | 53 | delete_ifnot_null(editAdvCommentButton); |
52 | delete_ifnot_null(commentTextEdit); | 54 | delete_ifnot_null(commentTextEdit); |
53 | delete pwGen; | 55 | delete pwGen; |
54 | } | 56 | } |
55 | 57 | ||
58 | #ifdef PWM_EMBEDDED | ||
59 | void AddEntryWndImpl::slotOk() | ||
60 | { | ||
61 | slotApply(); | ||
62 | |||
63 | if (pwLineEdit->text().isEmpty()) { | ||
64 | KMessageBox::error(this, | ||
65 | i18n("Sorry, you haven't set a password."), | ||
66 | i18n("no password")); | ||
67 | return; | ||
68 | } | ||
69 | |||
70 | if (descLineEdit->text().isEmpty()) { | ||
71 | KMessageBox::error(this, | ||
72 | i18n("You haven't set a \"Description\"."), | ||
73 | i18n("Description not set")); | ||
74 | return; | ||
75 | } | ||
76 | |||
77 | KDialogBase::slotOk(); | ||
78 | } | ||
79 | #else | ||
80 | |||
56 | void AddEntryWndImpl::okButton_slot() | 81 | void AddEntryWndImpl::okButton_slot() |
57 | { | 82 | { |
58 | if (pwLineEdit->text().isEmpty()) { | 83 | if (pwLineEdit->text().isEmpty()) { |
59 | KMessageBox::error(this, | 84 | KMessageBox::error(this, |
60 | i18n("Sorry, you haven't set a password."), | 85 | i18n("Sorry, you haven't set a password."), |
61 | i18n("no password")); | 86 | i18n("no password")); |
62 | return; | 87 | return; |
63 | } | 88 | } |
64 | if (descLineEdit->text().isEmpty()) { | 89 | if (descLineEdit->text().isEmpty()) { |
65 | KMessageBox::error(this, | 90 | KMessageBox::error(this, |
66 | i18n | 91 | i18n |
67 | ("You haven't set a \"Description\"."), | 92 | ("You haven't set a \"Description\"."), |
68 | i18n("Description not set")); | 93 | i18n("Description not set")); |
69 | return; | 94 | return; |
70 | } | 95 | } |
71 | done(1); | 96 | done(1); |
72 | } | 97 | } |
73 | 98 | ||
74 | void AddEntryWndImpl::cancelButton_slot() | 99 | void AddEntryWndImpl::cancelButton_slot() |
75 | { | 100 | { |
76 | done(2); | 101 | done(2); |
77 | } | 102 | } |
103 | #endif | ||
78 | 104 | ||
79 | void AddEntryWndImpl::setCurrCategory(const QString &cat) | 105 | void AddEntryWndImpl::setCurrCategory(const QString &cat) |
80 | { | 106 | { |
81 | int i, count = categoryComboBox->count(); | 107 | int i, count = categoryComboBox->count(); |
82 | 108 | ||
83 | for (i = 0; i < count; ++i) { | 109 | for (i = 0; i < count; ++i) { |
84 | if (categoryComboBox->text(i) == cat) { | 110 | if (categoryComboBox->text(i) == cat) { |
85 | categoryComboBox->setCurrentItem(i); | 111 | categoryComboBox->setCurrentItem(i); |
86 | return; | 112 | return; |
87 | } | 113 | } |
88 | } | 114 | } |
89 | BUG(); | 115 | BUG(); |
90 | } | 116 | } |
91 | 117 | ||
92 | void AddEntryWndImpl::revealButton_slot() | 118 | void AddEntryWndImpl::revealButton_slot() |
93 | { | 119 | { |
diff --git a/pwmanager/pwmanager/addentrywndimpl.h b/pwmanager/pwmanager/addentrywndimpl.h index c0bfcee..622e9d2 100644 --- a/pwmanager/pwmanager/addentrywndimpl.h +++ b/pwmanager/pwmanager/addentrywndimpl.h | |||
@@ -7,52 +7,59 @@ | |||
7 | * it under the terms of the GNU General Public License version 2 * | 7 | * it under the terms of the GNU General Public License version 2 * |
8 | * as published by the Free Software Foundation. * | 8 | * as published by the Free Software Foundation. * |
9 | * * | 9 | * * |
10 | ***************************************************************************/ | 10 | ***************************************************************************/ |
11 | 11 | ||
12 | /*************************************************************************** | 12 | /*************************************************************************** |
13 | * copyright (C) 2004 by Ulf Schenk | 13 | * copyright (C) 2004 by Ulf Schenk |
14 | * This file is originaly based on version 1.0.1 of pwmanager | 14 | * This file is originaly based on version 1.0.1 of pwmanager |
15 | * and was modified to run on embedded devices that run microkde | 15 | * and was modified to run on embedded devices that run microkde |
16 | * | 16 | * |
17 | * $Id$ | 17 | * $Id$ |
18 | **************************************************************************/ | 18 | **************************************************************************/ |
19 | 19 | ||
20 | #ifndef __ADDENTRYWNDIMPL_H | 20 | #ifndef __ADDENTRYWNDIMPL_H |
21 | #define __ADDENTRYWNDIMPL_H | 21 | #define __ADDENTRYWNDIMPL_H |
22 | 22 | ||
23 | #include "addentrywnd.h" | ||
24 | 23 | ||
25 | #include <qlineedit.h> | ||
26 | #ifndef PWM_EMBEDDED | 24 | #ifndef PWM_EMBEDDED |
25 | #include <qlineedit.h> | ||
27 | #include <qtextedit.h> | 26 | #include <qtextedit.h> |
27 | #include <qcombobox.h> | ||
28 | #include "addentrywnd.h" | ||
28 | #else | 29 | #else |
30 | #include <klineedit.h> | ||
31 | #include <kcombobox.h> | ||
29 | #include <qmultilineedit.h> | 32 | #include <qmultilineedit.h> |
33 | #include "addentrywnd_emb.h" | ||
30 | #endif | 34 | #endif |
31 | 35 | ||
32 | #include <qcombobox.h> | ||
33 | #include <qpushbutton.h> | 36 | #include <qpushbutton.h> |
34 | 37 | ||
35 | class PwGenWndImpl; | 38 | class PwGenWndImpl; |
36 | 39 | ||
37 | /** "add/edit" Window */ | 40 | /** "add/edit" Window */ |
38 | class AddEntryWndImpl : public addEntryWnd | 41 | class AddEntryWndImpl : public addEntryWnd |
39 | { | 42 | { |
40 | Q_OBJECT | 43 | Q_OBJECT |
41 | public: | 44 | public: |
45 | #ifndef PWM_EMBEDDED | ||
42 | AddEntryWndImpl(); | 46 | AddEntryWndImpl(); |
47 | #else | ||
48 | AddEntryWndImpl( QWidget* parent = 0, const char* name = 0); | ||
49 | #endif | ||
43 | ~AddEntryWndImpl(); | 50 | ~AddEntryWndImpl(); |
44 | 51 | ||
45 | /* get... functions */ | 52 | /* get... functions */ |
46 | QString getDescription() | 53 | QString getDescription() |
47 | { return descLineEdit->text(); } | 54 | { return descLineEdit->text(); } |
48 | QString getCategory() | 55 | QString getCategory() |
49 | { return categoryComboBox->currentText(); } | 56 | { return categoryComboBox->currentText(); } |
50 | QString getUsername() | 57 | QString getUsername() |
51 | { return usernameLineEdit->text(); } | 58 | { return usernameLineEdit->text(); } |
52 | QString getPassword() | 59 | QString getPassword() |
53 | { return pwLineEdit->text(); } | 60 | { return pwLineEdit->text(); } |
54 | QString getUrl() | 61 | QString getUrl() |
55 | { return urlLineEdit->text(); } | 62 | { return urlLineEdit->text(); } |
56 | QString getLauncher() | 63 | QString getLauncher() |
57 | { return launcherLineEdit->text(); } | 64 | { return launcherLineEdit->text(); } |
58 | QString getComment(); | 65 | QString getComment(); |
@@ -65,36 +72,42 @@ public: | |||
65 | { categoryComboBox->insertItem(cat); } | 72 | { categoryComboBox->insertItem(cat); } |
66 | void setUsername(const QString &name) | 73 | void setUsername(const QString &name) |
67 | { usernameLineEdit->setText(name); } | 74 | { usernameLineEdit->setText(name); } |
68 | void setPassword(const QString &pw) | 75 | void setPassword(const QString &pw) |
69 | { pwLineEdit->setText(pw); } | 76 | { pwLineEdit->setText(pw); } |
70 | void setUrl(const QString &url) | 77 | void setUrl(const QString &url) |
71 | { urlLineEdit->setText(url); } | 78 | { urlLineEdit->setText(url); } |
72 | void setLauncher(const QString launcher) | 79 | void setLauncher(const QString launcher) |
73 | { launcherLineEdit->setText(launcher); } | 80 | { launcherLineEdit->setText(launcher); } |
74 | void setComment(const QString &comm); | 81 | void setComment(const QString &comm); |
75 | 82 | ||
76 | /** are we using an advanced comment */ | 83 | /** are we using an advanced comment */ |
77 | bool isAdvancedComment() | 84 | bool isAdvancedComment() |
78 | { return useAdvComment; } | 85 | { return useAdvComment; } |
79 | 86 | ||
80 | public slots: | 87 | public slots: |
88 | #ifndef PWM_EMBEDDED | ||
89 | //MOC_SKIP_BEGIN | ||
81 | /** OK button pressed */ | 90 | /** OK button pressed */ |
82 | void okButton_slot(); | 91 | void okButton_slot(); |
83 | /** cancel button pressed */ | 92 | /** cancel button pressed */ |
84 | void cancelButton_slot(); | 93 | void cancelButton_slot(); |
94 | //MOC_SKIP_END | ||
95 | #else | ||
96 | virtual void slotOk(); | ||
97 | #endif | ||
85 | /** Reveal button pressed */ | 98 | /** Reveal button pressed */ |
86 | void revealButton_slot(); | 99 | void revealButton_slot(); |
87 | /** Generate button pressed */ | 100 | /** Generate button pressed */ |
88 | void generateButton_slot(); | 101 | void generateButton_slot(); |
89 | /** advanced comment button pressed */ | 102 | /** advanced comment button pressed */ |
90 | void advancedCommentButton_slot(bool on); | 103 | void advancedCommentButton_slot(bool on); |
91 | /** edit advanced comment button pressed */ | 104 | /** edit advanced comment button pressed */ |
92 | void editAdvCommentButton_slot(); | 105 | void editAdvCommentButton_slot(); |
93 | 106 | ||
94 | protected: | 107 | protected: |
95 | void switchComment(bool toAdvanced); | 108 | void switchComment(bool toAdvanced); |
96 | 109 | ||
97 | protected: | 110 | protected: |
98 | QPushButton *editAdvCommentButton; | 111 | QPushButton *editAdvCommentButton; |
99 | #ifndef PWM_EMBEDDED | 112 | #ifndef PWM_EMBEDDED |
100 | QTextEdit *commentTextEdit; | 113 | QTextEdit *commentTextEdit; |
diff --git a/pwmanager/pwmanager/pwgenwndimpl.cpp b/pwmanager/pwmanager/pwgenwndimpl.cpp index 01f5740..5313060 100644 --- a/pwmanager/pwmanager/pwgenwndimpl.cpp +++ b/pwmanager/pwmanager/pwgenwndimpl.cpp | |||
@@ -17,59 +17,84 @@ | |||
17 | * $Id$ | 17 | * $Id$ |
18 | **************************************************************************/ | 18 | **************************************************************************/ |
19 | 19 | ||
20 | #include "pwgenwndimpl.h" | 20 | #include "pwgenwndimpl.h" |
21 | #include "pwmexception.h" | 21 | #include "pwmexception.h" |
22 | #include "genpasswd.h" | 22 | #include "genpasswd.h" |
23 | 23 | ||
24 | #include <qtabwidget.h> | 24 | #include <qtabwidget.h> |
25 | #include <qspinbox.h> | 25 | #include <qspinbox.h> |
26 | #include <qcheckbox.h> | 26 | #include <qcheckbox.h> |
27 | #include <qlineedit.h> | 27 | #include <qlineedit.h> |
28 | 28 | ||
29 | #include <klocale.h> | 29 | #include <klocale.h> |
30 | #include <kmessagebox.h> | 30 | #include <kmessagebox.h> |
31 | 31 | ||
32 | 32 | ||
33 | #ifndef PWM_EMBEDDED | ||
33 | PwGenWndImpl::PwGenWndImpl(QWidget *parent, | 34 | PwGenWndImpl::PwGenWndImpl(QWidget *parent, |
34 | const char *name, | 35 | const char *name, |
35 | bool modal, | 36 | bool modal, |
36 | WFlags fl) | 37 | WFlags fl) |
37 | : pwGenWnd(parent, name, modal, fl) | 38 | : pwGenWnd(parent, name, modal, fl) |
38 | { | 39 | { |
39 | } | 40 | } |
40 | 41 | ||
42 | #else | ||
43 | PwGenWndImpl::PwGenWndImpl( QWidget* parent, const char* name) | ||
44 | : pwGenWnd( parent, name) | ||
45 | { | ||
46 | } | ||
47 | #endif | ||
48 | |||
41 | PwGenWndImpl::~PwGenWndImpl() | 49 | PwGenWndImpl::~PwGenWndImpl() |
42 | { | 50 | { |
43 | } | 51 | } |
44 | 52 | ||
53 | #ifdef PWM_EMBEDDED | ||
54 | void PwGenWndImpl::slotOk() | ||
55 | { | ||
56 | // internal generator | ||
57 | if (!optionsSanityIntGen()) | ||
58 | return; | ||
59 | if (!startIntGen()) | ||
60 | return; | ||
61 | |||
62 | KDialogBase::slotOk(); | ||
63 | } | ||
64 | #endif | ||
65 | |||
45 | void PwGenWndImpl::genButton_slot() | 66 | void PwGenWndImpl::genButton_slot() |
46 | { | 67 | { |
68 | #ifndef PWM_EMBEDDED | ||
47 | // internal generator | 69 | // internal generator |
48 | if (!optionsSanityIntGen()) | 70 | if (!optionsSanityIntGen()) |
49 | return; | 71 | return; |
50 | if (startIntGen()) | 72 | if (startIntGen()) |
51 | goto exit_success; | 73 | goto exit_success; |
52 | done(0); | 74 | done(0); |
53 | exit_success: | 75 | exit_success: |
54 | done(1); | 76 | done(1); |
77 | #endif | ||
55 | } | 78 | } |
56 | 79 | ||
57 | void PwGenWndImpl::cancelButton_slot() | 80 | void PwGenWndImpl::cancelButton_slot() |
58 | { | 81 | { |
82 | #ifndef PWM_EMBEDDED | ||
59 | done(0); | 83 | done(0); |
84 | #endif | ||
60 | } | 85 | } |
61 | 86 | ||
62 | bool PwGenWndImpl::optionsSanityIntGen() | 87 | bool PwGenWndImpl::optionsSanityIntGen() |
63 | { | 88 | { |
64 | if (int_charLowerCheckBox->isChecked()) | 89 | if (int_charLowerCheckBox->isChecked()) |
65 | return true; | 90 | return true; |
66 | if (int_charUpperCheckBox->isChecked()) | 91 | if (int_charUpperCheckBox->isChecked()) |
67 | return true; | 92 | return true; |
68 | if (int_charNumCheckBox->isChecked()) | 93 | if (int_charNumCheckBox->isChecked()) |
69 | return true; | 94 | return true; |
70 | if (int_charSpecCheckBox->isChecked()) | 95 | if (int_charSpecCheckBox->isChecked()) |
71 | return true; | 96 | return true; |
72 | if (int_charUserCheckBox->isChecked()) { | 97 | if (int_charUserCheckBox->isChecked()) { |
73 | if (int_userDefLineEdit->text().length() >= 2) | 98 | if (int_userDefLineEdit->text().length() >= 2) |
74 | return true; | 99 | return true; |
75 | if (int_charBlankCheckBox->isChecked()) | 100 | if (int_charBlankCheckBox->isChecked()) |
diff --git a/pwmanager/pwmanager/pwgenwndimpl.h b/pwmanager/pwmanager/pwgenwndimpl.h index 5c25643..994ff2f 100644 --- a/pwmanager/pwmanager/pwgenwndimpl.h +++ b/pwmanager/pwmanager/pwgenwndimpl.h | |||
@@ -7,48 +7,60 @@ | |||
7 | * it under the terms of the GNU General Public License version 2 * | 7 | * it under the terms of the GNU General Public License version 2 * |
8 | * as published by the Free Software Foundation. * | 8 | * as published by the Free Software Foundation. * |
9 | * * | 9 | * * |
10 | ***************************************************************************/ | 10 | ***************************************************************************/ |
11 | 11 | ||
12 | /*************************************************************************** | 12 | /*************************************************************************** |
13 | * copyright (C) 2004 by Ulf Schenk | 13 | * copyright (C) 2004 by Ulf Schenk |
14 | * This file is originaly based on version 1.0.1 of pwmanager | 14 | * This file is originaly based on version 1.0.1 of pwmanager |
15 | * and was modified to run on embedded devices that run microkde | 15 | * and was modified to run on embedded devices that run microkde |
16 | * | 16 | * |
17 | * $Id$ | 17 | * $Id$ |
18 | **************************************************************************/ | 18 | **************************************************************************/ |
19 | 19 | ||
20 | #ifndef __PWGENWNDIMPL_H | 20 | #ifndef __PWGENWNDIMPL_H |
21 | #define __PWGENWNDIMPL_H | 21 | #define __PWGENWNDIMPL_H |
22 | 22 | ||
23 | #ifndef PWM_EMBEDDED | ||
23 | #include "pwgenwnd.h" | 24 | #include "pwgenwnd.h" |
25 | #else | ||
26 | #include "pwgenwnd_emb.h" | ||
27 | #endif | ||
24 | 28 | ||
25 | class PwGenWndImpl : public pwGenWnd | 29 | class PwGenWndImpl : public pwGenWnd |
26 | { | 30 | { |
27 | public: | 31 | public: |
32 | #ifndef PWM_EMBEDDED | ||
28 | PwGenWndImpl(QWidget *parent = 0, | 33 | PwGenWndImpl(QWidget *parent = 0, |
29 | const char *name = 0, | 34 | const char *name = 0, |
30 | bool modal = FALSE, | 35 | bool modal = FALSE, |
31 | WFlags fl = 0); | 36 | WFlags fl = 0); |
37 | #else | ||
38 | PwGenWndImpl( QWidget* parent = 0, const char* name = 0); | ||
39 | #endif | ||
40 | |||
32 | ~PwGenWndImpl(); | 41 | ~PwGenWndImpl(); |
33 | 42 | ||
34 | /** returns the generated password */ | 43 | /** returns the generated password */ |
35 | QString getPassword(); | 44 | QString getPassword(); |
36 | 45 | ||
37 | protected slots: | 46 | protected slots: |
38 | /** generate button pressed */ | 47 | /** generate button pressed */ |
39 | void genButton_slot(); | 48 | void genButton_slot(); |
49 | #ifdef PWM_EMBEDDED | ||
50 | virtual void slotOk(); | ||
51 | #endif | ||
40 | /** cancel button pressed */ | 52 | /** cancel button pressed */ |
41 | void cancelButton_slot(); | 53 | void cancelButton_slot(); |
42 | 54 | ||
43 | protected: | 55 | protected: |
44 | /** start the internal generator */ | 56 | /** start the internal generator */ |
45 | bool startIntGen(); | 57 | bool startIntGen(); |
46 | /** check all options of the internal generator */ | 58 | /** check all options of the internal generator */ |
47 | bool optionsSanityIntGen(); | 59 | bool optionsSanityIntGen(); |
48 | 60 | ||
49 | protected: | 61 | protected: |
50 | /** the generated password */ | 62 | /** the generated password */ |
51 | QString password; | 63 | QString password; |
52 | }; | 64 | }; |
53 | 65 | ||
54 | #endif // __PWGENWNDIMPL_H | 66 | #endif // __PWGENWNDIMPL_H |
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp index 08fcb25..107e845 100644 --- a/pwmanager/pwmanager/pwm.cpp +++ b/pwmanager/pwmanager/pwm.cpp | |||
@@ -555,33 +555,38 @@ bool PwM::saveAs() | |||
555 | //US ENH : changed code to run with older MOC | 555 | //US ENH : changed code to run with older MOC |
556 | void PwM::addPwd_slot() | 556 | void PwM::addPwd_slot() |
557 | { | 557 | { |
558 | addPwd_slot(0, 0); | 558 | addPwd_slot(0, 0); |
559 | } | 559 | } |
560 | 560 | ||
561 | void PwM::addPwd_slot(QString *pw, PwMDoc *_doc) | 561 | void PwM::addPwd_slot(QString *pw, PwMDoc *_doc) |
562 | { | 562 | { |
563 | PwMDoc *doc; | 563 | PwMDoc *doc; |
564 | if (_doc) { | 564 | if (_doc) { |
565 | doc = _doc; | 565 | doc = _doc; |
566 | } else { | 566 | } else { |
567 | doc = curDoc(); | 567 | doc = curDoc(); |
568 | } | 568 | } |
569 | PWM_ASSERT(doc); | 569 | PWM_ASSERT(doc); |
570 | doc->timer()->getLock(DocTimer::id_autoLockTimer); | 570 | doc->timer()->getLock(DocTimer::id_autoLockTimer); |
571 | #ifndef PWM_EMBEDDED | ||
571 | AddEntryWndImpl w; | 572 | AddEntryWndImpl w; |
573 | #else | ||
574 | AddEntryWndImpl w(this, "addentrywndimpl"); | ||
575 | #endif | ||
576 | |||
572 | vector<string> catList; | 577 | vector<string> catList; |
573 | doc->getCategoryList(&catList); | 578 | doc->getCategoryList(&catList); |
574 | unsigned i, size = catList.size(); | 579 | unsigned i, size = catList.size(); |
575 | for (i = 0; i < size; ++i) { | 580 | for (i = 0; i < size; ++i) { |
576 | w.addCategory(catList[i].c_str()); | 581 | w.addCategory(catList[i].c_str()); |
577 | } | 582 | } |
578 | w.setCurrCategory(view->getCurrentCategory()); | 583 | w.setCurrCategory(view->getCurrentCategory()); |
579 | if (pw) | 584 | if (pw) |
580 | w.pwLineEdit->setText(*pw); | 585 | w.pwLineEdit->setText(*pw); |
581 | 586 | ||
582 | tryAgain: | 587 | tryAgain: |
583 | if (w.exec() == 1) | 588 | if (w.exec() == 1) |
584 | { | 589 | { |
585 | PwMDataItem d; | 590 | PwMDataItem d; |
586 | d.desc = w.getDescription().latin1(); | 591 | d.desc = w.getDescription().latin1(); |
587 | d.name = w.getUsername().latin1(); | 592 | d.name = w.getUsername().latin1(); |
diff --git a/pwmanager/pwmanager/pwmanagerE.pro b/pwmanager/pwmanager/pwmanagerE.pro index 5c29ea4..87142b7 100644 --- a/pwmanager/pwmanager/pwmanagerE.pro +++ b/pwmanager/pwmanager/pwmanagerE.pro | |||
@@ -26,56 +26,56 @@ LIBS += $(QTOPIALIB) | |||
26 | #setmasterpwwnd.ui \ | 26 | #setmasterpwwnd.ui \ |
27 | #subtbledit.ui | 27 | #subtbledit.ui |
28 | 28 | ||
29 | #INTERFACES = \ | 29 | #INTERFACES = \ |
30 | #subtbledit.ui \ | 30 | #subtbledit.ui \ |
31 | 31 | ||
32 | 32 | ||
33 | 33 | ||
34 | #HEADERS = \ | 34 | #HEADERS = \ |
35 | #configuration_31compat.h \ | 35 | #configuration_31compat.h \ |
36 | #configuration.h \ | 36 | #configuration.h \ |
37 | #configwnd.h \ | 37 | #configwnd.h \ |
38 | #configwndimpl.h \ | 38 | #configwndimpl.h \ |
39 | #selftest.h | 39 | #selftest.h |
40 | 40 | ||
41 | HEADERS = \ | 41 | HEADERS = \ |
42 | addentrywnd.h \ | 42 | addentrywnd_emb.h \ |
43 | addentrywndimpl.h \ | 43 | addentrywndimpl.h \ |
44 | base64.h \ | 44 | base64.h \ |
45 | binentrygen.h \ | 45 | binentrygen.h \ |
46 | blowfish.h \ | 46 | blowfish.h \ |
47 | commentbox.h \ | 47 | commentbox.h \ |
48 | compiler.h \ | 48 | compiler.h \ |
49 | compressbzip2.h \ | 49 | compressbzip2.h \ |
50 | compressgzip.h \ | 50 | compressgzip.h \ |
51 | findwnd.h \ | 51 | findwnd.h \ |
52 | findwndimpl.h \ | 52 | findwndimpl.h \ |
53 | genpasswd.h \ | 53 | genpasswd.h \ |
54 | getkeycardwnd.h \ | 54 | getkeycardwnd.h \ |
55 | getmasterpwwnd.h \ | 55 | getmasterpwwnd.h \ |
56 | getmasterpwwndimpl.h \ | 56 | getmasterpwwndimpl.h \ |
57 | globalstuff.h \ | 57 | globalstuff.h \ |
58 | gpasmanfile.h \ | 58 | gpasmanfile.h \ |
59 | htmlgen.h \ | 59 | htmlgen.h \ |
60 | htmlparse.h \ | 60 | htmlparse.h \ |
61 | ipc.h \ | 61 | ipc.h \ |
62 | listobjselectwnd.h \ | 62 | listobjselectwnd.h \ |
63 | listviewpwm.h \ | 63 | listviewpwm.h \ |
64 | printtext.h \ | 64 | printtext.h \ |
65 | pwgenwnd.h \ | 65 | pwgenwnd_emb.h \ |
66 | pwgenwndimpl.h \ | 66 | pwgenwndimpl.h \ |
67 | pwmdoc.h \ | 67 | pwmdoc.h \ |
68 | pwmdocui.h \ | 68 | pwmdocui.h \ |
69 | pwmexception.h \ | 69 | pwmexception.h \ |
70 | pwm.h \ | 70 | pwm.h \ |
71 | pwminit.h \ | 71 | pwminit.h \ |
72 | pwmprefs.h \ | 72 | pwmprefs.h \ |
73 | pwmprint.h \ | 73 | pwmprint.h \ |
74 | pwmtray.h \ | 74 | pwmtray.h \ |
75 | pwmview.h \ | 75 | pwmview.h \ |
76 | pwmviewstyle_0.h \ | 76 | pwmviewstyle_0.h \ |
77 | pwmviewstyle_1.h \ | 77 | pwmviewstyle_1.h \ |
78 | pwmviewstyle.h \ | 78 | pwmviewstyle.h \ |
79 | randomizer.h \ | 79 | randomizer.h \ |
80 | rc2.h \ | 80 | rc2.h \ |
81 | rencatwnd.h \ | 81 | rencatwnd.h \ |
@@ -90,54 +90,54 @@ kcmconfigs/kcmpwmconfig.h \ | |||
90 | kcmconfigs/pwmconfigwidget.h \ | 90 | kcmconfigs/pwmconfigwidget.h \ |
91 | 91 | ||
92 | #sources that need not be build | 92 | #sources that need not be build |
93 | #SOURCES = \ | 93 | #SOURCES = \ |
94 | #advcommeditimpl.cpp \ | 94 | #advcommeditimpl.cpp \ |
95 | #configuration.cpp \ | 95 | #configuration.cpp \ |
96 | #configwnd.cpp \ | 96 | #configwnd.cpp \ |
97 | #configwndimpl.cpp \ | 97 | #configwndimpl.cpp \ |
98 | #configuration_31compat.cpp \ | 98 | #configuration_31compat.cpp \ |
99 | #htmlparse.cpp \ | 99 | #htmlparse.cpp \ |
100 | #printtext.cpp \ | 100 | #printtext.cpp \ |
101 | #selftest.cpp \ | 101 | #selftest.cpp \ |
102 | #pwmprint.cpp \ | 102 | #pwmprint.cpp \ |
103 | #spinforsignal.cpp | 103 | #spinforsignal.cpp |
104 | 104 | ||
105 | SOURCES = \ | 105 | SOURCES = \ |
106 | addentrywnd.cpp \ | 106 | addentrywnd_emb.cpp \ |
107 | addentrywndimpl.cpp \ | 107 | addentrywndimpl.cpp \ |
108 | base64.cpp \ | 108 | base64.cpp \ |
109 | binentrygen.cpp \ | 109 | binentrygen.cpp \ |
110 | blowfish.cpp \ | 110 | blowfish.cpp \ |
111 | commentbox.cpp \ | 111 | commentbox.cpp \ |
112 | compressbzip2.cpp \ | 112 | compressbzip2.cpp \ |
113 | compressgzip.cpp \ | 113 | compressgzip.cpp \ |
114 | findwnd.cpp \ | 114 | findwnd.cpp \ |
115 | findwndimpl.cpp \ | 115 | findwndimpl.cpp \ |
116 | genpasswd.cpp \ | 116 | genpasswd.cpp \ |
117 | getkeycardwnd.cpp \ | 117 | getkeycardwnd.cpp \ |
118 | getmasterpwwnd.cpp \ | 118 | getmasterpwwnd.cpp \ |
119 | getmasterpwwndimpl.cpp \ | 119 | getmasterpwwndimpl.cpp \ |
120 | globalstuff.cpp \ | 120 | globalstuff.cpp \ |
121 | gpasmanfile.cpp \ | 121 | gpasmanfile.cpp \ |
122 | htmlgen.cpp \ | 122 | htmlgen.cpp \ |
123 | ipc.cpp \ | 123 | ipc.cpp \ |
124 | listobjselectwnd.cpp \ | 124 | listobjselectwnd.cpp \ |
125 | listviewpwm.cpp \ | 125 | listviewpwm.cpp \ |
126 | main.cpp \ | 126 | main.cpp \ |
127 | pwgenwnd.cpp \ | 127 | pwgenwnd_emb.cpp \ |
128 | pwgenwndimpl.cpp \ | 128 | pwgenwndimpl.cpp \ |
129 | pwm.cpp \ | 129 | pwm.cpp \ |
130 | pwmdoc.cpp \ | 130 | pwmdoc.cpp \ |
131 | pwmdocui.cpp \ | 131 | pwmdocui.cpp \ |
132 | pwmexception.cpp \ | 132 | pwmexception.cpp \ |
133 | pwminit.cpp \ | 133 | pwminit.cpp \ |
134 | pwmprefs.cpp \ | 134 | pwmprefs.cpp \ |
135 | pwmtray.cpp \ | 135 | pwmtray.cpp \ |
136 | pwmview.cpp \ | 136 | pwmview.cpp \ |
137 | pwmviewstyle_0.cpp \ | 137 | pwmviewstyle_0.cpp \ |
138 | pwmviewstyle_1.cpp \ | 138 | pwmviewstyle_1.cpp \ |
139 | pwmviewstyle.cpp \ | 139 | pwmviewstyle.cpp \ |
140 | randomizer.cpp \ | 140 | randomizer.cpp \ |
141 | rc2.cpp \ | 141 | rc2.cpp \ |
142 | rencatwnd.cpp \ | 142 | rencatwnd.cpp \ |
143 | serializer.cpp \ | 143 | serializer.cpp \ |