ViewVC Help

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

root/public/ibx/branches/journaling/ibcontrols/IBLookupComboEditBox.pas

Comparing ibx/trunk/ibcontrols/IBLookupComboEditBox.pas (file contents):
Revision 35 by tony, Tue Jan 26 14:38:47 2016 UTC vs.
Revision 225 by tony, Tue Apr 3 09:09:05 2018 UTC

#	Line 54 | Line 54 | type
54		FOwner: TIBLookupComboEditBox;
55		protected
56		procedure ActiveChanged; override;
57	+	procedure DataEvent(Event: TDataEvent; Info: Ptrint); override;
58		procedure RecordChanged(Field: TField); override;
59		procedure UpdateData; override;
60		public
#	Line 76 | Line 77 | type
77
78		TIBLookupComboEditBox = class(TDBLookupComboBox)
79		private
79	–	FCanAutoInsert: TCanAutoInsert;
80		{ Private declarations }
81		FDataLink: TIBLookupComboDataLink;
82		FIBLookupControlLink: TIBLookupControlLink;
#	Line 95 | Line 95 | type
95		FForceAutoComplete: boolean;
96		FInCheckAndInsert: boolean;
97		FLastKeyValue: variant;
98	+	FCurText: string;
99	+	FModified: boolean;
100		procedure DoActiveChanged(Data: PtrInt);
101		function GetAutoCompleteText: TComboBoxAutoCompleteText;
102		function GetListSource: TDataSource;
#	Line 121 | Line 123 | type
123		procedure SetItemIndex(const Val: integer); override;
124		function SQLSafe(aText: string): string;
125		procedure UpdateShowing; override;
126	<
126	>	procedure UpdateData(Sender: TObject); override;
127		public
128		{ Public declarations }
129		constructor Create(TheComponent: TComponent); override;
#	Line 145 | Line 147 | type
147
148		implementation
149
150	<	uses IBQuery, LCLType, Variants, LCLProc;
150	>	uses LCLType, Variants, LCLProc, LazUTF8;
151
152		{ TIBLookupControlLink }
153
#	Line 167 | Line 169 | begin
169		FOwner.ActiveChanged(self)
170		end;
171
172	+	procedure TIBLookupComboDataLink.DataEvent(Event: TDataEvent; Info: Ptrint);
173	+	begin
174	+	inherited DataEvent(Event, Info);
175	+	if Event = deLayoutChange then
176	+	FOwner.LookupCache := FOwner.LookupCache; {sneaky way of calling UpdateLookup}
177	+	end;
178	+
179		procedure TIBLookupComboDataLink.RecordChanged(Field: TField);
180		begin
181		FOwner.RecordChanged(self,Field);
#	Line 186 | Line 195 | end;
195		{ TIBLookupComboEditBox }
196
197		procedure TIBLookupComboEditBox.HandleTimer(Sender: TObject);
189	–	var ActiveState: boolean;
198		begin
199		FTimer.Interval := 0;
200		FFiltered := Text <> '';
#	Line 315 | Line 323 | procedure TIBLookupComboEditBox.UpdateLi
323		var
324		iSelStart: Integer; // char position
325		sCompleteText, sPrefixText, sResultText: string;
318	–	curText: string;
326		begin
327		if assigned(ListSource) and assigned(ListSource.DataSet) and (ListSource.DataSet is TIBCustomDataSet)
328		and ListSource.DataSet.Active then
329		begin
330	+	FCurText := Text;
331		FUpdating := true;
332		try
333		iSelStart := SelStart;//Capture original cursor position
334		if ((iSelStart < UTF8Length(Text)) and
335		(cbactEndOfLineComplete in AutoCompleteText)) then
336		Exit;
329	–	curText := Text;
337		sPrefixText := UTF8Copy(Text, 1, iSelStart);
338		ListSource.DataSet.Active := false;
339		ListSource.DataSet.Active :=  true;
340	<	Text := curText;
341	<	if not FExiting and (FForceAutoComplete or Focused) and (Text <> '')then
340	>	Text := FCurText;
341	>	if not FExiting and (FForceAutoComplete or Focused) and (FCurText <> '')then
342		begin
343		if ListSource.DataSet.Active and (ListSource.DataSet.RecordCount > 0) then
344		begin
345		sCompleteText := ListSource.DataSet.FieldByName(ListField).AsString;
346	<	if (sCompleteText <> Text) then
346	>	if (sCompleteText <> FCurText) then
347		begin
348	+	KeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant;
349		sResultText := sCompleteText;
350		if ((cbactEndOfLineComplete in AutoCompleteText) and
351		(cbactRetainPrefixCase in AutoCompleteText)) then
#	Line 347 | Line 355 | begin
355		end;
356		Text := sResultText;
357		SelStart := iSelStart;
358	<	SelLength := UTF8Length(Text);
358	>	SelLength := UTF8Length(Text) - iSelStart;
359		end;
360	<	KeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant;
360	>	end
361	>	else
362	>	begin
363	>	SelStart := iSelStart;
364	>	SelLength := 0;
365		end;
366		end;
367		finally
368		FUpdating := false
369		end;
370	+	FModified := true;
371		end;
372		end;
373
374		procedure TIBLookupComboEditBox.UpdateSQL(Sender: TObject;
375		Parser: TSelectSQLParser);
376		var FieldPosition: integer;
377	+	FilterText: string;
378		begin
379		if FFiltered then
380		begin
381	+	if FUpdating then
382	+	FilterText := FCurText
383	+	else
384	+	FilterText := Text;
385		if cbactSearchCaseSensitive in AutoCompleteText then
386		Parser.Add2WhereClause(GetRelationNameQualifier + '"' + ListField + '" Like ''' +
387	<	SQLSafe(Text) + '%''')
387	>	SQLSafe(FilterText) + '%''')
388		else
389	<	Parser.Add2WhereClause(GetRelationNameQualifier + 'Upper("' + ListField + '") Like Upper(''' +
390	<	SQLSafe(Text) + '%'')');
389	>	Parser.Add2WhereClause('Upper(' + GetRelationNameQualifier + '"' +  ListField + '") Like Upper(''' +
390	>	SQLSafe(FilterText) + '%'')');
391
392	<	end;
393	<	if cbactSearchAscending in AutoCompleteText then
394	<	begin
395	<	FieldPosition := Parser.GetFieldPosition(ListField);
378	<	if FieldPosition = 0 then Exit;
392	>	if cbactSearchAscending in AutoCompleteText then
393	>	begin
394	>	FieldPosition := Parser.GetFieldPosition(ListField);
395	>	if FieldPosition = 0 then Exit;
396
397	<	Parser.OrderByClause := IntToStr(FieldPosition) + ' ascending';
397	>	Parser.OrderByClause := IntToStr(FieldPosition) + ' ascending';
398	>	end;
399		end;
400		end;
401
#	Line 494 | Line 512 | begin
512		SelectAll;
513		end
514		else
515	+	if AutoComplete and (Style <> csDropDownList) then
516		begin
517	<	FTimer.Interval := 0;
518	<	if (IsEditableTextKey(Key) or (Key = VK_BACK))
519	<	and AutoComplete and (Style <> csDropDownList) and
520	<	(not (cbactEndOfLineComplete in AutoCompleteText) or (SelStart = UTF8Length(Text))) then
517	>	if (Key = VK_BACK) or (Key = VK_DELETE) then
518	>	begin
519	>	if SelStart = 0 then
520	>	begin
521	>	SelStart := UTF8Length(Text);
522	>	SelLength := 0;
523	>	end;
524	>	FTimer.Interval := 0;
525	>	end
526	>	else
527	>	if IsEditableTextKey(Key) and
528	>	(not(cbactEndOfLineComplete in AutoCompleteText) or (SelStart = UTF8Length(Text))) then
529	>	begin
530	>	FTimer.Interval := 0;
531		FTimer.Interval := FKeyPressInterval;
532	+	end;
533		end;
534		end;
535
#	Line 519 | Line 549 | end;
549
550		procedure TIBLookupComboEditBox.SetItemIndex(const Val: integer);
551		begin
552	+	if Val > 0 then
553	+	FCurText := '';
554		inherited SetItemIndex(Val);
555		FLastKeyValue := KeyValue;
556		end;
#	Line 541 | Line 573 | begin
573		ActiveChanged(nil);
574		end;
575
576	+	procedure TIBLookupComboEditBox.UpdateData(Sender: TObject);
577	+	begin
578	+	inherited UpdateData(Sender);
579	+	if FCurText <> '' then
580	+	Text := FCurText + Text;
581	+	FModified := false;
582	+	end;
583	+
584		constructor TIBLookupComboEditBox.Create(TheComponent: TComponent);
585		begin
586		inherited Create(TheComponent);
#	Line 559 | Line 599 | begin
599		if assigned(FDataLink) then FDataLink.Free;
600		if assigned(FIBLookupControlLink) then FIBLookupControlLink.Free;
601		if assigned(FTimer) then FTimer.Free;
602	+	Application.RemoveAsyncCalls(self);
603		inherited Destroy;
604		end;
605
#	Line 572 | Line 613 | begin
613		FForceAutoComplete := false;
614		end;
615		CheckAndInsert;
616	+	FCurText := '';
617	+	if FModified then
618	+	Change; {ensure Update}
619		inherited EditingDone;
620		end;
621

Diff Legend

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