Menu
▾
▴
[Instantobjects-cvscommit] SF.net SVN: instantobjects:[987] trunk/Demos
|
From: <car...@us...> - 2018-11-22 10:48:21
|
Revision: 987
http://sourceforge.net/p/instantobjects/code/987
Author: carlobar
Date: 2018-11-22 10:48:18 +0000 (Thu, 22 Nov 2018)
Log Message:
-----------
Demos updated
Modified Paths:
--------------
trunk/Demos/Intro/Intro.dproj
trunk/Demos/Intro/Intro.res
trunk/Demos/Intro/Main.dfm
trunk/Demos/Intro/Main.pas
trunk/Demos/Intro/PersonEdit.dfm
trunk/Demos/PrimerCross/QueryView.dfm
trunk/Demos/PrimerCross/QueryView.pas
trunk/Demos/PrimerCross/RandomData.pas
trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dproj
trunk/Demos/PrimerFireMonkey/Source/DemoData.pas
trunk/Demos/PrimerFireMonkey/Source/Main.fmx
trunk/Demos/PrimerFireMonkey/Source/Main.pas
Added Paths:
-----------
trunk/Demos/PrimerFireMonkey/Bin/
trunk/Demos/PrimerFireMonkey/Database/
Removed Paths:
-------------
trunk/Demos/Intro/Database/Company.DB
trunk/Demos/Intro/Database/Company.PX
trunk/Demos/Intro/Database/Company.VAL
trunk/Demos/Intro/Database/Contact.DB
trunk/Demos/Intro/Database/Contact.MB
trunk/Demos/Intro/Database/Contact.PX
trunk/Demos/Intro/Database/Contact.VAL
trunk/Demos/Intro/Database/Person.DB
trunk/Demos/Intro/Database/Person.PX
trunk/Demos/Intro/Database/Person.VAL
trunk/Demos/PrimerFireMonkey/Pictures/man01.emf
trunk/Demos/PrimerFireMonkey/Pictures/man02.emf
trunk/Demos/PrimerFireMonkey/Pictures/man03.emf
trunk/Demos/PrimerFireMonkey/Pictures/man04.emf
trunk/Demos/PrimerFireMonkey/Pictures/man05.emf
trunk/Demos/PrimerFireMonkey/Pictures/woman01.emf
trunk/Demos/PrimerFireMonkey/Pictures/woman02.emf
trunk/Demos/PrimerFireMonkey/Pictures/woman03.emf
trunk/Demos/PrimerFireMonkey/Pictures/woman04.emf
trunk/Demos/PrimerFireMonkey/Pictures/woman05.emf
Deleted: trunk/Demos/Intro/Database/Company.DB
===================================================================
(Binary files differ)
Deleted: trunk/Demos/Intro/Database/Company.PX
===================================================================
(Binary files differ)
Deleted: trunk/Demos/Intro/Database/Company.VAL
===================================================================
(Binary files differ)
Deleted: trunk/Demos/Intro/Database/Contact.DB
===================================================================
(Binary files differ)
Deleted: trunk/Demos/Intro/Database/Contact.MB
===================================================================
(Binary files differ)
Deleted: trunk/Demos/Intro/Database/Contact.PX
===================================================================
(Binary files differ)
Deleted: trunk/Demos/Intro/Database/Contact.VAL
===================================================================
(Binary files differ)
Deleted: trunk/Demos/Intro/Database/Person.DB
===================================================================
(Binary files differ)
Deleted: trunk/Demos/Intro/Database/Person.PX
===================================================================
(Binary files differ)
Deleted: trunk/Demos/Intro/Database/Person.VAL
===================================================================
(Binary files differ)
Modified: trunk/Demos/Intro/Intro.dproj
===================================================================
--- trunk/Demos/Intro/Intro.dproj 2018-09-01 10:14:45 UTC (rev 986)
+++ trunk/Demos/Intro/Intro.dproj 2018-11-22 10:48:18 UTC (rev 987)
@@ -6,7 +6,7 @@
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>Intro.exe</DCC_DependencyCheckOutputName>
<FrameworkType>VCL</FrameworkType>
- <ProjectVersion>18.1</ProjectVersion>
+ <ProjectVersion>18.5</ProjectVersion>
<Base>True</Base>
<Config Condition="'$(Config)'==''">Release</Config>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
@@ -31,12 +31,6 @@
<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>
@@ -68,9 +62,13 @@
<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>
+ <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
+ <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win64)'!=''">
<Icon_MainIcon>Intro_Icon.ico</Icon_MainIcon>
+ <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
+ <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<Version>7.0</Version>
@@ -85,14 +83,12 @@
<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>
+ <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+ <BT_BuildType>Debug</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<Version>7.0</Version>
@@ -111,7 +107,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
- <AppEnableHighDPI>true</AppEnableHighDPI>
+ <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
</PropertyGroup>
<ProjectExtensions>
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
@@ -164,7 +160,6 @@
</Excluded_Packages>
</Delphi.Personality>
<Platforms>
- <Platform value="iOSDevice64">False</Platform>
<Platform value="Win32">True</Platform>
<Platform value="Win64">False</Platform>
</Platforms>
Modified: trunk/Demos/Intro/Intro.res
===================================================================
(Binary files differ)
Modified: trunk/Demos/Intro/Main.dfm
===================================================================
--- trunk/Demos/Intro/Main.dfm 2018-09-01 10:14:45 UTC (rev 986)
+++ trunk/Demos/Intro/Main.dfm 2018-11-22 10:48:18 UTC (rev 987)
@@ -33,7 +33,7 @@
Height = 233
Anchors = [akLeft, akTop, akRight, akBottom]
DataSource = ContactsSource
- TabOrder = 1
+ TabOrder = 2
TitleFont.Charset = DEFAULT_CHARSET
TitleFont.Color = clWindowText
TitleFont.Height = -11
@@ -67,7 +67,7 @@
Height = 25
Anchors = [akRight, akBottom]
Caption = 'Add Person'
- TabOrder = 2
+ TabOrder = 3
OnClick = AddPersonButtonClick
end
object AddCompanyButton: TButton
@@ -77,7 +77,7 @@
Height = 25
Anchors = [akRight, akBottom]
Caption = 'Add Company'
- TabOrder = 3
+ TabOrder = 4
OnClick = AddCompanyButtonClick
end
object EditContactButton: TButton
@@ -87,7 +87,7 @@
Height = 25
Anchors = [akRight, akBottom]
Caption = 'Edit Contact'
- TabOrder = 4
+ TabOrder = 5
OnClick = EditContactButtonClick
end
object ExploreButton: TButton
@@ -97,9 +97,19 @@
Height = 25
Anchors = [akRight, akBottom]
Caption = 'Explore'
- TabOrder = 5
+ TabOrder = 6
OnClick = ExploreButtonClick
end
+ object GenerateDataButton: TButton
+ Left = 8
+ Top = 279
+ Width = 97
+ Height = 25
+ Anchors = [akRight, akBottom]
+ Caption = 'Generate Data...'
+ TabOrder = 1
+ OnClick = GenerateDataButtonClick
+ end
object ContactSelector: TInstantSelector
Command.Strings = (
'SELECT * FROM ANY TContact ORDER BY Name')
Modified: trunk/Demos/Intro/Main.pas
===================================================================
--- trunk/Demos/Intro/Main.pas 2018-09-01 10:14:45 UTC (rev 986)
+++ trunk/Demos/Intro/Main.pas 2018-11-22 10:48:18 UTC (rev 987)
@@ -19,6 +19,7 @@
ExploreButton: TButton;
InstantXMLConnector: TInstantXMLConnector;
XMLFileAccessor: TXMLFilesAccessor;
+ GenerateDataButton: TButton;
procedure AddPersonButtonClick(Sender: TObject);
procedure AddCompanyButtonClick(Sender: TObject);
procedure EditContactButtonClick(Sender: TObject);
@@ -25,10 +26,12 @@
procedure ExploreButtonClick(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure ContactGridDblClick(Sender: TObject);
+ procedure GenerateDataButtonClick(Sender: TObject);
private
function EditContact(Contact: TContact): Boolean;
procedure CreateRandomContacts(Count: Integer);
procedure EditCurrentContact;
+ procedure GenerateRandomData(const ANumber: Integer);
public
end;
@@ -111,16 +114,26 @@
ContactSelector.Open;
if ContactSelector.Eof then
begin
- ContactSelector.Close;
- try
- //First Time: create of Random Data
- CreateRandomContacts(100);
- finally
- ContactSelector.Open;
- end;
+ //First Time: create of Random Data
+ GenerateRandomData(30);
end;
end;
+procedure TMainForm.GenerateDataButtonClick(Sender: TObject);
+begin
+ GenerateRandomData(10);
+end;
+
+procedure TMainForm.GenerateRandomData(const ANumber: Integer);
+begin
+ ContactSelector.Close;
+ try
+ CreateRandomContacts(ANumber);
+ finally
+ ContactSelector.Open;
+ end;
+end;
+
procedure TMainForm.ContactGridDblClick(Sender: TObject);
begin
EditCurrentContact;
Modified: trunk/Demos/Intro/PersonEdit.dfm
===================================================================
--- trunk/Demos/Intro/PersonEdit.dfm 2018-09-01 10:14:45 UTC (rev 986)
+++ trunk/Demos/Intro/PersonEdit.dfm 2018-11-22 10:48:18 UTC (rev 987)
@@ -1,8 +1,6 @@
inherited PersonEditForm: TPersonEditForm
Caption = 'Person'
- ClientHeight = 237
OldCreateOrder = True
- ExplicitHeight = 266
PixelsPerInch = 96
TextHeight = 13
object Label6: TLabel [5]
@@ -16,16 +14,9 @@
TabOrder = 5
end
inherited OkButton: TButton
- Top = 208
TabOrder = 6
- ExplicitTop = 208
end
- inherited CancelButton: TButton
- Top = 208
- TabOrder = 7
- ExplicitTop = 208
- end
- object DBEdit5: TDBEdit [13]
+ object DBEdit5: TDBEdit [12]
Left = 8
Top = 184
Width = 95
@@ -34,6 +25,9 @@
DataSource = ContactSource
TabOrder = 4
end
+ inherited CancelButton: TButton
+ TabOrder = 7
+ end
inherited ContactExposer: TInstantExposer
ObjectClassName = 'TPerson'
Top = 208
Modified: trunk/Demos/PrimerCross/QueryView.dfm
===================================================================
--- trunk/Demos/PrimerCross/QueryView.dfm 2018-09-01 10:14:45 UTC (rev 986)
+++ trunk/Demos/PrimerCross/QueryView.dfm 2018-11-22 10:48:18 UTC (rev 987)
@@ -1,23 +1,53 @@
inherited QueryViewForm: TQueryViewForm
Width = 772
Height = 320
+ ExplicitWidth = 772
+ ExplicitHeight = 320
object Splitter: TSplitter
Left = 0
- Top = 147
+ Top = 182
Width = 772
Height = 6
Cursor = crVSplit
Align = alTop
+ ExplicitTop = 147
end
- object CommandPanel: TPanel
+ object ExamplePanel: TPanel
Left = 0
Top = 0
Width = 772
+ Height = 35
+ Align = alTop
+ BevelOuter = bvLowered
+ TabOrder = 0
+ object ExampleLabel: TLabel
+ Left = 27
+ Top = 16
+ Width = 40
+ Height = 13
+ Caption = 'E&xample'
+ FocusControl = ExampleComboBox
+ end
+ object ExampleComboBox: TComboBox
+ Left = 73
+ Top = 8
+ Width = 666
+ Height = 21
+ Style = csDropDownList
+ DropDownCount = 12
+ TabOrder = 0
+ OnClick = ExampleComboBoxClick
+ end
+ end
+ object CommandPanel: TPanel
+ Left = 0
+ Top = 35
+ Width = 772
Height = 147
Align = alTop
- BevelOuter = bvNone
+ BevelOuter = bvLowered
BorderWidth = 30
- TabOrder = 0
+ TabOrder = 1
object CommandLabel: TLabel
Left = 30
Top = 14
@@ -26,14 +56,6 @@
Caption = '&Command'
FocusControl = CommandEdit
end
- object ExampleLabel: TLabel
- Left = 315
- Top = 125
- Width = 40
- Height = 13
- Caption = 'E&xample'
- FocusControl = ExampleComboBox
- end
object NumberLabel: TLabel
Left = 614
Top = 126
@@ -45,8 +67,8 @@
FocusControl = MaxCountEdit
end
object Label1: TLabel
- Left = 168
- Top = 124
+ Left = 473
+ Top = 125
Width = 26
Height = 13
Caption = 'Mode'
@@ -53,12 +75,11 @@
FocusControl = LoadModeComboBox
end
object CommandEdit: TMemo
- Left = 30
- Top = 30
- Width = 712
- Height = 87
+ Left = 31
+ Top = 31
+ Width = 710
+ Height = 85
Align = alClient
- ParentFont = True
TabOrder = 0
end
object ExecuteButton: TButton
@@ -69,16 +90,6 @@
Action = ExecuteAction
TabOrder = 1
end
- object ExampleComboBox: TComboBox
- Left = 361
- Top = 121
- Width = 268
- Height = 21
- Style = csDropDownList
- DropDownCount = 12
- TabOrder = 4
- OnClick = ExampleComboBoxClick
- end
object MaxCountEdit: TMaskEdit
Left = 695
Top = 122
@@ -90,13 +101,13 @@
Text = '0 '
end
object LoadModeComboBox: TComboBox
- Left = 202
- Top = 121
+ Left = 507
+ Top = 122
Width = 101
Height = 21
Style = csDropDownList
ItemIndex = 0
- TabOrder = 3
+ TabOrder = 4
Text = 'Keys First'
Items.Strings = (
'Keys First'
@@ -104,8 +115,8 @@
'Full Burst')
end
object FetchAllCheckBox: TCheckBox
- Left = 95
- Top = 116
+ Left = 111
+ Top = 123
Width = 64
Height = 17
Alignment = taLeftJustify
@@ -113,23 +124,23 @@
TabOrder = 2
end
object StatementCacheCheckBox: TCheckBox
- Left = 95
- Top = 131
- Width = 64
+ Left = 199
+ Top = 123
+ Width = 106
Height = 17
Alignment = taLeftJustify
- Caption = 'S. Cache'
- TabOrder = 6
+ Caption = 'Statement Cache'
+ TabOrder = 3
end
end
object ResultPageControl: TPageControl
Left = 0
- Top = 153
+ Top = 188
Width = 772
- Height = 167
+ Height = 132
ActivePage = ResultTabSheet
Align = alClient
- TabOrder = 1
+ TabOrder = 2
object ResultTabSheet: TTabSheet
Caption = 'Result'
object ResultGrid: TDBGrid
@@ -136,7 +147,7 @@
Left = 0
Top = 0
Width = 764
- Height = 139
+ Height = 104
Align = alClient
DataSource = TestSource
TabOrder = 0
@@ -143,7 +154,7 @@
TitleFont.Charset = DEFAULT_CHARSET
TitleFont.Color = clWindowText
TitleFont.Height = -11
- TitleFont.Name = 'MS Sans Serif'
+ TitleFont.Name = 'Tahoma'
TitleFont.Style = []
end
end
@@ -150,13 +161,16 @@
object TranslatedQueryTabSheet: TTabSheet
Caption = 'Translated Query'
ImageIndex = 1
+ ExplicitLeft = 0
+ ExplicitTop = 0
+ ExplicitWidth = 0
+ ExplicitHeight = 0
object TranslatedQueryMemo: TMemo
Left = 0
Top = 0
Width = 764
- Height = 139
+ Height = 104
Align = alClient
- ParentFont = True
TabOrder = 0
end
end
@@ -163,13 +177,16 @@
object StatsTabSheet: TTabSheet
Caption = 'Stats'
ImageIndex = 2
+ ExplicitLeft = 0
+ ExplicitTop = 0
+ ExplicitWidth = 0
+ ExplicitHeight = 0
object StatsMemo: TMemo
Left = 0
Top = 0
Width = 764
- Height = 139
+ Height = 104
Align = alClient
- ParentFont = True
TabOrder = 0
end
end
Modified: trunk/Demos/PrimerCross/QueryView.pas
===================================================================
--- trunk/Demos/PrimerCross/QueryView.pas 2018-09-01 10:14:45 UTC (rev 986)
+++ trunk/Demos/PrimerCross/QueryView.pas 2018-11-22 10:48:18 UTC (rev 987)
@@ -26,8 +26,6 @@
CommandEdit: TMemo;
CommandLabel: TLabel;
CommandPanel: TPanel;
- ExampleComboBox: TComboBox;
- ExampleLabel: TLabel;
ExecuteAction: TAction;
ExecuteButton: TButton;
ResultGrid: TDBGrid;
@@ -46,6 +44,9 @@
StatsMemo: TMemo;
FetchAllCheckBox: TCheckBox;
StatementCacheCheckBox: TCheckBox;
+ ExamplePanel: TPanel;
+ ExampleLabel: TLabel;
+ ExampleComboBox: TComboBox;
procedure ExecuteActionExecute(Sender: TObject);
procedure ExampleComboBoxClick(Sender: TObject);
procedure TestSelectorAfterScroll(DataSet: TDataSet);
Modified: trunk/Demos/PrimerCross/RandomData.pas
===================================================================
--- trunk/Demos/PrimerCross/RandomData.pas 2018-09-01 10:14:45 UTC (rev 986)
+++ trunk/Demos/PrimerCross/RandomData.pas 2018-11-22 10:48:18 UTC (rev 987)
@@ -93,7 +93,7 @@
'Detroit', 'Houston', 'Indianapolis', 'Kansas City', 'Las Vegas',
'Los Angeles', 'Memphis', 'Miami', 'Minneapolis', 'Nashville',
'New Orleans', 'New York', 'Oklahoma', 'Omaha', 'Philadelphia',
- 'Pittsburgh', 'Portland', 'San Diego', 'San Fransisco', 'Seattle', 'Tampa',
+ 'Pittsburgh', 'Portland', 'San Diego', 'San Francisco', 'Seattle', 'Tampa',
'Utah', 'Washington');
DomainSuffixes: array[0..4] of string = (
Deleted: trunk/Demos/PrimerFireMonkey/Pictures/man01.emf
===================================================================
(Binary files differ)
Deleted: trunk/Demos/PrimerFireMonkey/Pictures/man02.emf
===================================================================
(Binary files differ)
Deleted: trunk/Demos/PrimerFireMonkey/Pictures/man03.emf
===================================================================
(Binary files differ)
Deleted: trunk/Demos/PrimerFireMonkey/Pictures/man04.emf
===================================================================
(Binary files differ)
Deleted: trunk/Demos/PrimerFireMonkey/Pictures/man05.emf
===================================================================
(Binary files differ)
Deleted: trunk/Demos/PrimerFireMonkey/Pictures/woman01.emf
===================================================================
(Binary files differ)
Deleted: trunk/Demos/PrimerFireMonkey/Pictures/woman02.emf
===================================================================
(Binary files differ)
Deleted: trunk/Demos/PrimerFireMonkey/Pictures/woman03.emf
===================================================================
(Binary files differ)
Deleted: trunk/Demos/PrimerFireMonkey/Pictures/woman04.emf
===================================================================
(Binary files differ)
Deleted: trunk/Demos/PrimerFireMonkey/Pictures/woman05.emf
===================================================================
(Binary files differ)
Modified: trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dproj
===================================================================
--- trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dproj 2018-09-01 10:14:45 UTC (rev 986)
+++ trunk/Demos/PrimerFireMonkey/Projects/DXE3/PrimerFM.dproj 2018-11-22 10:48:18 UTC (rev 987)
@@ -40,7 +40,7 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
- <DCC_Define>FMX;$(DCC_Define)</DCC_Define>
+ <DCC_Define>INSTANTOBJECTS_FMX;$(DCC_Define)</DCC_Define>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
<VerInfo_Locale>1040</VerInfo_Locale>
<Manifest_File>None</Manifest_File>
@@ -49,7 +49,7 @@
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
<DCC_UnitSearchPath>..\..\..\..\Source\Core;..\..\..\..\Source\Catalogs;..\..\..\..\Source\Brokers\XML;..\..\..\..\Source\Brokers\DBX;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
- <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
+ <DCC_ExeOutput>..\..\Bin</DCC_ExeOutput>
<DCC_E>false</DCC_E>
<DCC_N>false</DCC_N>
<DCC_S>false</DCC_S>
@@ -144,8 +144,8 @@
<Source Name="MainSource">PrimerFM.dpr</Source>
</Source>
<Excluded_Packages>
- <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
- <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k170.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp170.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
<Deployment/>
Modified: trunk/Demos/PrimerFireMonkey/Source/DemoData.pas
===================================================================
--- trunk/Demos/PrimerFireMonkey/Source/DemoData.pas 2018-09-01 10:14:45 UTC (rev 986)
+++ trunk/Demos/PrimerFireMonkey/Source/DemoData.pas 2018-11-22 10:48:18 UTC (rev 987)
@@ -10,7 +10,7 @@
uses
Classes, Model, InstantPersistence,
- {$IFDEF FMX}FMX.Objects,{$ELSE}Graphics,{$ENDIF}
+ {$IFDEF INSTANTOBJECTS_FMX}FMX.Objects,{$ELSE}Graphics,{$ENDIF}
RandomData;
@@ -28,12 +28,7 @@
procedure AssignRandomPicture(Male : boolean; InstantBlob : TInstantBlob);
const
-{$IFDEF MSWINDOWS}
- ARandomExt : Array[0..2] of string = ('.bmp','.jpg','.emf');
-{$ENDIF}
-{$IFDEF LINUX}
ARandomExt : Array[0..2] of string = ('.bmp','.jpg','.png');
-{$ENDIF}
var
Picture: TImage;
PictureName : string;
@@ -43,7 +38,7 @@
PictureName := 'man'+PictureName
else
PictureName := 'woman'+PictureName;
- PictureName := ExtractFilePath(ParamStr(0))+'..\..\..\..\Pictures'+PathDelim+PictureName;
+ PictureName := ExtractFilePath(ParamStr(0))+'..\Pictures'+PathDelim+PictureName;
if FileExists(PictureName) then
begin
Picture := TImage.Create(nil);
Modified: trunk/Demos/PrimerFireMonkey/Source/Main.fmx
===================================================================
--- trunk/Demos/PrimerFireMonkey/Source/Main.fmx 2018-09-01 10:14:45 UTC (rev 986)
+++ trunk/Demos/PrimerFireMonkey/Source/Main.fmx 2018-11-22 10:48:18 UTC (rev 987)
@@ -6,88 +6,61 @@
ClientWidth = 842
FormFactor.Width = 320
FormFactor.Height = 480
- FormFactor.Devices = [dkDesktop]
+ FormFactor.Devices = [Desktop]
+ DesignerMasterStyle = 0
object DBNavigator1: TBindNavigator
- Height = 25.000000000000000000
Position.X = 104.000000000000000000
Position.Y = 8.000000000000000000
- Width = 240.000000000000000000
+ Size.Width = 240.000000000000000000
+ Size.Height = 25.000000000000000000
+ Size.PlatformDefault = False
DataSource = BindScopeDB1
xRadius = 4.000000000000000000
yRadius = 4.000000000000000000
object ConnectButton: TButton
- DisableFocusEffect = False
- Height = 25.000000000000000000
Position.X = -96.000000000000000000
+ Size.Width = 80.000000000000000000
+ Size.Height = 22.000000000000000000
+ Size.PlatformDefault = False
TabOrder = 0
Text = 'Connect...'
- Width = 89.000000000000000000
OnClick = ConnectButtonClick
end
end
object RecordLabel: TLabel
- Height = 15.000000000000000000
Position.X = 352.000000000000000000
Position.Y = 14.000000000000000000
+ Size.Width = 120.000000000000000000
+ Size.Height = 15.000000000000000000
+ Size.PlatformDefault = False
Text = 'Record:'
- Width = 120.000000000000000000
end
object StringGrid1: TStringGrid
- Touch.InteractiveGestures = [igPan]
- Height = 441.000000000000000000
+ CanFocus = True
+ ClipChildren = True
Position.X = 8.000000000000000000
Position.Y = 40.000000000000000000
+ Size.Width = 625.000000000000000000
+ Size.Height = 353.000000000000000000
+ Size.PlatformDefault = False
StyleLookup = 'gridstyle'
- Width = 633.000000000000000000
+ RowHeight = 21.000000000000000000
RowCount = 0
- RowHeight = 21.000000000000000000
- object TStringColumn
- Header = 'Name'
- Height = 416.000000000000000000
- Width = 200.000000000000000000
- end
- object TStringColumn
- Header = 'City'
- Height = 416.000000000000000000
- Position.X = 200.000000000000000000
- Width = 100.000000000000000000
- end
- object TStringColumn
- Header = 'Street'
- Height = 416.000000000000000000
- Position.X = 300.000000000000000000
- Width = 100.000000000000000000
- end
- object TStringColumn
- Header = 'Zip'
- Height = 416.000000000000000000
- Position.X = 400.000000000000000000
- Width = 30.000000000000000000
- end
- object TStringColumn
- Header = 'State'
- Height = 416.000000000000000000
- Position.X = 430.000000000000000000
- Width = 60.000000000000000000
- end
- object TStringColumn
- Header = 'Country'
- Height = 416.000000000000000000
- Position.X = 490.000000000000000000
- Width = 100.000000000000000000
- end
+ Viewport.Width = 621.000000000000000000
+ Viewport.Height = 328.000000000000000000
end
object ImageControl1: TImageControl
- DisableFocusEffect = False
- Height = 105.000000000000000000
Position.X = 648.000000000000000000
Position.Y = 40.000000000000000000
Scale.X = 2.000000000000000000
Scale.Y = 2.000000000000000000
- Width = 81.000000000000000000
+ Size.Width = 73.000000000000000000
+ Size.Height = 89.000000000000000000
+ Size.PlatformDefault = False
object PictureOpacityAnimation: TFloatAnimation
Duration = 1.000000000000000000
PropertyName = 'Opacity'
+ StartValue = 0.000000000000000000
StopValue = 1.000000000000000000
end
object PictureRotationAngle: TFloatAnimation
@@ -98,19 +71,18 @@
end
end
object Edit1: TEdit
- DisableFocusEffect = False
- KeyboardType = vktDefault
- Password = False
+ Touch.InteractiveGestures = [LongTap, DoubleTap]
Position.X = 648.000000000000000000
Position.Y = 264.000000000000000000
- Width = 169.000000000000000000
- Height = 22.000000000000000000
+ Size.Width = 100.000000000000000000
+ Size.Height = 22.000000000000000000
+ Size.PlatformDefault = False
end
object ContactSelector: TInstantSelector
AfterScroll = ContactSelectorAfterScroll
Command.Strings = (
'SELECT * FROM ANY TContact')
- Connector = InstanXMLXConnector1
+ Connector = InstantXMLConnector
ObjectClassName = 'TContact'
AfterOpen = ContactSelectorAfterOpen
Left = 344
@@ -164,13 +136,13 @@
Left = 344
Top = 344
end
- object InstanXMLXConnector1: TInstantXMLConnector
- IsDefault = True
- Connection = XMLFilesAccessor1
+ object InstantXMLConnector: TInstantXMLConnector
+ BlobStreamFormat = sfXML
+ Connection = XMLFilesAccessor
Left = 56
Top = 344
end
- object XMLFilesAccessor1: TXMLFilesAccessor
+ object XMLFilesAccessor: TXMLFilesAccessor
RootFolder = '\'
Left = 56
Top = 288
@@ -177,7 +149,6 @@
end
object BindScopeDB1: TBindScopeDB
DataSource = ContactsSource
- DataSet = ContactSelector
ScopeMappings = <>
Left = 344
Top = 408
@@ -185,7 +156,6 @@
object BindingsList: TBindingsList
Methods = <>
OutputConverters = <>
- UseAppManager = True
Left = 704
Top = 48
object BindDBGridLink1: TBindDBGridLink
@@ -192,7 +162,6 @@
Category = 'DB Links'
DataSource = BindScopeDB1
GridControl = StringGrid1
- AutoBufferCount = False
Columns = <
item
FieldName = 'Name'
Modified: trunk/Demos/PrimerFireMonkey/Source/Main.pas
===================================================================
--- trunk/Demos/PrimerFireMonkey/Source/Main.pas 2018-09-01 10:14:45 UTC (rev 986)
+++ trunk/Demos/PrimerFireMonkey/Source/Main.pas 2018-11-22 10:48:18 UTC (rev 987)
@@ -8,15 +8,17 @@
Fmx.Bind.Navigator, InstantPersistence, InstantBrokers, Data.DB,
InstantXML, InstantPresentation, Data.Bind.Components, Data.Bind.DBScope,
Data.Bind.EngExt, Fmx.Bind.DBEngExt, System.Rtti, System.Bindings.Outputs,
- Fmx.Bind.Editors, FMX.Grid, Data.Bind.DBLinks, Fmx.Bind.DBLinks, FMX.Objects, FMX.Edit, FMX.Ani;
+ Fmx.Bind.Editors, FMX.Grid, Data.Bind.DBLinks, Fmx.Bind.DBLinks, FMX.Objects, FMX.Edit,
+ FMX.Ani, Data.Bind.Controls, FMX.Grid.Style, FMX.StdCtrls, FMX.ScrollBox,
+ FMX.Controls.Presentation;
type
TfmMain = class(TForm)
DBNavigator1: TBindNavigator;
ContactsSource: TDataSource;
- InstanXMLXConnector1: TInstantXMLConnector;
+ InstantXMLConnector: TInstantXMLConnector;
ContactSelector: TInstantSelector;
- XMLFilesAccessor1: TXMLFilesAccessor;
+ XMLFilesAccessor: TXMLFilesAccessor;
ConnectButton: TButton;
RecordLabel: TLabel;
BindScopeDB1: TBindScopeDB;
@@ -97,7 +99,6 @@
procedure TfmMain.ConnectButtonClick(Sender: TObject);
begin
InitConnection;
- ContactSelector.Open;
end;
procedure TfmMain.ContactSelectorAfterOpen(DataSet: TDataSet);
@@ -120,11 +121,22 @@
procedure TfmMain.InitConnection;
begin
- XMLFilesAccessor1.RootFolder := ExtractFilePath(ParamStr(0))+
- '..'+PathDelim+'..'+PathDelim+'..'+PathDelim+'..'+PathDelim+'Database';
-// CreateCategories;
-// CreateCountries;
-// CreateRandomContacts(100, True);
+ XMLFilesAccessor.RootFolder := ExtractFilePath(ParamStr(0))+
+ '..\Database';
+ InstantXMLConnector.Connected := True;
+ InstantXMLConnector.IsDefault := True;
+ ContactSelector.Open;
+ if ContactSelector.Eof then
+ begin
+ ContactSelector.Close;
+ Try
+ CreateCategories;
+ CreateCountries;
+ CreateRandomContacts(100, True);
+ Finally
+ ContactSelector.Open;
+ End;
+ end;
end;
procedure TfmMain.UpdateRecordLabel;
|
