From f2a94cb7b04638a071c9a81af30a37487b2dd8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cddf=E2=80=9D?= <“ddf668490@163.com”> Date: Fri, 15 Nov 2024 17:18:34 +0800 Subject: [PATCH] 1 --- public10/ThreeFun/Form/U_ColumnBandSet.pas | 4 +- public10/ThreeFun/Form/U_ColumnSet.pas | 4 +- public10/ThreeFun/Form/U_DxZDYHelp.pas | 2 +- public10/ThreeFun/Form/U_FjList.pas | 2 +- public10/ThreeFun/Form/U_FjList10.pas | 2 +- public10/ThreeFun/Form/U_ItemManageNew.pas | 4 +- public10/ThreeFun/Form/U_KHHelp.pas | 2 +- public10/ThreeFun/Form/U_LbaelMap.pas | 4 +- public10/ThreeFun/Form/U_ModulePromptList.pas | 4 +- public10/ThreeFun/Form/U_RTZDYHelp.pas | 2 +- public10/ThreeFun/Form/U_SysLogHelp.pas | 2 +- public10/ThreeFun/Form/U_UserHelp.pas | 4 +- public10/ThreeFun/Form/U_ZDYHelp.pas | 2 +- public10/ThreeFun/Form/U_ZDYHelpFZSel.pas | 4 +- public10/ThreeFun/Form/U_ZDYHelpSel.pas | 4 +- public10/ThreeFun/Form/U_ZdyAttachGYSHelp.pas | 4 +- .../ThreeFun/Form/U_ZdyAttachmentHelp.pas | 4 +- public10/ThreeFun/Fun/U_RTFun.pas | 40 ++++++++++--------- public10/ThreeFun/Fun/U_SelExportField.pas | 2 +- public10/design/U_BaseDataLink.pas | 4 +- public10/design/U_BaseList.pas | 2 +- public10/design/U_BaseOneTableInput.pas | 4 +- public10/design/U_DetailBaseList.pas | 4 +- public10/design/U_FormLayOutDesign.pas | 2 +- public10/design/U_MainBaseList.pas | 4 +- public10/design/U_PageBaseList.pas | 4 +- public10/design/U_QryBaseHelpList.pas | 4 +- public10/design/U_QryBaseList.pas | 38 +++++++++--------- public10/design/U_QryPivotBaseList.pas | 36 ++++++++--------- public10/design/U_QryPivotBaseListExample.pas | 4 +- public10/design/U_TradeBaseList.pas | 4 +- public10/design/U_TradeDetailBaseList.pas | 4 +- public10/design/U_WindowFormdesign.pas | 2 +- public10/design/cxPivotDrillDownFormUnit.pas | 2 +- 34 files changed, 109 insertions(+), 105 deletions(-) diff --git a/public10/ThreeFun/Form/U_ColumnBandSet.pas b/public10/ThreeFun/Form/U_ColumnBandSet.pas index c4398db..e638b3d 100644 --- a/public10/ThreeFun/Form/U_ColumnBandSet.pas +++ b/public10/ThreeFun/Form/U_ColumnBandSet.pas @@ -8,8 +8,8 @@ uses cxDataStorage, cxEdit, DB, cxDBData, cxCheckBox, ADODB, DBClient, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, ComCtrls, ToolWin, - ImgList, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, - dxSkinsDefaultPainters, cxNavigator, dxDateRanges, System.ImageList; + ImgList, cxLookAndFeels, cxLookAndFeelPainters, + cxNavigator, dxDateRanges, System.ImageList; type TfrmColumnBandSet = class(TForm) diff --git a/public10/ThreeFun/Form/U_ColumnSet.pas b/public10/ThreeFun/Form/U_ColumnSet.pas index dd04e2a..94ff749 100644 --- a/public10/ThreeFun/Form/U_ColumnSet.pas +++ b/public10/ThreeFun/Form/U_ColumnSet.pas @@ -8,8 +8,8 @@ uses cxDataStorage, cxEdit, DB, cxDBData, cxCheckBox, ADODB, DBClient, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, ComCtrls, ToolWin, - ImgList, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, - dxSkinsDefaultPainters, cxNavigator, dxDateRanges, System.ImageList; + ImgList, cxLookAndFeels, cxLookAndFeelPainters, + cxNavigator, dxDateRanges, System.ImageList; type TfrmColumnSet = class(TForm) diff --git a/public10/ThreeFun/Form/U_DxZDYHelp.pas b/public10/ThreeFun/Form/U_DxZDYHelp.pas index 788c7ff..8c71610 100644 --- a/public10/ThreeFun/Form/U_DxZDYHelp.pas +++ b/public10/ThreeFun/Form/U_DxZDYHelp.pas @@ -9,7 +9,7 @@ uses cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls, cxCheckBox, cxDropDownEdit, cxLookAndFeels, - cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, + cxLookAndFeelPainters, cxNavigator, dxDateRanges, System.ImageList; type diff --git a/public10/ThreeFun/Form/U_FjList.pas b/public10/ThreeFun/Form/U_FjList.pas index 0dea28f..ecddaa6 100644 --- a/public10/ThreeFun/Form/U_FjList.pas +++ b/public10/ThreeFun/Form/U_FjList.pas @@ -7,7 +7,7 @@ uses Dialogs, ExtCtrls, ComCtrls, Menus, cxLookAndFeelPainters, StdCtrls, cxButtons, DB, ADODB, ImgList,shellapi, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP,strutils, cxGraphics, cxLookAndFeels, - dxSkinsCore, dxSkinsDefaultPainters, IdExplicitTLSClientServerBase, + IdExplicitTLSClientServerBase, System.ImageList; type diff --git a/public10/ThreeFun/Form/U_FjList10.pas b/public10/ThreeFun/Form/U_FjList10.pas index f666016..175324c 100644 --- a/public10/ThreeFun/Form/U_FjList10.pas +++ b/public10/ThreeFun/Form/U_FjList10.pas @@ -7,7 +7,7 @@ uses Dialogs, ExtCtrls, ComCtrls, Menus, cxLookAndFeelPainters, StdCtrls, cxButtons, DB, ADODB, ImgList,shellapi, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP,strutils, cxGraphics, cxLookAndFeels, - dxSkinsCore, dxSkinsDefaultPainters, IdExplicitTLSClientServerBase, + IdExplicitTLSClientServerBase, System.ImageList; type diff --git a/public10/ThreeFun/Form/U_ItemManageNew.pas b/public10/ThreeFun/Form/U_ItemManageNew.pas index c916c4e..eca786a 100644 --- a/public10/ThreeFun/Form/U_ItemManageNew.pas +++ b/public10/ThreeFun/Form/U_ItemManageNew.pas @@ -8,8 +8,8 @@ uses cxDataStorage, cxEdit, DB, cxDBData, ToolWin, ComCtrls, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, - StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, - dxSkinsDefaultPainters, cxNavigator, dxDateRanges, System.ImageList; + StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, + cxNavigator, dxDateRanges, System.ImageList; type TfrmItemManageNew = class(TForm) diff --git a/public10/ThreeFun/Form/U_KHHelp.pas b/public10/ThreeFun/Form/U_KHHelp.pas index 0d403e1..0d4241c 100644 --- a/public10/ThreeFun/Form/U_KHHelp.pas +++ b/public10/ThreeFun/Form/U_KHHelp.pas @@ -9,7 +9,7 @@ uses cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls, cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, - cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, + cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, System.ImageList; type diff --git a/public10/ThreeFun/Form/U_LbaelMap.pas b/public10/ThreeFun/Form/U_LbaelMap.pas index 18b94d3..882164a 100644 --- a/public10/ThreeFun/Form/U_LbaelMap.pas +++ b/public10/ThreeFun/Form/U_LbaelMap.pas @@ -13,8 +13,8 @@ uses RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxCheckComboBox, cxDropDownEdit, Menus, RM_e_Xls, - cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, - dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, System.ImageList, + cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, + dxDateRanges, dxBarBuiltInMenu, System.ImageList, Vcl.ImgList; type diff --git a/public10/ThreeFun/Form/U_ModulePromptList.pas b/public10/ThreeFun/Form/U_ModulePromptList.pas index 912c7dd..782dd66 100644 --- a/public10/ThreeFun/Form/U_ModulePromptList.pas +++ b/public10/ThreeFun/Form/U_ModulePromptList.pas @@ -10,8 +10,8 @@ uses cxControls, cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, - cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, - dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu; + cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, + cxNavigator, dxDateRanges, dxBarBuiltInMenu; type TfrmModulePromptList = class(TForm) diff --git a/public10/ThreeFun/Form/U_RTZDYHelp.pas b/public10/ThreeFun/Form/U_RTZDYHelp.pas index 984e5bc..9fa9aff 100644 --- a/public10/ThreeFun/Form/U_RTZDYHelp.pas +++ b/public10/ThreeFun/Form/U_RTZDYHelp.pas @@ -9,7 +9,7 @@ uses cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls, cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, - cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, + cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu; type diff --git a/public10/ThreeFun/Form/U_SysLogHelp.pas b/public10/ThreeFun/Form/U_SysLogHelp.pas index a875a68..6aa3836 100644 --- a/public10/ThreeFun/Form/U_SysLogHelp.pas +++ b/public10/ThreeFun/Form/U_SysLogHelp.pas @@ -8,7 +8,7 @@ uses cxData, cxDataStorage, cxEdit, DB, cxDBData, cxGridLevel, strUtils, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, ADODB, StdCtrls, ExtCtrls, ImgList, - cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, + cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, System.ImageList, dxScrollbarAnnotations; type diff --git a/public10/ThreeFun/Form/U_UserHelp.pas b/public10/ThreeFun/Form/U_UserHelp.pas index d1323e3..fddaf9b 100644 --- a/public10/ThreeFun/Form/U_UserHelp.pas +++ b/public10/ThreeFun/Form/U_UserHelp.pas @@ -9,8 +9,8 @@ uses cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, cxInplaceContainer, cxDBTL, cxTLData, ComCtrls, ToolWin, ADODB, ImgList,StrUtils, ExtCtrls, - cxLookAndFeels, cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, dxSkinsCore, - dxSkinsDefaultPainters, cxNavigator, dxDateRanges, System.ImageList; + cxLookAndFeels, cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, + cxNavigator, dxDateRanges, System.ImageList; type TfrmUserHelp = class(TForm) diff --git a/public10/ThreeFun/Form/U_ZDYHelp.pas b/public10/ThreeFun/Form/U_ZDYHelp.pas index 09c2bbb..5f02dff 100644 --- a/public10/ThreeFun/Form/U_ZDYHelp.pas +++ b/public10/ThreeFun/Form/U_ZDYHelp.pas @@ -10,7 +10,7 @@ uses cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls, cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxScrollbarAnnotations, - cxContainer, dxBarBuiltInMenu, cxImageList, System.ImageList, dxSkinsCore, + cxContainer, dxBarBuiltInMenu, cxImageList, System.ImageList, dxSkinsDefaultPainters; type diff --git a/public10/ThreeFun/Form/U_ZDYHelpFZSel.pas b/public10/ThreeFun/Form/U_ZDYHelpFZSel.pas index b8da827..c893201 100644 --- a/public10/ThreeFun/Form/U_ZDYHelpFZSel.pas +++ b/public10/ThreeFun/Form/U_ZDYHelpFZSel.pas @@ -8,8 +8,8 @@ uses cxEdit, DB, cxDBData, ToolWin, ComCtrls, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls, - cxCheckBox, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, - dxSkinsDefaultPainters, cxNavigator, dxDateRanges, System.ImageList, + cxCheckBox, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, + cxNavigator, dxDateRanges, System.ImageList, System.Types, cxDropDownEdit, cxButtonEdit, dxBarBuiltInMenu, cxGridCustomPopupMenu, cxGridPopupMenu, U_BaseHelp, BtnEdit; diff --git a/public10/ThreeFun/Form/U_ZDYHelpSel.pas b/public10/ThreeFun/Form/U_ZDYHelpSel.pas index 73cd8d3..9dc93d8 100644 --- a/public10/ThreeFun/Form/U_ZDYHelpSel.pas +++ b/public10/ThreeFun/Form/U_ZDYHelpSel.pas @@ -8,8 +8,8 @@ uses cxEdit, DB, cxDBData, ToolWin, ComCtrls, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls, - cxCheckBox, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, - dxSkinsDefaultPainters, cxNavigator, dxDateRanges, System.ImageList, + cxCheckBox, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, + cxNavigator, dxDateRanges, System.ImageList, System.Types, dxBarBuiltInMenu, cxGridCustomPopupMenu, cxGridPopupMenu, dxScrollbarAnnotations, cxContainer; diff --git a/public10/ThreeFun/Form/U_ZdyAttachGYSHelp.pas b/public10/ThreeFun/Form/U_ZdyAttachGYSHelp.pas index 9b22a9f..8596644 100644 --- a/public10/ThreeFun/Form/U_ZdyAttachGYSHelp.pas +++ b/public10/ThreeFun/Form/U_ZdyAttachGYSHelp.pas @@ -10,8 +10,8 @@ uses cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP,ShellAPI,IniFiles, cxCheckBox, cxCalendar, - cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, - dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu; + cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, + cxNavigator, dxDateRanges, dxBarBuiltInMenu; type TfrmZdyAttachGYSHelp = class(TForm) diff --git a/public10/ThreeFun/Form/U_ZdyAttachmentHelp.pas b/public10/ThreeFun/Form/U_ZdyAttachmentHelp.pas index 428d4b2..1559580 100644 --- a/public10/ThreeFun/Form/U_ZdyAttachmentHelp.pas +++ b/public10/ThreeFun/Form/U_ZdyAttachmentHelp.pas @@ -12,8 +12,8 @@ uses cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP,ShellAPI,IniFiles, cxCheckBox, cxCalendar, - cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, - dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu; + cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, + cxNavigator, dxDateRanges, dxBarBuiltInMenu; type TfrmZdyAttachmentHelp = class(TForm) diff --git a/public10/ThreeFun/Fun/U_RTFun.pas b/public10/ThreeFun/Fun/U_RTFun.pas index cef92e4..bec7e70 100644 --- a/public10/ThreeFun/Fun/U_RTFun.pas +++ b/public10/ThreeFun/Fun/U_RTFun.pas @@ -218,6 +218,7 @@ procedure LSCSHData(ADOQueryTmp: TADOQuery; mParent: TdxLayoutControl; FTag: Int procedure LRTSetsavedata(ADOQueryCmd: TADOQuery; MyTable: string; Myparent: TdxLayoutControl; MyTag: Integer); function SLGetFilters(layoutControl: TdxLayoutControl; EquTag, LikeTag: Integer): string; + procedure InitAdoData(ADO1: TADOQuery; Tv1: TcxGridDBTableView; SqlStr, FilterStr, MarkStr: string); // **************** ʦүд *****************// @@ -238,7 +239,7 @@ var implementation uses - U_DataLink,U_globalVar; + U_DataLink, U_globalVar; /// ///////////////////////////////////////// @@ -2181,23 +2182,24 @@ var begin try - Tv1.BeginUpdate() ; + Tv1.BeginUpdate(); if trim(MarkStr) <> '' then begin if not CDS1.IsEmpty then - MarkStrValue := TRIM(CDS1.FieldByName(MarkStr).AsString); + MarkStrValue := TRIM(CDS1.FieldByName(MarkStr).AsString); end; with ADO1 do begin Close; SQL.Clear; + Filtered := false; sql.Add(SqlStr); Open; - end; + end; if trim(FilterStr) <> '' then - SDofilter(ADO1, FilterStr); + SDofilter(ADO1, FilterStr); SCreateCDS(ADO1, CDS1); SInitCDSData(ADO1, CDS1); @@ -2207,10 +2209,11 @@ begin if trim(MarkStr) <> '' then CDS1.Locate(MarkStr, MarkStrValue, []); finally - tv1.EndUpdate; + Tv1.EndUpdate; end; end; ////////////////////////////////////// + procedure InitAdoData(ADO1: TADOQuery; Tv1: TcxGridDBTableView; SqlStr, FilterStr, MarkStr: string); var MarkStrValue: string; @@ -2233,12 +2236,13 @@ begin if trim(FilterStr) <> '' then SDofilter(ADO1, FilterStr); Tv1.DataController.Filter.Refresh; - if trim(MarkStr) <> '' then - ADO1.Locate(MarkStr, MarkStrValue, []); + if trim(MarkStr) <> '' then + ADO1.Locate(MarkStr, MarkStrValue, []); finally Tv1.EndUpdate(); end; end; + procedure SInitRadioGroupBySql(ADOQueryTmp: TADOQuery; rg: TRadioGroup; emptyFlag: Boolean; mSql: string); begin with ADOQueryTmp do @@ -2672,18 +2676,18 @@ var mGridName: string; mfromName: string; mcxGridDbColumn1: TcxGridDbColumn; - mDir:string; + mDir: string; i: integer; begin if gGridNativeSet then begin - mDir:= ExtractFilePath(application.ExeName) + 'Layout\' + filePack ; - mFileName := mDir + '\' + Trim(fileName) + '.dbg'; + mDir := ExtractFilePath(application.ExeName) + 'Layout\' + filePack; + mFileName := mDir + '\' + Trim(fileName) + '.dbg'; //Ӳļлָ if FileExists(mFileName) then - cxGrid.RestoreFromIniFile(mFileName, false, false); + cxGrid.RestoreFromIniFile(mFileName, false, false); exit; - end ; + end; mGridName := cxGrid.GetParentComponent.Name + '.' + cxGrid.name; @@ -2768,7 +2772,7 @@ begin cxGrid.RestoreFromIniFile(mFileName); exit; - end; + end; mGridName := cxGrid.GetParentComponent.Name + '.' + cxGrid.name; @@ -2871,14 +2875,14 @@ var mADOCmd: TADOQuery; mGridName: string; mfromName: string; - mDir:string; + mDir: string; i: integer; mcurdate: Tdatetime; begin - mDir:= ExtractFilePath(application.ExeName) + 'Layout\' ; - if not DirectoryExists( mDir) then + mDir := ExtractFilePath(application.ExeName) + 'Layout\'; + if not DirectoryExists(mDir) then begin - CreateDir(pwidechar(mDir)); + CreateDir(pwidechar(mDir)); end; // mFileName := mDir + '\' + Trim(fileName) + '.dbg'; mFileName := ExtractFilePath(application.ExeName) + 'Layout\' + filePack + '\' + Trim(fileName) + '.dbg'; diff --git a/public10/ThreeFun/Fun/U_SelExportField.pas b/public10/ThreeFun/Fun/U_SelExportField.pas index 2dd7000..7e8ca12 100644 --- a/public10/ThreeFun/Fun/U_SelExportField.pas +++ b/public10/ThreeFun/Fun/U_SelExportField.pas @@ -9,7 +9,7 @@ uses cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid, - cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, + cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges; type diff --git a/public10/design/U_BaseDataLink.pas b/public10/design/U_BaseDataLink.pas index d0a520a..4461493 100644 --- a/public10/design/U_BaseDataLink.pas +++ b/public10/design/U_BaseDataLink.pas @@ -4,10 +4,10 @@ interface uses System.SysUtils,windows,forms, System.Classes, - dxSkinsDefaultPainters, dxCore, cxClasses, + dxCore, cxClasses, cxLookAndFeels, dxSkinsForm, cxContainer, cxEdit, System.ImageList, Vcl.ImgList, Vcl.Controls, cxImageList, cxGraphics, cxStyles, - dxSkinBasic, dxLayoutLookAndFeels, + dxLayoutLookAndFeels, cxLocalization; type diff --git a/public10/design/U_BaseList.pas b/public10/design/U_BaseList.pas index c4086f7..d1256dd 100644 --- a/public10/design/U_BaseList.pas +++ b/public10/design/U_BaseList.pas @@ -6,7 +6,7 @@ uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Data.DB, Data.Win.ADODB, U_WindowFormdesign, cxGraphics, cxControls, cxLookAndFeels, - cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, dxSkinWXI, + cxLookAndFeelPainters, cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations, cxDBData, cxGridLevel, cxClasses, cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, diff --git a/public10/design/U_BaseOneTableInput.pas b/public10/design/U_BaseOneTableInput.pas index c459aa5..aaf0075 100644 --- a/public10/design/U_BaseOneTableInput.pas +++ b/public10/design/U_BaseOneTableInput.pas @@ -5,8 +5,8 @@ interface uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ComCtrls, Vcl.ToolWin, cxGraphics, - cxControls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, - dxSkinsDefaultPainters, dxSkinWXI, cxClasses, dxLayoutContainer, + cxControls, cxLookAndFeels, cxLookAndFeelPainters, + cxClasses, dxLayoutContainer, dxLayoutControl, Data.DB, Data.Win.ADODB,U_WindowFormdesign; type diff --git a/public10/design/U_DetailBaseList.pas b/public10/design/U_DetailBaseList.pas index 6566270..2f2f8f4 100644 --- a/public10/design/U_DetailBaseList.pas +++ b/public10/design/U_DetailBaseList.pas @@ -5,8 +5,8 @@ interface uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ComCtrls, Vcl.ToolWin, cxGraphics, - cxControls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,U_WindowFormdesign, - dxSkinsDefaultPainters, dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData, + cxControls, cxLookAndFeels, cxLookAndFeelPainters, U_WindowFormdesign, + cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations, Data.DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, Data.Win.ADODB,math, diff --git a/public10/design/U_FormLayOutDesign.pas b/public10/design/U_FormLayOutDesign.pas index 9b54c08..894f771 100644 --- a/public10/design/U_FormLayOutDesign.pas +++ b/public10/design/U_FormLayOutDesign.pas @@ -8,7 +8,7 @@ uses cxGridCustomTableView, cxGraphics, cxCalendar, cxCheckBox, cxGridDBTableView,StrUtils, cxGridDBBandedTableView, cxStyles, cxPc, cxGroupBox, dxLayoutContainer, U_dataLink, cxCustomData, cxClasses, cxTimeEdit, cxEdit, cxLookAndFeels, dxLayoutControl, - cxLookAndFeelPainters, cxGridCustomView, Buttons, cxDropDownEdit,dxSkinsCore, dxSkinWXI,dxSkinsDefaultPainters; + cxLookAndFeelPainters, cxGridCustomView, Buttons, cxDropDownEdit, dxSkinsDefaultPainters; //function saveLayOut(dxLayoutControl1:TdxLayoutControl; ADOCmd: TADOQuery;mdesignCode:string):Boolean; diff --git a/public10/design/U_MainBaseList.pas b/public10/design/U_MainBaseList.pas index 95e79ba..faa6e1e 100644 --- a/public10/design/U_MainBaseList.pas +++ b/public10/design/U_MainBaseList.pas @@ -5,8 +5,8 @@ interface uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ComCtrls, Vcl.ToolWin, cxGraphics, - cxControls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,U_WindowFormdesign, - dxSkinsDefaultPainters, dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData, + cxControls, cxLookAndFeels, cxLookAndFeelPainters, U_WindowFormdesign, + cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations, Data.DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, Data.Win.ADODB,math, diff --git a/public10/design/U_PageBaseList.pas b/public10/design/U_PageBaseList.pas index 019aac2..75a0829 100644 --- a/public10/design/U_PageBaseList.pas +++ b/public10/design/U_PageBaseList.pas @@ -5,8 +5,8 @@ interface uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ComCtrls, Vcl.ToolWin, cxGraphics, - cxControls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,U_WindowFormdesign, - dxSkinsDefaultPainters, dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData, + cxControls, cxLookAndFeels, cxLookAndFeelPainters, U_WindowFormdesign, + cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations, Data.DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, Data.Win.ADODB,math, diff --git a/public10/design/U_QryBaseHelpList.pas b/public10/design/U_QryBaseHelpList.pas index fd03c07..5d03423 100644 --- a/public10/design/U_QryBaseHelpList.pas +++ b/public10/design/U_QryBaseHelpList.pas @@ -5,8 +5,8 @@ interface uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, U_QryBaseList, cxGraphics, cxControls, - cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, - dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxEdit, + cxLookAndFeels, cxLookAndFeelPainters, + cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations, Data.DB, cxDBData, cxCheckBox, cxContainer, dxBarBuiltInMenu, Datasnap.DBClient, cxGridCustomPopupMenu, cxGridPopupMenu, Data.Win.ADODB, MovePanel, cxTextEdit, diff --git a/public10/design/U_QryBaseList.pas b/public10/design/U_QryBaseList.pas index 6391318..5594595 100644 --- a/public10/design/U_QryBaseList.pas +++ b/public10/design/U_QryBaseList.pas @@ -5,8 +5,8 @@ interface uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ComCtrls, Vcl.ToolWin, cxGraphics, - cxControls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,U_WindowFormdesign, - dxSkinsDefaultPainters, dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData, + cxControls, cxLookAndFeels, cxLookAndFeelPainters, U_WindowFormdesign, + cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations, Data.DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, Data.Win.ADODB,math, @@ -14,23 +14,23 @@ uses cxContainer, dxCore, cxDateUtils, dxLayoutcxEditAdapters, dxLayoutContainer, cxMaskEdit, cxDropDownEdit, cxCalendar, cxTextEdit, dxLayoutControl, Datasnap.DBClient, cxMemo, Vcl.StdCtrls, Vcl.ExtCtrls, - cxGeometry, dxFramedControl, dxPanel, FrameDateSel10, dxSkinBasic, - dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, - dxSkinDarkroom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, - dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, - dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, - dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, - dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, - dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black, - dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, - dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinOffice2016Colorful, - dxSkinOffice2016Dark, dxSkinOffice2019Black, dxSkinOffice2019Colorful, - dxSkinOffice2019DarkGray, dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, - dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, - dxSkinSpringtime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld, - dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue, - dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010, - dxSkinWhiteprint, dxSkinXmas2008Blue, MovePanel; + cxGeometry, dxFramedControl, dxPanel, FrameDateSel10, + + + + + + + + + + + + + + + + MovePanel; type TfrmQryBaseList = class(TForm) diff --git a/public10/design/U_QryPivotBaseList.pas b/public10/design/U_QryPivotBaseList.pas index 09b2b36..7b2266c 100644 --- a/public10/design/U_QryPivotBaseList.pas +++ b/public10/design/U_QryPivotBaseList.pas @@ -6,29 +6,29 @@ uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ComCtrls, Vcl.ToolWin,cxExportPivotGridLink, FrameDateSel10, cxGraphics, cxControls, cxLookAndFeels, cxLookAndFeelPainters, - dxSkinsCore, dxSkinsDefaultPainters, dxSkinWXI, cxClasses, dxLayoutContainer, + cxClasses, dxLayoutContainer, cxPivotDrillDownFormUnit, dxLayoutControl, cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, Vcl.StdCtrls, Vcl.ExtCtrls, cxCustomData, cxStyles, dxBarBuiltInMenu,U_WindowFormdesign, cxCustomPivotGrid, cxPivotGrid, cxGridCustomPopupMenu, cxGridPopupMenu, math, Data.DB, Datasnap.DBClient, Data.Win.ADODB, cxDBPivotGrid, - dxLayoutControlAdapters, dxSkinBasic, dxSkinBlack, dxSkinBlue, - dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide, - dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy, - dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, - dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, - dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, - dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, - dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, - dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray, - dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark, - dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray, - dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, - dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust, - dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine, - dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark, - dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, - dxSkinXmas2008Blue; + dxLayoutControlAdapters, + + + + + + + + + + + + + + + + ; type TfrmQryPivotBaseList = class(TForm) diff --git a/public10/design/U_QryPivotBaseListExample.pas b/public10/design/U_QryPivotBaseListExample.pas index 8630351..ae950ff 100644 --- a/public10/design/U_QryPivotBaseListExample.pas +++ b/public10/design/U_QryPivotBaseListExample.pas @@ -5,8 +5,8 @@ interface uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, U_QryPivotBaseList, cxGraphics, - cxControls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, - dxSkinsDefaultPainters, dxSkinWXI, cxContainer, cxEdit, cxClasses, + cxControls, cxLookAndFeels, cxLookAndFeelPainters, + cxContainer, cxEdit, cxClasses, cxCustomData, cxStyles, dxBarBuiltInMenu, cxGridCustomPopupMenu, cxGridPopupMenu, Data.DB, Datasnap.DBClient, Data.Win.ADODB, cxCustomPivotGrid, cxPivotGrid, cxTextEdit, cxMaskEdit, cxDropDownEdit, diff --git a/public10/design/U_TradeBaseList.pas b/public10/design/U_TradeBaseList.pas index 5e75348..ee62906 100644 --- a/public10/design/U_TradeBaseList.pas +++ b/public10/design/U_TradeBaseList.pas @@ -5,8 +5,8 @@ interface uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ComCtrls, Vcl.ToolWin, cxGraphics, - cxControls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,U_WindowFormdesign, - dxSkinsDefaultPainters, dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData, + cxControls, cxLookAndFeels, cxLookAndFeelPainters, U_WindowFormdesign, + cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations, Data.DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, Data.Win.ADODB,math, diff --git a/public10/design/U_TradeDetailBaseList.pas b/public10/design/U_TradeDetailBaseList.pas index 4444f4d..a7e0cd5 100644 --- a/public10/design/U_TradeDetailBaseList.pas +++ b/public10/design/U_TradeDetailBaseList.pas @@ -5,8 +5,8 @@ interface uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ComCtrls, Vcl.ToolWin, cxGraphics, - cxControls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,U_WindowFormdesign, - dxSkinsDefaultPainters, dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData, + cxControls, cxLookAndFeels, cxLookAndFeelPainters, U_WindowFormdesign, + cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations, Data.DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, Data.Win.ADODB,math, diff --git a/public10/design/U_WindowFormdesign.pas b/public10/design/U_WindowFormdesign.pas index 73c2ca0..5b38378 100644 --- a/public10/design/U_WindowFormdesign.pas +++ b/public10/design/U_WindowFormdesign.pas @@ -8,7 +8,7 @@ uses Dialogs, Menus, DB, ADODB, cxLabel, BtnEdit, RTComboBox, cxTextEdit, cxMRUEdit, cxDBData, cxGridLevel, cxButtonEdit, cxCurrencyEdit, cxGridTableView, cxGrid, cxGridCustomTableView, cxGraphics, cxCalendar, cxCheckBox, cxGridDBTableView, - cxGridDBBandedTableView, cxStyles, cxPc, cxGroupBox, U_cxGridCustomCss,dxSkinsCore, dxSkinWXI,dxSkinsDefaultPainters, + cxGridDBBandedTableView, cxStyles, cxPc, cxGroupBox, U_cxGridCustomCss, cxCustomData, cxClasses, cxTimeEdit, cxEdit, cxLookAndFeels,dxLayoutControl, cxLookAndFeelPainters, cxGridCustomView, Buttons, cxDropDownEdit,FrameDateSel; diff --git a/public10/design/cxPivotDrillDownFormUnit.pas b/public10/design/cxPivotDrillDownFormUnit.pas index 4094bd1..92e5851 100644 --- a/public10/design/cxPivotDrillDownFormUnit.pas +++ b/public10/design/cxPivotDrillDownFormUnit.pas @@ -10,7 +10,7 @@ uses cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid, cxContainer, cxTextEdit, cxMemo, cxRichEdit, RichEdit, cxHyperLinkEdit, cxLabel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxScrollbarAnnotations, - dxSkinsCore, dxSkinsDefaultPainters, dxSkinWXI, dxBarBuiltInMenu, + dxBarBuiltInMenu, cxGridCustomPopupMenu, cxGridPopupMenu; type