Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1:/tmp/cvs-serv3647/JVCL3/run Modified Files: JvBDESQLScript.pas JvBaseDlg.pas JvCommonDialogD.pas JvCommonExecDlg.pas JvDsgnIntf.pas JvFormAnimatedIcon.pas JvFormWallpaper.pas JvImageDlg.pas JvImageForm.pas JvQuickPreviewForm.dfm JvQuickPreviewForm.pas JvRgbToHtml.pas JvSALMath.pas JvScreenResolution.pas JvScreenSaver.pas JvSelectDirectory.pas JvSerialMaker.pas JvSyncSplitter.pas JvgPointEditor.pas JvgProcessUtils.pas JvgStringContainer.pas Log Message: style cleaning Index: JvBDESQLScript.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBDESQLScript.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvBDESQLScript.pas 22 Jun 2003 02:52:45 -0000 1.2 --- JvBDESQLScript.pas 23 Nov 2003 13:34:33 -0000 1.3 *************** *** 45,51 **** private FOnProgress: TOnScriptProgress; ! FScript: TStrings; FCommit: TCommit; FDatabase: TDatabase; procedure SetScript(AValue: TStrings); procedure Progress(UserData: Integer; var Cancel: Boolean; Line: Integer); --- 45,52 ---- private FOnProgress: TOnScriptProgress; ! FScript: TStringList; FCommit: TCommit; FDatabase: TDatabase; + function GetScript: TStrings; procedure SetScript(AValue: TStrings); procedure Progress(UserData: Integer; var Cancel: Boolean; Line: Integer); *************** *** 56,60 **** procedure Execute; property OnProgress: TOnScriptProgress read FOnProgress write FOnProgress; ! property Script: TStrings read FScript write SetScript; property Commit: TCommit read FCommit write FCommit; property Database: TDatabase read FDatabase write FDatabase; --- 57,61 ---- procedure Execute; property OnProgress: TOnScriptProgress read FOnProgress write FOnProgress; ! property Script: TStrings read GetScript write SetScript; property Commit: TCommit read FCommit write FCommit; property Database: TDatabase read FDatabase write FDatabase; *************** *** 73,76 **** --- 74,82 ---- FScript.Free; inherited Destroy; + end; + + function TJvBDESQLScript.GetScript: TStrings; + begin + Result := FScript; end; Index: JvBaseDlg.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBaseDlg.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvBaseDlg.pas 23 Nov 2003 07:55:44 -0000 1.4 --- JvBaseDlg.pas 23 Nov 2003 13:34:33 -0000 1.5 *************** *** 32,36 **** uses - SysUtils, Classes, {$IFDEF VCL} Windows, Messages, Graphics, Controls, Forms, Dialogs, --- 32,35 ---- *************** *** 39,42 **** --- 38,42 ---- QGraphics, QControls, QForms, QDialogs, {$ENDIF VisualCLX} + SysUtils, Classes, JVCLVer, JvComponent; Index: JvCommonDialogD.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCommonDialogD.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvCommonDialogD.pas 22 Nov 2003 18:55:38 -0000 1.2 --- JvCommonDialogD.pas 23 Nov 2003 13:34:33 -0000 1.3 *************** *** 32,36 **** uses ! Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, JvTypes, JvComponent; --- 32,36 ---- uses ! Windows, SysUtils, Classes, Controls, JvTypes, JvComponent; Index: JvCommonExecDlg.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCommonExecDlg.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvCommonExecDlg.pas 17 Jun 2003 11:11:27 -0000 1.1 --- JvCommonExecDlg.pas 23 Nov 2003 13:34:33 -0000 1.2 *************** *** 32,36 **** uses ! Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, JvBaseDlg, JvTypes; --- 32,36 ---- uses ! Windows, SysUtils, Classes, Controls, Forms, JvBaseDlg, JvTypes; *************** *** 52,56 **** FOwnerWindow := (AOwner as TWinControl).Handle else ! FOwnerWindow := 0; end; --- 52,56 ---- FOwnerWindow := (AOwner as TWinControl).Handle else ! FOwnerWindow := HWND_DESKTOP; end; Index: JvDsgnIntf.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDsgnIntf.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvDsgnIntf.pas 23 Nov 2003 07:55:44 -0000 1.3 --- JvDsgnIntf.pas 23 Nov 2003 13:34:33 -0000 1.4 *************** *** 47,59 **** procedure DrawDesignFrame(Canvas: TCanvas; Rect: TRect); ! procedure DesignerNotify(Self, Item: TComponent; Operation: TOperation); ! procedure DesignerModified(Self: TComponent); ! procedure DesignerSelectComponent(Self: TComponent); var DrawDesignFrameProc: procedure(Canvas: TCanvas; Rect: TRect); ! DesignerNotifyProc: procedure(Self, Item: TComponent; Operation: TOperation); ! DesignerModifiedProc: procedure(Self: TComponent); ! DesignerSelectComponentProc: procedure(Self: TComponent); type --- 47,59 ---- procedure DrawDesignFrame(Canvas: TCanvas; Rect: TRect); ! procedure DesignerNotify(ASelf, Item: TComponent; Operation: TOperation); ! procedure DesignerModified(ASelf: TComponent); ! procedure DesignerSelectComponent(ASelf: TComponent); var DrawDesignFrameProc: procedure(Canvas: TCanvas; Rect: TRect); ! DesignerNotifyProc: procedure(ASelf, Item: TComponent; Operation: TOperation); ! DesignerModifiedProc: procedure(ASelf: TComponent); ! DesignerSelectComponentProc: procedure(ASelf: TComponent); type *************** *** 71,90 **** end; ! procedure DesignerNotify(Self, Item: TComponent; Operation: TOperation); begin if Assigned(DesignerNotifyProc) then ! DesignerNotifyProc(Self, Item, Operation); end; ! procedure DesignerModified(Self: TComponent); begin if Assigned(DesignerModifiedProc) then ! DesignerModifiedProc(Self); end; ! procedure DesignerSelectComponent(Self: TComponent); begin if Assigned(DesignerSelectComponentProc) then ! DesignerSelectComponentProc(Self); end; --- 71,90 ---- end; ! procedure DesignerNotify(ASelf, Item: TComponent; Operation: TOperation); begin if Assigned(DesignerNotifyProc) then ! DesignerNotifyProc(ASelf, Item, Operation); end; ! procedure DesignerModified(ASelf: TComponent); begin if Assigned(DesignerModifiedProc) then ! DesignerModifiedProc(ASelf); end; ! procedure DesignerSelectComponent(ASelf: TComponent); begin if Assigned(DesignerSelectComponentProc) then ! DesignerSelectComponentProc(ASelf); end; Index: JvFormAnimatedIcon.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvFormAnimatedIcon.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvFormAnimatedIcon.pas 17 Jun 2003 11:11:37 -0000 1.1 --- JvFormAnimatedIcon.pas 23 Nov 2003 13:34:33 -0000 1.2 *************** *** 41,45 **** FActive: Boolean; FDelay: Cardinal; ! FImageList: TImageList; FTimer: TTimer; FNumber: Integer; --- 41,45 ---- FActive: Boolean; FDelay: Cardinal; ! FIcons: TImageList; FTimer: TTimer; FNumber: Integer; *************** *** 52,57 **** destructor Destroy; override; published ! property Icons: TImageList read FImageList write FImageList; ! property Active: Boolean read FActive write SetActive; property Delay: Cardinal read FDelay write SetDelay default 100; end; --- 52,57 ---- destructor Destroy; override; published ! property Icons: TImageList read FIcons write FIcons; ! property Active: Boolean read FActive write SetActive default True; property Delay: Cardinal read FDelay write SetDelay default 100; end; *************** *** 64,67 **** --- 64,68 ---- FForm := GetParentForm(TControl(AOwner)); + FActive := True; FNumber := 0; FDelay := 100; *************** *** 85,92 **** procedure TJvFormAnimatedIcon.Animate(Sender: TObject); begin ! if (FImageList <> nil) and (FImageList.Count <> 0) then begin ! FNumber := (FNumber + 1) mod FImageList.Count; ! FImageList.GetIcon(FNumber, TForm(FForm).Icon); end; end; --- 86,93 ---- procedure TJvFormAnimatedIcon.Animate(Sender: TObject); begin ! if (FIcons <> nil) and (FIcons.Count <> 0) then begin ! FNumber := (FNumber + 1) mod FIcons.Count; ! FIcons.GetIcon(FNumber, TForm(FForm).Icon); end; end; Index: JvFormWallpaper.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvFormWallpaper.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvFormWallpaper.pas 17 Jun 2003 11:11:37 -0000 1.1 --- JvFormWallpaper.pas 23 Nov 2003 13:34:33 -0000 1.2 *************** *** 33,42 **** uses SysUtils, Classes, Graphics, Controls, ! JVCLVer; type ! TJvFormWallpaper = class(TGraphicControl) private - FAboutJVCL: TJVCLAboutInfo; FImage: TPicture; procedure SetImage(Value: TPicture); --- 33,41 ---- uses SysUtils, Classes, Graphics, Controls, ! JVCLVer, JvComponent; type ! TJvFormWallpaper = class(TJvGraphicControl) private FImage: TPicture; procedure SetImage(Value: TPicture); *************** *** 48,52 **** destructor Destroy; override; published - property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False; property Align default alClient; property Image: TPicture read FImage write SetImage; --- 47,50 ---- Index: JvImageDlg.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvImageDlg.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvImageDlg.pas 12 Jul 2003 00:27:16 -0000 1.3 --- JvImageDlg.pas 23 Nov 2003 13:34:33 -0000 1.4 *************** *** 33,37 **** uses SysUtils, Classes, Graphics, Controls, Forms, ! JvImageForm, JvBaseDlg, JvTypes; type --- 33,38 ---- uses SysUtils, Classes, Graphics, Controls, Forms, ! ExtCtrls, Jpeg, ! JvBaseDlg, JvComponent, JvTypes; type *************** *** 70,83 **** procedure TJvImageDialog.Execute; begin ! with TFormImg.Create(Application) do begin ! Image1.Picture.Assign(FPicture); ! ClientHeight := FPicture.Height; ! ClientWidth := FPicture.Width; ! Caption := FTitle; ! if (FPicture.Height <> 0) and (FPicture.Width <> 0) then ! ShowModal; ! Free; end; end; --- 71,95 ---- procedure TJvImageDialog.Execute; + var + Form: TJvForm; + Image1: TImage; begin ! if (FPicture.Height <> 0) and (FPicture.Width <> 0) then begin ! Form := TJvForm.Create(Self); ! try ! Form.BorderStyle := bsDialog; ! Form.BorderIcons := [biSystemMenu]; ! Form.Position := poScreenCenter; ! Image1 := TImage.Create(Form); ! Image1.Picture.Assign(FPicture); ! Image1.Parent := Form; ! Form.ClientHeight := Image1.Height; ! Form.ClientWidth := Image1.Width; ! Form.Caption := FTitle; ! Form.ShowModal; ! finally ! Form.Free; ! end; end; end; Index: JvImageForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvImageForm.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvImageForm.pas 10 Oct 2003 23:13:33 -0000 1.2 --- JvImageForm.pas 23 Nov 2003 13:34:33 -0000 1.3 *************** *** 32,37 **** uses ! SysUtils, Classes, Controls, Forms, ! ExtCtrls, Jpeg, JvComponent; type --- 32,37 ---- uses ! SysUtils, Classes, Controls, Forms, ExtCtrls, Jpeg, ! JvComponent; type *************** *** 39,45 **** Image1: TImage; end; - - var - FormImg: TFormImg; implementation --- 39,42 ---- Index: JvQuickPreviewForm.dfm =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvQuickPreviewForm.dfm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvQuickPreviewForm.dfm 22 Nov 2003 18:55:38 -0000 1.2 --- JvQuickPreviewForm.dfm 23 Nov 2003 13:34:33 -0000 1.3 *************** *** 39,43 **** BevelOuter = bvNone TabOrder = 1 ! object btnUse: TSpeedButton Left = 13 Top = 3 --- 39,43 ---- BevelOuter = bvNone TabOrder = 1 ! object BtnUse: TSpeedButton Left = 13 Top = 3 *************** *** 46,50 **** Caption = 'Use' Flat = True ! OnClick = btnUseClick end end --- 46,50 ---- Caption = 'Use' Flat = True ! OnClick = BtnUseClick end end Index: JvQuickPreviewForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvQuickPreviewForm.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvQuickPreviewForm.pas 22 Nov 2003 18:55:38 -0000 1.4 --- JvQuickPreviewForm.pas 23 Nov 2003 13:34:33 -0000 1.5 *************** *** 24,27 **** --- 24,28 ---- Known Issues: -----------------------------------------------------------------------------} + {$I JVCL.INC} *************** *** 40,45 **** PreviewImage: TImage; Panel1: TPanel; ! btnUse: TSpeedButton; ! procedure btnUseClick(Sender: TObject); private FDrawImage: TJvDrawImage; --- 41,46 ---- PreviewImage: TImage; Panel1: TPanel; ! BtnUse: TSpeedButton; ! procedure BtnUseClick(Sender: TObject); private FDrawImage: TJvDrawImage; *************** *** 52,56 **** {$R *.DFM} ! procedure TQuickPreviewForm.btnUseClick(Sender: TObject); begin --- 53,57 ---- {$R *.DFM} ! procedure TQuickPreviewForm.BtnUseClick(Sender: TObject); begin Index: JvRgbToHtml.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvRgbToHtml.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvRgbToHtml.pas 2 Sep 2003 18:45:38 -0000 1.2 --- JvRgbToHtml.pas 23 Nov 2003 13:34:34 -0000 1.3 *************** *** 38,50 **** TJvRGBToHTML = class(TJvComponent) private ! FHtml: string; ! FColor: TColor; ! procedure SetColor(const Value: TColor); ! procedure SetHtml(const Value: string); public constructor Create(AOwner: TComponent); override; published ! property RGBColor: TColor read FColor write SetColor default clBlack; ! property HTMLColor: string read FHtml write SetHtml; end; --- 38,50 ---- TJvRGBToHTML = class(TJvComponent) private ! FHTMLColor: string; ! FRGBColor: TColor; ! procedure SetRGBColor(const Value: TColor); ! procedure SetHTMLColor(const Value: string); public constructor Create(AOwner: TComponent); override; published ! property RGBColor: TColor read FRGBColor write SetRGBColor default clBlack; ! property HTMLColor: string read FHTMLColor write SetHTMLColor; end; *************** *** 56,64 **** begin with TJvRGBToHTML.Create(nil) do ! begin ! RgbColor := Value; ! Result := HtmlColor; ! Free; ! end; end; --- 56,65 ---- begin with TJvRGBToHTML.Create(nil) do ! try ! RGBColor := Value; ! Result := HtmlColor; ! finally ! Free; ! end; end; *************** *** 66,83 **** begin inherited Create(AOwner); ! FColor := clBlack; ! FHtml := '000000'; end; ! procedure TJvRGBToHTML.SetColor(const Value: TColor); var Clr: TColor; begin ! FColor := Value; Clr := ColorToRGB(Value); ! FHtml := IntToHex(GetRValue(Clr), 2) + IntToHex(GetGValue(Clr), 2) + IntToHex(GetBValue(Clr), 2); end; ! procedure TJvRGBToHTML.SetHtml(const Value: string); var C: TColor; --- 67,83 ---- begin inherited Create(AOwner); ! RGBColor := clBlack; end; ! procedure TJvRGBToHTML.SetRGBColor(const Value: TColor); var Clr: TColor; begin ! FRGBColor := Value; Clr := ColorToRGB(Value); ! FHTMLColor := IntToHex(GetRValue(Clr), 2) + IntToHex(GetGValue(Clr), 2) + IntToHex(GetBValue(Clr), 2); end; ! procedure TJvRGBToHTML.SetHTMLColor(const Value: string); var C: TColor; *************** *** 91,97 **** B := StrToInt('$' + Copy(Value, 5, 2)); C := RGB(R, G, B); ! FColor := C; ! ! FHtml := Value; end; except --- 91,96 ---- B := StrToInt('$' + Copy(Value, 5, 2)); C := RGB(R, G, B); ! FRGBColor := C; ! FHTMLColor := Value; end; except Index: JvSALMath.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSALMath.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvSALMath.pas 28 Oct 2003 22:43:22 -0000 1.4 --- JvSALMath.pas 23 Nov 2003 13:34:34 -0000 1.5 *************** *** 24,31 **** Known Issues: -----------------------------------------------------------------------------} ! {$I jvcl.inc} unit JvSALMath; - // SAL math package interface --- 24,32 ---- Known Issues: -----------------------------------------------------------------------------} ! ! {$I JVCL.INC} ! unit JvSALMath; interface *************** *** 37,134 **** TJvSALMath = class(TComponent) private ! { Private declarations } ! sal: TJvSAL; ! protected ! { Protected declarations } public ! { Public declarations } ! procedure AddProcedures(aSal: TJvSAL); ! procedure xSin; ! procedure xArcSin; ! procedure xCos; ! procedure xArcCos; ! procedure xTan; ! procedure xArcTan; ! procedure xPi; ! procedure xExp; ! procedure xLn; ! ! published ! { Published declarations } end; implementation ! { TJvSALMathBasic } ! ! procedure TJvSALMath.AddProcedures(aSal: TJvSAL); begin ! sal := aSal; ! sal.AddProcedure('sin', xsin, nil); ! sal.AddProcedure('cos', xcos, nil); ! sal.AddProcedure('tan', xtan, nil); ! sal.AddProcedure('arcsin', xsin, nil); ! sal.AddProcedure('arccos', xcos, nil); ! sal.AddProcedure('arctan', xtan, nil); ! sal.AddProcedure('pi', xpi, nil); ! sal.AddProcedure('exp', xpi, nil); ! sal.AddProcedure('ln', xpi, nil); end; ! procedure TJvSALMath.xSin; var ! v1: variant; begin ! v1 := sal.pop; ! v1 := sin(v1); ! sal.push(v1); end; ! procedure TJvSALMath.xCos; var ! v1: variant; begin ! v1 := sal.pop; ! v1 := cos(v1); ! sal.push(v1); end; ! procedure TJvSALMath.xTan; var ! v1: variant; begin ! v1 := sal.pop; ! v1 := tan(v1); ! sal.push(v1); end; ! procedure TJvSALMath.xPi; begin ! sal.push(pi); end; ! procedure TJvSALMath.xArcCos; begin ! sal.push(arccos(sal.pop)); end; ! procedure TJvSALMath.xArcSin; begin ! sal.push(arcsin(sal.pop)); end; ! procedure TJvSALMath.xArcTan; begin ! sal.push(arctan(sal.pop)); end; ! procedure TJvSALMath.xExp; begin ! sal.push(exp(sal.pop)); end; ! procedure TJvSALMath.xLn; begin ! sal.push(ln(sal.pop)); end; --- 38,128 ---- TJvSALMath = class(TComponent) private ! FSal: TJvSAL; public ! procedure AddProcedures(ASal: TJvSAL); ! procedure XSin; ! procedure XArcSin; ! procedure XCos; ! procedure XArcCos; ! procedure XTan; ! procedure XArcTan; ! procedure XPi; ! procedure XExp; ! procedure XLn; end; implementation ! procedure TJvSALMath.AddProcedures(ASal: TJvSAL); begin ! FSal := ASal; ! FSal.AddProcedure('sin', XSin, nil); ! FSal.AddProcedure('cos', XCos, nil); ! FSal.AddProcedure('tan', XTan, nil); ! // (rom) using XSin, XCos, XTan looks suspicious. Incomplete? ! FSal.AddProcedure('arcsin', XSin, nil); ! FSal.AddProcedure('arccos', XCos, nil); ! FSal.AddProcedure('arctan', XTan, nil); ! FSal.AddProcedure('pi', XPi, nil); ! // (rom) using XPi looks suspicious. Incomplete? ! FSal.AddProcedure('exp', XPi, nil); ! FSal.AddProcedure('ln', XPi, nil); end; ! procedure TJvSALMath.XSin; var ! V1: Variant; begin ! V1 := FSal.Pop; ! V1 := Sin(V1); ! FSal.Push(V1); end; ! procedure TJvSALMath.XCos; var ! V1: Variant; begin ! V1 := FSal.Pop; ! V1 := Cos(V1); ! FSal.Push(V1); end; ! procedure TJvSALMath.XTan; var ! V1: Variant; begin ! V1 := FSal.Pop; ! V1 := Tan(V1); ! FSal.Push(V1); end; ! procedure TJvSALMath.XPi; begin ! FSal.Push(Pi); end; ! procedure TJvSALMath.XArcCos; begin ! FSal.Push(ArcCos(FSal.Pop)); end; ! procedure TJvSALMath.XArcSin; begin ! FSal.Push(ArcSin(FSal.Pop)); end; ! procedure TJvSALMath.XArcTan; begin ! FSal.Push(ArcTan(FSal.Pop)); end; ! procedure TJvSALMath.XExp; begin ! FSal.Push(Exp(FSal.Pop)); end; ! procedure TJvSALMath.XLn; begin ! FSal.Push(Ln(FSal.Pop)); end; Index: JvScreenResolution.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvScreenResolution.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvScreenResolution.pas 17 Jun 2003 11:11:47 -0000 1.1 --- JvScreenResolution.pas 23 Nov 2003 13:34:34 -0000 1.2 *************** *** 57,61 **** {$ELSE} Consts, ! {$ENDIF} JvTypes; --- 57,61 ---- {$ELSE} Consts, ! {$ENDIF COMPILER6_UP} JvTypes; Index: JvScreenSaver.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvScreenSaver.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvScreenSaver.pas 17 Jun 2003 11:11:47 -0000 1.1 --- JvScreenSaver.pas 23 Nov 2003 13:34:34 -0000 1.2 *************** *** 43,47 **** FOnPasswordChange: TJvParentEvent; public ! constructor Create(AOwner: TComponent); override; published property OnConfigure: TNotifyEvent read FOnConfigure write FOnConfigure; --- 43,47 ---- FOnPasswordChange: TJvParentEvent; public ! procedure Loaded; override; published property OnConfigure: TNotifyEvent read FOnConfigure write FOnConfigure; *************** *** 53,74 **** implementation ! constructor TJvScreenSaver.Create(AOwner: TComponent); var ! St: string; Style: Integer; H: THandle; begin ! inherited Create(AOwner); Style := 0; if ParamCount <> 0 then begin ! St := UpperCase(ParamStr(1)); ! if St = 'C' then Style := 0 else ! if St = 'A' then Style := 1 else ! if St = 'P' then Style := 2 else --- 53,76 ---- implementation ! // (rom) moved from Create to Loaded. None of the events can be assigned otherwise. ! ! procedure TJvScreenSaver.Loaded; var ! S: string; Style: Integer; H: THandle; begin ! inherited Loaded; Style := 0; if ParamCount <> 0 then begin ! S := UpperCase(ParamStr(1)); ! if S = 'C' then Style := 0 else ! if S = 'A' then Style := 1 else ! if S = 'P' then Style := 2 else *************** *** 76,82 **** end; - H := 0; if Style in [1, 2] then ! H := StrToInt(ParamStr(2)); case Style of 0: --- 78,85 ---- end; if Style in [1, 2] then ! H := StrToInt(ParamStr(2)) ! else ! H := 0; case Style of 0: Index: JvSelectDirectory.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSelectDirectory.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvSelectDirectory.pas 17 Jun 2003 11:11:47 -0000 1.1 --- JvSelectDirectory.pas 23 Nov 2003 13:34:34 -0000 1.2 *************** *** 48,51 **** --- 48,52 ---- public constructor Create(AOwner: TComponent); override; + function Execute: Boolean; override; published property ClassicDialog: Boolean read FClassicDialog write FClassicDialog default True; *************** *** 55,59 **** property Options: TSelectDirOpts read FOptions write FOptions default [sdAllowCreate, sdPerformCreate, sdPrompt]; property Title: string read FTitle write FTitle; - function Execute: Boolean; override; end; --- 56,59 ---- Index: JvSerialMaker.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSerialMaker.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvSerialMaker.pas 3 Oct 2003 23:10:52 -0000 1.2 --- JvSerialMaker.pas 23 Nov 2003 13:34:34 -0000 1.3 *************** *** 38,52 **** TJvSerialMaker = class(TJvComponent) private ! FUsername: string; FBase: Integer; FSerial: string; FDummy: string; ! procedure ChangeUser(User: string); ! procedure ChangeBase(Base: Integer); public ! function GiveSerial(Base: Integer; Username: string): string; ! function SerialIsCorrect(Base: Integer; Username: string; Serial: string): Boolean; published ! property Username: string read FUsername write ChangeUser; property Base: Integer read FBase write ChangeBase; { Do not store dummies } --- 38,52 ---- TJvSerialMaker = class(TJvComponent) private ! FUserName: string; FBase: Integer; FSerial: string; FDummy: string; ! procedure ChangeUser(AUserName: string); ! procedure ChangeBase(ABase: Integer); public ! function GiveSerial(ABase: Integer; AUserName: string): string; ! function SerialIsCorrect(ABase: Integer; AUserName: string; Serial: string): Boolean; published ! property UserName: string read FUserName write ChangeUser; property Base: Integer read FBase write ChangeBase; { Do not store dummies } *************** *** 59,101 **** sError = 'Error'; ! procedure TJvSerialMaker.ChangeUser(User: string); begin ! FUsername := User; ! FSerial := GiveSerial(FBase, FUsername); end; ! procedure TJvSerialMaker.ChangeBase(Base: Integer); begin ! FBase := Base; ! FSerial := GiveSerial(FBase, FUsername); end; ! function TJvSerialMaker.GiveSerial(Base: Integer; Username: string): string; var - S: string; A: Integer; begin ! S := sError; ! if (Base <> 0) and (Username <> '') then begin ! A := Base * Length(Username) + Ord(Username[1]) * 666; ! S := IntToStr(A) + '-'; ! A := Base * Ord(Username[1]) * 123; ! S := S + IntToStr(A) + '-'; ! A := Base + (Length(Username) * Ord(Username[1])) * 6613; ! S := S + IntToStr(A); ! end; ! Result := S; end; ! function TJvSerialMaker.SerialIsCorrect(Base: Integer; Username: string; Serial: string): Boolean; begin ! if Username = '' then ! Result := False ! else ! if Base = 0 then ! Result := False else ! Result := Serial = GiveSerial(Base, Username); end; --- 59,97 ---- sError = 'Error'; ! procedure TJvSerialMaker.ChangeUser(AUserName: string); begin ! FUserName := AUserName; ! FSerial := GiveSerial(Base, AUserName); end; ! procedure TJvSerialMaker.ChangeBase(ABase: Integer); begin ! FBase := ABase; ! FSerial := GiveSerial(ABase, UserName); end; ! function TJvSerialMaker.GiveSerial(ABase: Integer; AUserName: string): string; var A: Integer; begin ! if (ABase <> 0) and (AUserName <> '') then begin ! A := ABase * Length(AUserName) + Ord(AUserName[1]) * 666; ! Result := IntToStr(A) + '-'; ! A := ABase * Ord(AUserName[1]) * 123; ! Result := Result + IntToStr(A) + '-'; ! A := ABase + (Length(AUserName) * Ord(AUserName[1])) * 6613; ! Result := Result + IntToStr(A); ! end ! else ! Result := SError; end; ! function TJvSerialMaker.SerialIsCorrect(ABase: Integer; AUserName: string; Serial: string): Boolean; begin ! if (AUserName <> '') and (ABase <> 0) then ! Result := Serial = GiveSerial(ABase, AUserName) else ! Result := False; end; Index: JvSyncSplitter.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSyncSplitter.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvSyncSplitter.pas 17 Jun 2003 11:11:47 -0000 1.1 --- JvSyncSplitter.pas 23 Nov 2003 13:34:34 -0000 1.2 *************** *** 32,36 **** uses ! Messages, SysUtils, Classes, Controls, ExtCtrls, JvSplitter; type --- 32,37 ---- uses ! Messages, SysUtils, Classes, Controls, ExtCtrls, ! JvSplitter; type *************** *** 55,64 **** resourcestring ! eInvalidPartner = 'TJvSyncSplitter.SetPartner: cannot set Partner to Self!'; procedure TJvSyncSplitter.Notification(AComponent: TComponent; Operation: TOperation); begin ! if (Operation = opRemove) and (aComponent = FPartner) then ! FPartner := nil; inherited Notification(AComponent, Operation); end; --- 56,65 ---- resourcestring ! SInvalidPartner = 'TJvSyncSplitter.SetPartner: cannot set Partner to Self!'; procedure TJvSyncSplitter.Notification(AComponent: TComponent; Operation: TOperation); begin ! if (Operation = opRemove) and (AComponent = Partner) then ! Partner := nil; inherited Notification(AComponent, Operation); end; *************** *** 69,86 **** FPartner := Value else ! raise EJVCLException.Create(eInvalidPartner); end; procedure TJvSyncSplitter.WndProc(var Msg: TMessage); begin ! if Assigned(FPartner) and not FForcedSize then case Msg.Msg of WM_MOUSEFIRST..WM_MOUSELAST: begin ! FPartner.FForcedSize := True; try ! FPartner.Perform(Msg.Msg, Msg.WParam, Msg.LParam); finally ! FPartner.FForcedSize := False; end; end; --- 70,87 ---- FPartner := Value else ! raise EJVCLException.Create(SInvalidPartner); end; procedure TJvSyncSplitter.WndProc(var Msg: TMessage); begin ! if Assigned(FPartner) and not ForcedSize then case Msg.Msg of WM_MOUSEFIRST..WM_MOUSELAST: begin ! Partner.ForcedSize := True; try ! Partner.Perform(Msg.Msg, Msg.WParam, Msg.LParam); finally ! Partner.ForcedSize := False; end; end; Index: JvgPointEditor.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgPointEditor.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvgPointEditor.pas 22 Nov 2003 18:55:38 -0000 1.2 --- JvgPointEditor.pas 23 Nov 2003 13:34:34 -0000 1.3 *************** *** 33,37 **** uses ! Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, {$IFDEF COMPILER6_UP} DesignIntf, DesignEditors, PropertyCategories, --- 33,37 ---- uses ! Windows, SysUtils, Classes, {$IFDEF COMPILER6_UP} DesignIntf, DesignEditors, PropertyCategories, *************** *** 52,59 **** implementation ! // (rom) seem obsolete var PPointTypeInfo: PTypeInfo; PointTypeInfo: TTypeInfo; function TJvgPointProperty.GetAttributes: TPropertyAttributes; --- 52,60 ---- implementation ! { (rom) disabled seem obsolete var PPointTypeInfo: PTypeInfo; PointTypeInfo: TTypeInfo; + } function TJvgPointProperty.GetAttributes: TPropertyAttributes; Index: JvgProcessUtils.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgProcessUtils.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvgProcessUtils.pas 25 Jun 2003 18:09:52 -0000 1.2 --- JvgProcessUtils.pas 23 Nov 2003 13:34:34 -0000 1.3 *************** *** 35,53 **** Windows, Messages, Classes, SysUtils; procedure GetProcessList(const SList: TStrings); procedure KillProcessByName(Name: string); const ! PROCESS_TERMINATE = $0001; ! PROCESS_CREATE_THREAD = $0002; ! PROCESS_VM_OPERATION = $0008; ! PROCESS_VM_READ = $0010; ! PROCESS_VM_WRITE = $0020; ! PROCESS_DUP_HANDLE = $0040; ! PROCESS_CREATE_PROCESS = $0080; ! PROCESS_SET_QUOTA = $0100; ! PROCESS_SET_INFORMATION = $0200; PROCESS_QUERY_INFORMATION = $0400; ! PROCESS_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED or SYNCHRONIZE or $0FFF; implementation --- 35,69 ---- Windows, Messages, Classes, SysUtils; + // (rom) definitely goes to JCL + procedure GetProcessList(const SList: TStrings); procedure KillProcessByName(Name: string); const ! // (rom) from WINNT.h ! PROCESS_TERMINATE = $0001; ! {$EXTERNALSYM PROCESS_TERMINATE} ! PROCESS_CREATE_THREAD = $0002; ! {$EXTERNALSYM PROCESS_CREATE_THREAD} ! PROCESS_SET_SESSIONID = $0004; ! {$EXTERNALSYM PROCESS_SET_SESSIONID} ! PROCESS_VM_OPERATION = $0008; ! {$EXTERNALSYM PROCESS_VM_OPERATION} ! PROCESS_VM_READ = $0010; ! {$EXTERNALSYM PROCESS_VM_READ} ! PROCESS_VM_WRITE = $0020; ! {$EXTERNALSYM PROCESS_VM_WRITE} ! PROCESS_DUP_HANDLE = $0040; ! {$EXTERNALSYM PROCESS_DUP_HANDLE} ! PROCESS_CREATE_PROCESS = $0080; ! {$EXTERNALSYM PROCESS_CREATE_PROCESS} ! PROCESS_SET_QUOTA = $0100; ! {$EXTERNALSYM PROCESS_SET_QUOTA} ! PROCESS_SET_INFORMATION = $0200; ! {$EXTERNALSYM PROCESS_SET_INFORMATION} PROCESS_QUERY_INFORMATION = $0400; ! {$EXTERNALSYM PROCESS_QUERY_INFORMATION} ! PROCESS_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED or SYNCHRONIZE or $0FFF; ! {$EXTERNALSYM PROCESS_ALL_ACCESS} implementation *************** *** 69,72 **** --- 85,89 ---- SList.Add(Format('%x, %x: %s', [Pe32.th32ProcessID, Pe32.th32ParentProcessID, Pe32.szExeFile])); until not Process32Next(hSnapshot, Pe32); + CloseHandle(hSnapshot); end; *************** *** 89,92 **** --- 106,110 ---- end; until not Process32Next(hSnapshot, Pe32); + CloseHandle(hSnapshot); end; Index: JvgStringContainer.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgStringContainer.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvgStringContainer.pas 25 Jun 2003 18:09:52 -0000 1.2 --- JvgStringContainer.pas 23 Nov 2003 13:34:34 -0000 1.3 *************** *** 37,41 **** type ! TOnReadItem = procedure(Sender: TObject; Index: Integer) of object; TJvgStringContainer = class(TJvComponent) --- 37,41 ---- type ! TOnReadItem = procedure(Sender: TObject; Idx: Integer) of object; TJvgStringContainer = class(TJvComponent) *************** *** 44,55 **** FReadOnly: Boolean; FOnReadItem: TOnReadItem; ! function GetString(Index: Integer): string; function GetCount: Integer; ! procedure SetString(Index: Integer; const Value: string); procedure SetItems(Value: TStringList); public constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Strings[Index: Integer]: string read GetString write SetString; default; published property Items: TStringList read FItems write SetItems; --- 44,55 ---- FReadOnly: Boolean; FOnReadItem: TOnReadItem; ! function GetString(Idx: Integer): string; function GetCount: Integer; ! procedure SetString(Idx: Integer; const Value: string); procedure SetItems(Value: TStringList); public constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Strings[Idx: Integer]: string read GetString write SetString; default; published property Items: TStringList read FItems write SetItems; *************** *** 76,90 **** end; ! function TJvgStringContainer.GetString(Index: Integer): string; begin ! Result := FItems[Index]; if Assigned(FOnReadItem) then ! FOnReadItem(Self, Index); end; ! procedure TJvgStringContainer.SetString(Index: Integer; const Value: string); begin ! if not FReadOnly then ! FItems[Index] := Value; end; --- 76,90 ---- end; ! function TJvgStringContainer.GetString(Idx: Integer): string; begin ! Result := FItems[Idx]; if Assigned(FOnReadItem) then ! FOnReadItem(Self, Idx); end; ! procedure TJvgStringContainer.SetString(Idx: Integer; const Value: string); begin ! if not ReadOnly then ! FItems[Idx] := Value; end; |