[Instantobjects-cvscommit] Demos/PrimerCross Main.dfm,1.1,1.2 Main.pas,1.3,1.4 PersonEdit.dfm,1.2,1.3 PersonEdit.pas,1.3,1.4 Primer.dof,1.2,1.3 Primer.res,1.2,1.3

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Demos/PrimerCross
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22650/Demos/PrimerCross

Modified Files:
	Main.dfm Main.pas PersonEdit.dfm PersonEdit.pas Primer.dof 
	Primer.res 
Log Message:
VERSION 1.6.7 - Info into Readme.txt

Index: Primer.res
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Primer.res,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsggLlS2 and /tmp/cvsPZdkQV differ

Index: PersonEdit.dfm
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PersonEdit.dfm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PersonEdit.dfm	29 Jul 2004 20:43:09 -0000	1.2
--- PersonEdit.dfm	17 Nov 2004 20:59:47 -0000	1.3
***************
*** 60,68 ****
            Caption = 'Sa&lary'
          end
!         object PictureImage: TImage [13]
!           Left = 339
!           Top = 206
!           Width = 70
!           Height = 93
          end
          inherited StreetEdit: TDBMemo
--- 60,78 ----
            Caption = 'Sa&lary'
          end
!         object PicturePanel: TPanel [13]
!           Left = 332
!           Top = 203
!           Width = 76
!           Height = 96
!           BevelOuter = bvLowered
!           Caption = 'Picture'
!           TabOrder = 14
!           object PictureImage: TImage
!             Left = 3
!             Top = 2
!             Width = 70
!             Height = 93
!             Stretch = True
!           end
          end
          inherited StreetEdit: TDBMemo
***************
*** 168,175 ****
          object PictureButton: TButton [24]
            Left = 240
!           Top = 274
            Width = 81
            Height = 25
!           Caption = '&Picture...'
            TabOrder = 13
            OnClick = PictureButtonClick
--- 178,185 ----
          object PictureButton: TButton [24]
            Left = 240
!           Top = 246
            Width = 81
            Height = 25
!           Caption = 'Load &Picture...'
            TabOrder = 13
            OnClick = PictureButtonClick
***************
*** 184,187 ****
--- 194,206 ----
            TabOrder = 10
          end
+         object ClearButton: TButton
+           Left = 240
+           Top = 274
+           Width = 81
+           Height = 25
+           Caption = '&Clear Picture'
+           TabOrder = 15
+           OnClick = ClearButtonClick
+         end
        end
      end

Index: Main.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Main.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Main.pas	4 Aug 2004 22:43:38 -0000	1.3
--- Main.pas	17 Nov 2004 20:59:47 -0000	1.4
***************
*** 730,733 ****
--- 730,734 ----
      try
        ShowModal;
+       ConnectionManagerAction.Execute;
      finally
        Free;

Index: Main.dfm
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Main.dfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Main.dfm	20 Jul 2004 11:05:15 -0000	1.1
--- Main.dfm	17 Nov 2004 20:59:47 -0000	1.2
***************
*** 13,17 ****
    Menu = MainMenu
    OldCreateOrder = False
-   Position = poScreenCenter
    WindowState = wsMaximized
    OnClose = FormClose
--- 13,16 ----

Index: Primer.dof
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Primer.dof,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Primer.dof	29 Jul 2004 20:43:09 -0000	1.2
--- Primer.dof	17 Nov 2004 20:59:47 -0000	1.3
***************
*** 115,119 ****
  MajorVer=1
  MinorVer=6
! Release=6
  Build=0
  Debug=0
--- 115,119 ----
  MajorVer=1
  MinorVer=6
! Release=7
  Build=0
  Debug=0
***************
*** 127,131 ****
  CompanyName=InstantObjects.org
  FileDescription=Primer Demo
! FileVersion=1.6.6.0
  InternalName=
  LegalCopyright=MPL public license
--- 127,131 ----
  CompanyName=InstantObjects.org
  FileDescription=Primer Demo
! FileVersion=1.6.7.0
  InternalName=
  LegalCopyright=MPL public license
***************
*** 133,136 ****
  OriginalFilename=
  ProductName=
! ProductVersion=1.6.6
  Comments=
--- 133,136 ----
  OriginalFilename=
  ProductName=
! ProductVersion=1.6.7
  Comments=

Index: PersonEdit.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PersonEdit.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PersonEdit.pas	4 Aug 2004 22:43:38 -0000	1.3
--- PersonEdit.pas	17 Nov 2004 20:59:47 -0000	1.4
***************
*** 30,37 ****
      EmployerClearButton: TToolButton;
      EmployerToolImages: TImageList;
-     PictureImage: TImage;
      PictureButton: TButton;
      SalaryLabel: TLabel;
      SalaryEdit: TDBEdit;
      procedure EmployerClearButtonClick(Sender: TObject);
      procedure EmployerEditButtonClick(Sender: TObject);
--- 30,39 ----
      EmployerClearButton: TToolButton;
      EmployerToolImages: TImageList;
      PictureButton: TButton;
      SalaryLabel: TLabel;
      SalaryEdit: TDBEdit;
+     PicturePanel: TPanel;
+     PictureImage: TImage;
+     ClearButton: TButton;
      procedure EmployerClearButtonClick(Sender: TObject);
      procedure EmployerEditButtonClick(Sender: TObject);
***************
*** 42,45 ****
--- 44,48 ----
      procedure FormCreate(Sender: TObject);
      procedure FormShow(Sender: TObject);
+     procedure ClearButtonClick(Sender: TObject);
    private
      function GetSubject: TPerson;
***************
*** 169,172 ****
--- 172,176 ----
  {$IFDEF MSWINDOWS}
    LoadMultipleImages(EmployerToolImages,'PERSONEMPLOYERTOOLIMAGES',HInstance);
+   PictureImage.Proportional := True;
  {$ENDIF}
  {$IFDEF LINUX}
***************
*** 181,184 ****
--- 185,195 ----
  end;
  
+ procedure TPersonEditForm.ClearButtonClick(Sender: TObject);
+ begin
+   inherited;
+   PictureImage.Picture := nil;
+   Subject._Picture.Clear;
+ end;
+ 
  initialization
    TPersonEditForm.RegisterClass;