Skip to content

Commit b21d99c

Browse files
Alex-Pertsev-DevExpressAlex-Pertsev-DevExpress
authored
Merge pull request #1 from DevExpress-Examples/25.2.3+
25.2.3+
2 parents 4573dcd + afa4599 commit b21d99c

6 files changed

Lines changed: 28 additions & 51 deletions

File tree

‎CPB/uMainForm.cpp‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,15 @@
2828
#pragma link "cxStyles"
2929
#pragma link "dxDateRanges"
3030
#pragma link "dxReport"
31-
#pragma link "dxReport.Backend"
32-
#pragma link "dxReport.ConnectionString.JSON"
33-
34-
#if defined(_WIN64)
35-
#pragma link "dxReport.ConnectionString.JSON.DB.O"
36-
#else
37-
#pragma link "dxReport.ConnectionString.JSON.DB.OBJ"
38-
#endif
3931

4032

4133
#pragma link "dxScrollbarAnnotations"
4234
#pragma link "dxmdaset"
4335
#pragma link "cxContainer"
4436
#pragma link "cxLabel"
37+
#pragma link "dxBackend"
38+
#pragma link "dxBackend.ConnectionString.JSON"
39+
#pragma link "dxBackend.ConnectionString.JSON.DataSet"
4540
#pragma resource "*.dfm"
4641
TMainForm *MainForm;
4742
//---------------------------------------------------------------------------

‎CPB/uMainForm.dfm‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,8 @@ object MainForm: TMainForm
3636
Height = 265
3737
TabOrder = 2
3838
object gvCategories: TcxGridDBTableView
39-
Navigator.Buttons.CustomButtons = <>
40-
ScrollbarAnnotations.CustomAnnotations = <>
4139
DataController.DataSource = DataModule1.dsCategories
4240
DataController.KeyFieldNames = 'CategoryID'
43-
DataController.Summary.DefaultGroupSummaryItems = <>
44-
DataController.Summary.FooterSummaryItems = <>
45-
DataController.Summary.SummaryGroups = <>
4641
object gvCategoriesCategoryID: TcxGridDBColumn
4742
DataBinding.FieldName = 'CategoryID'
4843
end
@@ -54,15 +49,10 @@ object MainForm: TMainForm
5449
end
5550
end
5651
object gvProducts: TcxGridDBTableView
57-
Navigator.Buttons.CustomButtons = <>
58-
ScrollbarAnnotations.CustomAnnotations = <>
5952
DataController.DataSource = DataModule1.dsProducts
6053
DataController.DetailKeyFieldNames = 'CategoryID'
6154
DataController.KeyFieldNames = 'ProductID'
6255
DataController.MasterKeyFieldNames = 'CategoryID'
63-
DataController.Summary.DefaultGroupSummaryItems = <>
64-
DataController.Summary.FooterSummaryItems = <>
65-
DataController.Summary.SummaryGroups = <>
6656
object gvProductsProductID: TcxGridDBColumn
6757
DataBinding.FieldName = 'ProductID'
6858
end
@@ -133,19 +123,20 @@ object MainForm: TMainForm
133123
TabOrder = 5
134124
end
135125
object dxReport1: TdxReport
126+
Parameters = <>
136127
Left = 48
137128
Top = 88
138129
end
139-
object dxReportDataConnectionManager1: TdxReportDataConnectionManager
130+
object dxBackendDataConnectionManager1: TdxBackendDataConnectionManager
140131
Left = 112
141132
Top = 88
142-
object dxReportDataConnectionManager1dxReportDataSetJSONConnection1: TdxReportDataSetJSONConnection
133+
object dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1: TdxBackendDataSetJSONConnection
143134
DisplayName = 'DataSetConnection'
144-
object itmProducts: TdxReportDataSetCollectionItem
135+
object itmProducts: TdxBackendDataSetCollectionItem
145136
DataSet = DataModule1.mdProducts
146137
DataSetAlias = 'mdProducts'
147138
end
148-
object itmCategories: TdxReportDataSetCollectionItem
139+
object itmCategories: TdxBackendDataSetCollectionItem
149140
DataSet = DataModule1.mdCategories
150141
DataSetAlias = 'mdCategories'
151142
end

‎CPB/uMainForm.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
#include "cxNavigator.hpp"
2929
#include "cxStyles.hpp"
3030
#include "dxDateRanges.hpp"
31-
#include "dxReport.Backend.hpp"
32-
#include "dxReport.ConnectionString.JSON.DB.hpp"
33-
#include "dxReport.ConnectionString.JSON.hpp"
3431
#include "dxReport.hpp"
3532
#include "dxScrollbarAnnotations.hpp"
3633
#include <Data.DB.hpp>
@@ -39,6 +36,9 @@
3936
#include "uData.h"
4037
#include "cxContainer.hpp"
4138
#include "cxLabel.hpp"
39+
#include "dxBackend.ConnectionString.JSON.DataSet.hpp"
40+
#include "dxBackend.ConnectionString.JSON.hpp"
41+
#include "dxBackend.hpp"
4242
//---------------------------------------------------------------------------
4343
class TMainForm : public TForm
4444
{
@@ -65,10 +65,10 @@ class TMainForm : public TForm
6565
TcxGridLevel *cxGrid1Level1;
6666
TcxGridLevel *cxGrid1Level2;
6767
TdxReport *dxReport1;
68-
TdxReportDataConnectionManager *dxReportDataConnectionManager1;
69-
TdxReportDataSetJSONConnection *dxReportDataConnectionManager1dxReportDataSetJSONConnection1;
70-
TdxReportDataSetCollectionItem *itmProducts;
71-
TdxReportDataSetCollectionItem *itmCategories;
68+
TdxBackendDataConnectionManager *dxBackendDataConnectionManager1;
69+
TdxBackendDataSetJSONConnection *dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1;
70+
TdxBackendDataSetCollectionItem *itmProducts;
71+
TdxBackendDataSetCollectionItem *itmCategories;
7272
TcxButton *btnSetLanguageUS;
7373
TcxButton *btnSetLanguageDE;
7474
TcxLabel *lblSelectLanguage;

‎Delphi/uMainForm.dfm‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,8 @@ object MainForm: TMainForm
3636
Height = 265
3737
TabOrder = 2
3838
object gvCategories: TcxGridDBTableView
39-
Navigator.Buttons.CustomButtons = <>
40-
ScrollbarAnnotations.CustomAnnotations = <>
4139
DataController.DataSource = DataModule1.dsCategories
4240
DataController.KeyFieldNames = 'CategoryID'
43-
DataController.Summary.DefaultGroupSummaryItems = <>
44-
DataController.Summary.FooterSummaryItems = <>
45-
DataController.Summary.SummaryGroups = <>
4641
object gvCategoriesCategoryID: TcxGridDBColumn
4742
DataBinding.FieldName = 'CategoryID'
4843
end
@@ -54,15 +49,10 @@ object MainForm: TMainForm
5449
end
5550
end
5651
object gvProducts: TcxGridDBTableView
57-
Navigator.Buttons.CustomButtons = <>
58-
ScrollbarAnnotations.CustomAnnotations = <>
5952
DataController.DataSource = DataModule1.dsProducts
6053
DataController.DetailKeyFieldNames = 'CategoryID'
6154
DataController.KeyFieldNames = 'ProductID'
6255
DataController.MasterKeyFieldNames = 'CategoryID'
63-
DataController.Summary.DefaultGroupSummaryItems = <>
64-
DataController.Summary.FooterSummaryItems = <>
65-
DataController.Summary.SummaryGroups = <>
6656
object gvProductsProductID: TcxGridDBColumn
6757
DataBinding.FieldName = 'ProductID'
6858
end
@@ -133,19 +123,20 @@ object MainForm: TMainForm
133123
TabOrder = 5
134124
end
135125
object dxReport1: TdxReport
126+
Parameters = <>
136127
Left = 48
137128
Top = 128
138129
end
139-
object dxReportDataConnectionManager1: TdxReportDataConnectionManager
130+
object dxBackendDataConnectionManager1: TdxBackendDataConnectionManager
140131
Left = 112
141132
Top = 128
142-
object dxReportDataConnectionManager1dxReportDataSetJSONConnection1: TdxReportDataSetJSONConnection
133+
object dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1: TdxBackendDataSetJSONConnection
143134
DisplayName = 'DataSetConnection'
144-
object itmProducts: TdxReportDataSetCollectionItem
135+
object itmProducts: TdxBackendDataSetCollectionItem
145136
DataSet = DataModule1.mdProducts
146137
DataSetAlias = 'mdProducts'
147138
end
148-
object itmCategories: TdxReportDataSetCollectionItem
139+
object itmCategories: TdxBackendDataSetCollectionItem
149140
DataSet = DataModule1.mdCategories
150141
DataSetAlias = 'mdCategories'
151142
end

‎Delphi/uMainForm.pas‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ interface
66
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
77
Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxClasses, dxReport, cxGraphics,
88
cxLookAndFeels, cxLookAndFeelPainters, Vcl.Menus, cxButtons,
9-
dxReport.Backend, cxControls, cxStyles, cxCustomData, cxFilter, cxData,
9+
dxBackend, cxControls, cxStyles, cxCustomData, cxFilter, cxData,
1010
cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations,
1111
Data.DB, cxDBData, cxGridLevel, cxGridCustomView, cxGridCustomTableView,
1212
cxGridTableView, cxGridDBTableView, cxGrid, FireDAC.Comp.DataSet,
13-
FireDAC.Comp.Client, dxReport.ConnectionString.JSON.DB,
14-
dxReport.ConnectionString.JSON, Vcl.StdCtrls, dxmdaset, uData, cxContainer,
13+
FireDAC.Comp.Client, dxBackend.ConnectionString.JSON.DataSet,
14+
dxBackend.ConnectionString.JSON, Vcl.StdCtrls, dxmdaset, uData, cxContainer,
1515
cxLabel;
1616

1717
type
1818
TMainForm = class(TForm)
1919
dxReport1: TdxReport;
20-
dxReportDataConnectionManager1: TdxReportDataConnectionManager;
20+
dxBackendDataConnectionManager1: TdxBackendDataConnectionManager;
2121
btnShowDesigner: TcxButton;
2222
btnViewReport: TcxButton;
23-
dxReportDataConnectionManager1dxReportDataSetJSONConnection1: TdxReportDataSetJSONConnection;
24-
itmProducts: TdxReportDataSetCollectionItem;
25-
itmCategories: TdxReportDataSetCollectionItem;
23+
dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1: TdxBackendDataSetJSONConnection;
24+
itmProducts: TdxBackendDataSetCollectionItem;
25+
itmCategories: TdxBackendDataSetCollectionItem;
2626
cxGrid1: TcxGrid;
2727
gvCategories: TcxGridDBTableView;
2828
gvCategoriesCategoryID: TcxGridDBColumn;

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- default badges list -->
2-
![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/1048527919/25.1.4%2B)
2+
![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/1048527919/25.2.3%2B)
33
[![](https://img.shields.io/badge/Open_in_DevExpress_Support_Center-FF7200?style=flat-square&logo=DevExpress&logoColor=white)](https://supportcenter.devexpress.com/ticket/details/T1305951)
44
[![](https://img.shields.io/badge/📖_How_to_use_DevExpress_Examples-e9f6fc?style=flat-square)](https://docs.devexpress.com/GeneralInformation/403183)
55
[![](https://img.shields.io/badge/💬_Leave_Feedback-feecdd?style=flat-square)](#does-this-example-address-your-development-requirementsobjectives)

0 commit comments

Comments
 (0)