From 84fee411a544daa36a4e7400c2e9bf12a90baac0 Mon Sep 17 00:00:00 2001 From: wp Date: Sun, 1 Oct 2017 17:34:00 +0000 Subject: [PATCH] DBExport examples: fix compilation and layout, improved usability git-svn-id: trunk@55953 - --- components/dbexport/demo/simple/frmmain.lfm | 303 ++++++++++-------- components/dbexport/demo/simple/frmmain.pp | 44 ++- .../dbexport/demo/simple/simpleexport.lpi | 40 ++- .../dbexport/demo/simple/simpleexport.lpr | 2 + components/dbexport/demo/simple/testdata.dbf | Bin 3500 -> 3500 bytes .../dbexport/demo/stdexports/frmmain.lfm | 292 +++++++++-------- .../dbexport/demo/stdexports/frmmain.pp | 1 - .../dbexport/demo/stdexports/stdexports.lpi | 40 ++- .../dbexport/demo/stdexports/stdexports.lpr | 2 + .../dbexport/demo/stdexports/testdata.dbf | Bin 3500 -> 3500 bytes 10 files changed, 374 insertions(+), 350 deletions(-) diff --git a/components/dbexport/demo/simple/frmmain.lfm b/components/dbexport/demo/simple/frmmain.lfm index 6025c8bb0d..cf70594dd4 100644 --- a/components/dbexport/demo/simple/frmmain.lfm +++ b/components/dbexport/demo/simple/frmmain.lfm @@ -7,196 +7,185 @@ object MainForm: TMainForm VertScrollBar.Page = 363 ActiveControl = GData Caption = 'Simple export demo' - ClientHeight = 364 + ClientHeight = 370 ClientWidth = 651 Menu = MMMain OnCreate = FormCreate - object PButtons: TPanel - Height = 26 + LCLVersion = '1.9.0.0' + object GData: TDBGrid + Left = 0 + Height = 342 + Top = 28 Width = 651 - Align = alTop - ClientHeight = 26 - ClientWidth = 651 + Align = alClient + Color = clWindow + Columns = <> + DataSource = DSData + ReadOnly = True TabOrder = 0 - object TBMain: TToolBar + end + object TBMain: TToolBar + Left = 0 + Height = 28 + Top = 0 + Width = 651 + AutoSize = True + ButtonHeight = 26 + ButtonWidth = 24 + Caption = 'TBMain' + Images = ILMain + TabOrder = 1 + object ToolButton1: TToolButton Left = 1 - Height = 24 - Top = 1 - Width = 311 - Align = alLeft - Caption = 'TBMain' - Images = ILMain - TabOrder = 0 - object ToolButton1: TToolButton - Left = 1 - Top = 2 - Action = ANew - end - object ToolButton2: TToolButton - Left = 29 - Top = 2 - Action = AOpen - end - object ToolButton3: TToolButton - Left = 57 - Top = 2 - Width = 14 - Caption = 'ToolButton3' - Style = tbsSeparator - end - object TBCSVExport: TToolButton - Left = 71 - Top = 2 - Action = AExportCSV - end - object TBFixedExport: TToolButton - Left = 99 - Top = 2 - Action = AExportFixed - end - object TBJSONExport: TToolButton - Left = 127 - Top = 2 - Action = AExportJSON - end - object TBXMLExport: TToolButton - Left = 155 - Top = 2 - Action = AExportXML - end - object TBDBFExport: TToolButton - Left = 183 - Top = 2 - Action = AExportDBF - end - object TBSQLExport: TToolButton - Left = 211 - Top = 2 - Action = AExportSQL - end - object TBTexExport: TToolButton - Left = 239 - Top = 2 - Action = AExportTeX - end - object TBRTFExport: TToolButton - Left = 267 - Top = 2 - Action = AExportRTF - end + Top = 2 + Action = ANew + end + object ToolButton2: TToolButton + Left = 29 + Top = 2 + Action = AOpen + end + object ToolButton3: TToolButton + Left = 57 + Height = 26 + Top = 2 + Caption = 'ToolButton3' + Style = tbsDivider + end + object TBCSVExport: TToolButton + Left = 62 + Top = 2 + Action = AExportCSV + end + object TBFixedExport: TToolButton + Left = 90 + Top = 2 + Action = AExportFixed + end + object TBJSONExport: TToolButton + Left = 118 + Top = 2 + Action = AExportJSON + end + object TBXMLExport: TToolButton + Left = 146 + Top = 2 + Action = AExportXML + end + object TBDBFExport: TToolButton + Left = 174 + Top = 2 + Action = AExportDBF + end + object TBSQLExport: TToolButton + Left = 202 + Top = 2 + Action = AExportSQL + end + object TBTexExport: TToolButton + Left = 230 + Top = 2 + Action = AExportTeX + end + object TBRTFExport: TToolButton + Left = 258 + Top = 2 + Action = AExportRTF end object NBData: TDBNavigator - Left = 409 - Height = 24 - Top = 1 + Left = 410 + Height = 26 + Top = 2 Width = 241 Align = alRight BevelOuter = bvNone - ClientHeight = 24 + ChildSizing.EnlargeHorizontal = crsScaleChilds + ChildSizing.EnlargeVertical = crsScaleChilds + ChildSizing.ShrinkHorizontal = crsScaleChilds + ChildSizing.ShrinkVertical = crsScaleChilds + ChildSizing.Layout = cclLeftToRightThenTopToBottom + ChildSizing.ControlsPerLine = 100 + ClientHeight = 26 ClientWidth = 241 DataSource = DSData + Flat = True + Options = [] + TabOrder = 0 end end - object GData: TDBGrid - Height = 338 - Top = 26 - Width = 651 - Align = alClient - DataSource = DSData - FixedColor = clBtnFace - FixedHotColor = cl3DLight - Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgTabs, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit] - OptionsExtra = [dgeAutoColumns, dgeCheckboxColumn] - ParentColor = False - ReadOnly = True - TabOrder = 1 - TabStop = True - end object ALMain: TActionList Images = ILMain - left = 123 + left = 128 top = 67 object ANew: TAction Caption = '&New' - DisableIfNoHandler = True ImageIndex = 0 OnExecute = ANewExecute - OnUpdate = ANewUpdate ShortCut = 16462 end object AOpen: TAction Caption = '&Open' - DisableIfNoHandler = True ImageIndex = 1 OnExecute = AOpenExecute ShortCut = 16463 end object AQuit: TAction Caption = '&Quit' - DisableIfNoHandler = True ImageIndex = 2 OnExecute = AQuitExecute ShortCut = 16465 end object AExportCSV: TAction Caption = 'CSV Export' - DisableIfNoHandler = True ImageIndex = 3 OnExecute = AExportCSVExecute OnUpdate = HaveData end object AExportFixed: TAction Caption = 'Fixed Length Export' - DisableIfNoHandler = True ImageIndex = 4 OnExecute = AExportFixedExecute OnUpdate = HaveData end object AExportJSON: TAction Caption = 'JSON export' - DisableIfNoHandler = True ImageIndex = 6 OnExecute = AExportJSONExecute OnUpdate = HaveData end object AExportXML: TAction Caption = 'XML export' - DisableIfNoHandler = True ImageIndex = 7 OnExecute = AExportXMLExecute OnUpdate = HaveData end object AExportDBF: TAction Caption = 'DBF Export' - DisableIfNoHandler = True ImageIndex = 5 OnExecute = AExportDBFExecute OnUpdate = HaveData end object AExportSQL: TAction Caption = 'SQL Export' - DisableIfNoHandler = True ImageIndex = 8 OnExecute = AExportSQLExecute OnUpdate = HaveData end object AExportTeX: TAction Caption = 'TeX Export' - DisableIfNoHandler = True ImageIndex = 9 OnExecute = AExportTeXExecute OnUpdate = HaveData end object AExportRTF: TAction Caption = 'RTF Export' - DisableIfNoHandler = True ImageIndex = 10 OnExecute = AExportRTFExecute OnUpdate = HaveData end end object MMMain: TMainMenu - left = 80 + left = 64 top = 67 object MFile: TMenuItem Caption = '&File' @@ -262,8 +251,8 @@ object MainForm: TMainForm object ILMain: TImageList Height = 24 Width = 24 - left = 80 - top = 105 + left = 64 + top = 118 Bitmap = { 4C690B0000001800000018000000FF00FF00FF00FF00FF00FF00FF00FF00FF00 FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 @@ -1065,82 +1054,128 @@ object MainForm: TMainForm DefaultExt = '.dbf' Filter = 'DBase files|*.dbf|All files|*.*' left = 128 - top = 105 + top = 118 end object DBFData: TDbf IndexDefs = <> TableLevel = 4 - left = 78 - top = 147 + FilterOptions = [] + left = 64 + top = 168 end - object DSData: TDatasource + object DSData: TDataSource DataSet = DBFData left = 123 - top = 147 + top = 168 end object ODDBF: TOpenDialog Title = 'Open existing DBase file' DefaultExt = '.dbf' Filter = 'DBase files|*.dbf|All files|*.*' - left = 160 - top = 105 + left = 184 + top = 118 end object SDExport: TSaveDialog - Title = 'Save file as' - left = 242 - top = 108 + Options = [ofOverwritePrompt, ofEnableSizing, ofViewDetail] + left = 240 + top = 118 end object ExCSV: TCSVExporter Dataset = DBFData ExportFields = <> + RestorePosition = False + FormatSettings.DecimalSeparator = #0 + FormatSettings.CurrencyDigits = 0 FormatSettings.FieldDelimiter = ',' - FormatSettings.StringQuoteChar = '"' - OnExportRow = ExCSVExportRow - left = 304 - top = 84 + FormatSettings.IgnoreOuterWhitespace = False + FormatSettings.RowDelimiter = #13#10 + FormatSettings.QuoteChar = '"' + left = 321 + top = 71 end object ExFixed: TFixedLengthExporter Dataset = DBFData ExportFields = <> - left = 301 - top = 118 + RestorePosition = False + FormatSettings.DecimalSeparator = #0 + FormatSettings.CurrencyDigits = 0 + left = 318 + top = 123 end object ExSQL: TSQLExporter Dataset = DBFData ExportFields = <> - left = 301 - top = 152 + RestorePosition = False + FormatSettings.DecimalSeparator = #0 + FormatSettings.CurrencyDigits = 0 + FormatSettings.EscapeStyle = sesFirebird + FormatSettings.StatementKind = skInsert + FormatSettings.QuoteIdentifiers = False + FormatSettings.TableName = 'Exported' + left = 318 + top = 176 end object ExXML: TSimpleXMLExporter Dataset = DBFData ExportFields = <> - left = 352 - top = 84 + RestorePosition = False + FormatSettings.DecimalSeparator = #0 + FormatSettings.CurrencyDigits = 0 + FormatSettings.FieldAsAttributes = False + FormatSettings.IndentSize = 0 + left = 369 + top = 71 end object ExJSON: TSimpleJSONExporter Dataset = DBFData ExportFields = <> - left = 352 - top = 118 + RestorePosition = False + FormatSettings.DecimalSeparator = #0 + FormatSettings.CurrencyDigits = 0 + FormatSettings.RowFormat = rfArray + FormatSettings.ColumnFormat = cfObject + FormatSettings.IndentSize = 0 + left = 369 + top = 123 end object ExDBF: TFPDBFExport Dataset = DBFData ExportFields = <> - left = 352 - top = 152 + RestorePosition = False + FormatSettings.IntegerFormat = '%d' + FormatSettings.DecimalSeparator = ',' + FormatSettings.CurrencySymbol = '€' + FormatSettings.CurrencyDigits = 0 + FormatSettings.BooleanTrue = 'True' + FormatSettings.BooleanFalse = 'False' + FormatSettings.DateFormat = 'dd.MM.yyyy' + FormatSettings.TimeFormat = 'hh:nn' + FormatSettings.DateTimeFormat = 'dd.MM.yyyy hh:nn' + FormatSettings.TableFormat = tfDBaseIV + FormatSettings.AutoRenameFields = True + left = 369 + top = 174 end object ExTeX: TTeXExporter Dataset = DBFData ExportFields = <> + RestorePosition = False + FormatSettings.DecimalSeparator = #0 + FormatSettings.CurrencyDigits = 0 FormatSettings.Options = [teHeaderRow, teTableEnvironment, teTopLine, teBottomLine] - left = 301 - top = 188 + FormatSettings.Units = tuEm + FormatSettings.Tabular = ttTabular + left = 318 + top = 223 end object ExRTF: TRTFExporter Dataset = DBFData ExportFields = <> + RestorePosition = False + FormatSettings.DecimalSeparator = #0 + FormatSettings.CurrencyDigits = 0 FormatSettings.Options = [reHeaderRow, reTopLine, reBottomLine] - left = 352 - top = 188 + left = 369 + top = 223 end end diff --git a/components/dbexport/demo/simple/frmmain.pp b/components/dbexport/demo/simple/frmmain.pp index 04e356d5c2..851e3c3165 100644 --- a/components/dbexport/demo/simple/frmmain.pp +++ b/components/dbexport/demo/simple/frmmain.pp @@ -53,7 +53,6 @@ type MISep: TMenuItem; MFile: TMenuItem; ODDBF: TOpenDialog; - PButtons: TPanel; ExRTF: TRTFExporter; SDExport: TSaveDialog; SDDBF: TSaveDialog; @@ -82,10 +81,8 @@ type procedure AExportTeXExecute(Sender: TObject); procedure AExportXMLExecute(Sender: TObject); procedure ANewExecute(Sender: TObject); - procedure ANewUpdate(Sender: TObject); procedure AOpenExecute(Sender: TObject); procedure AQuitExecute(Sender: TObject); - procedure ExCSVExportRow(Sender: TObject; var AllowExport: Boolean); procedure FormCreate(Sender: TObject); procedure HaveData(Sender: TObject); private @@ -127,11 +124,6 @@ Resourcestring { TMainForm } -procedure TMainForm.ANewUpdate(Sender: TObject); -begin - -end; - procedure TMainForm.AOpenExecute(Sender: TObject); begin If ODDBF.Execute then @@ -143,12 +135,6 @@ begin Close; end; -procedure TMainForm.ExCSVExportRow(Sender: TObject; - var AllowExport: Boolean); -begin - -end; - procedure TMainForm.ANewExecute(Sender: TObject); begin if SDDBF.Execute then @@ -159,23 +145,33 @@ begin end; procedure TMainForm.DoExport(E : TCustomDatasetExporter; Const ATitle,AFilter : String); - +var + s: String; begin if MIExportDLG.Checked then - begin + begin If not ShowBaseExportConfig(E) then Exit; - end + end else + begin + SDExport.FileName := ''; + SDExport.Title:=ATitle; + SDExport.Filter:=AFilter; + s := AFilter.Split('|')[1]; + Delete(s, 1, 1); + SDExport.DefaultExt:= s; + E.Dataset.First; + if SDExport.Execute then begin - If E is TCustomFileExporter then - begin - SDExport.Title:=ATitle; - SDExport.Filter:=AFilter; - If SDExport.Execute then + if (E is TFPDBFExport) then + (E as TFPDBFExport).FileName:=SDExport.FileName + else + if (E is TCustomFileExporter) then (E as TCustomFileExporter).FileName:=SDExport.FileName; - end; - end; + end else + exit; + end; E.Execute; end; diff --git a/components/dbexport/demo/simple/simpleexport.lpi b/components/dbexport/demo/simple/simpleexport.lpi index d6253e31ed..391222ebad 100644 --- a/components/dbexport/demo/simple/simpleexport.lpi +++ b/components/dbexport/demo/simple/simpleexport.lpi @@ -1,18 +1,19 @@ - + - - + + + + - - + <UseXPManifest Value="True"/> </General> - <VersionInfo> - <ProjectVersion Value=""/> - </VersionInfo> + <BuildModes Count="1"> + <Item1 Name="default" Default="True"/> + </BuildModes> <PublishOptions> <Version Value="2"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> @@ -47,30 +48,30 @@ <Unit0> <Filename Value="simpleexport.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="simpleexport"/> </Unit0> <Unit1> <Filename Value="frmmain.pp"/> - <ComponentName Value="MainForm"/> <IsPartOfProject Value="True"/> - <ResourceFilename Value="frmmain.lrs"/> - <UnitName Value="frmmain"/> + <ComponentName Value="MainForm"/> + <HasResources Value="True"/> + <ResourceBaseClass Value="Form"/> </Unit1> <Unit2> <Filename Value="../gendata.pp"/> <IsPartOfProject Value="True"/> - <UnitName Value="gendata"/> </Unit2> </Units> </ProjectOptions> <CompilerOptions> - <Version Value="5"/> + <Version Value="11"/> <SearchPaths> - <OtherUnitFiles Value="../"/> + <OtherUnitFiles Value=".."/> </SearchPaths> - <CodeGeneration> - <Generate Value="Faster"/> - </CodeGeneration> + <Parsing> + <SyntaxOptions> + <UseAnsiStrings Value="False"/> + </SyntaxOptions> + </Parsing> <Linking> <Options> <Win32> @@ -78,8 +79,5 @@ </Win32> </Options> </Linking> - <Other> - <CompilerPath Value="$(CompPath)"/> - </Other> </CompilerOptions> </CONFIG> diff --git a/components/dbexport/demo/simple/simpleexport.lpr b/components/dbexport/demo/simple/simpleexport.lpr index 3e3ae70d1b..202f5d507c 100644 --- a/components/dbexport/demo/simple/simpleexport.lpr +++ b/components/dbexport/demo/simple/simpleexport.lpr @@ -11,6 +11,8 @@ uses { you can add units after this }, frmmain, gendata, DBFLaz, RunTimeTypeInfoControls, lazdbexport; +{$R *.res} + begin Application.Title:='simple data export demo'; Application.Initialize; diff --git a/components/dbexport/demo/simple/testdata.dbf b/components/dbexport/demo/simple/testdata.dbf index 3e3b53582dec49cf967088e4c49588c10b09335b..49fb458d0a201090478008e7ef9adb5d0cee4f4b 100644 GIT binary patch delta 13 UcmZ1@y+)daxs;1>Bg+b202*8afB*mh delta 13 UcmZ1@y+)daIh&hzBg+b202){Wg8%>k diff --git a/components/dbexport/demo/stdexports/frmmain.lfm b/components/dbexport/demo/stdexports/frmmain.lfm index 19ed22b6b6..6c8dda7982 100644 --- a/components/dbexport/demo/stdexports/frmmain.lfm +++ b/components/dbexport/demo/stdexports/frmmain.lfm @@ -7,104 +7,98 @@ object MainForm: TMainForm VertScrollBar.Page = 298 ActiveControl = GData Caption = 'Standard export formats demo' - ClientHeight = 299 + ClientHeight = 305 ClientWidth = 616 Menu = MMMain OnCreate = FormCreate - object PButtons: TPanel - Height = 26 + LCLVersion = '1.9.0.0' + object GData: TDBGrid + Left = 0 + Height = 281 + Top = 24 Width = 616 - Align = alTop - ClientHeight = 26 - ClientWidth = 616 + Align = alClient + Color = clWindow + Columns = <> + DataSource = DSData + ReadOnly = True TabOrder = 0 - object TBMain: TToolBar + end + object TBMain: TToolBar + Left = 0 + Height = 24 + Top = 0 + Width = 616 + AutoSize = True + Caption = 'TBMain' + Images = ILMain + TabOrder = 1 + object ToolButton1: TToolButton Left = 1 - Height = 24 - Top = 1 - Width = 111 - Align = alLeft - Caption = 'TBMain' - Images = ILMain - TabOrder = 0 - object ToolButton1: TToolButton - Left = 1 - Top = 2 - Action = ANew - end - object ToolButton2: TToolButton - Left = 29 - Top = 2 - Action = AOpen - end - object ToolButton3: TToolButton - Left = 57 - Top = 2 - Width = 14 - Caption = 'ToolButton3' - Style = tbsSeparator - end - object TBRTFExport: TToolButton - Left = 71 - Top = 2 - Action = AExport - end + Top = 2 + Action = ANew + end + object ToolButton2: TToolButton + Left = 29 + Top = 2 + Action = AOpen + end + object ToolButton3: TToolButton + Left = 57 + Height = 22 + Top = 2 + Caption = 'ToolButton3' + Style = tbsDivider + end + object TBRTFExport: TToolButton + Left = 62 + Top = 2 + Action = AExport end object NBData: TDBNavigator - Left = 374 - Height = 24 - Top = 1 + Left = 375 + Height = 22 + Top = 2 Width = 241 Align = alRight BevelOuter = bvNone - ClientHeight = 24 + ChildSizing.EnlargeHorizontal = crsScaleChilds + ChildSizing.EnlargeVertical = crsScaleChilds + ChildSizing.ShrinkHorizontal = crsScaleChilds + ChildSizing.ShrinkVertical = crsScaleChilds + ChildSizing.Layout = cclLeftToRightThenTopToBottom + ChildSizing.ControlsPerLine = 100 + ClientHeight = 22 ClientWidth = 241 DataSource = DSData + Options = [] + TabOrder = 0 end end - object GData: TDBGrid - Height = 273 - Top = 26 - Width = 616 - Align = alClient - DataSource = DSData - FixedColor = clBtnFace - FixedHotColor = cl3DLight - Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgTabs, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit] - OptionsExtra = [dgeAutoColumns, dgeCheckboxColumn] - ParentColor = False - ReadOnly = True - TabOrder = 1 - TabStop = True - end object ALMain: TActionList Images = ILMain left = 123 - top = 67 + top = 48 object ANew: TAction Caption = '&New' - DisableIfNoHandler = True ImageIndex = 0 OnExecute = ANewExecute ShortCut = 16462 end object AOpen: TAction Caption = '&Open' - DisableIfNoHandler = True ImageIndex = 1 OnExecute = AOpenExecute ShortCut = 16463 end object AQuit: TAction Caption = '&Quit' - DisableIfNoHandler = True ImageIndex = 2 OnExecute = AQuitExecute ShortCut = 16465 end object AExport: TAction Caption = 'Export data' - DisableIfNoHandler = True ImageIndex = 3 OnExecute = AExportExecute OnUpdate = HaveData @@ -113,8 +107,8 @@ object MainForm: TMainForm end object MMMain: TMainMenu Images = ILMain - left = 80 - top = 67 + left = 78 + top = 48 object MFile: TMenuItem Caption = '&File' object MINew: TMenuItem @@ -141,8 +135,8 @@ object MainForm: TMainForm object ILMain: TImageList Height = 24 Width = 24 - left = 80 - top = 105 + left = 78 + top = 104 Bitmap = { 4C69040000001800000018000000FF00FF00FF00FF00FF00FF00FF00FF00FF00 FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 @@ -360,110 +354,110 @@ object MainForm: TMainForm FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00 - FF00FF00FF00FF00FF00FF00FF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF080408FF000000FF0000 - 00FF000000FF000000FF000000FF000000FF000000FF000400FF000000FF0000 - 00FF000000FF000400FF000000FF080400FF000000FF000000FF000400FF0000 - 00FF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFC5C6C5FF0004 - 00FFCDCECDFFC5C2C5FFD5CACDFFCDC6C5FFCDC6C5FFBDBEBDFFCDCECDFFCDC6 - CDFFCDCACDFFB4CECDFFB4CEC5FFC5BEBDFFCDC2C5FFBDCAC5FFB4CECDFFBDC2 - C5FF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000400FF000C08FF0000 - 00FF000000FF100000FF100000FF100000FF080000FF000000FF000400FF0000 - 00FF000000FF000000FF000400FF100400FF100800FF080000FF000000FF0004 - 00FF000400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFC5CEC5FF0000 - 00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCDCACDFF2969 - 29FF296929FF296929FF296929FF296929FF296929FF296929FF296929FFFFFF - FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFF0004 - 00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC5C6C5FF2969 - 29FF101CDEFF101CDEFF101CDEFF101CDEFF101CDEFF101CDEFF296929FFFFFF - FFFF000400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFC5CECDFF0004 - 00FFFFFFFFFF296929FF296929FF296929FF296929FFFFFFFFFFD5CAC5FF2969 - 29FF101CDEFF101CDEFF101CDEFF101CDEFF101CDEFF101CDEFF296929FFFFFF - FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000800FFFFFFFFFF000C - 00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD5CAC5FF2969 - 29FF296929FF296929FF296929FF296929FF101CDEFF101CDEFF296929FFFFFF - FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFC5CEC5FF0000 - 00FFFFFFFFFF296929FF296929FF296929FF296929FFFFFFFFFFD5CAC5FFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFF296929FF101CDEFF101CDEFF296929FFFFFF - FFFF000800FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFF0804 - 00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD5C6C5FFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFF296929FF101CDEFF101CDEFF296929FFFFFF - FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF080808FFC5C6C5FF0000 - 00FFFFFFFFFF296929FF296929FF296929FF296929FFFFFFFFFFD5CAC5FFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFF296929FF101CDEFF101CDEFF296929FFFFFF - FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFF0804 - 00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCDC2C5FFFFFF - FFFF296929FF296929FF296929FF296929FF296929FF296929FF296929FF2969 - 29FF296929FF296929FFFFFFFFFFFFFFFFFFFFFFFFFF000808FFC5C6C5FF0000 - 00FFFFFFFFFF296929FF296929FF296929FF296929FFFFFFFFFFCDC6C5FFFFFF - FFFFFFFFFFFF296929FF101CDEFF101CDEFF101CDEFF101CDEFF101CDEFF101C - DEFF296929FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFF0804 - 00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC5BEBDFFFFFF - FFFFFFFFFFFFFFFFFFFF296929FF101CDEFF101CDEFF101CDEFF101CDEFF2969 - 29FF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFCDCECDFF0000 - 00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCDCACDFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFF296929FF101CDEFF101CDEFF296929FFFFFF - FFFF080400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FF000000FF0808 - 08FF000000FF000000FF000000FF080400FF080000FF080000FF080000FF0800 - 00FF000000FF000000FF000000FF000000FF296929FF296929FF000000FF0000 - 00FF080400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFF + FF00FF00FF00FF00FF00FF00FF00000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000080408FF000000FF000000FF0000 + 00FF000000FF000000FF000000FF000000FF000400FF000000FF000000FF0000 + 00FF000400FF000000FF080400FF000000FF000000FF000400FF000000FF0000 + 00FF00000000000000000000000000000000000000FFC5C6C5FF000400FFCDCE + CDFFC5C2C5FFD5CACDFFCDC6C5FFCDC6C5FFBDBEBDFFCDCECDFFCDC6CDFFCDCA + CDFFB4CECDFFB4CEC5FFC5BEBDFFCDC2C5FFBDCAC5FFB4CECDFFBDC2C5FF0000 + 00FF00000000000000000000000000000000000400FF000C08FF000000FF0000 + 00FF100000FF100000FF100000FF080000FF000000FF000400FF000000FF0000 + 00FF000000FF000400FF100400FF100800FF080000FF000000FF000400FF0004 + 00FF00000000000000000000000000000000000000FFC5CEC5FF000000FF0000 + 00000000000000000000000000000000000000000000CDCACDFF296929FF2969 + 29FF296929FF296929FF296929FF296929FF296929FF296929FF000000000000 + 00FF00000000000000000000000000000000000000FF00000000000400FF0000 + 00000000000000000000000000000000000000000000C5C6C5FF296929FF101C + DEFF101CDEFF101CDEFF101CDEFF101CDEFF101CDEFF296929FF000000000004 + 00FF00000000000000000000000000000000000000FFC5CECDFF000400FF0000 + 0000296929FF296929FF296929FF296929FF00000000D5CAC5FF296929FF101C + DEFF101CDEFF101CDEFF101CDEFF101CDEFF101CDEFF296929FF000000000000 + 00FF00000000000000000000000000000000000800FF00000000000C00FF0000 + 00000000000000000000000000000000000000000000D5CAC5FF296929FF2969 + 29FF296929FF296929FF296929FF101CDEFF101CDEFF296929FF000000000000 + 00FF00000000000000000000000000000000000000FFC5CEC5FF000000FF0000 + 0000296929FF296929FF296929FF296929FF00000000D5CAC5FF000000000000 + 00000000000000000000296929FF101CDEFF101CDEFF296929FF000000000008 + 00FF00000000000000000000000000000000000000FF00000000080400FF0000 + 00000000000000000000000000000000000000000000D5C6C5FF000000000000 + 00000000000000000000296929FF101CDEFF101CDEFF296929FF000000000000 + 00FF00000000000000000000000000000000080808FFC5C6C5FF000000FF0000 + 0000296929FF296929FF296929FF296929FF00000000D5CAC5FF000000000000 + 00000000000000000000296929FF101CDEFF101CDEFF296929FF000000000000 + 00FF00000000000000000000000000000000000000FF00000000080400FF0000 + 00000000000000000000000000000000000000000000CDC2C5FF000000002969 + 29FF296929FF296929FF296929FF296929FF296929FF296929FF296929FF2969 + 29FF296929FF000000000000000000000000000808FFC5C6C5FF000000FF0000 + 0000296929FF296929FF296929FF296929FF00000000CDC6C5FF000000000000 + 0000296929FF101CDEFF101CDEFF101CDEFF101CDEFF101CDEFF101CDEFF2969 + 29FF00000000000000000000000000000000000000FF00000000080400FF0000 + 00000000000000000000000000000000000000000000C5BEBDFF000000000000 + 000000000000296929FF101CDEFF101CDEFF101CDEFF101CDEFF296929FF0000 + 00FF00000000000000000000000000000000000000FFCDCECDFF000000FF0000 + 00000000000000000000000000000000000000000000CDCACDFF000000000000 + 00000000000000000000296929FF101CDEFF101CDEFF296929FF000000000804 + 00FF00000000000000000000000000000000000000FF000000FF080808FF0000 + 00FF000000FF000000FF080400FF080000FF080000FF080000FF080000FF0000 + 00FF000000FF000000FF000000FF296929FF296929FF000000FF000000FF0804 + 00FF000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000 } end object SDDBF: TSaveDialog Title = 'Create new data in file' DefaultExt = '.dbf' Filter = 'DBase files|*.dbf|All files|*.*' - left = 128 - top = 105 + left = 256 + top = 48 end object DBFData: TDbf IndexDefs = <> TableLevel = 4 - left = 78 + FilterOptions = [] + left = 256 top = 147 end - object DSData: TDatasource + object DSData: TDataSource DataSet = DBFData - left = 123 + left = 328 top = 147 end object ODDBF: TOpenDialog Title = 'Open existing DBase file' DefaultExt = '.dbf' Filter = 'DBase files|*.dbf|All files|*.*' - left = 160 - top = 105 + left = 200 + top = 48 end object SDExport: TSaveDialog - Title = 'Save file as' - left = 242 - top = 108 + left = 328 + top = 48 end object Exporter: TFPDataExporter Dataset = DBFData @@ -472,7 +466,7 @@ object MainForm: TMainForm end object StandardExportFormats1: TStandardExportFormats Active = True - left = 106 - top = 195 + left = 160 + top = 196 end end diff --git a/components/dbexport/demo/stdexports/frmmain.pp b/components/dbexport/demo/stdexports/frmmain.pp index d0494f0ed3..f9ffb05707 100644 --- a/components/dbexport/demo/stdexports/frmmain.pp +++ b/components/dbexport/demo/stdexports/frmmain.pp @@ -32,7 +32,6 @@ type MISep: TMenuItem; MFile: TMenuItem; ODDBF: TOpenDialog; - PButtons: TPanel; SDExport: TSaveDialog; SDDBF: TSaveDialog; StandardExportFormats1: TStandardExportFormats; diff --git a/components/dbexport/demo/stdexports/stdexports.lpi b/components/dbexport/demo/stdexports/stdexports.lpi index 4bc57ffbea..8a7e71e496 100644 --- a/components/dbexport/demo/stdexports/stdexports.lpi +++ b/components/dbexport/demo/stdexports/stdexports.lpi @@ -1,18 +1,19 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <PathDelim Value="/"/> - <Version Value="6"/> + <Version Value="10"/> <General> + <Flags> + <LRSInOutputDirectory Value="False"/> + </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <IconPath Value="./"/> - <TargetFileExt Value=""/> <Title Value="Standard export routines"/> + <UseXPManifest Value="True"/> </General> - <VersionInfo> - <ProjectVersion Value=""/> - </VersionInfo> + <BuildModes Count="1"> + <Item1 Name="default" Default="True"/> + </BuildModes> <PublishOptions> <Version Value="2"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> @@ -48,30 +49,30 @@ <Unit0> <Filename Value="stdexports.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="stdexports"/> </Unit0> <Unit1> <Filename Value="frmmain.pp"/> - <ComponentName Value="MainForm"/> <IsPartOfProject Value="True"/> - <ResourceFilename Value="frmmain.lrs"/> - <UnitName Value="frmmain"/> + <ComponentName Value="MainForm"/> + <HasResources Value="True"/> + <ResourceBaseClass Value="Form"/> </Unit1> <Unit2> <Filename Value="../gendata.pp"/> <IsPartOfProject Value="True"/> - <UnitName Value="gendata"/> </Unit2> </Units> </ProjectOptions> <CompilerOptions> - <Version Value="5"/> + <Version Value="11"/> <SearchPaths> - <OtherUnitFiles Value="../"/> + <OtherUnitFiles Value=".."/> </SearchPaths> - <CodeGeneration> - <Generate Value="Faster"/> - </CodeGeneration> + <Parsing> + <SyntaxOptions> + <UseAnsiStrings Value="False"/> + </SyntaxOptions> + </Parsing> <Linking> <Options> <Win32> @@ -79,8 +80,5 @@ </Win32> </Options> </Linking> - <Other> - <CompilerPath Value="$(CompPath)"/> - </Other> </CompilerOptions> </CONFIG> diff --git a/components/dbexport/demo/stdexports/stdexports.lpr b/components/dbexport/demo/stdexports/stdexports.lpr index ec71164b8f..028f760b20 100644 --- a/components/dbexport/demo/stdexports/stdexports.lpr +++ b/components/dbexport/demo/stdexports/stdexports.lpr @@ -11,6 +11,8 @@ uses { you can add units after this }, frmmain, gendata, DBFLaz, RunTimeTypeInfoControls, lazdbexport; +{$R *.res} + begin Application.Title:='Standard export routines'; Application.Initialize; diff --git a/components/dbexport/demo/stdexports/testdata.dbf b/components/dbexport/demo/stdexports/testdata.dbf index 3e3b53582dec49cf967088e4c49588c10b09335b..49fb458d0a201090478008e7ef9adb5d0cee4f4b 100644 GIT binary patch delta 13 UcmZ1@y+)daxs;1>Bg+b202*8afB*mh delta 13 UcmZ1@y+)daIh&hzBg+b202){Wg8%>k