Skip to content

Commit ff7d793

Browse files
Alex-Pertsev-DevExpressAlex-Pertsev-DevExpress
authored
Merge pull request #2 from DevExpress-Examples/revert-1-25.2.3+
Revert "25.2.3+"
2 parents b21d99c + 0115005 commit ff7d793

6 files changed

Lines changed: 51 additions & 28 deletions

File tree

‎CPB/uMainForm.cpp‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,20 @@
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
3139

3240

3341
#pragma link "dxScrollbarAnnotations"
3442
#pragma link "dxmdaset"
3543
#pragma link "cxContainer"
3644
#pragma link "cxLabel"
37-
#pragma link "dxBackend"
38-
#pragma link "dxBackend.ConnectionString.JSON"
39-
#pragma link "dxBackend.ConnectionString.JSON.DataSet"
4045
#pragma resource "*.dfm"
4146
TMainForm *MainForm;
4247
//---------------------------------------------------------------------------

‎CPB/uMainForm.dfm‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,13 @@ object MainForm: TMainForm
3636
Height = 265
3737
TabOrder = 2
3838
object gvCategories: TcxGridDBTableView
39+
Navigator.Buttons.CustomButtons = <>
40+
ScrollbarAnnotations.CustomAnnotations = <>
3941
DataController.DataSource = DataModule1.dsCategories
4042
DataController.KeyFieldNames = 'CategoryID'
43+
DataController.Summary.DefaultGroupSummaryItems = <>
44+
DataController.Summary.FooterSummaryItems = <>
45+
DataController.Summary.SummaryGroups = <>
4146
object gvCategoriesCategoryID: TcxGridDBColumn
4247
DataBinding.FieldName = 'CategoryID'
4348
end
@@ -49,10 +54,15 @@ object MainForm: TMainForm
4954
end
5055
end
5156
object gvProducts: TcxGridDBTableView
57+
Navigator.Buttons.CustomButtons = <>
58+
ScrollbarAnnotations.CustomAnnotations = <>
5259
DataController.DataSource = DataModule1.dsProducts
5360
DataController.DetailKeyFieldNames = 'CategoryID'
5461
DataController.KeyFieldNames = 'ProductID'
5562
DataController.MasterKeyFieldNames = 'CategoryID'
63+
DataController.Summary.DefaultGroupSummaryItems = <>
64+
DataController.Summary.FooterSummaryItems = <>
65+
DataController.Summary.SummaryGroups = <>
5666
object gvProductsProductID: TcxGridDBColumn
5767
DataBinding.FieldName = 'ProductID'
5868
end
@@ -123,20 +133,19 @@ object MainForm: TMainForm
123133
TabOrder = 5
124134
end
125135
object dxReport1: TdxReport
126-
Parameters = <>
127136
Left = 48
128137
Top = 88
129138
end
130-
object dxBackendDataConnectionManager1: TdxBackendDataConnectionManager
139+
object dxReportDataConnectionManager1: TdxReportDataConnectionManager
131140
Left = 112
132141
Top = 88
133-
object dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1: TdxBackendDataSetJSONConnection
142+
object dxReportDataConnectionManager1dxReportDataSetJSONConnection1: TdxReportDataSetJSONConnection
134143
DisplayName = 'DataSetConnection'
135-
object itmProducts: TdxBackendDataSetCollectionItem
144+
object itmProducts: TdxReportDataSetCollectionItem
136145
DataSet = DataModule1.mdProducts
137146
DataSetAlias = 'mdProducts'
138147
end
139-
object itmCategories: TdxBackendDataSetCollectionItem
148+
object itmCategories: TdxReportDataSetCollectionItem
140149
DataSet = DataModule1.mdCategories
141150
DataSetAlias = 'mdCategories'
142151
end

‎CPB/uMainForm.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
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"
3134
#include "dxReport.hpp"
3235
#include "dxScrollbarAnnotations.hpp"
3336
#include <Data.DB.hpp>
@@ -36,9 +39,6 @@
3639
#include "uData.h"
3740
#include "cxContainer.hpp"
3841
#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-
TdxBackendDataConnectionManager *dxBackendDataConnectionManager1;
69-
TdxBackendDataSetJSONConnection *dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1;
70-
TdxBackendDataSetCollectionItem *itmProducts;
71-
TdxBackendDataSetCollectionItem *itmCategories;
68+
TdxReportDataConnectionManager *dxReportDataConnectionManager1;
69+
TdxReportDataSetJSONConnection *dxReportDataConnectionManager1dxReportDataSetJSONConnection1;
70+
TdxReportDataSetCollectionItem *itmProducts;
71+
TdxReportDataSetCollectionItem *itmCategories;
7272
TcxButton *btnSetLanguageUS;
7373
TcxButton *btnSetLanguageDE;
7474
TcxLabel *lblSelectLanguage;

‎Delphi/uMainForm.dfm‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,13 @@ object MainForm: TMainForm
3636
Height = 265
3737
TabOrder = 2
3838
object gvCategories: TcxGridDBTableView
39+
Navigator.Buttons.CustomButtons = <>
40+
ScrollbarAnnotations.CustomAnnotations = <>
3941
DataController.DataSource = DataModule1.dsCategories
4042
DataController.KeyFieldNames = 'CategoryID'
43+
DataController.Summary.DefaultGroupSummaryItems = <>
44+
DataController.Summary.FooterSummaryItems = <>
45+
DataController.Summary.SummaryGroups = <>
4146
object gvCategoriesCategoryID: TcxGridDBColumn
4247
DataBinding.FieldName = 'CategoryID'
4348
end
@@ -49,10 +54,15 @@ object MainForm: TMainForm
4954
end
5055
end
5156
object gvProducts: TcxGridDBTableView
57+
Navigator.Buttons.CustomButtons = <>
58+
ScrollbarAnnotations.CustomAnnotations = <>
5259
DataController.DataSource = DataModule1.dsProducts
5360
DataController.DetailKeyFieldNames = 'CategoryID'
5461
DataController.KeyFieldNames = 'ProductID'
5562
DataController.MasterKeyFieldNames = 'CategoryID'
63+
DataController.Summary.DefaultGroupSummaryItems = <>
64+
DataController.Summary.FooterSummaryItems = <>
65+
DataController.Summary.SummaryGroups = <>
5666
object gvProductsProductID: TcxGridDBColumn
5767
DataBinding.FieldName = 'ProductID'
5868
end
@@ -123,20 +133,19 @@ object MainForm: TMainForm
123133
TabOrder = 5
124134
end
125135
object dxReport1: TdxReport
126-
Parameters = <>
127136
Left = 48
128137
Top = 128
129138
end
130-
object dxBackendDataConnectionManager1: TdxBackendDataConnectionManager
139+
object dxReportDataConnectionManager1: TdxReportDataConnectionManager
131140
Left = 112
132141
Top = 128
133-
object dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1: TdxBackendDataSetJSONConnection
142+
object dxReportDataConnectionManager1dxReportDataSetJSONConnection1: TdxReportDataSetJSONConnection
134143
DisplayName = 'DataSetConnection'
135-
object itmProducts: TdxBackendDataSetCollectionItem
144+
object itmProducts: TdxReportDataSetCollectionItem
136145
DataSet = DataModule1.mdProducts
137146
DataSetAlias = 'mdProducts'
138147
end
139-
object itmCategories: TdxBackendDataSetCollectionItem
148+
object itmCategories: TdxReportDataSetCollectionItem
140149
DataSet = DataModule1.mdCategories
141150
DataSetAlias = 'mdCategories'
142151
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-
dxBackend, cxControls, cxStyles, cxCustomData, cxFilter, cxData,
9+
dxReport.Backend, 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, dxBackend.ConnectionString.JSON.DataSet,
14-
dxBackend.ConnectionString.JSON, Vcl.StdCtrls, dxmdaset, uData, cxContainer,
13+
FireDAC.Comp.Client, dxReport.ConnectionString.JSON.DB,
14+
dxReport.ConnectionString.JSON, Vcl.StdCtrls, dxmdaset, uData, cxContainer,
1515
cxLabel;
1616

1717
type
1818
TMainForm = class(TForm)
1919
dxReport1: TdxReport;
20-
dxBackendDataConnectionManager1: TdxBackendDataConnectionManager;
20+
dxReportDataConnectionManager1: TdxReportDataConnectionManager;
2121
btnShowDesigner: TcxButton;
2222
btnViewReport: TcxButton;
23-
dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1: TdxBackendDataSetJSONConnection;
24-
itmProducts: TdxBackendDataSetCollectionItem;
25-
itmCategories: TdxBackendDataSetCollectionItem;
23+
dxReportDataConnectionManager1dxReportDataSetJSONConnection1: TdxReportDataSetJSONConnection;
24+
itmProducts: TdxReportDataSetCollectionItem;
25+
itmCategories: TdxReportDataSetCollectionItem;
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.2.3%2B)
2+
![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/1048527919/25.1.4%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)