Index: dlgUser.h
===================================================================
RCS file: /projects/pgadmin3/src/include/dlgUser.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lsrc/include/dlgUser.h -Lsrc/include/dlgUser.h -u -w -r1.16 -r1.17
--- src/include/dlgUser.h
+++ src/include/dlgUser.h
@@ -47,6 +47,7 @@
void OnVarSelChange(wxListEvent &ev);
void OnVarnameSelChange(wxCommandEvent &ev);
+ void OnChangePasswd(wxCommandEvent &ev);
wxArrayString groupsIn;
Index: dlgUser.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgUser.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -Lsrc/ui/dlgUser.cpp -Lsrc/ui/dlgUser.cpp -u -w -r1.38 -r1.39
--- src/ui/dlgUser.cpp
+++ src/ui/dlgUser.cpp
@@ -26,6 +26,7 @@
// pointer to controls
#define txtID CTRL_TEXT("txtID")
#define txtPasswd CTRL_TEXT("txtPasswd")
+#define txtRePasswd CTRL_TEXT("txtRePasswd")
#define datValidUntil CTRL_CALENDAR("datValidUntil")
#define timValidUntil CTRL_TIME("timValidUntil")
#define chkCreateDB CTRL_CHECKBOX("chkCreateDB")
@@ -50,7 +51,8 @@
EVT_LISTBOX_DCLICK(XRCID("lbGroupsNotIn"), dlgUser::OnGroupAdd)
EVT_LISTBOX_DCLICK(XRCID("lbGroupsIn"), dlgUser::OnGroupRemove)
- EVT_TEXT(XRCID("txtPasswd"), dlgUser::OnChange)
+ EVT_TEXT(XRCID("txtPasswd"), dlgUser::OnChangePasswd)
+ EVT_TEXT(XRCID("txtRePasswd"), dlgUser::OnChangePasswd)
EVT_CHECKBOX(XRCID("chkCreateDB"), dlgUser::OnChange)
EVT_CHECKBOX(XRCID("chkCreateUser"), dlgUser::OnChangeSuperuser)
@@ -131,6 +133,7 @@
datValidUntil->Disable();
timValidUntil->Disable();
txtPasswd->Disable();
+ txtRePasswd->Disable();
btnAddGroup->Disable();
btnDelGroup->Disable();
cbVarname->Disable();
@@ -209,6 +212,17 @@
CheckChange();
}
+void dlgUser::OnChangePasswd(wxCommandEvent &ev)
+{
+ wxString passwd=txtPasswd->GetValue();
+ wxString repasswd=txtRePasswd->GetValue();
+ if ((!repasswd.IsEmpty())||(!repasswd.IsEmpty()))
+ {
+ bool enable=true;
+ CheckValid(enable, !passwd.compare(repasswd), _("The passwords entered do not match!"));
+ EnableOK(enable);
+ }
+}
void dlgUser::CheckChange()
{
Index: dlgUser.xrc
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/dlgUser.xrc,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lsrc/ui/common/dlgUser.xrc -Lsrc/ui/common/dlgUser.xrc -u -w -r1.21 -r1.22
--- src/ui/common/dlgUser.xrc
+++ src/ui/common/dlgUser.xrc
@@ -29,32 +29,42 @@
+
+