Menu
▾
▴
[JVCL-Checkins] CVS: jvcl/source JvBaseDlg.pas,1.3,1.4 JvBaseDlgEditor.pas,1.5,1.6 JvJVCLAbout.dfm,1.2,1.3 JvJVCLAbout.pas,1.4,1.5
|
From: Robert M. <mar...@us...> - 2003-01-04 15:16:51
|
Update of /cvsroot/jvcl/jvcl/source
In directory sc8-pr-cvs1:/tmp/cvs-serv21007/source
Modified Files:
JvBaseDlg.pas JvBaseDlgEditor.pas JvJVCLAbout.dfm
JvJVCLAbout.pas
Log Message:
JVCL About like Delphi About
Index: JvBaseDlg.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvBaseDlg.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvBaseDlg.pas 7 Oct 2002 20:02:04 -0000 1.3
--- JvBaseDlg.pas 4 Jan 2003 15:16:47 -0000 1.4
***************
*** 32,36 ****
uses
! Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, JVCLVer, JvComponent;
type
--- 32,37 ----
uses
! Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
! JVCLVer, JvComponent;
type
Index: JvBaseDlgEditor.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvBaseDlgEditor.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JvBaseDlgEditor.pas 9 Oct 2002 14:23:54 -0000 1.5
--- JvBaseDlgEditor.pas 4 Jan 2003 15:16:47 -0000 1.6
***************
*** 35,39 ****
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
EditIntf, ToolIntf, TypInfo,
! {$IFDEF COMPILER5}DsgnIntf, {$ENDIF}{$IFDEF COMPILER6_UP}DesignEditors, DesignIntf, {$ENDIF}
ExptIntf,
JvBaseDlg;
--- 35,44 ----
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
EditIntf, ToolIntf, TypInfo,
! {$IFDEF COMPILER5}
! DsgnIntf,
! {$ENDIF}
! {$IFDEF COMPILER6_UP}
! DesignEditors, DesignIntf,
! {$ENDIF}
ExptIntf,
JvBaseDlg;
***************
*** 58,62 ****
type
! // (p3) TCommonDialog.Execute is protected in D5...
THackCommonDialog = class(TCommonDialog);
--- 63,67 ----
type
! // (p3) TCommonDialog.Execute is protected in D5...
THackCommonDialog = class(TCommonDialog);
***************
*** 67,71 ****
if Component is TCommonDialog then // (p3) a TJvCommonDialog is also a TCommonDialog (nowadays)
THackCommonDialog(Component).Execute
! else if Component is TJvCommonDialogP then
TJvCommonDialogP(Component).Execute;
end;
--- 72,77 ----
if Component is TCommonDialog then // (p3) a TJvCommonDialog is also a TCommonDialog (nowadays)
THackCommonDialog(Component).Execute
! else
! if Component is TJvCommonDialogP then
TJvCommonDialogP(Component).Execute;
end;
Index: JvJVCLAbout.dfm
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvJVCLAbout.dfm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsQ7z7Iv and /tmp/cvsoFw5YQ differ
Index: JvJVCLAbout.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvJVCLAbout.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JvJVCLAbout.pas 20 Jul 2002 11:52:35 -0000 1.4
--- JvJVCLAbout.pas 4 Jan 2003 15:16:47 -0000 1.5
***************
*** 32,40 ****
uses
! Windows, Messages, SysUtils, {$IFDEF COMPILER6_UP}Variants, {$ENDIF}
! Classes, Graphics, Controls, Forms,
! Dialogs, JvHotLink, StdCtrls, ExtCtrls, jpeg, JvLabel,
! {$IFDEF COMPILER5}DsgnIntf, {$ENDIF}{$IFDEF COMPILER6_UP}DesignEditors, DesignIntf, {$ENDIF}
! JVCLVer, JvComponent, Buttons, IniFiles;
type
--- 32,49 ----
uses
! Windows, Messages, SysUtils,
! {$IFDEF COMPILER6_UP}
! Variants,
! {$ENDIF}
! Classes, Graphics, Controls, Forms, Buttons, IniFiles,
! Dialogs, StdCtrls, ExtCtrls, jpeg,
! {$IFDEF COMPILER5}
! DsgnIntf,
! {$ENDIF}
! {$IFDEF COMPILER6_UP}
! DesignEditors, DesignIntf,
! {$ENDIF}
! JclSysInfo, JclWin32,
! JVCLVer, JvComponent, JvLabel, JvHotLink;
type
***************
*** 51,55 ****
lblVersion: TLabel;
pnlImage: TPanel;
! Image1: TImage;
btnOK: TButton;
JvHotLink1: TJvHotLink;
--- 60,64 ----
lblVersion: TLabel;
pnlImage: TPanel;
! imgStarfield: TImage;
btnOK: TButton;
JvHotLink1: TJvHotLink;
***************
*** 60,64 ****
lblCopyRight: TLabel;
lblRights: TLabel;
! Image3: TImage;
MainPanel: TPanel;
Bevel2: TBevel;
--- 69,73 ----
lblCopyRight: TLabel;
lblRights: TLabel;
! imgProjectJEDI: TImage;
MainPanel: TPanel;
Bevel2: TBevel;
***************
*** 72,75 ****
--- 81,88 ----
btnOptions: TSpeedButton;
OpenDialog1: TOpenDialog;
+ Bevel3: TBevel;
+ lblWindowsVersion: TLabel;
+ Label4: TLabel;
+ lblMemory: TLabel;
procedure btnOKClick(Sender: TObject);
procedure FormShow(Sender: TObject);
***************
*** 77,102 ****
Shift: TShiftState; X, Y: Integer);
procedure btnHelpClick(Sender: TObject);
- procedure FormCreate(Sender: TObject);
procedure btnOptionsClick(Sender: TObject);
procedure FormDestroy(Sender: TObject);
- protected
- procedure CreateParams(var Params: TCreateParams); override;
-
private
- { Private declarations }
FHelpFile: string;
FHelpDirectory: string;
procedure LoadOptions;
procedure SaveOptions;
- public
- { Public declarations }
end;
- var
- JvJVCLAboutForm: TJvJVCLAboutForm;
-
implementation
uses
JvFunctions;
{$R *.dfm}
--- 90,107 ----
Shift: TShiftState; X, Y: Integer);
procedure btnHelpClick(Sender: TObject);
procedure btnOptionsClick(Sender: TObject);
procedure FormDestroy(Sender: TObject);
private
FHelpFile: string;
FHelpDirectory: string;
procedure LoadOptions;
procedure SaveOptions;
end;
implementation
+
uses
JvFunctions;
+
{$R *.dfm}
***************
*** 126,131 ****
end;
- { TJvJVCLAboutForm }
-
procedure TJvJVCLAboutForm.btnOKClick(Sender: TObject);
begin
--- 131,134 ----
***************
*** 133,149 ****
end;
- procedure TJvJVCLAboutForm.CreateParams(var Params: TCreateParams);
- begin
- inherited CreateParams(Params);
- with Params do
- begin
- Style := (Style or WS_POPUP) and (not WS_DLGFRAME);
- end;
- end;
-
procedure TJvJVCLAboutForm.FormShow(Sender: TObject);
begin
lblVersion.Caption := 'Version: ' + JVCL_VERSIONSTRING;
! lblCopyRight.Caption := 'Copyright© Project JEDI, 1999 - ' + FormatDateTime('yyyy', Now);
end;
--- 136,157 ----
end;
procedure TJvJVCLAboutForm.FormShow(Sender: TObject);
+ var
+ VersionInfo: TOSVersionInfoEx;
begin
+ FillChar(VersionInfo, SizeOf(TOSVersionInfoEx), #0);
+ VersionInfo.dwOSVersionInfoSize := SizeOf(TOSVersionInfoEx);
+ JclWin32.GetVersionEx(@VersionInfo);
lblVersion.Caption := 'Version: ' + JVCL_VERSIONSTRING;
! if VersionInfo.wServicePackMajor = 0 then
! lblWindowsVersion.Caption := Format('%s (Build %u)',
! [GetWindowsVersionString, VersionInfo.dwBuildNumber])
! else
! lblWindowsVersion.Caption := Format('%s (Build %u: %s)',
! [GetWindowsVersionString, VersionInfo.dwBuildNumber, GetWindowsServicePackVersionString]);
! lblMemory.Caption := Format('%u KB', [GetTotalPhysicalMemory div 1024]);
! lblCopyRight.Caption := 'Copyright © Project JEDI, 1999 - ' + FormatDateTime('yyyy', Now);
! LoadOptions;
! btnHelp.Enabled := FHelpFile <> '';
end;
***************
*** 161,173 ****
end;
- procedure TJvJVCLAboutForm.FormCreate(Sender: TObject);
- begin
- LoadOptions;
- if FHelpFile = '' then
- btnHelp.Enabled := False
- else
- btnHelp.Enabled := True;
- end;
-
procedure TJvJVCLAboutForm.btnOptionsClick(Sender: TObject);
begin
--- 169,172 ----
***************
*** 177,184 ****
FHelpDirectory := ExtractFileDir(OpenDialog1.FileName);
SaveOptions;
! if FHelpFile = '' then
! btnHelp.Enabled := False
! else
! btnHelp.Enabled := True;
end;
end;
--- 176,180 ----
FHelpDirectory := ExtractFileDir(OpenDialog1.FileName);
SaveOptions;
! btnHelp.Enabled := FHelpFile <> '';
end;
end;
***************
*** 186,222 ****
procedure TJvJVCLAboutForm.LoadOptions;
var
! l, t, w, h: integer;
begin
! with TIniFile.create(ExtractFileDir(Application.exename) + '\JVCL.ini') do
try
! l := ReadInteger('Options', 'Bounds.Left', 0);
! t := ReadInteger('Options', 'Bounds.Top', 0);
! w := ReadInteger('Options', 'Bounds.Width', -1);
! h := ReadInteger('Options', 'Bounds.Height', -1);
FHelpFile := ReadString('Options', 'Help.File', '');
FHelpDirectory := ReadString('Options', 'Help.Directory', '');
finally
! free;
end;
//make sure the form is positioned on screen ...
//(ie make sure nobody's fiddled with the INI file!)
! if (w > 0) and (h > 0) and
! (l < screen.Width) and (t < screen.Height) and
! (l + w > 0) and (t + h > 0) then
! setbounds(l, t, w, h);
end;
procedure TJvJVCLAboutForm.SaveOptions;
begin
! with TIniFile.create(ExtractFileDir(Application.exename) + '\JVCL.ini') do
try
! if windowState = wsNormal then
begin
! WriteInteger('Options', 'Bounds.Left', self.Left);
! WriteInteger('Options', 'Bounds.Top', self.Top);
! WriteInteger('Options', 'Bounds.Width', self.Width);
! WriteInteger('Options', 'Bounds.Height', self.Height);
end;
--- 182,215 ----
procedure TJvJVCLAboutForm.LoadOptions;
var
! l, t: Integer;
begin
! with TIniFile.Create(ExtractFileDir(Application.ExeName) + '\JVCL.ini') do
try
! l := ReadInteger('Options', 'Bounds.Left', -1);
! t := ReadInteger('Options', 'Bounds.Top', -1);
FHelpFile := ReadString('Options', 'Help.File', '');
FHelpDirectory := ReadString('Options', 'Help.Directory', '');
finally
! Free;
end;
//make sure the form is positioned on screen ...
//(ie make sure nobody's fiddled with the INI file!)
! if (l >= 0) and (t >= 0) and (l < Screen.Width) and (t < Screen.Height) then
! begin
! Left := l;
! Top := t;
! end;
end;
procedure TJvJVCLAboutForm.SaveOptions;
begin
! with TIniFile.Create(ExtractFileDir(Application.ExeName) + '\JVCL.ini') do
try
! if WindowState = wsNormal then
begin
! WriteInteger('Options', 'Bounds.Left', Left);
! WriteInteger('Options', 'Bounds.Top', Top);
end;
***************
*** 224,228 ****
WriteString('Options', 'Help.Directory', FHelpDirectory);
finally
! free;
end;
end;
--- 217,221 ----
WriteString('Options', 'Help.Directory', FHelpDirectory);
finally
! Free;
end;
end;
|