[JVCL-Checkins] dev/JVCL3/run JvBDELoginDialog.pas,1.13,1.14 JvBDESecurity.pas,1.7,1.8 - - Mantis #1389 (TJvDBLoginDialog OnLoginFailure event)

[Peter T. <pe...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22877/run

Modified Files:
	JvBDELoginDialog.pas JvBDESecurity.pas 
Log Message:
- Mantis #1389 (TJvDBLoginDialog OnLoginFailure event)



Index: JvBDESecurity.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBDESecurity.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JvBDESecurity.pas	5 Jan 2004 22:37:41 -0000	1.7
--- JvBDESecurity.pas	1 Mar 2004 22:12:32 -0000	1.8
***************
*** 16,20 ****
  All Rights Reserved.
  
! Last Modified: 2002-07-04
  
  You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
--- 16,20 ----
  All Rights Reserved.
  
! Last Modified: 2004-03-01
  
  You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
***************
*** 38,41 ****
--- 38,42 ----
      const Password: string): Boolean of object;
  
+ 
    TJvDBSecurity = class(TJvCustomLogin)
    private
***************
*** 46,49 ****
--- 47,51 ----
      FOnCheckUser: TCheckUserEvent;
      FOnChangePassword: TChangePasswordEvent;
+     FOnLoginFailure: TJvDBLoginEvent;
      procedure SetDatabase(Value: TDatabase);
      procedure SetUsersTableName(const Value: TFileName);
***************
*** 80,83 ****
--- 82,86 ----
      property OnUnlockApp;
      property OnIconDblClick;
+     property OnLoginFailure:TJvDBLoginEvent read FOnLoginFailure write FOnLoginFailure;
    end;
  
***************
*** 169,173 ****
    Result := LoginDialog(Database, AttemptNumber, UsersTableName,
      LoginNameField, MaxPasswordLen, DoCheckUser, IconClick, UserName,
!     AppStorage, AppStoragePath, SelectAlias);
  end;
  
--- 172,176 ----
    Result := LoginDialog(Database, AttemptNumber, UsersTableName,
      LoginNameField, MaxPasswordLen, DoCheckUser, IconClick, UserName,
!     AppStorage, AppStoragePath, SelectAlias,FOnLoginFailure );
  end;
  

Index: JvBDELoginDialog.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBDELoginDialog.pas,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** JvBDELoginDialog.pas	1 Mar 2004 18:30:11 -0000	1.13
--- JvBDELoginDialog.pas	1 Mar 2004 22:12:32 -0000	1.14
***************
*** 19,23 ****
    Polaris Software
  
! Last Modified: 2002-07-04
  
  You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
--- 19,23 ----
    Polaris Software
  
! Last Modified: 2004-03-01
  
  You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
***************
*** 43,47 ****
  
    TDialogMode = (dmAppLogin, dmDBLogin, dmUnlock);
!   TJvDBLoginEvent = procedure (Sender:TObject; const UserName, Password:string) of object;
  
    TJvDBLoginDialog = class(TObject)
--- 43,48 ----
  
    TDialogMode = (dmAppLogin, dmDBLogin, dmUnlock);
! 
!   TJvDBLoginEvent = procedure (Sender:TObject; const UserName, Password: string) of object;
  
    TJvDBLoginDialog = class(TObject)
***************
*** 82,86 ****
      property Mode: TDialogMode read FMode;
      property SelectDatabase: Boolean read FSelectDatabase;
-     property OnLoginFailure:TJvDBLoginEvent read FOnLoginFailure write FOnLoginFailure;
      property OnCheckUnlock: TCheckUnlockEvent read FCheckUnlock write FCheckUnlock;
      property OnCheckUserEvent: TCheckUserNameEvent read FCheckUserEvent write FCheckUserEvent;
--- 83,86 ----
***************
*** 95,98 ****
--- 95,100 ----
      property MaxPwdLen: Integer read FMaxPwdLen write fMaxPwdLen;
      property LoginName: string read FLoginName write FLoginName;
+   published
+     property OnLoginFailure: TJvDBLoginEvent read FOnLoginFailure write FOnLoginFailure;
    end;
  
***************
*** 104,108 ****
    CheckUserEvent: TCheckUserNameEvent; IconDblClick: TNotifyEvent;
    var LoginName: string; AppStorage: TJvCustomAppStorage;
!   AppStoragePath: string; SelectDatabase: Boolean): Boolean;
  
  function UnlockDialog(const UserName: string; OnUnlock: TCheckUnlockEvent;
--- 106,111 ----
    CheckUserEvent: TCheckUserNameEvent; IconDblClick: TNotifyEvent;
    var LoginName: string; AppStorage: TJvCustomAppStorage;
!   AppStoragePath: string; SelectDatabase: Boolean;
!   LoginFailure: TJvDBLoginEvent): Boolean;
  
  function UnlockDialog(const UserName: string; OnUnlock: TCheckUnlockEvent;
***************
*** 390,394 ****
          begin
            Result := CheckUser(Table);
!           if not Result then
            begin
              if Assigned(FOnLoginFailure) then
--- 393,398 ----
          begin
            Result := CheckUser(Table);
! 
!      if not Result then
            begin
              if Assigned(FOnLoginFailure) then
***************
*** 414,417 ****
--- 418,422 ----
  end;
  
+ 
  function TJvDBLoginDialog.CheckUser(Table: TTable): Boolean;
  begin
***************
*** 476,480 ****
    CheckUserEvent: TCheckUserNameEvent; IconDblClick: TNotifyEvent;
    var LoginName: string; AppStorage: TJvCustomAppStorage;
!   AppStoragePath: string; SelectDatabase: Boolean): Boolean;
  var
    Dlg: TJvDBLoginDialog;
--- 481,486 ----
    CheckUserEvent: TCheckUserNameEvent; IconDblClick: TNotifyEvent;
    var LoginName: string; AppStorage: TJvCustomAppStorage;
!   AppStoragePath: string; SelectDatabase: Boolean;
!   LoginFailure: TJvDBLoginEvent): Boolean;
  var
    Dlg: TJvDBLoginDialog;
***************
*** 485,488 ****
--- 491,495 ----
      Dlg.OnIconDblClick := IconDblClick;
      Dlg.OnCheckUserEvent := CheckUserEvent;
+     Dlg.OnLoginFailure := LoginFailure;
      Dlg.MaxPwdLen := MaxPwdLen;
      Dlg.Database := Database;