From: <car...@us...> - 2017-03-16 08:57:48
|
Revision: 978 http://sourceforge.net/p/instantobjects/code/978 Author: carlobar Date: 2017-03-16 08:57:46 +0000 (Thu, 16 Mar 2017) Log Message: ----------- Updated project GUID'S and demos Modified Paths: -------------- trunk/Demos/Intro/CompanyEdit.dfm trunk/Demos/Intro/ContactEdit.dfm trunk/Demos/Intro/Intro.dpr trunk/Demos/Intro/Intro.dproj trunk/Demos/Intro/Intro.mdr trunk/Demos/Intro/Intro.res trunk/Demos/Intro/Main.dfm trunk/Demos/Intro/Main.pas trunk/Demos/Intro/PersonEdit.dfm trunk/Demos/Intro/PersonEdit.pas trunk/Source/Brokers/ADO/D10_1/DclIOADO.dproj trunk/Source/Brokers/ADO/D10_1/IOADO.dproj trunk/Source/Brokers/BDE/InstantBDE.pas trunk/Source/Brokers/DBX/D10_1/DclIODBX.dproj trunk/Source/Brokers/DBX/D10_1/IODBX.dproj trunk/Source/Brokers/FireDAC/D10_1/DclIOFireDAC.dproj trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dproj trunk/Source/Brokers/IBX/D10_1/DclIOIBX.dproj trunk/Source/Brokers/IBX/D10_1/IOIBX.dproj trunk/Source/Brokers/IBX/DXE6/IOIBX.dproj trunk/Source/Brokers/XML/D10_1/DclIOXML.dproj trunk/Source/Brokers/XML/D10_1/IOXML.dproj trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dproj trunk/Source/Catalogs/MSSql/D10_1/IOMSSqlCatalog.dproj trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dproj trunk/Source/Core/D10_1/IOCore.dproj trunk/Source/Design/D10_1/DclIOCore.dproj Modified: trunk/Demos/Intro/CompanyEdit.dfm =================================================================== --- trunk/Demos/Intro/CompanyEdit.dfm 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/CompanyEdit.dfm 2017-03-16 08:57:46 UTC (rev 978) @@ -1,5 +1,4 @@ inherited CompanyEditForm: TCompanyEditForm - Height = 268 Caption = 'Company' OldCreateOrder = True PixelsPerInch = 96 @@ -11,21 +10,10 @@ Height = 13 Caption = 'ContactPerson' end - inherited DBGrid1: TDBGrid - TabOrder = 5 - end - inherited OkButton: TButton - Top = 208 - TabOrder = 6 - end - inherited CancelButton: TButton - Top = 208 - TabOrder = 7 - end - object DBLookupComboBox1: TDBLookupComboBox [13] + object DBLookupComboBox1: TDBLookupComboBox [10] Left = 8 Top = 184 - Width = 145 + Width = 184 Height = 21 DataField = 'ContactPerson' DataSource = ContactSource @@ -34,6 +22,9 @@ ListSource = PersonsSource TabOrder = 4 end + inherited DBGrid1: TDBGrid + TabOrder = 7 + end inherited ContactExposer: TInstantExposer FieldOptions = [foObjects, foThorough] ObjectClassName = 'TCompany' @@ -56,6 +47,7 @@ AutoOpen = True Command.Strings = ( 'SELECT * FROM TPerson') + Connector = MainForm.InstantXMLConnector Left = 136 Top = 208 end Modified: trunk/Demos/Intro/ContactEdit.dfm =================================================================== --- trunk/Demos/Intro/ContactEdit.dfm 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/ContactEdit.dfm 2017-03-16 08:57:46 UTC (rev 978) @@ -3,8 +3,8 @@ Top = 211 BorderStyle = bsDialog Caption = 'Contact' - ClientHeight = 206 - ClientWidth = 373 + ClientHeight = 272 + ClientWidth = 431 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -93,8 +93,8 @@ object DBGrid1: TDBGrid Left = 200 Top = 24 - Width = 169 - Height = 137 + Width = 223 + Height = 209 DataSource = PhonesSource TabOrder = 4 TitleFont.Charset = DEFAULT_CHARSET @@ -106,18 +106,19 @@ item Expanded = False FieldName = 'Name' - Width = 60 + Width = 78 Visible = True end item Expanded = False FieldName = 'Number' + Width = 103 Visible = True end> end object OkButton: TButton - Left = 208 - Top = 176 + Left = 268 + Top = 239 Width = 75 Height = 25 Caption = 'OK' @@ -127,8 +128,8 @@ OnClick = OkButtonClick end object CancelButton: TButton - Left = 288 - Top = 176 + Left = 348 + Top = 239 Width = 75 Height = 25 Cancel = True @@ -158,7 +159,6 @@ end object ContactExposerPhones: TDataSetField FieldName = 'Phones' - IncludeObjectField = False end end object ContactSource: TDataSource Modified: trunk/Demos/Intro/Intro.dpr =================================================================== --- trunk/Demos/Intro/Intro.dpr 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/Intro.dpr 2017-03-16 08:57:46 UTC (rev 978) @@ -4,6 +4,8 @@ Forms, Model in 'Model.pas', Main in 'Main.pas' {MainForm}, + DemoData in 'DemoData.pas', + RandomData in 'RandomData.pas', ContactEdit in 'ContactEdit.pas' {ContactEditForm}, PersonEdit in 'PersonEdit.pas' {PersonEditForm}, CompanyEdit in 'CompanyEdit.pas' {CompanyEditForm}; Modified: trunk/Demos/Intro/Intro.dproj =================================================================== --- trunk/Demos/Intro/Intro.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/Intro.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,103 +1,209 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <ProjectGuid>{5e7fed32-48a7-4d66-a1ed-fbf2fb9c43c1}</ProjectGuid> - <MainSource>Intro.dpr</MainSource> - <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> - <DCC_DependencyCheckOutputName>Intro.exe</DCC_DependencyCheckOutputName> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <Version>7.0</Version> - <DCC_WriteableConstants>True</DCC_WriteableConstants> - <DCC_Optimize>False</DCC_Optimize> - <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames> - <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe> - <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_UnitSearchPath> - <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_ResourcePath> - <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_ObjPath> - <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_IncludePath> - <DCC_UNSAFE_TYPE>True</DCC_UNSAFE_TYPE> - <DCC_UNSAFE_CODE>True</DCC_UNSAFE_CODE> - <DCC_UNSAFE_CAST>True</DCC_UNSAFE_CAST> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <Version>7.0</Version> - <DCC_WriteableConstants>True</DCC_WriteableConstants> - <DCC_Optimize>False</DCC_Optimize> - <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames> - <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe> - <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_UnitSearchPath> - <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_ResourcePath> - <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_ObjPath> - <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_IncludePath> - <DCC_Define>DEBUG</DCC_Define> - <DCC_UNSAFE_TYPE>True</DCC_UNSAFE_TYPE> - <DCC_UNSAFE_CODE>True</DCC_UNSAFE_CODE> - <DCC_UNSAFE_CAST>True</DCC_UNSAFE_CAST> - </PropertyGroup> - <ProjectExtensions> - <Borland.Personality>Delphi.Personality</Borland.Personality> - <Borland.ProjectType>VCLApplication</Borland.ProjectType> - <BorlandProject> -<BorlandProject xmlns=""> <Delphi.Personality> <Parameters> - <Parameters Name="UseLauncher">False</Parameters> - <Parameters Name="LoadAllSymbols">True</Parameters> - <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> - </Parameters> - <Language> - <Language Name="ProjectLang">$00000406</Language> - </Language> - <VersionInfo> - <VersionInfo Name="IncludeVerInfo">False</VersionInfo> - <VersionInfo Name="AutoIncBuild">False</VersionInfo> - <VersionInfo Name="MajorVer">1</VersionInfo> - <VersionInfo Name="MinorVer">0</VersionInfo> - <VersionInfo Name="Release">0</VersionInfo> - <VersionInfo Name="Build">0</VersionInfo> - <VersionInfo Name="Debug">False</VersionInfo> - <VersionInfo Name="PreRelease">False</VersionInfo> - <VersionInfo Name="Special">False</VersionInfo> - <VersionInfo Name="Private">False</VersionInfo> - <VersionInfo Name="DLL">False</VersionInfo> - <VersionInfo Name="Locale">1030</VersionInfo> - <VersionInfo Name="CodePage">1252</VersionInfo> - </VersionInfo> - <VersionInfoKeys> - <VersionInfoKeys Name="CompanyName"></VersionInfoKeys> - <VersionInfoKeys Name="FileDescription"></VersionInfoKeys> - <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> - <VersionInfoKeys Name="InternalName"></VersionInfoKeys> - <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys> - <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys> - <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys> - <VersionInfoKeys Name="ProductName"></VersionInfoKeys> - <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> - <VersionInfoKeys Name="Comments"></VersionInfoKeys> - </VersionInfoKeys> - <Source> - <Source Name="MainSource">Intro.dpr</Source> - </Source> - </Delphi.Personality> </BorlandProject></BorlandProject> - </ProjectExtensions> - <ItemGroup /> - <ItemGroup> - <DelphiCompile Include="Intro.dpr"> - <MainSource>MainSource</MainSource> - </DelphiCompile> - <DCCReference Include="CompanyEdit.pas"> - <Form>CompanyEditForm</Form> - </DCCReference> - <DCCReference Include="ContactEdit.pas"> - <Form>ContactEditForm</Form> - </DCCReference> - <DCCReference Include="Main.pas"> - <Form>MainForm</Form> - </DCCReference> - <DCCReference Include="Model.pas" /> - <DCCReference Include="PersonEdit.pas"> - <Form>PersonEditForm</Form> - </DCCReference> - </ItemGroup> - <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> -</Project> \ No newline at end of file + <PropertyGroup> + <ProjectGuid>{5e7fed32-48a7-4d66-a1ed-fbf2fb9c43c1}</ProjectGuid> + <MainSource>Intro.dpr</MainSource> + <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration> + <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> + <DCC_DependencyCheckOutputName>Intro.exe</DCC_DependencyCheckOutputName> + <FrameworkType>VCL</FrameworkType> + <ProjectVersion>18.1</ProjectVersion> + <Base>True</Base> + <Config Condition="'$(Config)'==''">Release</Config> + <Platform Condition="'$(Platform)'==''">Win32</Platform> + <TargetedPlatforms>1</TargetedPlatforms> + <AppType>Application</AppType> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''"> + <Base_Win32>true</Base_Win32> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''"> + <Base_Win64>true</Base_Win64> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''"> + <Cfg_1>true</Cfg_1> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_1)'=='true') or '$(Cfg_1_iOSDevice64)'!=''"> + <Cfg_1_iOSDevice64>true</Cfg_1_iOSDevice64> + <CfgParent>Cfg_1</CfgParent> + <Cfg_1>true</Cfg_1> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''"> + <Cfg_1_Win32>true</Cfg_1_Win32> + <CfgParent>Cfg_1</CfgParent> + <Cfg_1>true</Cfg_1> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''"> + <Cfg_2>true</Cfg_2> + <CfgParent>Base</CfgParent> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> + <Cfg_2_Win32>true</Cfg_2_Win32> + <CfgParent>Cfg_2</CfgParent> + <Cfg_2>true</Cfg_2> + <Base>true</Base> + </PropertyGroup> + <PropertyGroup Condition="'$(Base)'!=''"> + <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\XML;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> + <SanitizedProjectName>Intro</SanitizedProjectName> + <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> + <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_Locale>1030</VerInfo_Locale> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win32)'!=''"> + <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> + <VerInfo_Locale>1033</VerInfo_Locale> + <Icon_MainIcon>Intro_Icon.ico</Icon_MainIcon> + </PropertyGroup> + <PropertyGroup Condition="'$(Base_Win64)'!=''"> + <Icon_MainIcon>Intro_Icon.ico</Icon_MainIcon> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1)'!=''"> + <Version>7.0</Version> + <DCC_WriteableConstants>True</DCC_WriteableConstants> + <DCC_Optimize>False</DCC_Optimize> + <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames> + <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe> + <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\BDE;$(DCC_ResourcePath)</DCC_ResourcePath> + <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\BDE;$(DCC_ObjPath)</DCC_ObjPath> + <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\BDE;$(DCC_IncludePath)</DCC_IncludePath> + <DCC_UNSAFE_TYPE>True</DCC_UNSAFE_TYPE> + <DCC_UNSAFE_CODE>True</DCC_UNSAFE_CODE> + <DCC_UNSAFE_CAST>True</DCC_UNSAFE_CAST> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_iOSDevice64)'!=''"> + <BT_BuildType>Debug</BT_BuildType> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> + <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> + <VerInfo_Locale>1033</VerInfo_Locale> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <AppEnableHighDPI>true</AppEnableHighDPI> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <Version>7.0</Version> + <DCC_WriteableConstants>True</DCC_WriteableConstants> + <DCC_Optimize>False</DCC_Optimize> + <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames> + <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe> + <DCC_UnitSearchPath>..\..\Source\Brokers\BDE;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> + <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\BDE;$(DCC_ResourcePath)</DCC_ResourcePath> + <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\BDE;$(DCC_ObjPath)</DCC_ObjPath> + <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\BDE;$(DCC_IncludePath)</DCC_IncludePath> + <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> + <DCC_UNSAFE_TYPE>True</DCC_UNSAFE_TYPE> + <DCC_UNSAFE_CODE>True</DCC_UNSAFE_CODE> + <DCC_UNSAFE_CAST>True</DCC_UNSAFE_CAST> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> + <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> + <AppEnableHighDPI>true</AppEnableHighDPI> + </PropertyGroup> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType>VCLApplication</Borland.ProjectType> + <BorlandProject> + <Delphi.Personality> + <Parameters> + <Parameters Name="UseLauncher">False</Parameters> + <Parameters Name="LoadAllSymbols">True</Parameters> + <Parameters Name="LoadUnspecifiedSymbols">False</Parameters> + </Parameters> + <Language> + <Language Name="ProjectLang">$00000406</Language> + </Language> + <VersionInfo> + <VersionInfo Name="IncludeVerInfo">False</VersionInfo> + <VersionInfo Name="AutoIncBuild">False</VersionInfo> + <VersionInfo Name="MajorVer">1</VersionInfo> + <VersionInfo Name="MinorVer">0</VersionInfo> + <VersionInfo Name="Release">0</VersionInfo> + <VersionInfo Name="Build">0</VersionInfo> + <VersionInfo Name="Debug">False</VersionInfo> + <VersionInfo Name="PreRelease">False</VersionInfo> + <VersionInfo Name="Special">False</VersionInfo> + <VersionInfo Name="Private">False</VersionInfo> + <VersionInfo Name="DLL">False</VersionInfo> + <VersionInfo Name="Locale">1030</VersionInfo> + <VersionInfo Name="CodePage">1252</VersionInfo> + </VersionInfo> + <VersionInfoKeys> + <VersionInfoKeys Name="CompanyName"/> + <VersionInfoKeys Name="FileDescription"/> + <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"/> + <VersionInfoKeys Name="LegalCopyright"/> + <VersionInfoKeys Name="LegalTrademarks"/> + <VersionInfoKeys Name="OriginalFilename"/> + <VersionInfoKeys Name="ProductName"/> + <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"/> + </VersionInfoKeys> + <Source> + <Source Name="MainSource">Intro.dpr</Source> + </Source> + <Excluded_Packages> + <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\17.0\Bpl\FrameViewer10.bpl">(untitled)</Excluded_Packages> + <Excluded_Packages Name="$(BDS)\RBuilder\Lib\Win32\dclRBIBE1724.bpl">ReportBuilder Data Access for Interbase Express</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> + <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> + </Excluded_Packages> + </Delphi.Personality> + <Platforms> + <Platform value="iOSDevice64">False</Platform> + <Platform value="Win32">True</Platform> + <Platform value="Win64">False</Platform> + </Platforms> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + <ItemGroup> + <DelphiCompile Include="$(MainSource)"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="Model.pas"/> + <DCCReference Include="Main.pas"> + <Form>MainForm</Form> + </DCCReference> + <DCCReference Include="DemoData.pas"/> + <DCCReference Include="RandomData.pas"/> + <DCCReference Include="ContactEdit.pas"> + <Form>ContactEditForm</Form> + </DCCReference> + <DCCReference Include="PersonEdit.pas"> + <Form>PersonEditForm</Form> + </DCCReference> + <DCCReference Include="CompanyEdit.pas"> + <Form>CompanyEditForm</Form> + </DCCReference> + <BuildConfiguration Include="Debug"> + <Key>Cfg_2</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> + <BuildConfiguration Include="Base"> + <Key>Base</Key> + </BuildConfiguration> + <BuildConfiguration Include="Release"> + <Key>Cfg_1</Key> + <CfgParent>Base</CfgParent> + </BuildConfiguration> + </ItemGroup> + <ItemGroup/> + <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/> + <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/> + <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/> +</Project> Modified: trunk/Demos/Intro/Intro.mdr =================================================================== (Binary files differ) Modified: trunk/Demos/Intro/Intro.res =================================================================== (Binary files differ) Modified: trunk/Demos/Intro/Main.dfm =================================================================== --- trunk/Demos/Intro/Main.dfm 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/Main.dfm 2017-03-16 08:57:46 UTC (rev 978) @@ -1,10 +1,9 @@ object MainForm: TMainForm Left = 232 Top = 177 - BorderStyle = bsSingle - Caption = 'Demo' - ClientHeight = 309 - ClientWidth = 363 + Caption = 'InstantObjects simple demo' + ClientHeight = 311 + ClientWidth = 452 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -13,6 +12,10 @@ Font.Style = [] OldCreateOrder = False Position = poScreenCenter + OnCreate = FormCreate + DesignSize = ( + 452 + 311) PixelsPerInch = 96 TextHeight = 13 object DBNavigator1: TDBNavigator @@ -23,11 +26,12 @@ DataSource = ContactsSource TabOrder = 0 end - object DBGrid1: TDBGrid + object ContactGrid: TDBGrid Left = 8 Top = 40 - Width = 345 + Width = 439 Height = 233 + Anchors = [akLeft, akTop, akRight, akBottom] DataSource = ContactsSource TabOrder = 1 TitleFont.Charset = DEFAULT_CHARSET @@ -35,11 +39,12 @@ TitleFont.Height = -11 TitleFont.Name = 'MS Sans Serif' TitleFont.Style = [] + OnDblClick = ContactGridDblClick Columns = < item Expanded = False FieldName = 'Name' - Width = 97 + Width = 158 Visible = True end item @@ -51,50 +56,54 @@ item Expanded = False FieldName = 'Phones' + Width = 118 Visible = True end> end object AddPersonButton: TButton - Left = 8 + Left = 131 Top = 280 Width = 75 Height = 25 + Anchors = [akRight, akBottom] Caption = 'Add Person' TabOrder = 2 OnClick = AddPersonButtonClick end object AddCompanyButton: TButton - Left = 88 + Left = 211 Top = 280 Width = 75 Height = 25 + Anchors = [akRight, akBottom] Caption = 'Add Company' TabOrder = 3 OnClick = AddCompanyButtonClick end object EditContactButton: TButton - Left = 168 + Left = 291 Top = 280 Width = 75 Height = 25 + Anchors = [akRight, akBottom] Caption = 'Edit Contact' TabOrder = 4 OnClick = EditContactButtonClick end object ExploreButton: TButton - Left = 248 + Left = 371 Top = 280 Width = 75 Height = 25 + Anchors = [akRight, akBottom] Caption = 'Explore' TabOrder = 5 OnClick = ExploreButtonClick end object ContactSelector: TInstantSelector - AutoOpen = True Command.Strings = ( - 'SELECT * FROM ANY TContact') - Connector = InstantBDEConnector1 + 'SELECT * FROM ANY TContact ORDER BY Name') + Connector = InstantXMLConnector Left = 88 Top = 232 end @@ -103,22 +112,14 @@ Left = 120 Top = 232 end - object InstantBDEConnector1: TInstantBDEConnector + object InstantXMLConnector: TInstantXMLConnector IsDefault = True - Connection = Database1 + Connection = XMLFileAccessor Left = 56 Top = 232 end - object Database1: TDatabase - DatabaseName = 'DemoDatabase' - DriverName = 'STANDARD' - LoginPrompt = False - Params.Strings = ( - 'PATH=.\Database' - 'DEFAULT DRIVER=PARADOX' - 'ENABLE BCD=FALSE') - SessionName = 'Default' - TransIsolation = tiDirtyRead + object XMLFileAccessor: TXMLFilesAccessor + RootFolder = '\' Left = 24 Top = 232 end Modified: trunk/Demos/Intro/Main.pas =================================================================== --- trunk/Demos/Intro/Main.pas 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/Main.pas 2017-03-16 08:57:46 UTC (rev 978) @@ -5,28 +5,31 @@ uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, Db, InstantPresentation, InstantPersistence, Grids, DBGrids, - ExtCtrls, DBCtrls, Model, DBTables, InstantBDE, InstantBrokers; + ExtCtrls, DBCtrls, Model, InstantBrokers, InstantXML; type TMainForm = class(TForm) DBNavigator1: TDBNavigator; - DBGrid1: TDBGrid; + ContactGrid: TDBGrid; ContactSelector: TInstantSelector; ContactsSource: TDataSource; AddPersonButton: TButton; AddCompanyButton: TButton; EditContactButton: TButton; - InstantBDEConnector1: TInstantBDEConnector; - Database1: TDatabase; ExploreButton: TButton; + InstantXMLConnector: TInstantXMLConnector; + XMLFileAccessor: TXMLFilesAccessor; procedure AddPersonButtonClick(Sender: TObject); procedure AddCompanyButtonClick(Sender: TObject); procedure EditContactButtonClick(Sender: TObject); procedure ExploreButtonClick(Sender: TObject); + procedure FormCreate(Sender: TObject); + procedure ContactGridDblClick(Sender: TObject); private function EditContact(Contact: TContact): Boolean; + procedure CreateRandomContacts(Count: Integer); + procedure EditCurrentContact; public - { Public declarations } end; var @@ -34,7 +37,8 @@ implementation -uses CompanyEdit, ContactEdit, PersonEdit, InstantExplorer; +uses CompanyEdit, ContactEdit, PersonEdit, InstantExplorer, + RandomData, Contnrs, DemoData; {$R *.DFM} @@ -86,6 +90,11 @@ procedure TMainForm.EditContactButtonClick(Sender: TObject); begin + EditCurrentContact; +end; + +procedure TMainForm.EditCurrentContact; +begin if EditContact(ContactSelector.CurrentObject as TContact) then ContactSelector.Refresh; end; @@ -95,4 +104,59 @@ InstantExploreObject(ContactSelector.CurrentObject); end; +procedure TMainForm.FormCreate(Sender: TObject); +begin + XMLFileAccessor.RootFolder := ExtractFilePath(Application.ExeName)+PathDelim+'Database'; + InstantXMLConnector.Connect; + ContactSelector.Open; + if ContactSelector.Eof then + begin + ContactSelector.Close; + try + //First Time: create of Random Data + CreateRandomContacts(100); + finally + ContactSelector.Open; + end; + end; +end; + +procedure TMainForm.ContactGridDblClick(Sender: TObject); +begin + EditCurrentContact; +end; + +procedure TMainForm.CreateRandomContacts(Count: Integer); +var + I: Integer; + LCompany: TCompany; + LPerson: TPerson; +begin + GetAsyncKeyState(VK_ESCAPE); + Randomize; + InstantDefaultConnector.StartTransaction; + try + for I := 0 to Pred(Count) do + begin + //Create a new person + LPerson := nil; + LCompany := nil; + try + LPerson := CreateRandomPerson; + LPerson.Store; + //Create a new company + LCompany := CreateRandomCompany(LPerson); + LCompany.Store; + finally + LPerson.Free; + LCompany.Free; + end; + end; + InstantDefaultConnector.CommitTransaction; + except + InstantDefaultConnector.RollbackTransaction; + raise; + end; +end; + end. Modified: trunk/Demos/Intro/PersonEdit.dfm =================================================================== --- trunk/Demos/Intro/PersonEdit.dfm 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/PersonEdit.dfm 2017-03-16 08:57:46 UTC (rev 978) @@ -1,7 +1,8 @@ inherited PersonEditForm: TPersonEditForm - Height = 270 Caption = 'Person' + ClientHeight = 237 OldCreateOrder = True + ExplicitHeight = 266 PixelsPerInch = 96 TextHeight = 13 object Label6: TLabel [5] @@ -10,7 +11,6 @@ Width = 55 Height = 13 Caption = 'DateOfBirth' - FocusControl = DBEdit5 end inherited DBGrid1: TDBGrid TabOrder = 5 @@ -18,15 +18,17 @@ inherited OkButton: TButton Top = 208 TabOrder = 6 + ExplicitTop = 208 end inherited CancelButton: TButton Top = 208 TabOrder = 7 + ExplicitTop = 208 end object DBEdit5: TDBEdit [13] Left = 8 Top = 184 - Width = 112 + Width = 95 Height = 21 DataField = 'DateOfBirth' DataSource = ContactSource Modified: trunk/Demos/Intro/PersonEdit.pas =================================================================== --- trunk/Demos/Intro/PersonEdit.pas 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Demos/Intro/PersonEdit.pas 2017-03-16 08:57:46 UTC (rev 978) @@ -5,7 +5,7 @@ uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ContactEdit, Db, InstantPresentation, StdCtrls, Grids, DBGrids, Mask, - DBCtrls; + DBCtrls, Vcl.ComCtrls; type TPersonEditForm = class(TContactEditForm) Modified: trunk/Source/Brokers/ADO/D10_1/DclIOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/D10_1/DclIOADO.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/ADO/D10_1/DclIOADO.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{25086FF7-139E-40BB-9278-EDE3F344302B}</ProjectGuid> + <ProjectGuid>{2B6A9D5C-7E98-40CA-AB37-BAA86CEE7C7C}</ProjectGuid> <MainSource>DclIOADO.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/ADO/D10_1/IOADO.dproj =================================================================== --- trunk/Source/Brokers/ADO/D10_1/IOADO.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/ADO/D10_1/IOADO.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{A15C8D03-E537-4203-982B-A812DB31354A}</ProjectGuid> + <ProjectGuid>{1D42880F-45BE-4D04-A1A4-BA58B5768107}</ProjectGuid> <MainSource>IOADO.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/BDE/InstantBDE.pas =================================================================== --- trunk/Source/Brokers/BDE/InstantBDE.pas 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/BDE/InstantBDE.pas 2017-03-16 08:57:46 UTC (rev 978) @@ -43,7 +43,7 @@ interface uses - Classes, Db, DBTables, SysUtils, InstantPersistence, InstantCommand, + Classes, Db, SysUtils, InstantPersistence, InstantCommand, InstantBrokers, InstantMetadata, InstantTypes, InstantConsts; type Modified: trunk/Source/Brokers/DBX/D10_1/DclIODBX.dproj =================================================================== --- trunk/Source/Brokers/DBX/D10_1/DclIODBX.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/DBX/D10_1/DclIODBX.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{842285A6-913E-48EA-828B-CC991BAB45A2}</ProjectGuid> + <ProjectGuid>{7FC38828-3D71-48B7-8479-F8D95FA79BF6}</ProjectGuid> <MainSource>DclIODBX.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/DBX/D10_1/IODBX.dproj =================================================================== --- trunk/Source/Brokers/DBX/D10_1/IODBX.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/DBX/D10_1/IODBX.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{6826D1DF-E0FF-43C6-BE04-D34587C58280}</ProjectGuid> + <ProjectGuid>{A492F54E-3D8B-4AB4-8E75-8ED6947FF116}</ProjectGuid> <MainSource>IODBX.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/FireDAC/D10_1/DclIOFireDAC.dproj =================================================================== --- trunk/Source/Brokers/FireDAC/D10_1/DclIOFireDAC.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/FireDAC/D10_1/DclIOFireDAC.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{7ECBEBD9-43A5-439E-8FBB-4B27DC40A0DD}</ProjectGuid> + <ProjectGuid>{906189DF-7DA5-49AA-AA11-B81FCDF412D2}</ProjectGuid> <MainSource>DclIOFireDAC.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dproj =================================================================== --- trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/FireDAC/D10_1/IOFireDAC.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{50885E3B-26BC-4A4D-B07A-520421576DE5}</ProjectGuid> + <ProjectGuid>{D9C3A285-3C8C-4D2E-81B8-DF3D1B309F65}</ProjectGuid> <MainSource>IOFireDAC.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/IBX/D10_1/DclIOIBX.dproj =================================================================== --- trunk/Source/Brokers/IBX/D10_1/DclIOIBX.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/IBX/D10_1/DclIOIBX.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{04708EEE-5D69-4308-8BED-42B0C0B84A8F}</ProjectGuid> + <ProjectGuid>{FDA89D48-CF91-4858-9F0C-3EC1AD97D78D}</ProjectGuid> <MainSource>DclIOIBX.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/IBX/D10_1/IOIBX.dproj =================================================================== --- trunk/Source/Brokers/IBX/D10_1/IOIBX.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/IBX/D10_1/IOIBX.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{10FA0CC6-3FB0-4675-BB2B-751EBC259085}</ProjectGuid> + <ProjectGuid>{06D579BC-F163-41F2-8C4E-D6CA74F53A9D}</ProjectGuid> <MainSource>IOIBX.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/IBX/DXE6/IOIBX.dproj =================================================================== --- trunk/Source/Brokers/IBX/DXE6/IOIBX.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/IBX/DXE6/IOIBX.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -13,11 +13,6 @@ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> <Base>true</Base> </PropertyGroup> - <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''"> - <Base_Android>true</Base_Android> - <CfgParent>Base</CfgParent> - <Base>true</Base> - </PropertyGroup> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''"> <Base_Win32>true</Base_Win32> <CfgParent>Base</CfgParent> @@ -57,10 +52,6 @@ <DCC_E>false</DCC_E> <DCC_F>false</DCC_F> </PropertyGroup> - <PropertyGroup Condition="'$(Base_Android)'!=''"> - <BT_BuildType>Debug</BT_BuildType> - <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys> - </PropertyGroup> <PropertyGroup Condition="'$(Base_Win32)'!=''"> <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> @@ -146,9 +137,6 @@ </Excluded_Packages> </Delphi.Personality> <Platforms> - <Platform value="Android" ActiveMobileDevice="4df786101d45bf99">False</Platform> - <Platform value="iOSDevice">False</Platform> - <Platform value="iOSSimulator">False</Platform> <Platform value="Win32">True</Platform> <Platform value="Win64">False</Platform> </Platforms> Modified: trunk/Source/Brokers/XML/D10_1/DclIOXML.dproj =================================================================== --- trunk/Source/Brokers/XML/D10_1/DclIOXML.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/XML/D10_1/DclIOXML.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{C584DD0D-996D-48AA-92D7-CA8FBBAED5CC}</ProjectGuid> + <ProjectGuid>{03439244-E09D-4688-9148-9ECE3FAFDA2D}</ProjectGuid> <MainSource>DclIOXML.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Brokers/XML/D10_1/IOXML.dproj =================================================================== --- trunk/Source/Brokers/XML/D10_1/IOXML.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Brokers/XML/D10_1/IOXML.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{2C0CED56-B8D8-4009-9CD4-F41B37A09EBB}</ProjectGuid> + <ProjectGuid>{A7D47D1D-3833-44BD-A52F-3D176F35811C}</ProjectGuid> <MainSource>IOXML.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dproj =================================================================== --- trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Catalogs/IBFb/D10_1/IOIBFbCatalog.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{8F975D2A-74E9-46FA-8665-2FFE658AE6CF}</ProjectGuid> + <ProjectGuid>{DD39F374-C8AC-4A44-B3BE-219C900E2DDD}</ProjectGuid> <MainSource>IOIBFbCatalog.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Catalogs/MSSql/D10_1/IOMSSqlCatalog.dproj =================================================================== --- trunk/Source/Catalogs/MSSql/D10_1/IOMSSqlCatalog.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Catalogs/MSSql/D10_1/IOMSSqlCatalog.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{D79EB136-1196-4C33-842B-FCD304B70B90}</ProjectGuid> + <ProjectGuid>{37B6762C-756F-45CE-9421-BFD7D9FC105F}</ProjectGuid> <MainSource>IOMSSqlCatalog.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dproj =================================================================== --- trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Catalogs/MySQL/D10_1/IOMySQLCatalog.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{FA68923A-B9AB-4354-A220-A68A7F55E6D7}</ProjectGuid> + <ProjectGuid>{AA738A23-6D5F-4F61-A87E-F1500C31B316}</ProjectGuid> <MainSource>IOMySQLCatalog.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> Modified: trunk/Source/Core/D10_1/IOCore.dproj =================================================================== --- trunk/Source/Core/D10_1/IOCore.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Core/D10_1/IOCore.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -7,7 +7,7 @@ <TargetedPlatforms>1</TargetedPlatforms> <AppType>Package</AppType> <FrameworkType>VCL</FrameworkType> - <ProjectVersion>18.1</ProjectVersion> + <ProjectVersion>18.2</ProjectVersion> <Platform Condition="'$(Platform)'==''">Win32</Platform> </PropertyGroup> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> @@ -240,4 +240,5 @@ </ProjectExtensions> <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/> <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> + <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/> </Project> Modified: trunk/Source/Design/D10_1/DclIOCore.dproj =================================================================== --- trunk/Source/Design/D10_1/DclIOCore.dproj 2016-05-31 18:37:50 UTC (rev 977) +++ trunk/Source/Design/D10_1/DclIOCore.dproj 2017-03-16 08:57:46 UTC (rev 978) @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectGuid>{C573F984-7F86-4505-A31B-4EF4D14A0112}</ProjectGuid> + <ProjectGuid>{A7DD82C0-2950-4DEE-90F8-71608CED3E8B}</ProjectGuid> <MainSource>DclIOCore.dpk</MainSource> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> |