diff --git a/.gitattributes b/.gitattributes
index cc38b609cf..2f881ac77e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2076,7 +2076,6 @@ components/tachart/demo/chartsource/main.pas svneol=native#text/pascal
components/tachart/demo/db/dbdemo.lpi svneol=native#text/plain
components/tachart/demo/db/dbdemo.lpr svneol=native#text/pascal
components/tachart/demo/db/main.lfm svneol=native#text/plain
-components/tachart/demo/db/main.lrs svneol=native#text/pascal
components/tachart/demo/db/main.pas svneol=native#text/pascal
components/tachart/demo/dragdrop/dragdropdemo.lpi svneol=native#text/plain
components/tachart/demo/dragdrop/dragdropdemo.lpr svneol=native#text/plain
diff --git a/components/tachart/demo/db/dbdemo.lpi b/components/tachart/demo/db/dbdemo.lpi
index ef57ce3b7f..3020bdb0c6 100644
--- a/components/tachart/demo/db/dbdemo.lpi
+++ b/components/tachart/demo/db/dbdemo.lpi
@@ -6,12 +6,13 @@
+
-
+
@@ -77,4 +78,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/tachart/demo/db/main.lfm b/components/tachart/demo/db/main.lfm
index 86060de196..49c2078a31 100644
--- a/components/tachart/demo/db/main.lfm
+++ b/components/tachart/demo/db/main.lfm
@@ -7,17 +7,26 @@ object Form1: TForm1
ClientHeight = 300
ClientWidth = 547
Position = poScreenCenter
- LCLVersion = '0.9.27'
+ LCLVersion = '0.9.29'
object Chart1: TChart
Left = 0
Height = 274
Top = 26
Width = 347
- BottomAxis.Grid.Style = psDot
+ AxisList = <
+ item
+ Alignment = calLeft
+ Title.Font.Orientation = 900
+ Transformation.Offset = 0
+ Transformation.Scale = 1
+ end
+ item
+ Alignment = calBottom
+ Transformation.Offset = 0
+ Transformation.Scale = 1
+ end>
Foot.Brush.Color = clBtnFace
Foot.Font.Color = clBlue
- LeftAxis.Grid.Style = psDot
- LeftAxis.Title.Angle = 90
Margins.Left = 8
Margins.Top = 8
Margins.Right = 8
diff --git a/components/tachart/demo/db/main.lrs b/components/tachart/demo/db/main.lrs
deleted file mode 100644
index 8371237d99..0000000000
--- a/components/tachart/demo/db/main.lrs
+++ /dev/null
@@ -1,30 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TForm1','FORMDATA',[
- 'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'I'#1#6'Height'#3','#1#3'Top'#3#190#0#5'Wi'
- +'dth'#3'#'#2#7'Caption'#6#5'Form1'#12'ClientHeight'#3','#1#11'ClientWidth'#3
- +'#'#2#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#6'TChart'
- +#6'Chart1'#4'Left'#2#0#6'Height'#3#18#1#3'Top'#2#26#5'Width'#3'['#1#21'Botto'
- +'mAxis.Grid.Style'#7#5'psDot'#16'Foot.Brush.Color'#7#9'clBtnFace'#15'Foot.Fo'
- +'nt.Color'#7#6'clBlue'#19'LeftAxis.Grid.Style'#7#5'psDot'#20'LeftAxis.Title.'
- +'Angle'#2'Z'#12'Margins.Left'#2#8#11'Margins.Top'#2#8#13'Margins.Right'#2#8
- +#14'Margins.Bottom'#2#0#17'Title.Brush.Color'#7#9'clBtnFace'#16'Title.Font.C'
- +'olor'#7#6'clBlue'#18'Title.Text.Strings'#1#6#7'TAChart'#0#5'Align'#7#8'alCl'
- +'ient'#11'ParentColor'#8#0#11'TLineSeries'#17'Chart1LineSeries1'#9'ZPosition'
- +#2#1#13'LinePen.Color'#7#6'clTeal'#13'LinePen.Width'#2#3#11'SeriesColor'#7#6
- +'clTeal'#6'Source'#7#14'DbChartSource1'#0#0#10'TBarSeries'#16'Chart1BarSerie'
- +'s1'#14'BarBrush.Color'#7#5'clRed'#11'SeriesColor'#7#5'clRed'#0#0#0#7'TDBGri'
- +'d'#7'DBGrid1'#4'Left'#3'['#1#6'Height'#3#18#1#3'Top'#2#26#5'Width'#3#200#0#5
- +'Align'#7#7'alRight'#10'DataSource'#7#11'Datasource1'#10'Scrollbars'#7#10'ss'
- +'AutoBoth'#8'TabOrder'#2#1#0#0#8'TToolBar'#8'ToolBar1'#4'Left'#2#0#6'Height'
- +#2#26#3'Top'#2#0#5'Width'#3'#'#2#7'Caption'#6#8'ToolBar1'#12'ShowCaptions'#9
- +#8'TabOrder'#2#2#0#11'TToolButton'#6'tbCopy'#4'Left'#2#1#3'Top'#2#2#7'Captio'
- +'n'#6#15'Copy db to list'#7'OnClick'#7#11'tbCopyClick'#0#0#0#11'TMemDataset'
- +#11'MemDataset1'#6'Active'#9#9'FieldDefs'#14#1#4'Name'#6#1'X'#8'DataType'#7#7
- +'ftFloat'#9'Precision'#2#0#4'Size'#2#0#0#1#4'Name'#6#1'Y'#8'DataType'#7#7'ft'
- +'Float'#9'Precision'#2#0#4'Size'#2#0#0#0#4'left'#3#15#1#3'top'#2'<'#0#0#11'T'
- +'Datasource'#11'Datasource1'#7'DataSet'#7#11'MemDataset1'#4'left'#3#15#1#3't'
- +'op'#2'l'#0#0#14'TDbChartSource'#14'DbChartSource1'#10'DataSource'#7#11'Data'
- +'source1'#6'FieldX'#6#1'X'#6'FieldY'#6#1'Y'#4'left'#3#15#1#3'top'#3#156#0#0#0
- +#0
-]);
diff --git a/components/tachart/demo/db/main.pas b/components/tachart/demo/db/main.pas
index 9772a5eacb..f74aad62cc 100644
--- a/components/tachart/demo/db/main.pas
+++ b/components/tachart/demo/db/main.pas
@@ -5,8 +5,7 @@ unit Main;
interface
uses
- Classes, ComCtrls, db, DBGrids, memds, SysUtils, FileUtil,
- LResources, Forms, Controls, Graphics, Dialogs, TADbSource, TAGraph, TASeries;
+ ComCtrls, db, DBGrids, memds, Forms, TADbSource, TAGraph, TASeries;
type
@@ -30,6 +29,8 @@ var
implementation
+{$R *.lfm}
+
{ TForm1 }
procedure TForm1.tbCopyClick(Sender: TObject);
@@ -37,8 +38,5 @@ begin
Chart1BarSeries1.ListSource.CopyForm(DbChartSource1);
end;
-initialization
- {$I main.lrs}
-
end.