From: <na...@us...> - 2009-08-06 15:27:27
|
Revision: 816 http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=816&view=rev Author: nandod Date: 2009-08-06 15:27:10 +0000 (Thu, 06 Aug 2009) Log Message: ----------- * Fixed two regressions. Modified Paths: -------------- trunk/Demos/PrimerCross/Main.dfm trunk/Demos/PrimerCross/Main.pas trunk/Demos/PrimerCross/Model/Model.pas trunk/Source/Core/InstantTextFiler.pas Modified: trunk/Demos/PrimerCross/Main.dfm =================================================================== --- trunk/Demos/PrimerCross/Main.dfm 2009-08-05 17:15:33 UTC (rev 815) +++ trunk/Demos/PrimerCross/Main.dfm 2009-08-06 15:27:10 UTC (rev 816) @@ -10,21 +10,21 @@ Font.Style = [] Menu = MainMenu OldCreateOrder = False + OnActivate = FormActivate OnClose = FormClose OnCreate = FormCreate - OnShow = FormShow PixelsPerInch = 96 TextHeight = 13 object SideBarSplitter: TSplitter Left = 88 Top = 26 - Height = 458 + Height = 139 ResizeStyle = rsLine end object ToolBar: TToolBar Left = 0 Top = 0 - Width = 624 + Width = 304 Height = 26 AutoSize = True BorderWidth = 1 @@ -45,8 +45,8 @@ end object StatusBar: TStatusBar Left = 0 - Top = 484 - Width = 624 + Top = 165 + Width = 304 Height = 19 Panels = < item @@ -61,7 +61,7 @@ Left = 0 Top = 26 Width = 88 - Height = 458 + Height = 139 Align = alLeft BevelOuter = bvNone BorderStyle = bsSingle @@ -79,7 +79,7 @@ Left = 0 Top = 8 Width = 84 - Height = 446 + Height = 127 Align = alClient BorderStyle = bsNone Color = clAppWorkSpace @@ -89,6 +89,7 @@ Font.Height = -11 Font.Name = 'MS Sans Serif' Font.Style = [] + IconOptions.AutoArrange = True ReadOnly = True ParentFont = False TabOrder = 0 @@ -98,15 +99,15 @@ object WorkPanel: TPanel Left = 91 Top = 26 - Width = 533 - Height = 458 + Width = 213 + Height = 139 Align = alClient BevelOuter = bvNone TabOrder = 3 object WorkTitleSpacer: TBevel Left = 0 Top = 27 - Width = 533 + Width = 213 Height = 4 Align = alTop Shape = bsSpacer @@ -114,7 +115,7 @@ object WorkTitlePanel: TPanel Left = 0 Top = 0 - Width = 533 + Width = 213 Height = 27 Align = alTop BevelInner = bvLowered @@ -137,8 +138,8 @@ object WorkClientPanel: TPanel Left = 0 Top = 31 - Width = 533 - Height = 427 + Width = 213 + Height = 108 Align = alClient BevelOuter = bvNone TabOrder = 1 Modified: trunk/Demos/PrimerCross/Main.pas =================================================================== --- trunk/Demos/PrimerCross/Main.pas 2009-08-05 17:15:33 UTC (rev 815) +++ trunk/Demos/PrimerCross/Main.pas 2009-08-06 15:27:10 UTC (rev 816) @@ -75,7 +75,7 @@ procedure ExportItemClick(Sender: TObject); procedure ImportItemClick(Sender: TObject); procedure ExportModelItemClick(Sender: TObject); - procedure FormShow(Sender: TObject); + procedure FormActivate(Sender: TObject); private FActiveSubView: TBasicViewForm; FConnectionDef: TInstantConnectionDef; @@ -501,6 +501,11 @@ end; end; +procedure TMainForm.FormActivate(Sender: TObject); +begin + WindowState := wsMaximized; +end; + procedure TMainForm.FormClose(Sender: TObject; var Action: TCloseAction); begin Disconnect; @@ -519,7 +524,6 @@ BorderWidth := 4; HoverTime := 0; HotTrackStyles := [htHandPoint]; - IconOptions.Arrangement := iaLeft; LargeImages := SideBarImages; end; {$ENDIF} @@ -537,16 +541,10 @@ // ConnectionManager.FileFormat := sfBinary; // ConnectionManager.FileName := ChangeFileExt(Application.ExeName, '.con'); - CreateSubViews; UpdateStatus; end; -procedure TMainForm.FormShow(Sender: TObject); -begin - WindowState := wsMaximized; -end; - function TMainForm.GetConnectionName: string; begin if Assigned(FConnectionDef) then Modified: trunk/Demos/PrimerCross/Model/Model.pas =================================================================== --- trunk/Demos/PrimerCross/Model/Model.pas 2009-08-05 17:15:33 UTC (rev 815) +++ trunk/Demos/PrimerCross/Model/Model.pas 2009-08-06 15:27:10 UTC (rev 816) @@ -23,7 +23,7 @@ TAddress = class(TInstantObject) - {IOMETADATA City: String(30) index; + {IOMETADATA City: String(30) index; Country: Reference(TCountry); State: String(4); Street: Memo; @@ -53,7 +53,7 @@ end; TCountry = class(TInstantObject) - {IOMETADATA stored; + {IOMETADATA stored; Name: String(30); } _Name: TInstantString; private @@ -68,7 +68,7 @@ end; TPhone = class(TInstantObject) - {IOMETADATA Name: String(20); + {IOMETADATA Name: String(20); Number: String(20) mask '(000) 000-0000;0;_'; } _Name: TInstantString; _Number: TInstantString; @@ -83,7 +83,7 @@ end; TEmail = class(TInstantObject) - {IOMETADATA Address: String(100); } + {IOMETADATA Address: String(100); } _Address: TInstantString; private function GetAddress: string; @@ -93,7 +93,7 @@ end; TCategory = class(TInstantObject) - {IOMETADATA stored; + {IOMETADATA stored; Name: String(30); } _Name: TInstantString; private @@ -106,7 +106,7 @@ end; TContact = class(TInstantObject) - {IOMETADATA stored; + {IOMETADATA stored; Address: Part(TAddress); Category: Reference(TCategory); City: String(30) index; @@ -153,6 +153,7 @@ end; TContactFilter = class(TContact) + {IOMETADATA embedded; } private FIsDynamic: Boolean; function GetIsEmpty: Boolean; @@ -164,7 +165,7 @@ end; TPerson = class(TContact) - {IOMETADATA stored; + {IOMETADATA stored; Emails: Parts(TEmail); Employer: Reference(TCompany); Picture: Graphic; @@ -214,7 +215,7 @@ end; TCompany = class(TContact) - {IOMETADATA stored; + {IOMETADATA stored; Employees: References(TPerson); } _Employees: TInstantReferences; private Modified: trunk/Source/Core/InstantTextFiler.pas =================================================================== --- trunk/Source/Core/InstantTextFiler.pas 2009-08-05 17:15:33 UTC (rev 815) +++ trunk/Source/Core/InstantTextFiler.pas 2009-08-06 15:27:10 UTC (rev 816) @@ -194,7 +194,7 @@ constructor TInstantTextFiler.Create(AText: string); begin - Create(TStringStream.Create(AText), True); + Create(TInstantStringStream.Create(AText), True); end; procedure TInstantTextFiler.DescendPosition(Ch: Char); |