1

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,
+  ImgList, cxLookAndFeels, cxLookAndFeelPainters, 
-  dxSkinsDefaultPainters, cxNavigator, dxDateRanges, System.ImageList;
+   cxNavigator, dxDateRanges, System.ImageList;
 
 type
   TfrmColumnBandSet = class(TForm)

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,
+  ImgList, cxLookAndFeels, cxLookAndFeelPainters, 
-  dxSkinsDefaultPainters, cxNavigator, dxDateRanges, System.ImageList;
+   cxNavigator, dxDateRanges, System.ImageList;
 
 type
   TfrmColumnSet = class(TForm)

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

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

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

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,
+  StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, 
-  dxSkinsDefaultPainters, cxNavigator, dxDateRanges, System.ImageList;
+   cxNavigator, dxDateRanges, System.ImageList;
 
 type
   TfrmItemManageNew = class(TForm)

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

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,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, System.ImageList,
+   dxDateRanges, dxBarBuiltInMenu, System.ImageList,
   Vcl.ImgList;
 
 type

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,
+  cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, 
-  dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu;
+   cxNavigator, dxDateRanges, dxBarBuiltInMenu;
 
 type
   TfrmModulePromptList = class(TForm)

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

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

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,
+  cxLookAndFeels, cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, 
-  dxSkinsDefaultPainters, cxNavigator, dxDateRanges, System.ImageList;
+   cxNavigator, dxDateRanges, System.ImageList;
 
 type
   TfrmUserHelp = class(TForm)

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

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,
+  cxCheckBox, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, 
-  dxSkinsDefaultPainters, cxNavigator, dxDateRanges, System.ImageList,
+   cxNavigator, dxDateRanges, System.ImageList,
   System.Types, cxDropDownEdit, cxButtonEdit, dxBarBuiltInMenu,
   cxGridCustomPopupMenu, cxGridPopupMenu, U_BaseHelp, BtnEdit;
 

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,
+  cxCheckBox, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, 
-  dxSkinsDefaultPainters, cxNavigator, dxDateRanges, System.ImageList,
+   cxNavigator, dxDateRanges, System.ImageList,
   System.Types, dxBarBuiltInMenu, cxGridCustomPopupMenu, cxGridPopupMenu,
   dxScrollbarAnnotations, cxContainer;
 

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,
+  cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, 
-  dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu;
+   cxNavigator, dxDateRanges, dxBarBuiltInMenu;
 
 type
   TfrmZdyAttachGYSHelp = class(TForm)

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,
+  cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, 
-  dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu;
+   cxNavigator, dxDateRanges, dxBarBuiltInMenu;
 
 type
   TfrmZdyAttachmentHelp = class(TForm)

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
+    if trim(MarkStr) <> '' then
-     ADO1.Locate(MarkStr, MarkStrValue, []);
+      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 ;
+    mDir := ExtractFilePath(application.ExeName) + 'Layout\' + filePack;
-     mFileName := mDir + '\' + Trim(fileName) + '.dbg';
+    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\' ;
+  mDir := ExtractFilePath(application.ExeName) + 'Layout\';
-  if not DirectoryExists( mDir) then
+  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';

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

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

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,

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,
+  cxControls, cxLookAndFeels, cxLookAndFeelPainters, 
-  dxSkinsDefaultPainters, dxSkinWXI, cxClasses, dxLayoutContainer,
+    cxClasses, dxLayoutContainer,
   dxLayoutControl, Data.DB, Data.Win.ADODB,U_WindowFormdesign;
 
 type

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,
+  cxControls, cxLookAndFeels, cxLookAndFeelPainters, U_WindowFormdesign,
-  dxSkinsDefaultPainters, dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData,
+    cxStyles, cxCustomData, cxFilter, cxData,
   cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations,
   Data.DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, Data.Win.ADODB,math,

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;

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,
+  cxControls, cxLookAndFeels, cxLookAndFeelPainters, U_WindowFormdesign,
-  dxSkinsDefaultPainters, dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData,
+    cxStyles, cxCustomData, cxFilter, cxData,
   cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations,
   Data.DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, Data.Win.ADODB,math,

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,
+  cxControls, cxLookAndFeels, cxLookAndFeelPainters, U_WindowFormdesign,
-  dxSkinsDefaultPainters, dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData,
+    cxStyles, cxCustomData, cxFilter, cxData,
   cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations,
   Data.DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, Data.Win.ADODB,math,

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,
+  cxLookAndFeels, cxLookAndFeelPainters,  
-  dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxEdit,
+   cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxEdit,
   cxNavigator, dxDateRanges, dxScrollbarAnnotations, Data.DB, cxDBData,
   cxCheckBox, cxContainer, dxBarBuiltInMenu, Datasnap.DBClient,
   cxGridCustomPopupMenu, cxGridPopupMenu, Data.Win.ADODB, MovePanel, cxTextEdit,

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,
+  cxControls, cxLookAndFeels, cxLookAndFeelPainters, U_WindowFormdesign,
-  dxSkinsDefaultPainters, dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData,
+    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,
+  cxGeometry, dxFramedControl, dxPanel, FrameDateSel10, 
-  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;
+    MovePanel;
 
 type
   TfrmQryBaseList = class(TForm)

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,
+  dxLayoutControlAdapters,   
-  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;
+  ;
 
 type
   TfrmQryPivotBaseList = class(TForm)

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,
+  cxControls, cxLookAndFeels, cxLookAndFeelPainters, 
-  dxSkinsDefaultPainters, dxSkinWXI, cxContainer, cxEdit, cxClasses,
+    cxContainer, cxEdit, cxClasses,
   cxCustomData, cxStyles, dxBarBuiltInMenu, cxGridCustomPopupMenu,
   cxGridPopupMenu, Data.DB, Datasnap.DBClient, Data.Win.ADODB,
   cxCustomPivotGrid, cxPivotGrid, cxTextEdit, cxMaskEdit, cxDropDownEdit,

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,
+  cxControls, cxLookAndFeels, cxLookAndFeelPainters, U_WindowFormdesign,
-  dxSkinsDefaultPainters, dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData,
+    cxStyles, cxCustomData, cxFilter, cxData,
   cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations,
   Data.DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, Data.Win.ADODB,math,

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,
+  cxControls, cxLookAndFeels, cxLookAndFeelPainters, U_WindowFormdesign,
-  dxSkinsDefaultPainters, dxSkinWXI, cxStyles, cxCustomData, cxFilter, cxData,
+    cxStyles, cxCustomData, cxFilter, cxData,
   cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations,
   Data.DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, Data.Win.ADODB,math,

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;
 

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