Skip to content

Revert "25.2.3+" #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexpa-devexspress merged 1 commit into from
Dec 16, 2025
Merged

Revert "25.2.3+" #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions CPB/uMainForm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,20 @@
#pragma link "cxStyles"
#pragma link "dxDateRanges"
#pragma link "dxReport"
#pragma link "dxReport.Backend"
#pragma link "dxReport.ConnectionString.JSON"

#if defined(_WIN64)
#pragma link "dxReport.ConnectionString.JSON.DB.O"
#else
#pragma link "dxReport.ConnectionString.JSON.DB.OBJ"
#endif


#pragma link "dxScrollbarAnnotations"
#pragma link "dxmdaset"
#pragma link "cxContainer"
#pragma link "cxLabel"
#pragma link "dxBackend"
#pragma link "dxBackend.ConnectionString.JSON"
#pragma link "dxBackend.ConnectionString.JSON.DataSet"
#pragma resource "*.dfm"
TMainForm *MainForm;
//---------------------------------------------------------------------------
Expand Down
19 changes: 14 additions & 5 deletions CPB/uMainForm.dfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,13 @@ object MainForm: TMainForm
Height = 265
TabOrder = 2
object gvCategories: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <>
ScrollbarAnnotations.CustomAnnotations = <>
DataController.DataSource = DataModule1.dsCategories
DataController.KeyFieldNames = 'CategoryID'
DataController.Summary.DefaultGroupSummaryItems = <>
DataController.Summary.FooterSummaryItems = <>
DataController.Summary.SummaryGroups = <>
object gvCategoriesCategoryID: TcxGridDBColumn
DataBinding.FieldName = 'CategoryID'
end
Expand All @@ -49,10 +54,15 @@ object MainForm: TMainForm
end
end
object gvProducts: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <>
ScrollbarAnnotations.CustomAnnotations = <>
DataController.DataSource = DataModule1.dsProducts
DataController.DetailKeyFieldNames = 'CategoryID'
DataController.KeyFieldNames = 'ProductID'
DataController.MasterKeyFieldNames = 'CategoryID'
DataController.Summary.DefaultGroupSummaryItems = <>
DataController.Summary.FooterSummaryItems = <>
DataController.Summary.SummaryGroups = <>
object gvProductsProductID: TcxGridDBColumn
DataBinding.FieldName = 'ProductID'
end
Expand Down Expand Up @@ -123,20 +133,19 @@ object MainForm: TMainForm
TabOrder = 5
end
object dxReport1: TdxReport
Parameters = <>
Left = 48
Top = 88
end
object dxBackendDataConnectionManager1: TdxBackendDataConnectionManager
object dxReportDataConnectionManager1: TdxReportDataConnectionManager
Left = 112
Top = 88
object dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1: TdxBackendDataSetJSONConnection
object dxReportDataConnectionManager1dxReportDataSetJSONConnection1: TdxReportDataSetJSONConnection
DisplayName = 'DataSetConnection'
object itmProducts: TdxBackendDataSetCollectionItem
object itmProducts: TdxReportDataSetCollectionItem
DataSet = DataModule1.mdProducts
DataSetAlias = 'mdProducts'
end
object itmCategories: TdxBackendDataSetCollectionItem
object itmCategories: TdxReportDataSetCollectionItem
DataSet = DataModule1.mdCategories
DataSetAlias = 'mdCategories'
end
Expand Down
14 changes: 7 additions & 7 deletions CPB/uMainForm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
#include "cxNavigator.hpp"
#include "cxStyles.hpp"
#include "dxDateRanges.hpp"
#include "dxReport.Backend.hpp"
#include "dxReport.ConnectionString.JSON.DB.hpp"
#include "dxReport.ConnectionString.JSON.hpp"
#include "dxReport.hpp"
#include "dxScrollbarAnnotations.hpp"
#include <Data.DB.hpp>
Expand All @@ -36,9 +39,6 @@
#include "uData.h"
#include "cxContainer.hpp"
#include "cxLabel.hpp"
#include "dxBackend.ConnectionString.JSON.DataSet.hpp"
#include "dxBackend.ConnectionString.JSON.hpp"
#include "dxBackend.hpp"
//---------------------------------------------------------------------------
class TMainForm : public TForm
{
Expand All @@ -65,10 +65,10 @@ class TMainForm : public TForm
TcxGridLevel *cxGrid1Level1;
TcxGridLevel *cxGrid1Level2;
TdxReport *dxReport1;
TdxBackendDataConnectionManager *dxBackendDataConnectionManager1;
TdxBackendDataSetJSONConnection *dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1;
TdxBackendDataSetCollectionItem *itmProducts;
TdxBackendDataSetCollectionItem *itmCategories;
TdxReportDataConnectionManager *dxReportDataConnectionManager1;
TdxReportDataSetJSONConnection *dxReportDataConnectionManager1dxReportDataSetJSONConnection1;
TdxReportDataSetCollectionItem *itmProducts;
TdxReportDataSetCollectionItem *itmCategories;
TcxButton *btnSetLanguageUS;
TcxButton *btnSetLanguageDE;
TcxLabel *lblSelectLanguage;
Expand Down
19 changes: 14 additions & 5 deletions Delphi/uMainForm.dfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,13 @@ object MainForm: TMainForm
Height = 265
TabOrder = 2
object gvCategories: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <>
ScrollbarAnnotations.CustomAnnotations = <>
DataController.DataSource = DataModule1.dsCategories
DataController.KeyFieldNames = 'CategoryID'
DataController.Summary.DefaultGroupSummaryItems = <>
DataController.Summary.FooterSummaryItems = <>
DataController.Summary.SummaryGroups = <>
object gvCategoriesCategoryID: TcxGridDBColumn
DataBinding.FieldName = 'CategoryID'
end
Expand All @@ -49,10 +54,15 @@ object MainForm: TMainForm
end
end
object gvProducts: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <>
ScrollbarAnnotations.CustomAnnotations = <>
DataController.DataSource = DataModule1.dsProducts
DataController.DetailKeyFieldNames = 'CategoryID'
DataController.KeyFieldNames = 'ProductID'
DataController.MasterKeyFieldNames = 'CategoryID'
DataController.Summary.DefaultGroupSummaryItems = <>
DataController.Summary.FooterSummaryItems = <>
DataController.Summary.SummaryGroups = <>
object gvProductsProductID: TcxGridDBColumn
DataBinding.FieldName = 'ProductID'
end
Expand Down Expand Up @@ -123,20 +133,19 @@ object MainForm: TMainForm
TabOrder = 5
end
object dxReport1: TdxReport
Parameters = <>
Left = 48
Top = 128
end
object dxBackendDataConnectionManager1: TdxBackendDataConnectionManager
object dxReportDataConnectionManager1: TdxReportDataConnectionManager
Left = 112
Top = 128
object dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1: TdxBackendDataSetJSONConnection
object dxReportDataConnectionManager1dxReportDataSetJSONConnection1: TdxReportDataSetJSONConnection
DisplayName = 'DataSetConnection'
object itmProducts: TdxBackendDataSetCollectionItem
object itmProducts: TdxReportDataSetCollectionItem
DataSet = DataModule1.mdProducts
DataSetAlias = 'mdProducts'
end
object itmCategories: TdxBackendDataSetCollectionItem
object itmCategories: TdxReportDataSetCollectionItem
DataSet = DataModule1.mdCategories
DataSetAlias = 'mdCategories'
end
Expand Down
14 changes: 7 additions & 7 deletions Delphi/uMainForm.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ interface
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxClasses, dxReport, cxGraphics,
cxLookAndFeels, cxLookAndFeelPainters, Vcl.Menus, cxButtons,
dxBackend, cxControls, cxStyles, cxCustomData, cxFilter, cxData,
dxReport.Backend, cxControls, cxStyles, cxCustomData, cxFilter, cxData,
cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations,
Data.DB, cxDBData, cxGridLevel, cxGridCustomView, cxGridCustomTableView,
cxGridTableView, cxGridDBTableView, cxGrid, FireDAC.Comp.DataSet,
FireDAC.Comp.Client, dxBackend.ConnectionString.JSON.DataSet,
dxBackend.ConnectionString.JSON, Vcl.StdCtrls, dxmdaset, uData, cxContainer,
FireDAC.Comp.Client, dxReport.ConnectionString.JSON.DB,
dxReport.ConnectionString.JSON, Vcl.StdCtrls, dxmdaset, uData, cxContainer,
cxLabel;

type
TMainForm = class(TForm)
dxReport1: TdxReport;
dxBackendDataConnectionManager1: TdxBackendDataConnectionManager;
dxReportDataConnectionManager1: TdxReportDataConnectionManager;
btnShowDesigner: TcxButton;
btnViewReport: TcxButton;
dxBackendDataConnectionManager1dxBackendDataSetJSONConnection1: TdxBackendDataSetJSONConnection;
itmProducts: TdxBackendDataSetCollectionItem;
itmCategories: TdxBackendDataSetCollectionItem;
dxReportDataConnectionManager1dxReportDataSetJSONConnection1: TdxReportDataSetJSONConnection;
itmProducts: TdxReportDataSetCollectionItem;
itmCategories: TdxReportDataSetCollectionItem;
cxGrid1: TcxGrid;
gvCategories: TcxGridDBTableView;
gvCategoriesCategoryID: TcxGridDBColumn;
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- default badges list -->
![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/1048527919/25.2.3%2B)
![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/1048527919/25.1.4%2B)
[![](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)
[![](https://img.shields.io/badge/📖_How_to_use_DevExpress_Examples-e9f6fc?style=flat-square)](https://docs.devexpress.com/GeneralInformation/403183)
[![](https://img.shields.io/badge/💬_Leave_Feedback-feecdd?style=flat-square)](#does-this-example-address-your-development-requirementsobjectives)
Expand All @@ -18,7 +18,7 @@
* [TdxReport.Language Property](https://docs.devexpress.com/VCL/dxReport.TdxReport.Language)

<!-- feedback -->
## Does this example address your development requirements/objectives?

Check failure on line 21 in README.md

View workflow job for this annotation

GitHub Actions / vale

[vale] README.md#L21 

[DX.HeadingCapitalization] 'Does this example address your development requirements/objectives?' should match our guidelines for title case
Raw output 
{"message": "[DX.HeadingCapitalization] 'Does this example address your development requirements/objectives?' should match our guidelines for title case", "location": {"path": "README.md", "range": {"start": {"line": 21, "column": 4}}}, "severity": "ERROR"}

Check failure on line 21 in README.md

View workflow job for this annotation

GitHub Actions / vale

[vale] README.md#L21 

[DX.HeadingPunctuation] Don't use end punctuation at the end of headings.
Raw output 
{"message": "[DX.HeadingPunctuation] Don't use end punctuation at the end of headings.", "location": {"path": "README.md", "range": {"start": {"line": 21, "column": 69}}}, "severity": "ERROR"}

[<img src="https://www.devexpress.com/support/examples/i/yes-button.svg"/>](https://www.devexpress.com/support/examples/survey.xml?utm_source=github&utm_campaign=vcl-reports-localize&~~~was_helpful=yes) [<img src="https://www.devexpress.com/support/examples/i/no-button.svg"/>](https://www.devexpress.com/support/examples/survey.xml?utm_source=github&utm_campaign=vcl-reports-localize&~~~was_helpful=no)

Expand Down
Loading