[Instantobjects-cvscommit] Source/Brokers/UIB InstantUIB.pas,1.16,1.17 InstantUIBConnectionDefEdit.dfm,1.5,1.6

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/UIB
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3213/Brokers/UIB

Modified Files:
	InstantUIB.pas InstantUIBConnectionDefEdit.dfm 
Log Message:
Changes for Delphi 5 compatibility (login form and .dfm file)

Index: InstantUIBConnectionDefEdit.dfm
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/UIB/InstantUIBConnectionDefEdit.dfm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InstantUIBConnectionDefEdit.dfm	21 Oct 2005 09:15:08 -0000	1.5
--- InstantUIBConnectionDefEdit.dfm	16 Nov 2005 21:39:31 -0000	1.6
***************
*** 4,8 ****
    BorderStyle = bsDialog
    Caption = 'UIB Connection'
!   ClientHeight = 329
    ClientWidth = 362
    Color = clBtnFace
--- 4,8 ----
    BorderStyle = bsDialog
    Caption = 'UIB Connection'
!   ClientHeight = 336
    ClientWidth = 362
    Color = clBtnFace
***************
*** 19,23 ****
    object BottomBevel: TBevel
      Left = 0
!     Top = 292
      Width = 362
      Height = 2
--- 19,23 ----
    object BottomBevel: TBevel
      Left = 0
!     Top = 299
      Width = 362
      Height = 2
***************
*** 29,33 ****
      Top = 0
      Width = 362
!     Height = 292
      Align = alClient
      BevelOuter = bvNone
--- 29,33 ----
      Top = 0
      Width = 362
!     Height = 299
      Align = alClient
      BevelOuter = bvNone
***************
*** 141,145 ****
    object BottomPanel: TPanel
      Left = 0
!     Top = 294
      Width = 362
      Height = 35
--- 141,145 ----
    object BottomPanel: TPanel
      Left = 0
!     Top = 301
      Width = 362
      Height = 35
***************
*** 147,153 ****
      BevelOuter = bvNone
      TabOrder = 1
-     DesignSize = (
-       362
-       35)
      object OkButton: TButton
        Left = 204
--- 147,150 ----

Index: InstantUIB.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/UIB/InstantUIB.pas,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** InstantUIB.pas	12 Nov 2005 09:58:29 -0000	1.16
--- InstantUIB.pas	16 Nov 2005 21:39:31 -0000	1.17
***************
*** 148,152 ****
  uses
    Controls, InstantConsts, InstantUIBConnectionDefEdit, InstantUtils,
!   TypInfo, InstantDBBuild, InstantIBFbCatalog;
  
  { TInstantUIBConnectionDef }
--- 148,152 ----
  uses
    Controls, InstantConsts, InstantUIBConnectionDefEdit, InstantUtils,
!   TypInfo, InstantDBBuild, InstantIBFbCatalog, DbLogDlg;
  
  { TInstantUIBConnectionDef }
***************
*** 387,400 ****
    LUserName := DataBase.UserName;
    LPassWord := DataBase.PassWord;
!   if Assigned(LoginDialogProc) then
    begin
!     if LoginDialogProc(FDataBase.DatabaseName, LUserName, LPassWord) then
!     begin
!       FDataBase.UserName := LUserName;
!       FDataBase.PassWord := LPassWord;
!     end;
!   end
!   else
!     raise EDatabaseError.Create(SLoginPromptFailure);
  end;
  
--- 387,395 ----
    LUserName := DataBase.UserName;
    LPassWord := DataBase.PassWord;
!   if LoginDialogEx(FDataBase.DatabaseName, LUserName, LPassWord, False) then
    begin
!     FDataBase.UserName := LUserName;
!     FDataBase.PassWord := LPassWord;
!   end;
  end;