pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

RxDBGrid: fix modify TRxDBGridKeyStrokes

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2672 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2013-02-12 11:44:08 +00:00
parent af3ee31a25
commit c4c6ccb983
1 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
components/rx/rxdbgrid.pas
View File

@ -124,7 +124,7 @@ type
protected protected
function GetDisplayName: string; override; function GetDisplayName: string; override;
public public
procedure Assign(Source: TPersistent); override;
published published
property Command: TRxDBGridCommand read FCommand write SetCommand; property Command: TRxDBGridCommand read FCommand write SetCommand;
property ShortCut: TShortCut read FShortCut write SetShortCut; property ShortCut: TShortCut read FShortCut write SetShortCut;
@ -133,15 +133,17 @@ type
{ TRxDBGridKeyStrokes } { TRxDBGridKeyStrokes }
TRxDBGridKeyStrokes = class(TCollection) TRxDBGridKeyStrokes = class(TOwnedCollection)
private private
FOwner: TPersistent; //FOwn: TPersistent;
function GetItem(Index: integer): TRxDBGridKeyStroke; function GetItem(Index: integer): TRxDBGridKeyStroke;
procedure SetItem(Index: integer; const AValue: TRxDBGridKeyStroke); procedure SetItem(Index: integer; const AValue: TRxDBGridKeyStroke);
protected protected
//function GetOwner: TPersistent; override;
procedure Update(Item: TCollectionItem); override; procedure Update(Item: TCollectionItem); override;
public public
constructor Create(AOwner: TPersistent); constructor Create(AOwner: TPersistent);
procedure Assign(Source: TPersistent); override;
function Add: TRxDBGridKeyStroke; function Add: TRxDBGridKeyStroke;
function AddE(ACommand: TRxDBGridCommand; AShortCut: TShortCut): TRxDBGridKeyStroke; function AddE(ACommand: TRxDBGridCommand; AShortCut: TShortCut): TRxDBGridKeyStroke;
procedure ResetDefaults; procedure ResetDefaults;
@ -4076,8 +4078,6 @@ begin
{$ENDIF} {$ENDIF}
FSortColumns:=TRxDbGridColumnsSortList.Create; FSortColumns:=TRxDbGridColumnsSortList.Create;
FKeyStrokes := TRxDBGridKeyStrokes.Create(Self);
FKeyStrokes.ResetDefaults;
FMarkerUp := LoadLazResBitmapImage('rx_markerup'); FMarkerUp := LoadLazResBitmapImage('rx_markerup');
FMarkerDown := LoadLazResBitmapImage('rx_markerdown'); FMarkerDown := LoadLazResBitmapImage('rx_markerdown');
@ -4090,11 +4090,13 @@ begin
// FTitleButtons:=True; // FTitleButtons:=True;
F_Clicked := False; F_Clicked := False;
// F_MenuBMP := TBitmap.Create;
F_MenuBMP := LoadLazResBitmapImage('menu_grid'); F_MenuBMP := LoadLazResBitmapImage('menu_grid');
DoCreateJMenu; DoCreateJMenu;
FKeyStrokes := TRxDBGridKeyStrokes.Create(Self);
FKeyStrokes.ResetDefaults;
F_LastFilter := TStringList.Create; F_LastFilter := TStringList.Create;
//F_SortListField := TStringList.Create; //F_SortListField := TStringList.Create;
@ -4102,7 +4104,6 @@ begin
FPropertyStorageLink.OnSave := @OnIniSave; FPropertyStorageLink.OnSave := @OnIniSave;
FPropertyStorageLink.OnLoad := @OnIniLoad; FPropertyStorageLink.OnLoad := @OnIniLoad;
// FTitleLines := TITLE_DEFAULT;
FAllowedOperations := [aoInsert, aoUpdate, aoDelete, aoAppend]; FAllowedOperations := [aoInsert, aoUpdate, aoDelete, aoAppend];
FFilterListEditor := TFilterListCellEditor.Create(nil); FFilterListEditor := TFilterListCellEditor.Create(nil);
@ -4127,6 +4128,7 @@ begin
FRxDbGridDateEditor.Visible := False; FRxDbGridDateEditor.Visible := False;
UpdateJMenuKeys; UpdateJMenuKeys;
end; end;
destructor TRxDBGrid.Destroy; destructor TRxDBGrid.Destroy;
@ -4882,7 +4884,8 @@ begin
if FCommand = AValue then if FCommand = AValue then
exit; exit;
FCommand := AValue; FCommand := AValue;
Changed(False); Changed(true);
/// Changed(False);
end; end;
procedure TRxDBGridKeyStroke.SetShortCut(const AValue: TShortCut); procedure TRxDBGridKeyStroke.SetShortCut(const AValue: TShortCut);
@ -4891,7 +4894,8 @@ begin
exit; exit;
FShortCut := AValue; FShortCut := AValue;
Menus.ShortCutToKey(FShortCut, FKey, FShift); Menus.ShortCutToKey(FShortCut, FKey, FShift);
Changed(False); Changed(true);
/// Changed(False);
end; end;
function TRxDBGridKeyStroke.GetDisplayName: string; function TRxDBGridKeyStroke.GetDisplayName: string;
@ -4900,6 +4904,21 @@ begin
Result := Result + ' - ' + ShortCutToText(FShortCut); Result := Result + ' - ' + ShortCutToText(FShortCut);
end; end;
procedure TRxDBGridKeyStroke.Assign(Source: TPersistent);
begin
if Source is TRxDBGridKeyStroke then
begin
Command := TRxDBGridKeyStroke(Source).Command;
ShortCut := TRxDBGridKeyStroke(Source).ShortCut;
Enabled := TRxDBGridKeyStroke(Source).Enabled;
{ Shift := TSynEditKeyStroke(Source).Shift;
Shift2 := TSynEditKeyStroke(Source).Shift2; }
end
else
inherited Assign(Source);
end;
{ TRxDBGridKeyStrokes } { TRxDBGridKeyStrokes }
function TRxDBGridKeyStrokes.GetItem(Index: integer): TRxDBGridKeyStroke; function TRxDBGridKeyStrokes.GetItem(Index: integer): TRxDBGridKeyStroke;
@ -4912,6 +4931,11 @@ begin
inherited SetItem(Index, AValue); inherited SetItem(Index, AValue);
end; end;
{function TRxDBGridKeyStrokes.GetOwner: TPersistent;
begin
Result:=FOwn;
end;
}
procedure TRxDBGridKeyStrokes.Update(Item: TCollectionItem); procedure TRxDBGridKeyStrokes.Update(Item: TCollectionItem);
begin begin
inherited Update(Item); inherited Update(Item);
@ -4923,8 +4947,24 @@ end;
constructor TRxDBGridKeyStrokes.Create(AOwner: TPersistent); constructor TRxDBGridKeyStrokes.Create(AOwner: TPersistent);
begin begin
inherited Create(TRxDBGridKeyStroke); //FOwn := AOwner;
FOwner := AOwner; inherited Create(AOwner, TRxDBGridKeyStroke);
end;
procedure TRxDBGridKeyStrokes.Assign(Source: TPersistent);
var
i: integer;
begin
if Source is TRxDBGridKeyStrokes then
begin
Clear;
for i := 0 to TRxDBGridKeyStrokes(Source).Count-1 do
begin
with Add do
Assign(TRxDBGridKeyStrokes(Source)[i]);
end;
end else
inherited Assign(Source);
end; end;
function TRxDBGridKeyStrokes.Add: TRxDBGridKeyStroke; function TRxDBGridKeyStrokes.Add: TRxDBGridKeyStroke;