ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/public/ibx/trunk/design/IBDSDialogs.pas

Comparing ibx/trunk/design/IBDSDialogs.pas (file contents):
Revision 66 by tony, Tue Dec 6 10:33:46 2016 UTC vs.
Revision 67 by tony, Tue Oct 3 14:08:11 2017 UTC

#	Line 160 | Line 160 | end;
160
161		function TIBDSLCLInterface.ServerLoginDialog(var AServerName: string;
162		var AUserName, APassword: string): Boolean;
163	+	var ActiveForm: TCustomForm;
164		begin
165	+	ActiveForm := Screen.ActiveCustomForm;
166		with TIBXDSLoginDlg.Create(nil) do
167		try
168		Caption := 'Firebird Server Login';
#	Line 182 | Line 184 | begin
184		finally
185		Free;
186		end;
187	+	if ActiveForm <> nil then
188	+	begin
189	+	ActiveForm.SetFocus;
190	+	Application.ProcessMessages;
191	+	end;
192		end;
193
194		function TIBDSLCLInterface.LoginDialogEx(var ADatabaseName: string;
195		var AUserName, APassword: string; NameReadOnly: Boolean): Boolean;
196	+	var ActiveForm: TCustomForm;
197		begin
198		try
199	+	ActiveForm := Screen.ActiveCustomForm;
200		with TIBXDSLoginDlg.Create(Application) do
201		try
202		ProjectName.Caption := GetProjectName;
#	Line 210 | Line 219 | begin
219		finally
220		Free;
221		end;
222	+	if ActiveForm <> nil then
223	+	begin
224	+	ActiveForm.SetFocus;
225	+	Application.ProcessMessages;
226	+	end;
227		except On E:Exception do
228		MessageDlg('Unable to Load Login Dialog ' + E.Message,mtError,[mbOK],0);
229		end;

Diff Legend

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