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

improved draw TRCloockupCombobox, new propertys for RxDbGrid - SortField and SortOrder

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2431 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2012-05-12 17:51:20 +00:00
parent 793a4cb817
commit 38ac510e85
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
components/rx/rxdbgrid.pas
View File

@ -416,6 +416,7 @@ type
function GetFooterColor: TColor; function GetFooterColor: TColor;
function GetFooterRowCount: integer; function GetFooterRowCount: integer;
function GetPropertyStorage: TCustomPropertyStorage; function GetPropertyStorage: TCustomPropertyStorage;
function GetSortField: string;
function GetTitleButtons: boolean; function GetTitleButtons: boolean;
function IsColumnsStored: boolean; function IsColumnsStored: boolean;
procedure SetAutoSort(const AValue: boolean); procedure SetAutoSort(const AValue: boolean);
@ -508,16 +509,23 @@ type
procedure Loaded; override; procedure Loaded; override;
procedure UpdateFooterRowOnUpdateActive; procedure UpdateFooterRowOnUpdateActive;
public public
procedure FilterRec(DataSet: TDataSet; var Accept: boolean);
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;
procedure FilterRec(DataSet: TDataSet; var Accept: boolean);
function EditorByStyle(Style: TColumnButtonStyle): TWinControl; override; function EditorByStyle(Style: TColumnButtonStyle): TWinControl; override;
procedure LayoutChanged; override; procedure LayoutChanged; override;
procedure ShowFindDialog; procedure ShowFindDialog;
procedure ShowColumnsDialog; procedure ShowColumnsDialog;
function ColumnByFieldName(AFieldName: string): TRxColumn; function ColumnByFieldName(AFieldName: string): TRxColumn;
function ColumnByCaption(ACaption: string): TRxColumn; function ColumnByCaption(ACaption: string): TRxColumn;
procedure CalcStatTotals;
procedure OptimizeColumnsWidth(AColList: string);
procedure OptimizeColumnsWidthAll;
procedure UpdateTitleHight;
procedure GetOnCreateLookup;
procedure GetOnDisplayLookup;
property Canvas; property Canvas;
property DefaultTextStyle; property DefaultTextStyle;
property EditorBorderStyle; property EditorBorderStyle;
@ -526,14 +534,10 @@ type
property FastEditing; property FastEditing;
property FocusRectVisible; property FocusRectVisible;
property SelectedRows; property SelectedRows;
procedure CalcStatTotals;
procedure OptimizeColumnsWidth(AColList: string);
procedure OptimizeColumnsWidthAll;
procedure UpdateTitleHight;
property QuickUTF8Search: string read FQuickUTF8Search write SetQuickUTF8Search; property QuickUTF8Search: string read FQuickUTF8Search write SetQuickUTF8Search;
property SortField:string read GetSortField;
property SortOrder:TSortMarker read FSortOrder;
procedure GetOnCreateLookup;
procedure GetOnDisplayLookup;
published published
property AfterQuickSearch: TRxQuickSearchNotifyEvent property AfterQuickSearch: TRxQuickSearchNotifyEvent
read FAfterQuickSearch write FAfterQuickSearch; read FAfterQuickSearch write FAfterQuickSearch;
@ -1304,6 +1308,14 @@ begin
Result := FPropertyStorageLink.Storage; Result := FPropertyStorageLink.Storage;
end; end;
function TRxDBGrid.GetSortField: string;
begin
if Assigned(FSortField) then
Result:=FSortField.FieldName
else
Result:='';
end;
function TRxDBGrid.GetTitleButtons: boolean; function TRxDBGrid.GetTitleButtons: boolean;
begin begin
Result := dgHeaderPushedLook in Options; Result := dgHeaderPushedLook in Options;

2
components/rx/rxlookup.pas
View File

@ -913,7 +913,7 @@ begin
F:=LookupSource.DataSet.FieldByName(FFieldList[i]); F:=LookupSource.DataSet.FieldByName(FFieldList[i]);
S := FValuesList[i]; S := FValuesList[i];
if FPopUpFormOptions.Columns.Count>i then if (FPopUpFormOptions.Columns.Count>i) and (I<LastIndex) then
W := FPopUpFormOptions.Columns[i].Width W := FPopUpFormOptions.Columns[i].Width
else else
begin begin