[JVCL-Checkins] dev/JVCL3/examples/JvAni JvAniMainFormU.dfm,1.9,1.10 JvAniMainFormU.pas,1.9,1.10 - JvAniFile.pas integrated into JvAni.pas

[Robert M. <mar...@pr...>]

Update of /cvsroot/jvcl/dev/JVCL3/examples/JvAni
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17605/JVCL3/examples/JvAni

Modified Files:
	JvAniMainFormU.dfm JvAniMainFormU.pas 
Log Message:
JvAniFile.pas integrated into JvAni.pas


Index: JvAniMainFormU.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/examples/JvAni/JvAniMainFormU.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** JvAniMainFormU.pas	26 Jan 2004 07:24:47 -0000	1.9
--- JvAniMainFormU.pas	27 Jan 2004 09:30:16 -0000	1.10
***************
*** 30,45 ****
    Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
    StdCtrls, FileCtrl, ExtCtrls,
!   JvAni, JvCombobox, JvDriveCtrls, JvListBox, JvExStdCtrls;
  
  type
    TJvAniMainForm = class(TForm)
-     Image1: TImage;
      FileListBox1: TJvFileListBox;
      DirectoryListBox1: TJvDirectoryListBox;
      DriveComboBox1: TJvDriveCombo;
      Memo1: TMemo;
-     Image2: TImage;
      SaveDialog1: TSaveDialog;
      Save: TButton;
      procedure FileListBox1Click(Sender: TObject);
      procedure SaveClick(Sender: TObject);
--- 30,52 ----
    Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
    StdCtrls, FileCtrl, ExtCtrls,
!   JvAni, JvCombobox, JvDriveCtrls, JvListBox, JvExStdCtrls, JvExControls,
!   JvComponent, JvAnimatedImage;
  
  type
    TJvAniMainForm = class(TForm)
      FileListBox1: TJvFileListBox;
      DirectoryListBox1: TJvDirectoryListBox;
      DriveComboBox1: TJvDriveCombo;
      Memo1: TMemo;
      SaveDialog1: TSaveDialog;
      Save: TButton;
+     Panel1: TPanel;
+     Image1: TImage;
+     Panel2: TPanel;
+     ImageIcons: TImage;
+     Panel3: TPanel;
+     Label1: TLabel;
+     Label2: TLabel;
+     ImageFrames: TImage;
      procedure FileListBox1Click(Sender: TObject);
      procedure SaveClick(Sender: TObject);
***************
*** 60,73 ****
    Image1.Picture.LoadFromFile(FileListBox1.FileName);
  
!   with TJvAni(Image1.Picture.Graphic) do
!   begin
!     Animated := True;
!     AssignToBitmap(Image2.Picture.Bitmap, clBtnFace, False, False);
!     Memo1.Clear;
!     Memo1.Lines.Add('Author: ' + Author);
!     Memo1.Lines.Add('Title: ' + Title);
!     Memo1.Lines.Add('Icons: ' + IntToStr(IconCount));
!     Memo1.Lines.Add('Frames: ' + IntToStr(FrameCount));
!   end;
  end;
  
--- 67,83 ----
    Image1.Picture.LoadFromFile(FileListBox1.FileName);
  
!   if Assigned(Image1.Picture) and Assigned(Image1.Picture.Graphic) and
!     (Image1.Picture.Graphic is TJvAni) then
!     with TJvAni(Image1.Picture.Graphic) do
!     begin
!       Animated := True;
!       AssignIconsToBitmap(ImageIcons.Picture.Bitmap, clBtnFace, False, False);
!       AssignToBitmap(ImageFrames.Picture.Bitmap, clBtnFace, False, False);
!       Memo1.Clear;
!       Memo1.Lines.Add('Author: ' + Author);
!       Memo1.Lines.Add('Title: ' + Title);
!       Memo1.Lines.Add('Icons: ' + IntToStr(IconCount));
!       Memo1.Lines.Add('Frames: ' + IntToStr(FrameCount));
!     end;
  end;
  

Index: JvAniMainFormU.dfm
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/examples/JvAni/JvAniMainFormU.dfm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** JvAniMainFormU.dfm	26 Jan 2004 15:21:30 -0000	1.9
--- JvAniMainFormU.dfm	27 Jan 2004 09:30:15 -0000	1.10
***************
*** 7,11 ****
    Color = clBtnFace
    Constraints.MinHeight = 350
!   Constraints.MinWidth = 300
    Font.Charset = DEFAULT_CHARSET
    Font.Color = clWindowText
--- 7,11 ----
    Color = clBtnFace
    Constraints.MinHeight = 350
!   Constraints.MinWidth = 450
    Font.Charset = DEFAULT_CHARSET
    Font.Color = clWindowText
***************
*** 21,45 ****
    PixelsPerInch = 96
    TextHeight = 13
!   object Image1: TImage
!     Left = 254
!     Top = 8
!     Width = 116
!     Height = 73
!     Anchors = [akLeft, akTop, akRight]
!     Center = True
!     Transparent = True
    end
!   object Image2: TImage
      Left = 160
!     Top = 96
!     Width = 320
!     Height = 105
!     Anchors = [akLeft, akTop, akRight]
    end
    object FileListBox1: TJvFileListBox
      Left = 0
!     Top = 137
      Width = 145
!     Height = 177
      Anchors = [akLeft, akBottom]
      ItemHeight = 13
--- 21,43 ----
    PixelsPerInch = 96
    TextHeight = 13
!   object Label1: TLabel
!     Left = 160
!     Top = 72
!     Width = 29
!     Height = 13
!     Caption = 'Icons:'
    end
!   object Label2: TLabel
      Left = 160
!     Top = 139
!     Width = 37
!     Height = 13
!     Caption = 'Frames:'
    end
    object FileListBox1: TJvFileListBox
      Left = 0
!     Top = 191
      Width = 145
!     Height = 115
      Anchors = [akLeft, akBottom]
      ItemHeight = 13
***************
*** 53,57 ****
      Top = 34
      Width = 145
!     Height = 100
      Directory = 'E:\Daten\dev\JVCL3\examples\JvAni'
      FileList = FileListBox1
--- 51,55 ----
      Top = 34
      Width = 145
!     Height = 155
      Directory = 'E:\Daten\dev\JVCL3\examples\JvAni'
      FileList = FileListBox1
***************
*** 75,81 ****
    object Memo1: TMemo
      Left = 160
!     Top = 218
      Width = 320
!     Height = 89
      Anchors = [akLeft, akRight, akBottom]
      Color = clBtnFace
--- 73,79 ----
    object Memo1: TMemo
      Left = 160
!     Top = 209
      Width = 320
!     Height = 97
      Anchors = [akLeft, akRight, akBottom]
      Color = clBtnFace
***************
*** 84,88 ****
    object Save: TButton
      Left = 160
!     Top = 8
      Width = 75
      Height = 25
--- 82,86 ----
    object Save: TButton
      Left = 160
!     Top = 12
      Width = 75
      Height = 25
***************
*** 91,98 ****
      OnClick = SaveClick
    end
    object SaveDialog1: TSaveDialog
      DefaultExt = 'ani'
!     Left = 448
!     Top = 8
    end
  end
--- 89,146 ----
      OnClick = SaveClick
    end
+   object Panel1: TPanel
+     Left = 272
+     Top = 16
+     Width = 97
+     Height = 57
+     Anchors = [akLeft, akTop, akRight]
+     BevelOuter = bvLowered
+     TabOrder = 5
+     object Image1: TImage
+       Left = 1
+       Top = 1
+       Width = 95
+       Height = 55
+       Align = alClient
+       Center = True
+       Transparent = True
+     end
+   end
+   object Panel2: TPanel
+     Left = 160
+     Top = 85
+     Width = 320
+     Height = 49
+     Anchors = [akLeft, akTop, akRight]
+     BevelOuter = bvLowered
+     TabOrder = 6
+     object ImageIcons: TImage
+       Left = 1
+       Top = 1
+       Width = 318
+       Height = 47
+       Align = alClient
+     end
+   end
+   object Panel3: TPanel
+     Left = 160
+     Top = 152
+     Width = 320
+     Height = 49
+     Anchors = [akLeft, akTop, akRight]
+     BevelOuter = bvLowered
+     TabOrder = 7
+     object ImageFrames: TImage
+       Left = 1
+       Top = 1
+       Width = 318
+       Height = 47
+       Align = alClient
+     end
+   end
    object SaveDialog1: TSaveDialog
      DefaultExt = 'ani'
!     Left = 440
!     Top = 16
    end
  end