ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/branches/journaling/ibcontrols/IBLookupComboEditBox.pas
(Generate patch)

Comparing ibx/trunk/ibcontrols/IBLookupComboEditBox.pas (file contents):
Revision 143 by tony, Fri Feb 23 12:11:21 2018 UTC vs.
Revision 311 by tony, Mon Aug 24 09:32:58 2020 UTC

# Line 30 | Line 30 | unit IBLookupComboEditBox;
30   interface
31  
32   uses
33 <  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, DbCtrls,
33 >  Classes, SysUtils, LCLType, LResources, Forms, Controls, Graphics, Dialogs, DbCtrls,
34    ExtCtrls, IBSQLParser, DB, StdCtrls, IBCustomDataSet, LCLVersion;
35  
36   type
# Line 54 | Line 54 | type
54      FOwner: TIBLookupComboEditBox;
55    protected
56      procedure ActiveChanged; override;
57 +    {$if lcl_fullversion < 2000000}
58 +    procedure DataEvent(Event: TDataEvent; Info: Ptrint); override;
59 +    {$endif}
60      procedure RecordChanged(Field: TField); override;
61      procedure UpdateData; override;
62    public
# Line 76 | Line 79 | type
79  
80    TIBLookupComboEditBox = class(TDBLookupComboBox)
81    private
79 –    FCanAutoInsert: TCanAutoInsert;
82      { Private declarations }
83      FDataLink: TIBLookupComboDataLink;
84      FIBLookupControlLink: TIBLookupControlLink;
# Line 111 | Line 113 | type
113      procedure UpdateSQL(Sender: TObject; Parser: TSelectSQLParser);
114      procedure HandleEnter(Data: PtrInt);
115      procedure UpdateLinkData(Sender: TObject);
116 +    procedure ValidateListField;
117    protected
118      { Protected declarations }
119      procedure ActiveChanged(Sender: TObject);
120      procedure CheckAndInsert;
121      procedure DoEnter; override;
122      procedure DoExit; override;
123 +    {$if lcl_fullversion >= 2000002}
124 +    {Deferred update changes in Lazarus 2.0 stop the combo box working when
125 +     the datasource is nil. We thus have to reverse out the changes :(}
126 +    function DoEdit: boolean; override;
127 +    procedure Change; override;
128 +    procedure CloseUp; override;
129 +    procedure Select; override;
130 +    {$ifend}
131 +    {$if lcl_fullversion = 2000002}
132 +    procedure UTF8KeyPress(var UTF8Key: TUTF8Char); override;
133 +    {$ifend}
134      procedure KeyUp(var Key: Word; Shift: TShiftState); override;
135      procedure Loaded; override;
136      procedure Notification(AComponent: TComponent; Operation: TOperation); override;
137      procedure SetItemIndex(const Val: integer); override;
124 –    function SQLSafe(aText: string): string;
138      procedure UpdateShowing; override;
139      procedure UpdateData(Sender: TObject); override;
140    public
# Line 147 | Line 160 | type
160  
161   implementation
162  
163 < uses IBQuery, LCLType, Variants, LCLProc, LazUTF8;
163 > uses Variants, LCLProc, LazUTF8, IBUtils, IBMessages;
164  
165   { TIBLookupControlLink }
166  
# Line 169 | Line 182 | begin
182    FOwner.ActiveChanged(self)
183   end;
184  
185 + {$if lcl_fullversion < 2000000}
186 + procedure TIBLookupComboDataLink.DataEvent(Event: TDataEvent; Info: Ptrint);
187 + begin
188 +  inherited DataEvent(Event, Info);
189 +  if Event = deLayoutChange then
190 +   FOwner.LookupCache := FOwner.LookupCache; {sneaky way of calling UpdateLookup}
191 + end;
192 + {$endif}
193 +
194   procedure TIBLookupComboDataLink.RecordChanged(Field: TField);
195   begin
196    FOwner.RecordChanged(self,Field);
# Line 188 | Line 210 | end;
210   { TIBLookupComboEditBox }
211  
212   procedure TIBLookupComboEditBox.HandleTimer(Sender: TObject);
191 – var ActiveState: boolean;
213   begin
214    FTimer.Interval := 0;
215    FFiltered := Text <> '';
# Line 231 | Line 252 | begin
252       and ListSource.DataSet.Active   then
253    begin
254      begin
255 +      ValidateListField;
256        if varIsNull(FLastKeyValue) and (ItemIndex = -1) then
257          KeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant
258        else
# Line 339 | Line 361 | begin
361               sCompleteText := ListSource.DataSet.FieldByName(ListField).AsString;
362               if (sCompleteText <> FCurText) then
363               begin
364 +               KeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant;
365                 sResultText := sCompleteText;
366                 if ((cbactEndOfLineComplete in AutoCompleteText) and
367                           (cbactRetainPrefixCase in AutoCompleteText)) then
# Line 347 | Line 370 | begin
370                   UTF8Insert(sPrefixText, sResultText, 1);
371                 end;
372                 Text := sResultText;
350 –               SelStart := iSelStart;
351 –               SelLength := UTF8Length(Text);
373               end;
374 <             KeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant;
374 >             SelStart := iSelStart;
375 >             SelLength := UTF8Length(Text) - iSelStart;
376             end
377             else
378             begin
# Line 369 | Line 391 | procedure TIBLookupComboEditBox.UpdateSQ
391    Parser: TSelectSQLParser);
392   var FieldPosition: integer;
393      FilterText: string;
394 +    SQLDialect: integer;
395   begin
396    if FFiltered then
397    begin
# Line 376 | Line 399 | begin
399        FilterText := FCurText
400      else
401        FilterText := Text;
402 +
403 +    if Parser.DataSet <> nil then
404 +      SQLDialect := (Parser.DataSet as TIBCustomDataSet).Database.SQLDialect
405 +    else
406 +      SQLDialect := 1;
407 +
408      if cbactSearchCaseSensitive in AutoCompleteText then
409 <      Parser.Add2WhereClause(GetRelationNameQualifier + '"' + ListField + '" Like ''' +
410 <                                  SQLSafe(FilterText) + '%''')
409 >      Parser.Add2WhereClause(GetRelationNameQualifier + QuoteIdentifierIfNeeded(SQLDialect,ListField) + ' Like ''' +
410 >                                  SQLSafeString(FilterText) + '%''')
411      else
412 <      Parser.Add2WhereClause('Upper(' + GetRelationNameQualifier + '"' +  ListField + '") Like Upper(''' +
413 <                                  SQLSafe(FilterText) + '%'')');
412 >      Parser.Add2WhereClause('Upper(' + GetRelationNameQualifier + QuoteIdentifierIfNeeded(SQLDialect,ListField) + ') Like Upper(''' +
413 >                                  SQLSafeString(FilterText) + '%'')');
414  
415      if cbactSearchAscending in AutoCompleteText then
416      begin
# Line 405 | Line 434 | begin
434      ListSource.DataSet.FieldByName(ListField).AsString := Text
435   end;
436  
437 + {Check to ensure that ListField exists and convert to upper case if necessary}
438 +
439 + procedure TIBLookupComboEditBox.ValidateListField;
440 + var SQLDialect: integer;
441 +    FieldNames: TStringList;
442 + begin
443 +  if (ListSource = nil) or (ListSource.DataSet = nil) or
444 +    not (ListSource.DataSet is TIBCustomDataSet) or
445 +     ((ListSource.DataSet as TIBCustomDataSet).Database = nil) then Exit;
446 +  SQLDialect := (ListSource.DataSet as TIBCustomDataSet).Database.SQLDialect;
447 +  FieldNames := TStringList.Create;
448 +  try
449 +    FieldNames.CaseSensitive := true;
450 +    FieldNames.Sorted := true;
451 +    FieldNames.Duplicates := dupError;
452 +    ListSource.DataSet.GetFieldNames(FieldNames);
453 +    if FieldNames.IndexOf(ListField) = -1 then {not found}
454 +    begin
455 +      if (SQLDialect = 3) and (FieldNames.IndexOf(AnsiUpperCase(ListField)) <> - 1) then {normalise to upper case}
456 +        ListField := AnsiUpperCase(ListField)
457 +      else
458 +        IBError(ibxeListFieldNotFound,[ListField])
459 +    end;
460 +  finally
461 +    FieldNames.Free;
462 +  end;
463 + end;
464 +
465   procedure TIBLookupComboEditBox.CheckAndInsert;
466   var Accept: boolean;
467      NewKeyValue: variant;
# Line 495 | Line 552 | end;
552   procedure TIBLookupComboEditBox.KeyUp(var Key: Word; Shift: TShiftState);
553   begin
554    inherited KeyUp(Key, Shift);
498 –  if Key = VK_RETURN then
499 –     EditingDone
500 –  else
555    if Key = VK_ESCAPE then
556    begin
557      SelStart := UTF8Length(Text);      {Ensure end of line selection}
# Line 506 | Line 560 | begin
560      SelectAll;
561    end
562    else
563 +  if AutoComplete and (Style <> csDropDownList) then
564    begin
565 <    FTimer.Interval := 0;
566 <    if (IsEditableTextKey(Key) or (Key = VK_BACK))
567 <       and AutoComplete and (Style <> csDropDownList) and
568 <       (not (cbactEndOfLineComplete in AutoCompleteText) or (SelStart = UTF8Length(Text))) then
565 >    if (Key = VK_BACK) or (Key = VK_DELETE) then
566 >    begin
567 >      if SelStart = 0 then
568 >      begin
569 >        SelStart := UTF8Length(Text);
570 >        SelLength := 0;
571 >      end;
572 >      FTimer.Interval := 0;
573 >    end
574 >    else
575 >    if IsEditableTextKey(Key) and
576 >     (not(cbactEndOfLineComplete in AutoCompleteText) or (SelStart = UTF8Length(Text))) then
577 >    begin
578 >      FTimer.Interval := 0;
579        FTimer.Interval := FKeyPressInterval;
580 +    end;
581    end;
582   end;
583  
# Line 531 | Line 597 | end;
597  
598   procedure TIBLookupComboEditBox.SetItemIndex(const Val: integer);
599   begin
600 +  if Val > 0 then
601 +    FCurText := '';
602    inherited SetItemIndex(Val);
603    FLastKeyValue := KeyValue;
604   end;
605  
538 – function TIBLookupComboEditBox.SQLSafe(aText: string): string;
539 – var I: integer;
540 – begin
541 –  Result := '';
542 –  for I := 1 to length(aText) do
543 –    if aText[I] = '''' then
544 –      Result := Result + ''''''
545 –    else
546 –      Result := Result + aText[I];
547 – end;
548 –
606   procedure TIBLookupComboEditBox.UpdateShowing;
607   begin
608    inherited UpdateShowing;
# Line 556 | Line 613 | end;
613   procedure TIBLookupComboEditBox.UpdateData(Sender: TObject);
614   begin
615    inherited UpdateData(Sender);
616 +  if FCurText <> '' then
617 +    Text := FCurText + Text;
618    FModified := false;
619   end;
620  
621 +
622 + {Workarounds due to bugs in various Lazarus 2.0 release candidates}
623 + {$if lcl_fullversion >= 2000002}
624 + type
625 +
626 +  { THackedCustomComboBox }
627 +
628 +  THackedCustomComboBox = class(TCustomComboBox)
629 +  private
630 +    procedure CallChange;
631 +    procedure CallUTF8KeyPress(var UTF8Key: TUTF8Char);
632 +  end;
633 +
634 + { THackedCustomComboBox }
635 +
636 + procedure THackedCustomComboBox.CallChange;
637 + begin
638 +  inherited Change;
639 + end;
640 +
641 + procedure THackedCustomComboBox.CallUTF8KeyPress(var UTF8Key: TUTF8Char);
642 + begin
643 +  inherited UTF8KeyPress(UTF8Key);
644 + end;
645 +
646 + procedure TIBLookupComboEditBox.Change;
647 + begin
648 +  if DataSource = nil then
649 +    THackedCustomComboBox(self).CallChange
650 +  else
651 +    inherited Change;
652 + end;
653 +
654 + procedure TIBLookupComboEditBox.CloseUp;
655 + begin
656 +  inherited DoEdit;
657 +  inherited CloseUp;
658 +  EditingDone;
659 + end;
660 +
661 + procedure TIBLookupComboEditBox.Select;
662 + begin
663 +  inherited Select;
664 +  if DataSource = nil then
665 +    inherited DoEdit;
666 + end;
667 +
668 + function TIBLookupComboEditBox.DoEdit: boolean;
669 + begin
670 +  {DoEdit will swallow characters if no editable Field. Hence, to enabled
671 +   writing we must avoid calling the inherited method.}
672 +  if DataSource = nil then
673 +    Result := true
674 +  else
675 +    Result := inherited DoEdit;
676 + end;
677 + {$ifend}
678 +
679 + {$if lcl_fullversion = 2000002}
680 + procedure TIBLookupComboEditBox.UTF8KeyPress(var UTF8Key: TUTF8Char);
681 + begin
682 +  if DataSource = nil then
683 +    THackedCustomComboBox(self).CallUTF8KeyPress(UTF8Key)
684 +  else
685 +    inherited;
686 + end;
687 + {$ifend}
688 +
689 +
690   constructor TIBLookupComboEditBox.Create(TheComponent: TComponent);
691   begin
692    inherited Create(TheComponent);
# Line 591 | Line 719 | begin
719      FForceAutoComplete := false;
720    end;
721    CheckAndInsert;
722 +  FCurText := '';
723    if FModified then
724      Change; {ensure Update}
725    inherited EditingDone;

Diff Legend

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