summaryrefslogtreecommitdiffabout
path: root/pwmanager
Unidiff
Diffstat (limited to 'pwmanager') (more/less context) (ignore whitespace changes)
-rw-r--r--pwmanager/pwmanager/addentrywnd_emb.cpp2
-rw-r--r--pwmanager/pwmanager/findwnd_emb.cpp123
-rw-r--r--pwmanager/pwmanager/findwnd_emb.h62
-rw-r--r--pwmanager/pwmanager/findwndimpl.cpp13
-rw-r--r--pwmanager/pwmanager/findwndimpl.h8
-rw-r--r--pwmanager/pwmanager/getmasterpwwnd_emb.cpp86
-rw-r--r--pwmanager/pwmanager/getmasterpwwnd_emb.h48
-rw-r--r--pwmanager/pwmanager/getmasterpwwndimpl.cpp14
-rw-r--r--pwmanager/pwmanager/getmasterpwwndimpl.h7
-rw-r--r--pwmanager/pwmanager/listviewpwm.cpp15
-rw-r--r--pwmanager/pwmanager/main.cpp2
-rw-r--r--pwmanager/pwmanager/pwgenwnd_emb.cpp3
-rw-r--r--pwmanager/pwmanager/pwm.cpp35
-rw-r--r--pwmanager/pwmanager/pwmanagerE.pro12
-rw-r--r--pwmanager/pwmanager/pwmdocui.cpp15
-rw-r--r--pwmanager/pwmanager/pwmviewstyle.cpp14
-rw-r--r--pwmanager/pwmanager/serializer.cpp2
-rw-r--r--pwmanager/pwmanager/setmasterpwwnd_emb.cpp163
-rw-r--r--pwmanager/pwmanager/setmasterpwwnd_emb.h62
-rw-r--r--pwmanager/pwmanager/setmasterpwwndimpl.cpp43
-rw-r--r--pwmanager/pwmanager/setmasterpwwndimpl.h8
21 files changed, 699 insertions, 38 deletions
diff --git a/pwmanager/pwmanager/addentrywnd_emb.cpp b/pwmanager/pwmanager/addentrywnd_emb.cpp
index 3a40cfc..ed02e6d 100644
--- a/pwmanager/pwmanager/addentrywnd_emb.cpp
+++ b/pwmanager/pwmanager/addentrywnd_emb.cpp
@@ -42,7 +42,7 @@ $Id$
42 * TRUE to construct a modal dialog. 42 * TRUE to construct a modal dialog.
43 */ 43 */
44addEntryWnd::addEntryWnd( QWidget* parent, const char* name) 44addEntryWnd::addEntryWnd( QWidget* parent, const char* name)
45 : KDialogBase( KDialogBase::Plain, i18n( "Edit Password" ), 45 : KDialogBase( KDialogBase::Plain, i18n( "edit/add a password entry" ),
46 KDialogBase::Ok | KDialogBase::Cancel, 46 KDialogBase::Ok | KDialogBase::Cancel,
47 KDialogBase::Ok, parent, name, true ) 47 KDialogBase::Ok, parent, name, true )
48{ 48{
diff --git a/pwmanager/pwmanager/findwnd_emb.cpp b/pwmanager/pwmanager/findwnd_emb.cpp
new file mode 100644
index 0000000..6db2684
--- a/dev/null
+++ b/pwmanager/pwmanager/findwnd_emb.cpp
@@ -0,0 +1,123 @@
1/*
2 This file is part of PwManager/Platform independent.
3 Copyright (c) 2004 Ulf Schenk
4
5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version.
9
10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details.
14
15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18
19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution.
22
23$Id$
24*/
25
26#include "findwnd_emb.h"
27
28#include <klocale.h>
29
30#include <qcheckbox.h>
31#include <qbuttongroup.h>
32#include <qradiobutton.h>
33#include <qlayout.h>
34#include <klineedit.h>
35#include <qlabel.h>
36
37/*
38#include <qvariant.h>
39#include <qlabel.h>
40#include <qlineedit.h>
41#include <qpushbutton.h>
42#include <qcheckbox.h>
43#include <qbuttongroup.h>
44#include <qradiobutton.h>
45#include <qlayout.h>
46#include <qtooltip.h>
47#include <qwhatsthis.h>
48*/
49
50/*
51 * Constructs a findWnd as a child of 'parent', with the
52 * name 'name'.
53 */
54findWnd::findWnd( QWidget* parent, const char* name )
55 : KDialogBase( KDialogBase::Plain, i18n( "Find" ),
56 KDialogBase::Ok | KDialogBase::Cancel,
57 KDialogBase::Ok, parent, name, true )
58{
59 QWidget *page = plainPage();
60 QVBoxLayout *layout = new QVBoxLayout( page );
61 layout->setMargin( KDialogBase::marginHint() );
62 layout->setSpacing( KDialogBase::spacingHint() );
63
64 exactCheckBox = new QCheckBox( i18n( "&Exact match" ), page );
65 layout->addWidget( exactCheckBox );
66
67 caseSensCheckBox = new QCheckBox( i18n( "&Case sensitive" ), page );
68 layout->addWidget( caseSensCheckBox );
69
70
71 QButtonGroup* buttonGroup1 = new QButtonGroup(1, Qt::Horizontal, i18n( "Search in Column" ), page );
72 layout->addWidget( buttonGroup1 );
73
74 descRadioButton = new QRadioButton( i18n( "&Description" ), buttonGroup1 );
75 pwRadioButton = new QRadioButton( i18n( "&Password" ), buttonGroup1 );
76 commentRadioButton = new QRadioButton( i18n( "C&omment" ), buttonGroup1 );
77 nameRadioButton = new QRadioButton( i18n( "&Username" ), buttonGroup1 );
78 urlRadioButton = new QRadioButton( i18n( "U&RL" ), buttonGroup1 );
79 launcherRadioButton = new QRadioButton( i18n( "&Launcher" ), buttonGroup1 );
80 descRadioButton->setChecked( TRUE );
81
82 findLineEdit = new KLineEdit( page );
83 QLabel* label = new QLabel( findLineEdit, i18n( "Find:" ), page );
84 layout->addWidget( label );
85 layout->addWidget( findLineEdit );
86
87 setButtonText( KDialogBase::Ok, "&Find" );
88 setButtonText( KDialogBase::Cancel, "&Close" );
89
90
91 // resize( QSize(200, 150) );
92
93
94 connect( buttonGroup1, SIGNAL( clicked(int) ), this, SLOT( selectionChanged_slot() ) );
95 connect( findLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( selectionChanged_slot() ) );
96 connect( caseSensCheckBox, SIGNAL( stateChanged(int) ), this, SLOT( selectionChanged_slot() ) );
97 connect( exactCheckBox, SIGNAL( stateChanged(int) ), this, SLOT( selectionChanged_slot() ) );
98
99}
100
101/*
102 * Destroys the object and frees any allocated resources
103 */
104findWnd::~findWnd()
105{
106 // no need to delete child widgets, Qt does it all for us
107}
108
109void findWnd::findButton_slot()
110{
111 qWarning( "findWnd::findButton_slot(): Not implemented yet" );
112}
113
114void findWnd::selectionChanged_slot()
115{
116 qWarning( "findWnd::selectionChanged_slot(): Not implemented yet" );
117}
118
119void findWnd::closeButton_slot()
120{
121 qWarning( "findWnd::closeButton_slot(): Not implemented yet" );
122}
123
diff --git a/pwmanager/pwmanager/findwnd_emb.h b/pwmanager/pwmanager/findwnd_emb.h
new file mode 100644
index 0000000..9ad5a73
--- a/dev/null
+++ b/pwmanager/pwmanager/findwnd_emb.h
@@ -0,0 +1,62 @@
1/*
2 This file is part of PwManager/Platform independent.
3 Copyright (c) 2004 Ulf Schenk
4
5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version.
9
10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details.
14
15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18
19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution.
22
23$Id$
24*/
25
26
27#ifndef FINDWND_EMB_H
28#define FINDWND_EMB_H
29
30#include <kdialogbase.h>
31
32
33class QLineEdit;
34class QCheckBox;
35class QRadioButton;
36
37
38class findWnd : public KDialogBase
39{
40 Q_OBJECT
41
42public:
43 findWnd( QWidget* parent = 0, const char* name = 0 );
44 ~findWnd();
45
46 QLineEdit* findLineEdit;
47 QCheckBox* exactCheckBox;
48 QCheckBox* caseSensCheckBox;
49 QRadioButton* descRadioButton;
50 QRadioButton* pwRadioButton;
51 QRadioButton* commentRadioButton;
52 QRadioButton* nameRadioButton;
53 QRadioButton* urlRadioButton;
54 QRadioButton* launcherRadioButton;
55
56public slots:
57 virtual void findButton_slot();
58 virtual void selectionChanged_slot();
59 virtual void closeButton_slot();
60};
61
62#endif // FINDWND_H
diff --git a/pwmanager/pwmanager/findwndimpl.cpp b/pwmanager/pwmanager/findwndimpl.cpp
index fec1a6a..059219f 100644
--- a/pwmanager/pwmanager/findwndimpl.cpp
+++ b/pwmanager/pwmanager/findwndimpl.cpp
@@ -108,9 +108,22 @@ void FindWndImpl::findButton_slot()
108 currFoundPos = 0; 108 currFoundPos = 0;
109} 109}
110 110
111
112#ifdef PWM_EMBEDDED
113void FindWndImpl::slotOk()
114{
115 findButton_slot();
116
117 //do not call KDialogBase::slotOk() here
118 // user should press the close button instead
119}
120#endif
121
111void FindWndImpl::closeButton_slot() 122void FindWndImpl::closeButton_slot()
112{ 123{
124#ifndef PWM_EMBEDDED
113 done(0); 125 done(0);
126#endif
114} 127}
115 128
116void FindWndImpl::selectionChanged_slot() 129void FindWndImpl::selectionChanged_slot()
diff --git a/pwmanager/pwmanager/findwndimpl.h b/pwmanager/pwmanager/findwndimpl.h
index d8cb65d..b601390 100644
--- a/pwmanager/pwmanager/findwndimpl.h
+++ b/pwmanager/pwmanager/findwndimpl.h
@@ -20,7 +20,11 @@
20#ifndef FINDWNDIMPL_H 20#ifndef FINDWNDIMPL_H
21#define FINDWNDIMPL_H 21#define FINDWNDIMPL_H
22 22
23#ifndef PWM_EMBEDDED
23#include "findwnd.h" 24#include "findwnd.h"
25#else
26#include "findwnd_emb.h"
27#endif
24 28
25class PwMView; 29class PwMView;
26 30
@@ -43,6 +47,10 @@ public slots:
43 /** selection of one of the radio buttons changed */ 47 /** selection of one of the radio buttons changed */
44 void selectionChanged_slot(); 48 void selectionChanged_slot();
45 49
50#ifdef PWM_EMBEDDED
51 virtual void slotOk();
52#endif
53
46protected: 54protected:
47 /** parent view */ 55 /** parent view */
48 PwMView *parent; 56 PwMView *parent;
diff --git a/pwmanager/pwmanager/getmasterpwwnd_emb.cpp b/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
new file mode 100644
index 0000000..3519de8
--- a/dev/null
+++ b/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
@@ -0,0 +1,86 @@
1/*
2 This file is part of PwManager/Platform independent.
3 Copyright (c) 2004 Ulf Schenk
4
5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version.
9
10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details.
14
15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18
19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution.
22
23$Id$
24*/
25
26#include "getmasterpwwnd_emb.h"
27
28#include "klocale.h"
29/*
30#include <qvariant.h>
31#include <qpushbutton.h>
32#include <qlabel.h>
33#include <qlineedit.h>
34#include <qlayout.h>
35#include <qtooltip.h>
36#include <qwhatsthis.h>
37*/
38
39#include <qwidget.h>
40#include <qlayout.h>
41#include <qlabel.h>
42#include <qlineedit.h>
43
44/*
45 * Constructs a getMasterPwWnd as a child of 'parent', with the
46 * name 'name'
47 */
48getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name)
49 : KDialogBase( KDialogBase::Plain, i18n( "Master-password" ),
50 KDialogBase::Ok | KDialogBase::Cancel,
51 KDialogBase::Ok, parent, name, true )
52{
53 QWidget *page = plainPage();
54 QVBoxLayout *pageLayout = new QVBoxLayout( page );
55
56 pwLineEdit = new QLineEdit( page, "pwLineEdit" );
57 pwLineEdit->setEchoMode( QLineEdit::Password );
58
59 QLabel* textLabel1 = new QLabel( pwLineEdit, i18n("Please enter the master-password:"), page, "textLabel1" );
60 textLabel1->setAlignment( int( QLabel::WordBreak | QLabel::AlignCenter ) );
61 pageLayout->addWidget(textLabel1);
62 pageLayout->addWidget(pwLineEdit);
63
64
65 resize( QSize(200, 100) );
66
67}
68
69/*
70 * Destroys the object and frees any allocated resources
71 */
72getMasterPwWnd::~getMasterPwWnd()
73{
74 // no need to delete child widgets, Qt does it all for us
75}
76
77void getMasterPwWnd::okButton_slot()
78{
79 qWarning( "getMasterPwWnd::okButton_slot(): Not implemented yet" );
80}
81
82void getMasterPwWnd::cancelButton_slot()
83{
84 qWarning( "getMasterPwWnd::cancelButton_slot(): Not implemented yet" );
85}
86
diff --git a/pwmanager/pwmanager/getmasterpwwnd_emb.h b/pwmanager/pwmanager/getmasterpwwnd_emb.h
new file mode 100644
index 0000000..64121c4
--- a/dev/null
+++ b/pwmanager/pwmanager/getmasterpwwnd_emb.h
@@ -0,0 +1,48 @@
1/*
2 This file is part of PwManager/Platform independent.
3 Copyright (c) 2004 Ulf Schenk
4
5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version.
9
10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details.
14
15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18
19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution.
22
23$Id$
24*/
25
26#ifndef GETMASTERPWWND_EMB_H
27#define GETMASTERPWWND_EMB_H
28
29#include <kdialogbase.h>
30
31class QLineEdit;
32
33class getMasterPwWnd : public KDialogBase
34{
35 Q_OBJECT
36
37public:
38 getMasterPwWnd( QWidget* parent = 0, const char* name = 0);
39 ~getMasterPwWnd();
40
41 QLineEdit* pwLineEdit;
42
43public slots:
44 virtual void okButton_slot();
45 virtual void cancelButton_slot();
46};
47
48#endif // GETMASTERPWWND_H
diff --git a/pwmanager/pwmanager/getmasterpwwndimpl.cpp b/pwmanager/pwmanager/getmasterpwwndimpl.cpp
index db0223e..6be9618 100644
--- a/pwmanager/pwmanager/getmasterpwwndimpl.cpp
+++ b/pwmanager/pwmanager/getmasterpwwndimpl.cpp
@@ -32,14 +32,28 @@ GetMasterPwWndImpl::~GetMasterPwWndImpl()
32 32
33void GetMasterPwWndImpl::okButton_slot() 33void GetMasterPwWndImpl::okButton_slot()
34{ 34{
35#ifndef PWM_EMBEDDED
35 if (pwLineEdit->text() != "") 36 if (pwLineEdit->text() != "")
36 done(1); 37 done(1);
38#endif
37} 39}
38 40
39void GetMasterPwWndImpl::cancelButton_slot() 41void GetMasterPwWndImpl::cancelButton_slot()
40{ 42{
43#ifndef PWM_EMBEDDED
41 done(2); 44 done(2);
45#endif
46}
47
48#ifdef PWM_EMBEDDED
49void GetMasterPwWndImpl::slotOk()
50{
51 if (pwLineEdit->text() != "")
52 getMasterPwWnd::slotOk();
53 else
54 return;
42} 55}
56#endif
43 57
44#ifndef PWM_EMBEDDED 58#ifndef PWM_EMBEDDED
45#include "getmasterpwwndimpl.moc" 59#include "getmasterpwwndimpl.moc"
diff --git a/pwmanager/pwmanager/getmasterpwwndimpl.h b/pwmanager/pwmanager/getmasterpwwndimpl.h
index 28aa427..8a4c03e 100644
--- a/pwmanager/pwmanager/getmasterpwwndimpl.h
+++ b/pwmanager/pwmanager/getmasterpwwndimpl.h
@@ -20,7 +20,11 @@
20#ifndef GETMASTERPWWNDIMPL_H 20#ifndef GETMASTERPWWNDIMPL_H
21#define GETMASTERPWWNDIMPL_H 21#define GETMASTERPWWNDIMPL_H
22 22
23#ifndef PWM_EMBEDDED
23#include "getmasterpwwnd.h" 24#include "getmasterpwwnd.h"
25#else
26#include "getmasterpwwnd_emb.h"
27#endif
24 28
25/** set master pw wnd */ 29/** set master pw wnd */
26class GetMasterPwWndImpl : public getMasterPwWnd 30class GetMasterPwWndImpl : public getMasterPwWnd
@@ -35,6 +39,9 @@ public slots:
35 void okButton_slot(); 39 void okButton_slot();
36 /** cancel button pressed */ 40 /** cancel button pressed */
37 void cancelButton_slot(); 41 void cancelButton_slot();
42#ifdef PWM_EMBEDDED
43 virtual void slotOk();
44#endif
38}; 45};
39 46
40#endif 47#endif
diff --git a/pwmanager/pwmanager/listviewpwm.cpp b/pwmanager/pwmanager/listviewpwm.cpp
index b987c9e..c53cfd7 100644
--- a/pwmanager/pwmanager/listviewpwm.cpp
+++ b/pwmanager/pwmanager/listviewpwm.cpp
@@ -25,6 +25,9 @@
25 25
26#include <kiconloader.h> 26#include <kiconloader.h>
27 27
28#ifdef PWM_EMBEDDED
29#include <kglobal.h>
30#endif
28 31
29ListViewPwM::ListViewPwM(QWidget *parent, const char *name) 32ListViewPwM::ListViewPwM(QWidget *parent, const char *name)
30 : KListView(parent, name) 33 : KListView(parent, name)
@@ -48,10 +51,18 @@ ListViewItemPwM::ListViewItemPwM(QListView *parent)
48{ 51{
49 if (!onPix) { 52 if (!onPix) {
50 PWM_ASSERT(!offPix); 53 PWM_ASSERT(!offPix);
54 KIconLoader* picons;
55#ifndef PWM_EMBEDDED
56 KIconLoader il;
57 picons = &il;
58#else
59 picons = KGlobal::iconLoader();
60#endif
61
51 KIconLoader il; 62 KIconLoader il;
52 static QPixmap onP(il.loadIcon("button_ok", KIcon::Small)); 63 static QPixmap onP(picons->loadIcon("button_ok", KIcon::Small));
53 onPix = &onP; 64 onPix = &onP;
54 static QPixmap offP(il.loadIcon("encrypted", KIcon::Small)); 65 static QPixmap offP(picons->loadIcon("encrypted", KIcon::Small));
55 offPix = &offP; 66 offPix = &offP;
56 } 67 }
57} 68}
diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp
index d720e1f..3ae4d55 100644
--- a/pwmanager/pwmanager/main.cpp
+++ b/pwmanager/pwmanager/main.cpp
@@ -22,6 +22,7 @@
22#include <kaboutdata.h> 22#include <kaboutdata.h>
23#else 23#else
24#include <qdir.h> 24#include <qdir.h>
25#include <kpimglobalprefs.h>
25#endif 26#endif
26 27
27#include <klocale.h> 28#include <klocale.h>
@@ -185,6 +186,7 @@ int main(int argc, char *argv[])
185 186
186#endif 187#endif
187 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "pwmanager"))); 188 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "pwmanager")));
189 KPimGlobalPrefs::instance()->setGlobalConfig();
188 190
189 a.newInstance(); 191 a.newInstance();
190 192
diff --git a/pwmanager/pwmanager/pwgenwnd_emb.cpp b/pwmanager/pwmanager/pwgenwnd_emb.cpp
index 9655e9f..429904c 100644
--- a/pwmanager/pwmanager/pwgenwnd_emb.cpp
+++ b/pwmanager/pwmanager/pwgenwnd_emb.cpp
@@ -45,9 +45,6 @@ pwGenWnd::pwGenWnd( QWidget* parent, const char* name)
45 KDialogBase::Ok | KDialogBase::Cancel, 45 KDialogBase::Ok | KDialogBase::Cancel,
46 KDialogBase::Ok, parent, name, true ) 46 KDialogBase::Ok, parent, name, true )
47{ 47{
48 if ( !name )
49 setName( "pwGenWnd" );
50
51 QWidget *page = plainPage(); 48 QWidget *page = plainPage();
52 QVBoxLayout* pwGenWndLayout = new QVBoxLayout( page, 11, 6, "pwGenWndLayout"); 49 QVBoxLayout* pwGenWndLayout = new QVBoxLayout( page, 11, 6, "pwGenWndLayout");
53 50
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index 107e845..bd07c80 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -357,6 +357,10 @@ void PwM::initToolbar()
357 picons = KGlobal::iconLoader(); 357 picons = KGlobal::iconLoader();
358#endif 358#endif
359 359
360#ifdef PWM_EMBEDDED
361 if ( QApplication::desktop()->width() > 320 )
362#endif
363 {
360 toolBar()->insertButton(picons->loadIcon("filenew", KIcon::Toolbar), 364 toolBar()->insertButton(picons->loadIcon("filenew", KIcon::Toolbar),
361 BUTTON_TOOL_NEW, SIGNAL(clicked(int)), this, 365 BUTTON_TOOL_NEW, SIGNAL(clicked(int)), this,
362 SLOT(new_slot()), true, i18n("New")); 366 SLOT(new_slot()), true, i18n("New"));
@@ -364,6 +368,7 @@ void PwM::initToolbar()
364 BUTTON_TOOL_OPEN, SIGNAL(clicked(int)), this, 368 BUTTON_TOOL_OPEN, SIGNAL(clicked(int)), this,
365 SLOT(open_slot()), true, i18n("Open")); 369 SLOT(open_slot()), true, i18n("Open"));
366 toolBar()->insertSeparator(); 370 toolBar()->insertSeparator();
371 }
367 toolBar()->insertButton(picons->loadIcon("filesave", KIcon::Toolbar), 372 toolBar()->insertButton(picons->loadIcon("filesave", KIcon::Toolbar),
368 BUTTON_TOOL_SAVE, SIGNAL(clicked(int)), this, 373 BUTTON_TOOL_SAVE, SIGNAL(clicked(int)), this,
369 SLOT(save_slot()), true, i18n("Save")); 374 SLOT(save_slot()), true, i18n("Save"));
@@ -725,8 +730,8 @@ void PwM::deletePwd_slot()
725 if (KMessageBox:: 730 if (KMessageBox::
726 questionYesNo(this, 731 questionYesNo(this,
727 i18n 732 i18n
728 ("Do you really want to delete the selected entry") + 733 ("Do you really want to delete\nthe selected entry") +
729 " \"" + QString(currItem.desc.c_str()) 734 " \n\"" + QString(currItem.desc.c_str())
730 + "\" ?", i18n("delete?")) 735 + "\" ?", i18n("delete?"))
731 == KMessageBox::Yes) { 736 == KMessageBox::Yes) {
732 737
@@ -1282,21 +1287,17 @@ void PwM::createAboutData_slot()
1282 1287
1283 "(c) 2004 Ulf Schenk\n" 1288 "(c) 2004 Ulf Schenk\n"
1284 "(c) 2004 Lutz Rogowski\n" 1289 "(c) 2004 Lutz Rogowski\n"
1285 "(c) 1997-2003, The KDE PIM Team\n" 1290 "(c) 1997-2004, The KDE PIM Team\n"
1286 1291
1287 "Michael Buesch - main programming and current maintainer\nmbuesch@freenet.de\n" 1292 "(c) Michael Buesch - main programming\nand current maintainer\nmbuesch@freenet.de\n"
1288 "Matt Scifo - original implementaion of \n" 1293 "Matt Scifo - mscifo@o1.com\n"
1289 "\"categories\" and the password-tree \n" 1294 "Elias Probst - elias.probst@gmx.de\n"
1290 "in the system-tray. Original implementations of \n" 1295 "George Staikos - staikos@kde.org\n"
1291 "numerous view-improvements.\n" 1296 "Matthew Palmer - mjp16@uow.edu.au\n"
1292 "mscifo@o1.com\n" 1297 "Olivier Sessink - gpasman@nl.linux.org\n"
1293 "Elias Probst - Gentoo ebuild maintainer.\nelias.probst@gmx.de\n" 1298 "The libgcrypt developers -\nBlowfish and SHA1 algorithms\nftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/\n"
1294 "George Staikos - KWallet\nstaikos@kde.org\n" 1299 "Troy Engel - tengel@sonic.net\n"
1295 "Matthew Palmer - rc2 code\nmjp16@uow.edu.au\n" 1300 "Wickey - wickey@gmx.at\n"
1296 "Olivier Sessink - gpasman\ngpasman@nl.linux.org\n"
1297 "The libgcrypt developers - Blowfish and SHA1 algorithms\nftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/\n"
1298 "Troy Engel - kpasman\n tengel@sonic.net\n"
1299 "Wickey - graphics-design in older versions\nwickey@gmx.at\n"
1300 "Ian MacGregor - original documentation author.\n" 1301 "Ian MacGregor - original documentation author.\n"
1301 ); 1302 );
1302} 1303}
diff --git a/pwmanager/pwmanager/pwmanagerE.pro b/pwmanager/pwmanager/pwmanagerE.pro
index 87142b7..b0c9236 100644
--- a/pwmanager/pwmanager/pwmanagerE.pro
+++ b/pwmanager/pwmanager/pwmanagerE.pro
@@ -48,11 +48,11 @@ commentbox.h \
48compiler.h \ 48compiler.h \
49compressbzip2.h \ 49compressbzip2.h \
50compressgzip.h \ 50compressgzip.h \
51findwnd.h \ 51findwnd_emb.h \
52findwndimpl.h \ 52findwndimpl.h \
53genpasswd.h \ 53genpasswd.h \
54getkeycardwnd.h \ 54getkeycardwnd.h \
55getmasterpwwnd.h \ 55getmasterpwwnd_emb.h \
56getmasterpwwndimpl.h \ 56getmasterpwwndimpl.h \
57globalstuff.h \ 57globalstuff.h \
58gpasmanfile.h \ 58gpasmanfile.h \
@@ -80,7 +80,7 @@ randomizer.h \
80rc2.h \ 80rc2.h \
81rencatwnd.h \ 81rencatwnd.h \
82serializer.h \ 82serializer.h \
83setmasterpwwnd.h \ 83setmasterpwwnd_emb.h \
84setmasterpwwndimpl.h \ 84setmasterpwwndimpl.h \
85sha1.h \ 85sha1.h \
86subtbledit.h \ 86subtbledit.h \
@@ -111,11 +111,11 @@ blowfish.cpp \
111commentbox.cpp \ 111commentbox.cpp \
112compressbzip2.cpp \ 112compressbzip2.cpp \
113compressgzip.cpp \ 113compressgzip.cpp \
114findwnd.cpp \ 114findwnd_emb.cpp \
115findwndimpl.cpp \ 115findwndimpl.cpp \
116genpasswd.cpp \ 116genpasswd.cpp \
117getkeycardwnd.cpp \ 117getkeycardwnd.cpp \
118getmasterpwwnd.cpp \ 118getmasterpwwnd_emb.cpp \
119getmasterpwwndimpl.cpp \ 119getmasterpwwndimpl.cpp \
120globalstuff.cpp \ 120globalstuff.cpp \
121gpasmanfile.cpp \ 121gpasmanfile.cpp \
@@ -141,7 +141,7 @@ randomizer.cpp \
141rc2.cpp \ 141rc2.cpp \
142rencatwnd.cpp \ 142rencatwnd.cpp \
143serializer.cpp \ 143serializer.cpp \
144setmasterpwwnd.cpp \ 144setmasterpwwnd_emb.cpp \
145setmasterpwwndimpl.cpp \ 145setmasterpwwndimpl.cpp \
146sha1.cpp \ 146sha1.cpp \
147subtbledit.cpp \ 147subtbledit.cpp \
diff --git a/pwmanager/pwmanager/pwmdocui.cpp b/pwmanager/pwmanager/pwmdocui.cpp
index 3993fa8..e42dd9d 100644
--- a/pwmanager/pwmanager/pwmdocui.cpp
+++ b/pwmanager/pwmanager/pwmdocui.cpp
@@ -79,9 +79,11 @@ QString PwMDocUi::requestMpw(bool chipcard)
79 no_keycard_support_msg_box(currentView); 79 no_keycard_support_msg_box(currentView);
80#endif // CONFIG_KEYCARD 80#endif // CONFIG_KEYCARD
81 } else { 81 } else {
82 GetMasterPwWndImpl pwWnd;
83#ifndef PWM_EMBEDDED 82#ifndef PWM_EMBEDDED
83 GetMasterPwWndImpl pwWnd;
84 KWin::setState(pwWnd.winId(), NET::StaysOnTop); 84 KWin::setState(pwWnd.winId(), NET::StaysOnTop);
85#else
86 GetMasterPwWndImpl pwWnd;
85#endif 87#endif
86 if (pwWnd.exec() != 1) 88 if (pwWnd.exec() != 1)
87 return ""; 89 return "";
@@ -96,13 +98,13 @@ QString PwMDocUi::requestNewMpw(bool *chipcard)
96 QString pw; 98 QString pw;
97 SetMasterPwWndImpl pwWnd(currentView); 99 SetMasterPwWndImpl pwWnd(currentView);
98 pwWnd.setPwMKeyCard(keyCard); 100 pwWnd.setPwMKeyCard(keyCard);
99#ifndef PWM_EMBEDDED
100 if (!chipcard) { 101 if (!chipcard) {
102#ifndef PWM_EMBEDDED
101 pwWnd.mainTab->removePage(pwWnd.mainTab->page(1)); 103 pwWnd.mainTab->removePage(pwWnd.mainTab->page(1));
102 }
103#else 104#else
104 qDebug("PwMDocUi::requestNewMpw must be implemented"); 105 pwWnd.mainTab->removePage(pwWnd.tab_2);
105#endif 106#endif
107 }
106 108
107 if (pwWnd.exec() != 1) 109 if (pwWnd.exec() != 1)
108 return ""; 110 return "";
@@ -137,7 +139,7 @@ void PwMDocUi::wrongMpwMsgBox(bool chipcard, QString prefix, QString postfix)
137 139
138 if (chipcard) { 140 if (chipcard) {
139 msg += i18n("Wrong key-card!\n" 141 msg += i18n("Wrong key-card!\n"
140 "Please try again with the " 142 "Please try again with the\n"
141 "correct key-card."); 143 "correct key-card.");
142 } else { 144 } else {
143 msg += i18n("Wrong master-password!\n" 145 msg += i18n("Wrong master-password!\n"
@@ -163,7 +165,7 @@ void PwMDocUi::noMpwMsgBox(bool chipcard, QString prefix, QString postfix)
163 165
164 if (chipcard) { 166 if (chipcard) {
165 msg += i18n("No key-card found!\n" 167 msg += i18n("No key-card found!\n"
166 "Please insert the " 168 "Please insert the\n"
167 "correct key-card."); 169 "correct key-card.");
168 } else { 170 } else {
169 msg += i18n("No master-password given!"); 171 msg += i18n("No master-password given!");
@@ -360,6 +362,7 @@ bool PwMDocUi::openDocUi(PwMDoc *doc,
360 } 362 }
361 } 363 }
362 ret = doc->openDoc(&filename, lockStat); 364 ret = doc->openDoc(&filename, lockStat);
365 qDebug("pwmdocui::OpenDocui %i", ret);
363 if (ret != e_success) { 366 if (ret != e_success) {
364 if (ret == e_readFile || ret == e_openFile) { 367 if (ret == e_readFile || ret == e_openFile) {
365 KMessageBox::error(getCurrentView(), 368 KMessageBox::error(getCurrentView(),
diff --git a/pwmanager/pwmanager/pwmviewstyle.cpp b/pwmanager/pwmanager/pwmviewstyle.cpp
index 67b5197..51d8f6c 100644
--- a/pwmanager/pwmanager/pwmviewstyle.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle.cpp
@@ -25,7 +25,11 @@
25#include "listviewpwm.h" 25#include "listviewpwm.h"
26#include "pwmview.h" 26#include "pwmview.h"
27#include "commentbox.h" 27#include "commentbox.h"
28 28#ifndef PWM_EMBEDDED
29#include "configuration.h"
30#else
31#include "pwmprefs.h"
32#endif
29 33
30PwMViewStyle::PwMViewStyle(QWidget *parent, const char *name) 34PwMViewStyle::PwMViewStyle(QWidget *parent, const char *name)
31 : QWidget(parent, name) 35 : QWidget(parent, name)
@@ -37,6 +41,10 @@ PwMViewStyle::PwMViewStyle(QWidget *parent, const char *name)
37 41
38PwMViewStyle::~PwMViewStyle() 42PwMViewStyle::~PwMViewStyle()
39{ 43{
44 //US ENH : load and store the size of the listviewcolumns
45 lv->saveLayout(conf()->getConfig(), "listview");
46 conf()->getConfig()->sync();
47
40 delete_ifnot_null(s0); 48 delete_ifnot_null(s0);
41 delete_ifnot_null(s1); 49 delete_ifnot_null(s1);
42} 50}
@@ -79,6 +87,10 @@ void PwMViewStyle::initStyle(style_t style)
79 lv->addColumn(i18n("URL"), 180); 87 lv->addColumn(i18n("URL"), 180);
80 lv->addColumn(i18n("Launcher"), 120); 88 lv->addColumn(i18n("Launcher"), 120);
81 v->tmpReEnableSort(); 89 v->tmpReEnableSort();
90
91 //US ENH : load and store the size of the listviewcolumns
92 lv->restoreLayout(conf()->getConfig(), "listview");
93
82 resizeView(v->size()); 94 resizeView(v->size());
83 v->updateView(); 95 v->updateView();
84 if (wasMaximized) { 96 if (wasMaximized) {
diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp
index f29ef6c..2810b48 100644
--- a/pwmanager/pwmanager/serializer.cpp
+++ b/pwmanager/pwmanager/serializer.cpp
@@ -27,7 +27,7 @@
27#endif 27#endif
28 28
29/* enable/disable serializer debugging (0/1) */ 29/* enable/disable serializer debugging (0/1) */
30 #define SERIALIZER_DEBUG0 30 #define SERIALIZER_DEBUG1
31/* use the old xml tags for writing (0/1) */ 31/* use the old xml tags for writing (0/1) */
32 #define USE_OLD_TAGS 0 32 #define USE_OLD_TAGS 0
33/* write a CDATA section (0/1) */ 33/* write a CDATA section (0/1) */
diff --git a/pwmanager/pwmanager/setmasterpwwnd_emb.cpp b/pwmanager/pwmanager/setmasterpwwnd_emb.cpp
new file mode 100644
index 0000000..e6471e6
--- a/dev/null
+++ b/pwmanager/pwmanager/setmasterpwwnd_emb.cpp
@@ -0,0 +1,163 @@
1/*
2 This file is part of PwManager/Platform independent.
3 Copyright (c) 2004 Ulf Schenk
4
5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version.
9
10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details.
14
15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18
19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution.
22
23$Id$
24*/
25
26#include "setmasterpwwnd_emb.h"
27
28#include <qpushbutton.h>
29#include <qtabwidget.h>
30#include <qwidget.h>
31#include <qlabel.h>
32#include <qlineedit.h>
33#include <qlayout.h>
34
35#include <klocale.h>
36
37/*US
38#include <qvariant.h>
39#include <qpushbutton.h>
40#include <qtabwidget.h>
41#include <qwidget.h>
42#include <qlabel.h>
43#include <qlineedit.h>
44#include <qlayout.h>
45#include <qtooltip.h>
46#include <qwhatsthis.h>
47*/
48
49/*
50 * Constructs a setMasterPwWnd as a child of 'parent', with the
51 * name 'name'
52 *
53 */
54setMasterPwWnd::setMasterPwWnd( QWidget* parent, const char* name )
55 : KDialogBase( KDialogBase::Plain, i18n( "Set master-password" ),
56 KDialogBase::Ok | KDialogBase::Cancel,
57 KDialogBase::Ok, parent, name, true )
58{
59 QWidget *page = plainPage();
60 QVBoxLayout *pageLayout = new QVBoxLayout( page );
61
62 mainTab = new QTabWidget( page );
63 pageLayout->addWidget( mainTab );
64
65
66 if ( !name )
67 setName( "setMasterPwWnd" );
68
69 ////////////////////////////////////////////////////////////////////
70 // This is the Password tab1
71 tab = new QWidget( mainTab );
72
73 QGridLayout *layout = new QGridLayout( tab, 5, 1 );
74 layout->setMargin( KDialogBase::marginHint() );
75 layout->setSpacing( KDialogBase::spacingHint() );
76
77 QLabel* label = new QLabel( i18n( "Using a normal password-string to encrypt the data." ), tab );
78 label->setAlignment( int( QLabel::WordBreak | QLabel::AlignCenter ) );
79 layout->addWidget(label, 0, 0);
80
81 pwEdit_1 = new QLineEdit( tab, "pwEdit_1" );
82 pwEdit_1->setEchoMode( QLineEdit::Password );
83
84 label = new QLabel( pwEdit_1, i18n( "Please enter the new master-password:" ), tab );
85 layout->addWidget(label, 1, 0);
86 layout->addWidget(pwEdit_1, 2, 0);
87
88 pwEdit_2 = new QLineEdit( tab, "pwEdit_2" );
89 pwEdit_2->setEchoMode( QLineEdit::Password );
90
91 label = new QLabel( pwEdit_2, i18n( "Please enter the password again:" ), tab );
92 layout->addWidget(label, 3, 0);
93 layout->addWidget(pwEdit_2, 4, 0);
94
95 mainTab->insertTab( tab, i18n("Normal password") );
96
97
98 ////////////////////////////////////////////////////////////////////
99 // This is the Password tab2
100 tab_2 = new QWidget( mainTab );
101
102 layout = new QGridLayout( tab_2, 5, 1 );
103 layout->setMargin( KDialogBase::marginHint() );
104 layout->setSpacing( KDialogBase::spacingHint() );
105
106 label = new QLabel( i18n( "Using a PwM key-card to encrypt the data." ), tab_2 );
107 label->setAlignment( int( QLabel::WordBreak | QLabel::AlignCenter ) );
108 layout->addWidget(label, 0, 0);
109
110 label = new QLabel( i18n( "selected card:" ), tab_2 );
111 label->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
112 layout->addWidget(label, 1, 0);
113
114 selCardButton = new QPushButton( i18n( "&Select the currently inserted card as key-card" ), tab_2 );
115 layout->addWidget(selCardButton, 2, 0);
116
117 genCardButton = new QPushButton( i18n( "&generate new key-card") , tab_2 );
118 layout->addWidget(genCardButton, 3, 0);
119
120 curCardIdLabel = new QLabel( QString("") , tab_2 );
121 layout->addWidget(curCardIdLabel, 4, 0);
122
123 mainTab->insertTab( tab_2, i18n("Key-card (chipcard)" ) );
124
125
126 // resize( QSize(411, 313).expandedTo(minimumSizeHint()) );
127
128 // signals and slots connections
129 // connect( okButton, SIGNAL( clicked() ), this, SLOT( okButton_slot() ) );
130 // connect( cancelButton, SIGNAL( clicked() ), this, SLOT( cancelButton_slot() ) );
131 connect( genCardButton, SIGNAL( clicked() ), this, SLOT( genCardButton_slot() ) );
132 connect( selCardButton, SIGNAL( clicked() ), this, SLOT( selCardButton_slot() ) );
133
134}
135
136/*
137 * Destroys the object and frees any allocated resources
138 */
139setMasterPwWnd::~setMasterPwWnd()
140{
141 // no need to delete child widgets, Qt does it all for us
142}
143
144void setMasterPwWnd::okButton_slot()
145{
146 qWarning( "setMasterPwWnd::okButton_slot(): Not implemented yet" );
147}
148
149void setMasterPwWnd::cancelButton_slot()
150{
151 qWarning( "setMasterPwWnd::cancelButton_slot(): Not implemented yet" );
152}
153
154void setMasterPwWnd::genCardButton_slot()
155{
156 qWarning( "setMasterPwWnd::genCardButton_slot(): Not implemented yet" );
157}
158
159void setMasterPwWnd::selCardButton_slot()
160{
161 qWarning( "setMasterPwWnd::selCardButton_slot(): Not implemented yet" );
162}
163
diff --git a/pwmanager/pwmanager/setmasterpwwnd_emb.h b/pwmanager/pwmanager/setmasterpwwnd_emb.h
new file mode 100644
index 0000000..c8ddec6
--- a/dev/null
+++ b/pwmanager/pwmanager/setmasterpwwnd_emb.h
@@ -0,0 +1,62 @@
1/*
2 This file is part of PwManager/Platform independent.
3 Copyright (c) 2004 Ulf Schenk
4
5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version.
9
10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details.
14
15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18
19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution.
22
23$Id$
24*/
25
26#ifndef SETMASTERPWWND_EMB_H
27#define SETMASTERPWWND_EMB_H
28
29#include <kdialogbase.h>
30
31class QLineEdit;
32class QPushButton;
33class QLabel;
34class QTabWidget;
35class QWidget;
36
37class setMasterPwWnd : public KDialogBase
38{
39 Q_OBJECT
40
41public:
42 setMasterPwWnd( QWidget* parent = 0, const char* name = 0 );
43 ~setMasterPwWnd();
44
45 QTabWidget* mainTab;
46 QWidget* tab;
47 QWidget* tab_2;
48 QLineEdit* pwEdit_1;
49 QLineEdit* pwEdit_2;
50 QPushButton* selCardButton;
51 QPushButton* genCardButton;
52 QLabel* curCardIdLabel;
53
54public slots:
55 virtual void okButton_slot();
56 virtual void cancelButton_slot();
57 virtual void genCardButton_slot();
58 virtual void selCardButton_slot();
59
60};
61
62#endif // SETMASTERPWWND_H
diff --git a/pwmanager/pwmanager/setmasterpwwndimpl.cpp b/pwmanager/pwmanager/setmasterpwwndimpl.cpp
index aac0408..3482643 100644
--- a/pwmanager/pwmanager/setmasterpwwndimpl.cpp
+++ b/pwmanager/pwmanager/setmasterpwwndimpl.cpp
@@ -46,8 +46,9 @@ SetMasterPwWndImpl::SetMasterPwWndImpl(QWidget * parent, const char *name)
46#ifndef PWM_EMBEDDED 46#ifndef PWM_EMBEDDED
47 mainTab->removePage(mainTab->page(1)); 47 mainTab->removePage(mainTab->page(1));
48#else 48#else
49 qDebug("SetMasterPwWndImpl::SetMasterPwWndImpl has to be fixed"); 49 mainTab->removePage(tab_2);
50#endif 50#endif
51
51#endif // CONFIG_KEYCARD 52#endif // CONFIG_KEYCARD
52 keyCard = 0; 53 keyCard = 0;
53} 54}
@@ -58,6 +59,7 @@ SetMasterPwWndImpl::~SetMasterPwWndImpl()
58 59
59void SetMasterPwWndImpl::okButton_slot() 60void SetMasterPwWndImpl::okButton_slot()
60{ 61{
62#ifndef PWM_EMBEDDED
61 int index = mainTab->currentPageIndex(); 63 int index = mainTab->currentPageIndex();
62 if (index == 0) { 64 if (index == 0) {
63 // normal password 65 // normal password
@@ -88,13 +90,52 @@ void SetMasterPwWndImpl::okButton_slot()
88 } 90 }
89 } 91 }
90 done(1); 92 done(1);
93#endif
91} 94}
92 95
93void SetMasterPwWndImpl::cancelButton_slot() 96void SetMasterPwWndImpl::cancelButton_slot()
94{ 97{
98#ifndef PWM_EMBEDDED
95 done(2); 99 done(2);
100#endif
101}
102
103void SetMasterPwWndImpl::slotOk()
104{
105 int index = mainTab->currentPageIndex();
106 if (index == 0) {
107 // normal password
108 if (pwEdit_1->text() != pwEdit_2->text()) {
109 KMessageBox::error(this,
110 i18n
111 ("The two passwords you have entered\ndon't match.\n"
112 "Please try entering them again."),
113 i18n("Different passwords"));
114 return;
115 }
116 if (pwEdit_1->text() == "") {
117 KMessageBox::error(this,
118 i18n("No password entered.\n"
119 "Please type in a password,\nthat "
120 "you want to use for\nthe encryption."),
121 i18n("no password"));
122 return;
123 }
124 } else {
125 // key-card
126 if (curCardIdLabel->text() == STRING_CARD_NONE) {
127 KMessageBox::error(this,
128 i18n("You didn't select a card as\n"
129 "PwM-key-card."),
130 i18n("no card"));
131 return;
132 }
133 }
134
135 setMasterPwWnd::slotOk();
96} 136}
97 137
138
98void SetMasterPwWndImpl::genCardButton_slot() 139void SetMasterPwWndImpl::genCardButton_slot()
99{ 140{
100#ifdef CONFIG_KEYCARD 141#ifdef CONFIG_KEYCARD
diff --git a/pwmanager/pwmanager/setmasterpwwndimpl.h b/pwmanager/pwmanager/setmasterpwwndimpl.h
index 56effc1..3203d4d 100644
--- a/pwmanager/pwmanager/setmasterpwwndimpl.h
+++ b/pwmanager/pwmanager/setmasterpwwndimpl.h
@@ -21,7 +21,11 @@
21#ifndef SETMASTERPWWNDIMPL_H 21#ifndef SETMASTERPWWNDIMPL_H
22#define SETMASTERPWWNDIMPL_H 22#define SETMASTERPWWNDIMPL_H
23 23
24#ifndef PWM_EMBEDDED
24#include "setmasterpwwnd.h" 25#include "setmasterpwwnd.h"
26#else
27#include "setmasterpwwnd_emb.h"
28#endif
25 29
26#include <klocale.h> 30#include <klocale.h>
27 31
@@ -58,6 +62,10 @@ public slots:
58 /** "select current card" button pressed */ 62 /** "select current card" button pressed */
59 void selCardButton_slot(); 63 void selCardButton_slot();
60 64
65#ifdef PWM_EMBEDDED
66 virtual void slotOk();
67#endif
68
61protected slots: 69protected slots:
62 /** key from PwMKeyCard is available */ 70 /** key from PwMKeyCard is available */
63 void keyAvailable_slot(uint32_t cardId, const string &key); 71 void keyAvailable_slot(uint32_t cardId, const string &key);