Menu
▾
▴
[JVCL-Checkins] CVS: dev/JVCL3/run JvControlPanelButton.pas,1.4,1.5 JvInterpreter_JvInterpreter.pas,1.1,1.2 JvPatchForm.pas,1.3,1.4 JvSplitter.pas,1.3,1.4 JvStringListToHtml.pas,1.5,1.6 JvTextListBox.pas,1.1,1.2 - style cleaning
Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1:/tmp/cvs-serv28003/JVCL3/run
Modified Files:
JvControlPanelButton.pas JvInterpreter_JvInterpreter.pas
JvPatchForm.pas JvSplitter.pas JvStringListToHtml.pas
JvTextListBox.pas
Log Message:
style cleaning
Index: JvControlPanelButton.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvControlPanelButton.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JvControlPanelButton.pas 20 Jun 2003 14:27:55 -0000 1.4
--- JvControlPanelButton.pas 28 Nov 2003 05:11:22 -0000 1.5
***************
*** 45,49 ****
FDirs: TJvDirectories;
FOnLinkClick: TJvLinkClickEvent;
! FIMages: TImageList;
procedure AddToPopup(Item: TMenuItem; Path: string);
procedure SetImages(const Value: TImageList);
--- 45,49 ----
FDirs: TJvDirectories;
FOnLinkClick: TJvLinkClickEvent;
! FImages: TImageList;
procedure AddToPopup(Item: TMenuItem; Path: string);
procedure SetImages(const Value: TImageList);
***************
*** 52,59 ****
procedure Notification(AComponent: TComponent; Operation: TOperation); override;
public
- procedure CreateParams(var Params: TCreateParams); override;
- procedure Click; override;
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
procedure Refresh;
published
--- 52,59 ----
procedure Notification(AComponent: TComponent; Operation: TOperation); override;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
+ procedure CreateParams(var Params: TCreateParams); override;
+ procedure Click; override;
procedure Refresh;
published
***************
*** 82,85 ****
--- 82,87 ----
inherited Destroy;
end;
+
+ // (rom) a strange place for doing this
procedure TJvControlPanelButton.CreateParams(var Params: TCreateParams);
Index: JvInterpreter_JvInterpreter.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvInterpreter_JvInterpreter.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvInterpreter_JvInterpreter.pas 17 Jun 2003 11:11:37 -0000 1.1
--- JvInterpreter_JvInterpreter.pas 28 Nov 2003 05:11:23 -0000 1.2
***************
*** 46,50 ****
{ EJvInterpreterError }
! { constructor Create(AErrCode: integer; AErrPos: integer; AErrName: string; AErrName2: string) }
procedure EJvInterpreterError_Create(var Value: Variant; Args: TJvInterpreterArgs);
--- 46,50 ----
{ EJvInterpreterError }
! { constructor Create(AErrCode: Integer; AErrPos: Integer; AErrName: string; AErrName2: string) }
procedure EJvInterpreterError_Create(var Value: Variant; Args: TJvInterpreterArgs);
***************
*** 67,71 ****
end;
! { property Read ErrCode: integer }
procedure EJvInterpreterError_Read_ErrCode(var Value: Variant; Args: TJvInterpreterArgs);
--- 67,71 ----
end;
! { property Read ErrCode: Integer }
procedure EJvInterpreterError_Read_ErrCode(var Value: Variant; Args: TJvInterpreterArgs);
***************
*** 74,78 ****
end;
! { property Read ErrPos: integer }
procedure EJvInterpreterError_Read_ErrPos(var Value: Variant; Args: TJvInterpreterArgs);
--- 74,78 ----
end;
! { property Read ErrPos: Integer }
procedure EJvInterpreterError_Read_ErrPos(var Value: Variant; Args: TJvInterpreterArgs);
Index: JvPatchForm.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvPatchForm.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvPatchForm.pas 10 Oct 2003 23:13:33 -0000 1.3
--- JvPatchForm.pas 28 Nov 2003 05:11:23 -0000 1.4
***************
*** 56,64 ****
end;
-
- resourcestring
- sJvPatcherEditorComparingFilesd = 'Jv - Patcher Editor : Comparing files %d%%';
- sJvPatcherEditorEndStep = 'Jv - Patcher Editor : end step ...';
-
implementation
--- 56,59 ----
***************
*** 68,71 ****
--- 63,70 ----
{$R *.DFM}
+ resourcestring
+ sJvPatcherEditorComparingFilesd = 'Jv - Patcher Editor : Comparing files %d%%';
+ sJvPatcherEditorEndStep = 'Jv - Patcher Editor : end step ...';
+
procedure TFoPatch.LoadFromStr(Value: TStringList);
begin
***************
*** 113,117 ****
Reset(g);
Caption := Format(sJvPatcherEditorComparingFilesd, [0]);
! Application.ProcessMessages;
l := Res.Add(IntToStr(FileSize(f)));
Res.Add(IntToStr(FileSize(g)));
--- 112,116 ----
Reset(g);
Caption := Format(sJvPatcherEditorComparingFilesd, [0]);
! Repaint;
l := Res.Add(IntToStr(FileSize(f)));
Res.Add(IntToStr(FileSize(g)));
***************
*** 139,143 ****
Caption := sJvPatcherEditorEndStep;
! Application.ProcessMessages;
if res1 > res2 then
begin
--- 138,142 ----
Caption := sJvPatcherEditorEndStep;
! Repaint;
if res1 > res2 then
begin
***************
*** 156,160 ****
Res.Add('end%' + IntToStr(icount));
end
! else if res2 > res1 then
begin
//g>f patched>original
--- 155,160 ----
Res.Add('end%' + IntToStr(icount));
end
! else
! if res2 > res1 then
begin
//g>f patched>original
Index: JvSplitter.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSplitter.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvSplitter.pas 9 Oct 2003 23:19:06 -0000 1.3
--- JvSplitter.pas 28 Nov 2003 05:11:23 -0000 1.4
***************
*** 45,59 ****
FOnParentColorChanged: TNotifyEvent;
FOver: Boolean;
! {$IFDEF JVCLThemesEnabled}
function GetParentBackground: Boolean;
procedure SetParentBackground(const Value: Boolean);
! {$ENDIF}
protected
procedure CMMouseEnter(var Msg: TMessage); message CM_MOUSEENTER;
procedure CMMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
procedure CMParentColorChanged(var Msg: TMessage); message CM_PARENTCOLORCHANGED;
! {$IFDEF JVCLThemesEnabled}
procedure Paint; override;
! {$ENDIF}
public
constructor Create(AOwner: TComponent); override;
--- 45,59 ----
FOnParentColorChanged: TNotifyEvent;
FOver: Boolean;
! {$IFDEF JVCLThemesEnabled}
function GetParentBackground: Boolean;
procedure SetParentBackground(const Value: Boolean);
! {$ENDIF JVCLThemesEnabled}
protected
procedure CMMouseEnter(var Msg: TMessage); message CM_MOUSEENTER;
procedure CMMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
procedure CMParentColorChanged(var Msg: TMessage); message CM_PARENTCOLORCHANGED;
! {$IFDEF JVCLThemesEnabled}
procedure Paint; override;
! {$ENDIF JVCLThemesEnabled}
public
constructor Create(AOwner: TComponent); override;
***************
*** 65,71 ****
property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave;
property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged;
! {$IFDEF JVCLThemesEnabled}
property ParentBackground: Boolean read GetParentBackground write SetParentBackground default True;
! {$ENDIF}
end;
--- 65,71 ----
property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave;
property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged;
! {$IFDEF JVCLThemesEnabled}
property ParentBackground: Boolean read GetParentBackground write SetParentBackground default True;
! {$ENDIF JVCLThemesEnabled}
end;
***************
*** 123,127 ****
DC: THandle;
begin
! if (ThemeServices.ThemesEnabled) and (ParentBackground) then
begin
// DrawThemedBackground(Self, Canvas, ClientRect, Parent.Brush.Color);
--- 123,127 ----
DC: THandle;
begin
! if ThemeServices.ThemesEnabled and ParentBackground then
begin
// DrawThemedBackground(Self, Canvas, ClientRect, Parent.Brush.Color);
Index: JvStringListToHtml.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvStringListToHtml.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JvStringListToHtml.pas 25 Sep 2003 12:15:00 -0000 1.5
--- JvStringListToHtml.pas 28 Nov 2003 05:11:23 -0000 1.6
***************
*** 38,46 ****
TJvStringListToHtml = class(TJvComponent)
private
! FStrings, FHTML: TStrings;
FHTMLTitle: string;
FHTMLLineBreak: string;
! FIncludeHeader: boolean;
function GetHTML: TStrings;
procedure SetStrings(const Value: TStrings);
procedure DoStringsChange(Sender: TObject);
--- 38,48 ----
TJvStringListToHtml = class(TJvComponent)
private
! FStrings: TStringList;
! FHTML: TStringList;
FHTMLTitle: string;
FHTMLLineBreak: string;
! FIncludeHeader: Boolean;
function GetHTML: TStrings;
+ function GetStrings: TStrings;
procedure SetStrings(const Value: TStrings);
procedure DoStringsChange(Sender: TObject);
***************
*** 49,57 ****
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
! procedure ConvertToHtml(Source: TStrings; const Filename: string);
procedure ConvertToHTMLStrings(Source, Destination: TStrings);
published
! property HTML: TStrings read GetHTML write SetHTML stored false;
! property Strings: TStrings read FStrings write SetStrings;
property HTMLLineBreak: string read FHTMLLineBreak write FHTMLLineBreak;
property HTMLTitle: string read FHTMLTitle write FHTMLTitle;
--- 51,59 ----
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
! procedure ConvertToHtml(Source: TStrings; const FileName: string);
procedure ConvertToHTMLStrings(Source, Destination: TStrings);
published
! property HTML: TStrings read GetHTML write SetHTML stored False;
! property Strings: TStrings read GetStrings write SetStrings;
property HTMLLineBreak: string read FHTMLLineBreak write FHTMLLineBreak;
property HTMLTitle: string read FHTMLTitle write FHTMLTitle;
***************
*** 65,69 ****
I: integer;
begin
! if (Source = nil) or (Destination = nil) then Exit;
Destination.BeginUpdate;
Source.BeginUpdate;
--- 67,72 ----
I: integer;
begin
! if (Source = nil) or (Destination = nil) then
! Exit;
Destination.BeginUpdate;
Source.BeginUpdate;
***************
*** 88,100 ****
end;
! procedure TJvStringListToHtml.ConvertToHtml(Source: TStrings; const Filename: string);
var
Dest: TStringlist;
begin
! if Source = nil then Exit;
! Dest := TStringlist.Create;
try
! ConvertStringsToHTML(Source, Dest, HTMLTitle, HTMLLineBreak, true);
! Dest.SaveToFile(Filename);
finally
Dest.Free;
--- 91,104 ----
end;
! procedure TJvStringListToHtml.ConvertToHtml(Source: TStrings; const FileName: string);
var
Dest: TStringlist;
begin
! if Source = nil then
! Exit;
! Dest := TStringList.Create;
try
! ConvertStringsToHTML(Source, Dest, HTMLTitle, HTMLLineBreak, True);
! Dest.SaveToFile(FileName);
finally
Dest.Free;
***************
*** 109,116 ****
constructor TJvStringListToHtml.Create(AOwner: TComponent);
begin
! inherited;
! FStrings := TStringlist.Create;
! FHTML := TStringlist.Create;
! TStringlist(FStrings).OnChange := DoStringsChange;
FHTMLLineBreak := '<BR>';
FHTMLTitle := 'Converted by TJvStringListToHtml';
--- 113,120 ----
constructor TJvStringListToHtml.Create(AOwner: TComponent);
begin
! inherited Create(AOwner);
! FStrings := TStringList.Create;
! FHTML := TStringList.Create;
! FStrings.OnChange := DoStringsChange;
FHTMLLineBreak := '<BR>';
FHTMLTitle := 'Converted by TJvStringListToHtml';
***************
*** 122,126 ****
FreeAndNil(FStrings);
FreeAndNil(FHTML);
! inherited;
end;
--- 126,130 ----
FreeAndNil(FStrings);
FreeAndNil(FHTML);
! inherited Destroy;
end;
***************
*** 133,140 ****
begin
if ComponentState * [csLoading, csDestroying] <> [] then
- begin
if FHTML.Count = 0 then
ConvertToHtmlStrings(Strings, FHTML);
- end;
Result := FHTML;
end;
--- 137,142 ----
***************
*** 143,146 ****
--- 145,153 ----
begin
// do nothing
+ end;
+
+ function TJvStringListToHtml.GetStrings: TStrings;
+ begin
+ Result := FStrings;
end;
Index: JvTextListBox.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTextListBox.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvTextListBox.pas 20 Oct 2003 18:56:11 -0000 1.1
--- JvTextListBox.pas 28 Nov 2003 05:11:23 -0000 1.2
***************
*** 1,3 ****
- {$I JVCL.INC}
{-----------------------------------------------------------------------------
The contents of this file are subject to the Mozilla Public License
--- 1,2 ----
***************
*** 33,42 ****
-----------------------------------------------------------------------------}
unit JvTextListBox;
interface
uses
! Windows,
! Messages, Graphics, StdCtrls;
type
--- 32,44 ----
-----------------------------------------------------------------------------}
+ {$I JVCL.INC}
+
unit JvTextListBox;
interface
+
uses
! Windows, Messages, Graphics, StdCtrls,
! JVCLVer;
type
***************
*** 45,48 ****
--- 47,51 ----
TJvTextListBox = class(TCustomListBox)
private
+ FAboutJVCL: TJVCLAboutInfo;
FMaxWidth: Integer;
procedure ResetHorizontalExtent;
***************
*** 52,55 ****
--- 55,59 ----
procedure WndProc(var Msg: TMessage); override;
published
+ property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False;
property Align;
property BorderStyle;
***************
*** 105,113 ****
implementation
uses
Math;
-
-
- //=== TJvTextListBox =========================================================
procedure TJvTextListBox.SetHorizontalExtent;
--- 109,115 ----
implementation
+
uses
Math;
procedure TJvTextListBox.SetHorizontalExtent;
***************
*** 175,179 ****
Canvas.Font.Assign(Self.Font);
ResetHorizontalExtent;
- Exit;
end;
else
--- 177,180 ----
|