ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/runtime/IBDialogs.pas
(Generate patch)

Comparing ibx/trunk/runtime/IBDialogs.pas (file contents):
Revision 33 by tony, Sat Jul 18 12:30:52 2015 UTC vs.
Revision 80 by tony, Mon Jan 1 11:31:07 2018 UTC

# Line 38 | Line 38 | uses
38   {$ELSE}
39    unix,
40   {$ENDIF}
41 <  SysUtils, Classes, Graphics, Controls,
42 <  Forms, StdCtrls, ExtCtrls, IB;
41 >  SysUtils, Classes,  Controls,
42 >  Forms, StdCtrls, ExtCtrls, IB, IBTypes;
43  
44   type
45  
# Line 49 | Line 49 | type
49      private
50        FSetCursorDepth: integer;
51    public
52 <    function ServerLoginDialog(const AServerName: string;
53 <                               var AUserName, APassword: string): Boolean;
54 <    function LoginDialogEx(const ADatabaseName: string;
52 >    function ServerLoginDialog(var AServerName: string;
53 >                               var AUserName, APassword: string): Boolean;  virtual;
54 >    function LoginDialogEx(var ADatabaseName: string;
55                                 var AUserName, APassword: string;
56 <                               NameReadOnly: Boolean): Boolean;
56 >                               NameReadOnly: Boolean): Boolean; virtual;
57      procedure SetCursor;
58      procedure RestoreCursor;
59    end;
# Line 70 | Line 70 | type
70      Button1: TButton;
71      Button2: TButton;
72      DatabaseName: TLabel;
73 <    Label1: TLabel;
73 >    TargetCaption: TLabel;
74      Label2: TLabel;
75      Label3: TLabel;
76      Password: TEdit;
# Line 81 | Line 81 | type
81      { public declarations }
82    end;
83  
84 < function TIBLCLInterface.ServerLoginDialog(const AServerName: string;
85 <         var AUserName, APassword: string): Boolean;
84 > function TIBLCLInterface.ServerLoginDialog(var AServerName: string;
85 >  var AUserName, APassword: string): Boolean;
86 > var ActiveForm: TCustomForm;
87   begin
88 +  ActiveForm := Screen.ActiveCustomForm;
89    with TIBXLoginDlg.Create(nil) do
90    try
91      Caption := 'Firebird Server Login';
92 <    Label3.Caption := 'Server Name: ';
92 >    TargetCaption.Caption := 'Server Name: ';
93      DatabaseName.Caption := AServerName;
94      UserName.Text := AUserName;
95      Result := False;
# Line 101 | Line 103 | begin
103    finally
104      Free;
105    end;
106 +  if ActiveForm <> nil then
107 +  begin
108 +    ActiveForm.SetFocus;
109 +    Application.ProcessMessages;
110 +  end;
111   end;
112  
113 < function TIBLCLInterface.LoginDialogEx(const ADatabaseName: string;
113 > function TIBLCLInterface.LoginDialogEx(var ADatabaseName: string;
114    var AUserName, APassword: string; NameReadOnly: Boolean): Boolean;
115 + var ActiveForm: TCustomForm;
116   begin
117 +  ActiveForm := Screen.ActiveCustomForm;
118    with TIBXLoginDlg.Create(Application) do
119    try
120      DatabaseName.Caption := ADatabaseName;
# Line 124 | Line 133 | begin
133    finally
134      Free;
135    end;
136 +  if (ActiveForm <> nil) and ActiveForm.CanFocus then
137 +  begin
138 +    ActiveForm.SetFocus;
139 +    Application.ProcessMessages;
140 +  end;
141   end;
142  
143   procedure TIBLCLInterface.SetCursor;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines