Menu
▾
▴
[JVCL-Checkins] CVS: dev/JVCL3/run JvAppIniStorage.pas,1.3,1.4 JvAppStorage.pas,1.3,1.4 JvAppStorageSelectList.pas,1.2,1.3 JvBmpAnimator.pas,1.10,1.11 JvDiagramShape.pas,1.5,1.6 JvDynControlEngine.pas,1.7,1.8 JvDynControlEngineIntf.pas,1.5,1.6 JvDynControlEngineVCL.pas,1.8,1.9 JvFormTransparent.pas,1.3,1.4 JvItemsPanel.pas,1.13,1.14 JvMaxPixel.pas,1.3,1.4 JvParameterList.pas,1.9,1.10 JvParameterListParameter.pas,1.10,1.11 JvProgressUtils.pas,1.8,1.9 JvPropertyStorage.pas,1.2,1.3 JvPropertyStore.pas,1.12,1.13 JvTFAlarm.pas,1.6,1.7 JvTFDays.pas,1.17,1.18 JvTFGlance.pas,1.12,1.13 JvTFManager.pas,1.15,1.16 JvTFMonths.pas,1.6,1.7 JvTFSparseMatrix.pas,1.7,1.8 JvTFUtils.pas,1.8,1.9 JvTFWeeks.pas,1.10,1.11 JvTimeLine.pas,1.14,1.15 JvVersionInfo.pas,1.10,1.11 - Style cleaning
Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1:/tmp/cvs-serv12104/run
Modified Files:
JvAppIniStorage.pas JvAppStorage.pas
JvAppStorageSelectList.pas JvBmpAnimator.pas
JvDiagramShape.pas JvDynControlEngine.pas
JvDynControlEngineIntf.pas JvDynControlEngineVCL.pas
JvFormTransparent.pas JvItemsPanel.pas JvMaxPixel.pas
JvParameterList.pas JvParameterListParameter.pas
JvProgressUtils.pas JvPropertyStorage.pas JvPropertyStore.pas
JvTFAlarm.pas JvTFDays.pas JvTFGlance.pas JvTFManager.pas
JvTFMonths.pas JvTFSparseMatrix.pas JvTFUtils.pas
JvTFWeeks.pas JvTimeLine.pas JvVersionInfo.pas
Log Message:
AutoSize adjusted
Style cleaning
Index: JvAppIniStorage.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAppIniStorage.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvAppIniStorage.pas 5 Jan 2004 22:37:41 -0000 1.3
--- JvAppIniStorage.pas 11 Jan 2004 10:56:58 -0000 1.4
***************
*** 38,42 ****
{$ENDIF MSWINDOWS}
{$IFDEF LINUX}
! Libc,
{$ENDIF LINUX}
SysUtils, Classes, IniFiles,
--- 38,42 ----
{$ENDIF MSWINDOWS}
{$IFDEF LINUX}
! Libc, QWindows,
{$ENDIF LINUX}
SysUtils, Classes, IniFiles,
***************
*** 153,168 ****
cSectionHeaderEnd = ']';
cKeyValueSeparator = '=';
-
- {$IFDEF LINUX}
- function GetTickCount: Cardinal;
- var
- Info: TSysInfo;
- TimeVal: TTimeVal;
- begin
- sysinfo(Info);
- gettimeofday(TimeVal, nil);
- Result := Cardinal((Int64(Info.uptime) * 1000) + Round(TimeVal.tv_usec / 1000));
- end;
- {$ENDIF LINUX}
function AnsiSameTextShortest(S1, S2: string): Boolean;
--- 153,156 ----
Index: JvAppStorage.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAppStorage.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvAppStorage.pas 5 Jan 2004 22:37:41 -0000 1.3
--- JvAppStorage.pas 11 Jan 2004 10:56:58 -0000 1.4
***************
*** 85,89 ****
uses
! Classes, TypInfo,
JvComponent, JvTypes;
--- 85,89 ----
uses
! SysUtils, Classes, TypInfo,
JvComponent, JvTypes;
***************
*** 565,569 ****
uses
- SysUtils,
JclStrings, JclRTTI,
JvPropertyStore, JvConsts, JvResources;
--- 565,568 ----
Index: JvAppStorageSelectList.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAppStorageSelectList.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JvAppStorageSelectList.pas 5 Jan 2004 22:37:41 -0000 1.2
--- JvAppStorageSelectList.pas 11 Jan 2004 10:56:58 -0000 1.3
***************
*** 27,31 ****
uses
! Classes, Controls, Forms,
JvComponent, JvTypes, JvAppStorage, JvDynControlEngine,
JvDynControlEngineIntf;
--- 27,37 ----
uses
! SysUtils, Classes,
! {$IFDEF VCL}
! Controls, Forms,
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
! QControls, QForms,
! {$ENDIF VisualCLX}
JvComponent, JvTypes, JvAppStorage, JvDynControlEngine,
JvDynControlEngineIntf;
***************
*** 91,95 ****
uses
- SysUtils,
JvConsts, JvResources;
--- 97,100 ----
***************
*** 212,218 ****
begin
BorderIcons := [];
DefaultMonitor := dmActiveForm;
- FormStyle := fsNormal;
BorderStyle := bsDialog;
Position := poScreenCenter;
OnDestroy := SelectFormDestroying;
--- 217,227 ----
begin
BorderIcons := [];
+ {$IFDEF VCL}
DefaultMonitor := dmActiveForm;
BorderStyle := bsDialog;
+ {$ELSE}
+ BorderStyle := fbsDialog;
+ {$ENDIF VCL}
+ FormStyle := fsNormal;
Position := poScreenCenter;
OnDestroy := SelectFormDestroying;
Index: JvBmpAnimator.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBmpAnimator.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JvBmpAnimator.pas 8 Jan 2004 16:27:42 -0000 1.10
--- JvBmpAnimator.pas 11 Jan 2004 10:56:58 -0000 1.11
***************
*** 82,89 ****
protected
procedure Paint; override;
- {$IFDEF COMPILER6_UP}
procedure SetAutoSize(Value: Boolean); {$IFDEF VCL} override; {$ENDIF}
property AutoSize: Boolean read FAutoSize write SetAutoSize default False;
- {$ENDIF COMPILER6_UP}
procedure Notification(AComponent: TComponent; AOperation: TOperation); override;
property Centered: Boolean read FCenter write SetCenter;
--- 82,87 ----
***************
*** 252,256 ****
end;
- {$IFDEF COMPILER6_UP}
procedure TJvCustomBmpAnimator.SetAutoSize(Value: Boolean);
begin
--- 250,253 ----
***************
*** 265,269 ****
end;
end;
- {$ENDIF COMPILER6_UP}
procedure TJvCustomBmpAnimator.SetTransparent(Value: Boolean);
--- 262,265 ----
Index: JvDiagramShape.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDiagramShape.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JvDiagramShape.pas 6 Jan 2004 23:13:24 -0000 1.5
--- JvDiagramShape.pas 11 Jan 2004 10:56:58 -0000 1.6
***************
*** 38,47 ****
Types, QGraphics, QControls, QExtCtrls, QImgList,
{$ENDIF VisualCLX}
! SysUtils, Classes;
type
TJvTextShape = class;
! TJvCustomDiagramShape = class(TGraphicControl)
// All controls descend from this, to help with streaming and unique naming
private
--- 38,48 ----
Types, QGraphics, QControls, QExtCtrls, QImgList,
{$ENDIF VisualCLX}
! SysUtils, Classes,
! JvComponent;
type
TJvTextShape = class;
! TJvCustomDiagramShape = class(TJvGraphicControl)
// All controls descend from this, to help with streaming and unique naming
private
***************
*** 149,155 ****
procedure SetText(Value: string);
procedure SetFont(Value: TFont);
! procedure FontChanged(Sender: TObject);
protected
! procedure SetAutoSize(Value: Boolean); {$IFDEF COMPILER6_UP} override; {$ENDIF}
procedure RefreshText;
procedure SetParent(AParent: TWinControl); override;
--- 150,156 ----
procedure SetText(Value: string);
procedure SetFont(Value: TFont);
! procedure FontChange(Sender: TObject);
protected
! procedure SetAutoSize(Value: Boolean); override;
procedure RefreshText;
procedure SetParent(AParent: TWinControl); override;
***************
*** 161,165 ****
published
property Text: string read FText write SetText;
! property AutoSize: Boolean read FAutoSize write SetAutoSize;
property Font: TFont read FFont write SetFont;
end;
--- 162,166 ----
published
property Text: string read FText write SetText;
! property AutoSize: Boolean read FAutoSize write SetAutoSize default True;
property Font: TFont read FFont write SetFont;
end;
***************
*** 1090,1094 ****
FText := '';
FFont := TFont.Create;
! FFont.OnChange := FontChanged;
end;
--- 1091,1095 ----
FText := '';
FFont := TFont.Create;
! FFont.OnChange := FontChange;
end;
***************
*** 1108,1112 ****
TempStr := '';
Count := 1;
! if FAutoSize and Assigned(Parent) then
begin
Canvas.Font := Font;
--- 1109,1113 ----
TempStr := '';
Count := 1;
! if AutoSize and Assigned(Parent) then
begin
Canvas.Font := Font;
***************
*** 1156,1160 ****
end;
! procedure TJvTextShape.FontChanged(Sender: TObject);
begin
RefreshText;
--- 1157,1161 ----
end;
! procedure TJvTextShape.FontChange(Sender: TObject);
begin
RefreshText;
Index: JvDynControlEngine.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDynControlEngine.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JvDynControlEngine.pas 10 Jan 2004 19:23:52 -0000 1.7
--- JvDynControlEngine.pas 11 Jan 2004 10:56:58 -0000 1.8
***************
*** 35,39 ****
{$ENDIF VCL}
{$IFDEF VisualCLX}
! Controls, Forms, StdCtrls, Graphics, Buttons,
{$ENDIF VisualCLX}
JvDynControlEngineIntf;
--- 35,39 ----
{$ENDIF VCL}
{$IFDEF VisualCLX}
! QControls, QForms, QStdCtrls, QGraphics, QButtons,
{$ENDIF VisualCLX}
JvDynControlEngineIntf;
***************
*** 46,49 ****
--- 46,51 ----
jctCalculateEdit, jctSpinEdit, jctDirectoryEdit, jctFileNameEdit,
jctButton, jctButtonEdit, jctForm);
+
+ TControlClass = class of TControl;
TJvAfterCreateControl = procedure(AControl: TControl) of object;
Index: JvDynControlEngineIntf.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDynControlEngineIntf.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JvDynControlEngineIntf.pas 10 Jan 2004 19:23:52 -0000 1.5
--- JvDynControlEngineIntf.pas 11 Jan 2004 10:56:58 -0000 1.6
***************
*** 37,41 ****
{$ENDIF VCL}
{$IFDEF VisualCLX}
! QControls, QForms, QStdCtrls, QExtCtrls, QGraphics, QButtons, QFileCtrl,
QDialogs,
{$ENDIF VisualCLX}
--- 37,44 ----
{$ENDIF VCL}
{$IFDEF VisualCLX}
! QControls, QForms, QStdCtrls, QExtCtrls, QGraphics, QButtons,
! {$IFDEF COMPILER7_UP}
! QFileCtrls,
! {$ENDIF COMPILER7_UP}
QDialogs,
{$ENDIF VisualCLX}
***************
*** 103,107 ****
--- 106,112 ----
procedure ControlSetInitialDir(Value: string);
procedure ControlSetDialogTitle(Value: string);
+ {$IFDEF VCL}
procedure ControlSetDialogOptions(Value: TSelectDirOpts);
+ {$ENDIF VCL}
end;
***************
*** 148,152 ****
--- 153,159 ----
procedure ControlSetIncrementalDisplay(Value: Boolean);
procedure ControlSetCenter(Value: Boolean);
+ {$IFDEF VCL}
procedure ControlSetProportional(Value: Boolean);
+ {$ENDIF VCL}
procedure ControlSetStretch(Value: Boolean);
procedure ControlSetTransparent(Value: Boolean);
Index: JvDynControlEngineVCL.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDynControlEngineVCL.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JvDynControlEngineVCL.pas 10 Jan 2004 19:23:52 -0000 1.8
--- JvDynControlEngineVCL.pas 11 Jan 2004 10:56:58 -0000 1.9
***************
*** 46,52 ****
public
procedure ControlSetDefaultProperties;
! procedure ControlSetReadOnly(Value: boolean);
procedure ControlSetCaption(Value: string);
! procedure ControlSetTabOrder(Value: integer);
procedure ControlSetOnEnter(Value: TNotifyEvent);
--- 46,52 ----
public
procedure ControlSetDefaultProperties;
[...1154 lines suppressed...]
--- 1799,1805 ----
IntDynControlEngineVCL := TJvDynControlEngine.Create;
IntDynControlEngineVCL.RegisterControl(jctLabel, TJvDynControlVCLLabel);
+ {$IFDEF VCL}
IntDynControlEngineVCL.RegisterControl(jctStaticText, TJvDynControlVCLStaticText);
+ {$ENDIF VCL}
IntDynControlEngineVCL.RegisterControl(jctButton, TJvDynControlVCLButton);
IntDynControlEngineVCL.RegisterControl(jctScrollBox, TJvDynControlVCLScrollBox);
***************
*** 1764,1770 ****
--- 1810,1818 ----
IntDynControlEngineVCL.RegisterControl(jctListBox, TJvDynControlVCLListBox);
IntDynControlEngineVCL.RegisterControl(jctRadioGroup, TJvDynControlVCLRadioGroup);
+ {$IFDEF VCL}
IntDynControlEngineVCL.RegisterControl(jctDateTimeEdit, TJvDynControlVCLDateTimeEdit);
IntDynControlEngineVCL.RegisterControl(jctTimeEdit, TJvDynControlVCLTimeEdit);
IntDynControlEngineVCL.RegisterControl(jctDateEdit, TJvDynControlVCLDateEdit);
+ {$ENDIF VCL}
IntDynControlEngineVCL.RegisterControl(jctEdit, TJvDynControlVCLMaskEdit);
// IntDynControlEngineVCL.RegisterControl(jctCalculateEdit, TJvDynControlVCLMaskEdit);
Index: JvFormTransparent.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvFormTransparent.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvFormTransparent.pas 5 Jan 2004 22:37:42 -0000 1.3
--- JvFormTransparent.pas 11 Jan 2004 10:56:58 -0000 1.4
***************
*** 42,49 ****
FAutoSize: Boolean;
FActive: Boolean;
- procedure SetAutoSize(Value: Boolean);
procedure SetActive(Value: Boolean);
procedure SetMask(Value: TBitmap);
protected
procedure UpdateRegion;
procedure Loaded; override;
--- 42,49 ----
FAutoSize: Boolean;
FActive: Boolean;
procedure SetActive(Value: Boolean);
procedure SetMask(Value: TBitmap);
protected
+ procedure SetAutoSize(Value: Boolean); virtual;
procedure UpdateRegion;
procedure Loaded; override;
***************
*** 53,59 ****
published
// (rom) renamed to Active as (RB) asked for here
! property Active: Boolean read FActive write SetActive;
property Mask: TBitmap read FMask write SetMask;
! property AutoSize: Boolean read FAutoSize write SetAutoSize;
end;
--- 53,59 ----
published
// (rom) renamed to Active as (RB) asked for here
! property Active: Boolean read FActive write SetActive default False;
property Mask: TBitmap read FMask write SetMask;
! property AutoSize: Boolean read FAutoSize write SetAutoSize default False;
end;
Index: JvItemsPanel.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvItemsPanel.pas,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** JvItemsPanel.pas 8 Jan 2004 16:27:43 -0000 1.13
--- JvItemsPanel.pas 11 Jan 2004 10:56:58 -0000 1.14
***************
*** 51,57 ****
FItems: TStrings;
FItemHeight: Integer;
- {$IFDEF COMPILER6_UP}
FAutoSize: Boolean;
- {$ENDIF COMPILER6_UP}
FAutoGrow: Boolean;
FDown: Boolean;
--- 51,55 ----
***************
*** 74,80 ****
procedure SetOrientation(const Value: TJvPanelOrientation);
protected
- {$IFDEF COMPILER6_UP}
procedure SetAutoSize(Value: Boolean); {$IFDEF VCL} override; {$ENDIF}
- {$ENDIF COMPILER6_UP}
{$IFDEF VisualCLX}
procedure AdjustSize; override;
--- 72,76 ----
***************
*** 102,108 ****
published
property AutoGrow: Boolean read FAutoGrow write SetAutoGrow;
- {$IFDEF COMPILER6_UP}
property AutoSize: Boolean read FAutoSize write SetAutoSize;
- {$ENDIF COMPILER6_UP}
property Items: TStrings read FItems write SetItems;
property ItemHeight: Integer read FItemHeight write SetItemHeight default 16;
--- 98,102 ----
***************
*** 281,285 ****
end;
- {$IFDEF COMPILER6_UP}
procedure TJvItemsPanel.SetAutoSize(Value: Boolean);
begin
--- 275,278 ----
***************
*** 297,301 ****
end;
end;
- {$ENDIF COMPILER6_UP}
procedure TJvItemsPanel.SetItemHeight(const Value: Integer);
--- 290,293 ----
Index: JvMaxPixel.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvMaxPixel.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvMaxPixel.pas 5 Jan 2004 22:37:43 -0000 1.3
--- JvMaxPixel.pas 11 Jan 2004 10:56:58 -0000 1.4
***************
*** 32,36 ****
uses
! SysUtils, Classes, Graphics, Controls, Forms;
type
--- 32,43 ----
uses
! SysUtils,
! {$IFDEF VCL}
! Graphics, Controls,
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
! QGraphics, QControls,
! {$ENDIF VisualCLX}
! Classes;
type
***************
*** 90,101 ****
procedure TJvMaxPixel.SetFont(const Value: TFont);
begin
! FFont.Assign(Value);
! Changed;
end;
procedure TJvMaxPixel.SetLength(const Value: Integer);
begin
! FLength := Value;
! Changed;
end;
--- 97,114 ----
procedure TJvMaxPixel.SetFont(const Value: TFont);
begin
! if Value <> FFont then
! begin
! FFont.Assign(Value);
! Changed;
! end;
end;
procedure TJvMaxPixel.SetLength(const Value: Integer);
begin
! if Value <> FLength then
! begin
! FLength := Value;
! Changed;
! end;
end;
***************
*** 112,116 ****
begin
Result := True;
! if FLength = 0 then
Exit;
--- 125,129 ----
begin
Result := True;
! if Length = 0 then
Exit;
***************
*** 124,129 ****
Font.Assign(FFont);
! Result := TextWidth(Value) > FLength;
! while (TextWidth(Value) > FLength) and (Value <> '') do
Value := Copy(Value, 1, System.Length(Value) - 1);
finally
--- 137,142 ----
Font.Assign(FFont);
! Result := TextWidth(Value) > Length;
! while (TextWidth(Value) > Length) and (Value <> '') do
Value := Copy(Value, 1, System.Length(Value) - 1);
finally
Index: JvParameterList.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvParameterList.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** JvParameterList.pas 7 Jan 2004 01:03:52 -0000 1.9
--- JvParameterList.pas 11 Jan 2004 10:56:58 -0000 1.10
***************
*** 111,115 ****
end;
! TJvBaseParameter = class(TComponent)
private
FCaption: string;
--- 111,115 ----
end;
! TJvBaseParameter = class(TJvComponent)
private
FCaption: string;
Index: JvParameterListParameter.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvParameterListParameter.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JvParameterListParameter.pas 5 Jan 2004 22:37:43 -0000 1.10
--- JvParameterListParameter.pas 11 Jan 2004 10:56:58 -0000 1.11
***************
*** 175,179 ****
protected
procedure SetPicture(Value: TPicture);
! procedure SetAutosize(Value: Boolean);
function GetParameterNameExt: string; override;
procedure CreateWinControl(AParameterParent: TWinControl); override;
--- 175,179 ----
protected
procedure SetPicture(Value: TPicture);
! procedure SetAutoSize(Value: Boolean); virtual;
function GetParameterNameExt: string; override;
procedure CreateWinControl(AParameterParent: TWinControl); override;
***************
*** 792,798 ****
end;
! procedure TJvImageParameter.SetAutosize(Value: Boolean);
begin
! FAutosize := Value;
end;
--- 792,801 ----
end;
! procedure TJvImageParameter.SetAutoSize(Value: Boolean);
begin
! if Value <> FAutoSize then
! begin
! FAutoSize := Value;
! end;
end;
Index: JvProgressUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvProgressUtils.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JvProgressUtils.pas 5 Jan 2004 22:37:43 -0000 1.8
--- JvProgressUtils.pas 11 Jan 2004 10:56:58 -0000 1.9
***************
*** 33,40 ****
{$IFDEF VCL}
Controls, ComCtrls,
! {$ENDIF}
{$IFDEF VisualCLX}
QControls, QComCtrls,
! {$ENDIF}
SysUtils, Classes;
--- 33,40 ----
{$IFDEF VCL}
Controls, ComCtrls,
! {$ENDIF VCL}
{$IFDEF VisualCLX}
QControls, QComCtrls,
! {$ENDIF VisualCLX}
SysUtils, Classes;
***************
*** 42,46 ****
type
TControlClass = class of TControl;
! {$ENDIF}
procedure RegisterProgressControl(AClass: TControlClass;
--- 42,46 ----
type
TControlClass = class of TControl;
! {$ENDIF VisualCLX}
procedure RegisterProgressControl(AClass: TControlClass;
Index: JvPropertyStorage.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvPropertyStorage.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JvPropertyStorage.pas 5 Jan 2004 22:37:43 -0000 1.2
--- JvPropertyStorage.pas 11 Jan 2004 10:56:58 -0000 1.3
***************
*** 31,35 ****
uses
! SysUtils, Classes, Forms, TypInfo;
type
--- 31,42 ----
uses
! SysUtils, Classes,
! {$IFDEF VCL}
! Forms,
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
! QForms,
! {$ENDIF VisualCLX}
! TypInfo;
type
Index: JvPropertyStore.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvPropertyStore.pas,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** JvPropertyStore.pas 7 Jan 2004 01:03:52 -0000 1.12
--- JvPropertyStore.pas 11 Jan 2004 10:56:58 -0000 1.13
***************
*** 139,143 ****
{$IFDEF COMPILER6_UP}
RTLConsts,
! {$ENDIF}
Consts, SysUtils, Typinfo;
--- 139,143 ----
{$IFDEF COMPILER6_UP}
RTLConsts,
! {$ENDIF COMPILER6_UP}
Consts, SysUtils, Typinfo;
Index: JvTFAlarm.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFAlarm.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JvTFAlarm.pas 5 Jan 2004 22:37:44 -0000 1.6
--- JvTFAlarm.pas 11 Jan 2004 10:56:58 -0000 1.7
***************
*** 70,74 ****
procedure Clear; override;
function GetAlarmForAppt(AAppt: TJvTFAppt): TJvTFAlarmInfo;
! function GetAlarmForApptID(ID: string): TJvTFAlarmInfo;
function IndexOfAppt(AAppt: TJvTFAppt): Integer;
procedure AddAppt(AAppt: TJvTFAppt);
--- 70,74 ----
procedure Clear; override;
function GetAlarmForAppt(AAppt: TJvTFAppt): TJvTFAlarmInfo;
! function GetAlarmForApptID(const ID: string): TJvTFAlarmInfo;
function IndexOfAppt(AAppt: TJvTFAppt): Integer;
procedure AddAppt(AAppt: TJvTFAppt);
***************
*** 334,338 ****
end;
! function TJvTFAlarmList.GetAlarmForApptID(ID: string): TJvTFAlarmInfo;
var
I: Integer;
--- 334,338 ----
end;
! function TJvTFAlarmList.GetAlarmForApptID(const ID: string): TJvTFAlarmInfo;
var
I: Integer;
Index: JvTFDays.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFDays.pas,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** JvTFDays.pas 5 Jan 2004 22:37:44 -0000 1.17
--- JvTFDays.pas 11 Jan 2004 10:56:58 -0000 1.18
***************
*** 52,56 ****
StdCtrls, ImgList,
JvTFManager, JvTFSparseMatrix,
! {$IFDEF USEJVCL}JvTypes, {$ENDIF}
JvTFUtils;
--- 52,58 ----
StdCtrls, ImgList,
JvTFManager, JvTFSparseMatrix,
! {$IFDEF USEJVCL}
! JvTypes,
[...29437 lines suppressed...]
! procedure TJvTFDaysApptDrawInfo.SetFont(Value: TFont);
begin
! FFont.Assign(Value);
end;
! procedure TJvTFDaysApptDrawInfo.SetFrameColor(Value: TColor);
begin
! FFrameColor := Value;
end;
! procedure TJvTFDaysApptDrawInfo.SetFrameWidth(const Value: Integer);
begin
! FFrameWidth := Value;
end;
! procedure TJvTFDaysApptDrawInfo.SetVisible(Value: Boolean);
begin
! FVisible := Value;
end;
Index: JvTFGlance.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFGlance.pas,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** JvTFGlance.pas 5 Jan 2004 22:37:44 -0000 1.12
--- JvTFGlance.pas 11 Jan 2004 10:56:58 -0000 1.13
***************
*** 50,67 ****
TJvTFCellPics = class;
! TJvTFUpdateTitleEvent = procedure(Sender: TObject; var NewTitle: String)
of object;
TJvTFCellPic = class(TCollectionItem)
private
! FPicName : String;
! FPicIndex : Integer;
! FPicPoint : TPoint;
[...6287 lines suppressed...]
! raise EJvTFGlanceError.Create(RsECellCannotBeSplit);
! if IsSubCell then
! raise EJvTFGlanceError.Create(RsEASubcellCannotBeSplit);
! if not IsSplit then
! begin
! FSplitRef := TJvTFGlanceCell.Create(nil);
! //FSplitRef := TJvTFGlanceCell.Create(CellCollection);
! FSplitRef.FCellCollection := CellCollection;
! FSplitRef.SetColIndex(ColIndex);
! FSplitRef.SetRowIndex(RowIndex);
! FSplitRef.FSplitOrientation := SplitOrientation;
! FSplitRef.FSplitRef := Self;
! FSplitRef.FIsSubcell := True;
! if not CellCollection.Configuring then
! CellCollection.ReconfigCells;
! end;
end;
Index: JvTFManager.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFManager.pas,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** JvTFManager.pas 5 Jan 2004 22:37:44 -0000 1.15
--- JvTFManager.pas 11 Jan 2004 10:56:58 -0000 1.16
***************
*** 96,110 ****
protected
FList: TStringlist;
! function GetDate(Index: integer): TDate;
procedure Change; virtual;
public
constructor Create;
destructor Destroy; override;
! function Add(ADate: TDate): integer;
! procedure Delete(Index: integer);
procedure Clear;
[...4680 lines suppressed...]
! function TJvTFDateList.GetDate(Index: integer): TDate;
begin
Result := StrToInt(FList[Index]);
end;
! function TJvTFDateList.IndexOf(ADate: TDate): integer;
begin
Result := FList.IndexOf(IntToStr(trunc(ADate)));
--- 5241,5250 ----
end;
! function TJvTFDateList.GetDate(Index: Integer): TDate;
begin
Result := StrToInt(FList[Index]);
end;
! function TJvTFDateList.IndexOf(ADate: TDate): Integer;
begin
Result := FList.IndexOf(IntToStr(trunc(ADate)));
Index: JvTFMonths.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFMonths.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JvTFMonths.pas 5 Jan 2004 22:37:44 -0000 1.6
--- JvTFMonths.pas 11 Jan 2004 10:56:58 -0000 1.7
***************
*** 42,65 ****
TJvTFMonths = class(TJvTFCustomGlance)
private
! FDisplayDate : TDate;
! FDWNames : TJvTFDWNames;
! FDWTitleAttr : TJvTFGlanceTitle;
! FOnDrawDWTitle : TJvTFDrawDWTitleEvent;
! FOnUpdateTitle : TJvTFUpdateTitleEvent;
! FOffDays : TTFDaysOfWeek;
! FExtraDayCellAttr : TJvTFGlanceCellAttr;
! FOffDayCellAttr : TJvTFGlanceCellAttr;
! FScrollSize : TJvTFMonthsScrollSize;
! FSplitSatSun : Boolean;
! function GetMonth : Word;
procedure SetMonth(Value: Word);
! function GetYear : Word;
procedure SetYear(Value: Word);
procedure SetDisplayDate(Value: TDate);
! procedure SetDWNames(Value : TJvTFDWNames);
procedure SetDWTitleAttr(Value: TJvTFGlanceTitle);
! procedure SetOffDays(Value : TTFDaysOfWeek);
! procedure SetExtraDayCellAttr(Value : TJvTFGlanceCellAttr);
! procedure SetOffDayCellAttr(Value : TJvTFGlanceCellAttr);
procedure SetSplitSatSun(Value: Boolean);
protected
--- 42,65 ----
TJvTFMonths = class(TJvTFCustomGlance)
private
! FDisplayDate: TDate;
! FDWNames: TJvTFDWNames;
! FDWTitleAttr: TJvTFGlanceTitle;
! FOnDrawDWTitle: TJvTFDrawDWTitleEvent;
! FOnUpdateTitle: TJvTFUpdateTitleEvent;
! FOffDays: TTFDaysOfWeek;
! FExtraDayCellAttr: TJvTFGlanceCellAttr;
! FOffDayCellAttr: TJvTFGlanceCellAttr;
! FScrollSize: TJvTFMonthsScrollSize;
! FSplitSatSun: Boolean;
! function GetMonth: Word;
procedure SetMonth(Value: Word);
! function GetYear: Word;
procedure SetYear(Value: Word);
procedure SetDisplayDate(Value: TDate);
! procedure SetDWNames(Value: TJvTFDWNames);
procedure SetDWTitleAttr(Value: TJvTFGlanceTitle);
! procedure SetOffDays(Value: TTFDaysOfWeek);
! procedure SetExtraDayCellAttr(Value: TJvTFGlanceCellAttr);
! procedure SetOffDayCellAttr(Value: TJvTFGlanceCellAttr);
procedure SetSplitSatSun(Value: Boolean);
protected
***************
*** 72,76 ****
// draws the DWTitles
! procedure DrawTitle(aCanvas : TCanvas); override;
procedure UpdateTitle;
--- 72,76 ----
// draws the DWTitles
! procedure DrawTitle(aCanvas: TCanvas); override;
procedure UpdateTitle;
***************
*** 81,116 ****
procedure PrevWeek;
! function GetCellTitleText(Cell : TJvTFGlanceCell) : String; override;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
! function GetDataTop : Integer; override;
! function GetCellAttr(aCell: TJvTFGlanceCell) : TJvTFGlanceCellAttr; override;
! function CellIsExtraDay(aCell: TJvTFGlanceCell) : Boolean;
! function CellIsOffDay(aCell: TJvTFGlanceCell) : Boolean;
! function DOWShowing(DOW: TTFDayOfWeek) : Boolean;
procedure ScrollPrev;
procedure ScrollNext;
published
! property ScrollSize : TJvTFMonthsScrollSize read FScrollSize
write FScrollSize default mssMonth;
! property Month : Word read GetMonth write SetMonth;
! property Year : Word read GetYear write SetYear;
! property DisplayDate : TDate read FDisplayDate write SetDisplayDate;
! property DWNames : TJvTFDWNames read FDWNames write SetDWNames;
! property DWTitleAttr : TJvTFGlanceTitle read FDWTitleAttr write SetDWTitleAttr;
! property OffDays : TTFDaysOfWeek read FOffDays write SetOffDays
default [dowSunday, dowSaturday];
! property ExtraDayCellAttr : TJvTFGlanceCellAttr read FExtraDayCellAttr
write SetExtraDayCellAttr;
! property OffDayCellAttr : TJvTFGlanceCellAttr read FOffDayCellAttr
write SetOffDayCellAttr;
! property SplitSatSun : Boolean read FSplitSatSun write SetSplitSatSun
default False;
! property OnDrawDWTitle : TJvTFDrawDWTitleEvent read FOnDrawDWTitle
write FOnDrawDWTitle;
! property OnUpdateTitle : TJvTFUpdateTitleEvent read FOnUpdateTitle
write FOnUpdateTitle;
--- 81,116 ----
procedure PrevWeek;
! function GetCellTitleText(Cell: TJvTFGlanceCell): string; override;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
! function GetDataTop: Integer; override;
! function GetCellAttr(aCell: TJvTFGlanceCell): TJvTFGlanceCellAttr; override;
! function CellIsExtraDay(aCell: TJvTFGlanceCell): Boolean;
! function CellIsOffDay(aCell: TJvTFGlanceCell): Boolean;
! function DOWShowing(DOW: TTFDayOfWeek): Boolean;
procedure ScrollPrev;
procedure ScrollNext;
published
! property ScrollSize: TJvTFMonthsScrollSize read FScrollSize
write FScrollSize default mssMonth;
! property Month: Word read GetMonth write SetMonth;
! property Year: Word read GetYear write SetYear;
! property DisplayDate: TDate read FDisplayDate write SetDisplayDate;
! property DWNames: TJvTFDWNames read FDWNames write SetDWNames;
! property DWTitleAttr: TJvTFGlanceTitle read FDWTitleAttr write SetDWTitleAttr;
! property OffDays: TTFDaysOfWeek read FOffDays write SetOffDays
default [dowSunday, dowSaturday];
! property ExtraDayCellAttr: TJvTFGlanceCellAttr read FExtraDayCellAttr
write SetExtraDayCellAttr;
! property OffDayCellAttr: TJvTFGlanceCellAttr read FOffDayCellAttr
write SetOffDayCellAttr;
! property SplitSatSun: Boolean read FSplitSatSun write SetSplitSatSun
default False;
! property OnDrawDWTitle: TJvTFDrawDWTitleEvent read FOnDrawDWTitle
write FOnDrawDWTitle;
! property OnUpdateTitle: TJvTFUpdateTitleEvent read FOnUpdateTitle
write FOnUpdateTitle;
***************
*** 129,133 ****
function TJvTFMonths.CellIsExtraDay(aCell: TJvTFGlanceCell): Boolean;
var
! Y, M, D : Word;
begin
DecodeDate(aCell.CellDate, Y, M, D);
--- 129,133 ----
function TJvTFMonths.CellIsExtraDay(aCell: TJvTFGlanceCell): Boolean;
var
! Y, M, D: Word;
begin
DecodeDate(aCell.CellDate, Y, M, D);
***************
*** 144,160 ****
Row,
Col,
! SplitCount : Integer;
! Cell : TJvTFGlanceCell;
begin
{
For Row := 0 to RowCount - 1 do
For Col := 0 to ColCount - 1 do
! Begin
Cell := Cells.Cells[Col, Row];
! If SplitSatSun and (DateToDow(Cell.CellDate) = dowSaturday) Then
SplitCell(Cell)
! Else
Cell.Combine;
! End;
{
--- 144,160 ----
Row,
Col,
! SplitCount: Integer;
! Cell: TJvTFGlanceCell;
begin
{
For Row := 0 to RowCount - 1 do
For Col := 0 to ColCount - 1 do
! begin
Cell := Cells.Cells[Col, Row];
! if SplitSatSun and (DateToDow(Cell.CellDate) = dowSaturday) Then
SplitCell(Cell)
! else
Cell.Combine;
! end;
{
***************
*** 162,199 ****
Col := 0;
While (Col < ColCount) and not Found do
! If DateToDOW(Cells.Cells[Col, 0].CellDate) = dowSaturday Then
Found := True
! Else
Inc(Col);
! If Found Then
For Row := 0 to RowCount - 1 do
! If SplitSatSun Then
SplitCell(Cells.Cells[Col, Row])
! Else
Cells.Cells[Col, Row].Combine;
}
For Row := 0 to RowCount - 1 do
! Begin
SplitCount := 0;
For Col := 0 to ColCount - 1 do
! Begin
Cell := Cells.Cells[Col, Row];
SetCellDate(Cell, OriginDate + Row * 7 + Col + SplitCount);
! If SplitSatSun and (DateToDOW(Cell.CellDate) = dowSaturday) Then
SplitCell(Cell)
! Else
CombineCell(Cell);
! If Cell.IsSplit Then
! Begin
Inc(SplitCount);
SetCellDate(Cell.SubCell, OriginDate + Row * 7 + Col + SplitCount);
! End;
! End;
! End;
inherited;
--- 162,199 ----
Col := 0;
While (Col < ColCount) and not Found do
! if DateToDOW(Cells.Cells[Col, 0].CellDate) = dowSaturday Then
Found := True
! else
Inc(Col);
! if Found Then
For Row := 0 to RowCount - 1 do
! if SplitSatSun Then
SplitCell(Cells.Cells[Col, Row])
! else
Cells.Cells[Col, Row].Combine;
}
For Row := 0 to RowCount - 1 do
! begin
SplitCount := 0;
For Col := 0 to ColCount - 1 do
! begin
Cell := Cells.Cells[Col, Row];
SetCellDate(Cell, OriginDate + Row * 7 + Col + SplitCount);
! if SplitSatSun and (DateToDOW(Cell.CellDate) = dowSaturday) Then
SplitCell(Cell)
! else
CombineCell(Cell);
! if Cell.IsSplit Then
! begin
Inc(SplitCount);
SetCellDate(Cell.SubCell, OriginDate + Row * 7 + Col + SplitCount);
! end;
! end;
! end;
inherited;
***************
*** 220,224 ****
FDWTitleAttr := TJvTFGlanceTitle.Create(Self);
With FDWTitleAttr do
! Begin
// Assign(TitleAttr);
TxtAttr.Font.Size := 8;
--- 220,224 ----
FDWTitleAttr := TJvTFGlanceTitle.Create(Self);
With FDWTitleAttr do
! begin
// Assign(TitleAttr);
TxtAttr.Font.Size := 8;
***************
*** 228,232 ****
FrameAttr.Style := fs3DRaised;
OnChange := GlanceTitleChange;
! End;
end;
--- 228,232 ----
FrameAttr.Style := fs3DRaised;
OnChange := GlanceTitleChange;
! end;
end;
***************
*** 244,264 ****
function TJvTFMonths.DOWShowing(DOW: TTFDayOfWeek): Boolean;
var
! I : Integer;
! TestDOW : TTFDayOfWeek;
begin
// THIS ROUTINE SUPPORTS ONLY SAT/SUN SPLITS
! If (DOW = dowSunday) and SplitSatSun Then
Result := DOWShowing(dowSaturday)
! Else
! Begin
I := 0;
Result := False;
TestDOW := StartOfWeek;
While (I < ColCount) and not Result do
! If TestDOW = DOW Then
Result := True
! Else
IncDOW(TestDOW, 1);
! End;
end;
--- 244,264 ----
function TJvTFMonths.DOWShowing(DOW: TTFDayOfWeek): Boolean;
var
! I: Integer;
! TestDOW: TTFDayOfWeek;
begin
// THIS ROUTINE SUPPORTS ONLY SAT/SUN SPLITS
! if (DOW = dowSunday) and SplitSatSun Then
Result := DOWShowing(dowSaturday)
! else
! begin
I := 0;
Result := False;
TestDOW := StartOfWeek;
While (I < ColCount) and not Result do
! if TestDOW = DOW Then
Result := True
! else
IncDOW(TestDOW, 1);
! end;
end;
***************
*** 267,288 ****
I,
Col,
! LineBottom : Integer;
! CurrDOW : TTFDayOfWeek;
aRect,
TempRect,
TxtRect,
! TextBounds : TRect;
! OldPen : TPen;
! OldBrush : TBrush;
! OldFont : TFont;
! Txt : String;
begin
inherited;
! If not DWTitleAttr.Visible Then
Exit;
With aCanvas do
! Begin
OldPen := TPen.Create;
OldPen.Assign(Pen);
--- 267,288 ----
I,
Col,
! LineBottom: Integer;
! CurrDOW: TTFDayOfWeek;
aRect,
TempRect,
TxtRect,
! TextBounds: TRect;
! OldPen: TPen;
! OldBrush: TBrush;
! OldFont: TFont;
! Txt: string;
begin
inherited;
! if not DWTitleAttr.Visible Then
Exit;
With aCanvas do
! begin
OldPen := TPen.Create;
OldPen.Assign(Pen);
***************
*** 291,298 ****
OldFont := TFont.Create;
OldFont.Assign(Font);
! End;
// draw the DWTitles
! aRect.Top := Inherited GetDataTop;
aRect.Bottom := GetDataTop;
--- 291,298 ----
OldFont := TFont.Create;
OldFont.Assign(Font);
! end;
// draw the DWTitles
! aRect.Top := inherited GetDataTop;
aRect.Bottom := GetDataTop;
***************
*** 300,304 ****
For Col := 0 to ColCount - 1 do
! Begin
TempRect := WholeCellRect(Col, 0);
aRect.Left := TempRect.Left;
--- 300,304 ----
For Col := 0 to ColCount - 1 do
! begin
TempRect := WholeCellRect(Col, 0);
aRect.Left := TempRect.Left;
***************
*** 308,312 ****
With aCanvas do
! Begin
Brush.Color := DWTitleAttr.Color;
FillRect(aRect);
--- 308,312 ----
With aCanvas do
! begin
Brush.Color := DWTitleAttr.Color;
FillRect(aRect);
***************
*** 318,353 ****
Draw3DFrame(aCanvas, aRect, clBtnShadow, clBtnHighlight);
fsFlat :
! Begin
Pen.Color := DWTitleAttr.FrameAttr.Color;
Pen.Width := DWTitleAttr.FrameAttr.Width;
! If Col = 0 Then
! Begin
MoveTo(aRect.Left, aRect.Top);
LineTo(aRect.Left, aRect.Bottom);
! End;
PolyLine([Point(aRect.Right - 1, aRect.Top),
Point(aRect.Right - 1, aRect.Bottom - 1),
Point(aRect.Left - 1, aRect.Bottom - 1)]);
! End;
fsNone :
! Begin
Pen.Color := DWTitleAttr.FrameAttr.Color;
Pen.Width := 1;
LineBottom := aRect.Bottom - 1;
For I := 1 to DWTitleAttr.FrameAttr.Width do
! Begin
MoveTo(aRect.Left, LineBottom);
LineTo(aRect.Right, LineBottom);
Dec(LineBottom);
! End;
! End;
! End;
Txt := DWNames.GetDWName(DOWToBorl(CurrDOW));
! If SplitSatSun and (CurrDow = dowSaturday) Then
! Begin
IncDOW(CurrDOW, 1);
Txt := Txt + '/' + DWNames.GetDWName(DOWToBorl(CurrDOW));
! End;
Font := DWTitleAttr.TxtAttr.Font;
--- 318,353 ----
Draw3DFrame(aCanvas, aRect, clBtnShadow, clBtnHighlight);
fsFlat :
! begin
Pen.Color := DWTitleAttr.FrameAttr.Color;
Pen.Width := DWTitleAttr.FrameAttr.Width;
! if Col = 0 Then
! begin
MoveTo(aRect.Left, aRect.Top);
LineTo(aRect.Left, aRect.Bottom);
! end;
PolyLine([Point(aRect.Right - 1, aRect.Top),
Point(aRect.Right - 1, aRect.Bottom - 1),
Point(aRect.Left - 1, aRect.Bottom - 1)]);
! end;
fsNone :
! begin
Pen.Color := DWTitleAttr.FrameAttr.Color;
Pen.Width := 1;
LineBottom := aRect.Bottom - 1;
For I := 1 to DWTitleAttr.FrameAttr.Width do
! begin
MoveTo(aRect.Left, LineBottom);
LineTo(aRect.Right, LineBottom);
Dec(LineBottom);
! end;
! end;
! end;
Txt := DWNames.GetDWName(DOWToBorl(CurrDOW));
! if SplitSatSun and (CurrDow = dowSaturday) Then
! begin
IncDOW(CurrDOW, 1);
Txt := Txt + '/' + DWNames.GetDWName(DOWToBorl(CurrDOW));
! end;
Font := DWTitleAttr.TxtAttr.Font;
***************
*** 356,369 ****
DWTitleAttr.TxtAttr.AlignH,
DWTitleAttr.TxtAttr.AlignV, Txt);
! End;
! If Assigned(FOnDrawDWTitle) Then
FOnDrawDWTitle(Self, aCanvas, aRect, CurrDOW, Txt);
IncDOW(CurrDOW, 1);
! End;
With aCanvas do
! Begin
Pen.Assign(OldPen);
Brush.Assign(OldBrush);
--- 356,369 ----
DWTitleAttr.TxtAttr.AlignH,
DWTitleAttr.TxtAttr.AlignV, Txt);
! end;
! if Assigned(FOnDrawDWTitle) Then
FOnDrawDWTitle(Self, aCanvas, aRect, CurrDOW, Txt);
IncDOW(CurrDOW, 1);
! end;
With aCanvas do
! begin
Pen.Assign(OldPen);
Brush.Assign(OldBrush);
***************
*** 372,376 ****
OldBrush.Free;
OldFont.Free;
! End;
end;
--- 372,376 ----
OldBrush.Free;
OldFont.Free;
! end;
end;
***************
*** 382,401 ****
function TJvTFMonths.GetCellAttr(aCell: TJvTFGlanceCell): TJvTFGlanceCellAttr;
begin
! If CellIsSelected(aCell) Then
Result := SelCellAttr
! Else If CellIsExtraDay(aCell) Then
Result := ExtraDayCellAttr
! Else If CellIsOffDay(aCell) Then
Result := OffDayCellAttr
! Else
Result := CellAttr;
end;
! function TJvTFMonths.GetCellTitleText(Cell: TJvTFGlanceCell): String;
begin
! If CellIsExtraDay(Cell) and (IsFirstOfMonth(Cell.CellDate) or
EqualDates(Cell.CellDate, OriginDate)) Then
Result := FormatDateTime('mmm d', Cell.CellDate)
! Else
Result := FormatDateTime('d', Cell.CellDate);
end;
--- 382,401 ----
function TJvTFMonths.GetCellAttr(aCell: TJvTFGlanceCell): TJvTFGlanceCellAttr;
begin
! if CellIsSelected(aCell) Then
Result := SelCellAttr
! else if CellIsExtraDay(aCell) Then
Result := ExtraDayCellAttr
! else if CellIsOffDay(aCell) Then
Result := OffDayCellAttr
! else
Result := CellAttr;
end;
! function TJvTFMonths.GetCellTitleText(Cell: TJvTFGlanceCell): string;
begin
! if CellIsExtraDay(Cell) and (IsFirstOfMonth(Cell.CellDate) or
EqualDates(Cell.CellDate, OriginDate)) Then
Result := FormatDateTime('mmm d', Cell.CellDate)
! else
Result := FormatDateTime('d', Cell.CellDate);
end;
***************
*** 403,408 ****
function TJvTFMonths.GetDataTop: Integer;
begin
! Result := Inherited GetDataTop;
! If DWTitleAttr.Visible Then
Inc(Result, DWTitleAttr.Height);
end;
--- 403,408 ----
function TJvTFMonths.GetDataTop: Integer;
begin
! Result := inherited GetDataTop;
! if DWTitleAttr.Visible Then
Inc(Result, DWTitleAttr.Height);
end;
***************
*** 422,426 ****
begin
inherited;
! If Dates.Count > 0 Then
DisplayDate := Dates[0];
end;
--- 422,426 ----
begin
inherited;
! if Dates.Count > 0 Then
DisplayDate := Dates[0];
end;
***************
*** 428,432 ****
procedure TJvTFMonths.NextMonth;
var
! Temp : TDateTime;
begin
Temp := DisplayDate;
--- 428,432 ----
procedure TJvTFMonths.NextMonth;
var
! Temp: TDateTime;
begin
Temp := DisplayDate;
***************
*** 437,441 ****
procedure TJvTFMonths.NextWeek;
var
! Temp : TDateTime;
begin
Temp := DisplayDate;
--- 437,441 ----
procedure TJvTFMonths.NextWeek;
var
! Temp: TDateTime;
begin
Temp := DisplayDate;
***************
*** 446,450 ****
procedure TJvTFMonths.PrevMonth;
var
! Temp : TDateTime;
begin
Temp := DisplayDate;
--- 446,450 ----
procedure TJvTFMonths.PrevMonth;
var
! Temp: TDateTime;
begin
Temp := DisplayDate;
***************
*** 455,459 ****
procedure TJvTFMonths.PrevWeek;
var
! Temp : TDateTime;
begin
Temp := DisplayDate;
--- 455,459 ----
procedure TJvTFMonths.PrevWeek;
var
! Temp: TDateTime;
begin
Temp := DisplayDate;
***************
*** 464,470 ****
procedure TJvTFMonths.ScrollNext;
begin
! If ScrollSize = mssMonth Then
NextMonth
! Else
NextWeek;
end;
--- 464,470 ----
procedure TJvTFMonths.ScrollNext;
begin
! if ScrollSize = mssMonth Then
NextMonth
! else
NextWeek;
end;
***************
*** 472,478 ****
procedure TJvTFMonths.ScrollPrev;
begin
! If ScrollSize = mssMonth Then
PrevMonth
! Else
PrevWeek;
end;
--- 472,478 ----
procedure TJvTFMonths.ScrollPrev;
begin
! if ScrollSize = mssMonth Then
PrevMonth
! else
PrevWeek;
end;
***************
*** 481,485 ****
begin
Value := Lesser(Value, 7);
! Inherited SetColCount(Value);
end;
--- 481,485 ----
begin
Value := Lesser(Value, 7);
! inherited SetColCount(Value);
end;
***************
*** 487,493 ****
begin
FDisplayDate := Value;
! If ScrollSize = mssMonth Then
StartDate := FirstOfMonth(Value)
! Else
StartDate := Value;
UpdateTitle;
--- 487,493 ----
begin
FDisplayDate := Value;
! if ScrollSize = mssMonth Then
StartDate := FirstOfMonth(Value)
! else
StartDate := Value;
UpdateTitle;
***************
*** 511,520 ****
procedure TJvTFMonths.SetMonth(Value: Word);
var
! Y, M, D : Word;
begin
EnsureMonth(Value);
DecodeDate(DisplayDate, Y, M, D);
! If Value <> M Then
DisplayDate := EncodeDate(Y, Value, D);
end;
--- 511,520 ----
procedure TJvTFMonths.SetMonth(Value: Word);
var
! Y, M, D: Word;
begin
EnsureMonth(Value);
DecodeDate(DisplayDate, Y, M, D);
! if Value <> M Then
DisplayDate := EncodeDate(Y, Value, D);
end;
***************
*** 527,561 ****
procedure TJvTFMonths.SetOffDays(Value: TTFDaysOfWeek);
begin
! If Value <> FOffDays Then
! Begin
FOffDays := Value;
Invalidate;
! End;
end;
procedure TJvTFMonths.SetSplitSatSun(Value: Boolean);
begin
! If Value <> FSplitSatSun Then
! Begin
! If DOWShowing(dowSunday) or DOWShowing(dowSaturday) Then
! If Value Then
! Begin
! If StartOfWeek = dowSunday Then
StartOfWeek := dowMonday;
ColCount := ColCount - 1;
! End
! Else
! Begin
ColCount := ColCount + 1;
! End;
FSplitSatSun := Value;
Cells.ReconfigCells;
! End;
end;
procedure TJvTFMonths.SetStartOfWeek(Value: TTFDayOfWeek);
begin
! If SplitSatSun and (Value = dowSunday) Then
Value := dowSaturday;
--- 527,561 ----
procedure TJvTFMonths.SetOffDays(Value: TTFDaysOfWeek);
begin
! if Value <> FOffDays Then
! begin
FOffDays := Value;
Invalidate;
! end;
end;
procedure TJvTFMonths.SetSplitSatSun(Value: Boolean);
begin
! if Value <> FSplitSatSun Then
! begin
! if DOWShowing(dowSunday) or DOWShowing(dowSaturday) Then
! if Value Then
! begin
! if StartOfWeek = dowSunday Then
StartOfWeek := dowMonday;
ColCount := ColCount - 1;
! end
! else
! begin
ColCount := ColCount + 1;
! end;
FSplitSatSun := Value;
Cells.ReconfigCells;
! end;
end;
procedure TJvTFMonths.SetStartOfWeek(Value: TTFDayOfWeek);
begin
! if SplitSatSun and (Value = dowSunday) Then
Value := dowSaturday;
***************
*** 565,572 ****
procedure TJvTFMonths.SetYear(Value: Word);
var
! Y, M, D : Word;
begin
DecodeDate(DisplayDate, Y, M, D);
! If Value <> Y Then
DisplayDate := EncodeDate(Value, M, D);
end;
--- 565,572 ----
procedure TJvTFMonths.SetYear(Value: Word);
var
! Y, M, D: Word;
begin
DecodeDate(DisplayDate, Y, M, D);
! if Value <> Y Then
DisplayDate := EncodeDate(Value, M, D);
end;
***************
*** 574,586 ****
procedure TJvTFMonths.UpdateTitle;
var
! NewTitle : String;
begin
NewTitle := FormatDateTime('mmmm yyyy', DisplayDate);
! If NewTitle <> TitleAttr.Title Then
! Begin
! If Assigned(FOnUpdateTitle) Then
FOnUpdateTitle(Self, NewTitle);
TitleAttr.Title := NewTitle;
! End;
end;
--- 574,586 ----
procedure TJvTFMonths.UpdateTitle;
var
! NewTitle: string;
begin
NewTitle := FormatDateTime('mmmm yyyy', DisplayDate);
! if NewTitle <> TitleAttr.Title Then
! begin
! if Assigned(FOnUpdateTitle) Then
FOnUpdateTitle(Self, NewTitle);
TitleAttr.Title := NewTitle;
! end;
end;
Index: JvTFSparseMatrix.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFSparseMatrix.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JvTFSparseMatrix.pas 5 Jan 2004 22:37:44 -0000 1.7
--- JvTFSparseMatrix.pas 11 Jan 2004 10:56:58 -0000 1.8
***************
*** 69,78 ****
uses
JvResources;
! {$ENDIF}
{$IFNDEF USEJVCL}
resourcestring
RsEMatrixMustBeEmpty = 'Matrix must be empty before setting null value';
! {$ENDIF}
destructor TJvTFSparseMatrix.Destroy;
--- 69,78 ----
uses
JvResources;
! {$ENDIF USEJVCL}
{$IFNDEF USEJVCL}
resourcestring
RsEMatrixMustBeEmpty = 'Matrix must be empty before setting null value';
! {$ENDIF USEJVCL}
destructor TJvTFSparseMatrix.Destroy;
Index: JvTFUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFUtils.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JvTFUtils.pas 5 Jan 2004 22:37:44 -0000 1.8
--- JvTFUtils.pas 11 Jan 2004 10:56:58 -0000 1.9
***************
*** 47,53 ****
const
! DOW_WEEK : TTFDaysOfWeek = [dowSunday..dowSaturday];
! DOW_WEEKEND : TTFDaysOfWeek = [dowSunday, dowSaturday];
! DOW_WORKWEEK : TTFDaysOfWeek = [dowMonday..dowFriday];
ONE_HOUR = 1 / 24;
--- 47,53 ----
const
! DOW_WEEK: TTFDaysOfWeek = [dowSunday..dowSaturday];
! DOW_WEEKEND: TTFDaysOfWeek = [dowSunday, dowSaturday];
! DOW_WORKWEEK: TTFDaysOfWeek = [dowMonday..dowFriday];
ONE_HOUR = 1 / 24;
***************
*** 56,67 ****
ONE_MILLISECOND = ONE_SECOND / 1000;
! function ExtractYear(aDate : TDateTime) : Word;
! function ExtractMonth(aDate : TDateTime) : Word;
! function ExtractDay(aDate : TDateTime) : Word;
! function ExtractHours(aTime : TDateTime) : Word;
! function ExtractMins(aTime : TDateTime) : Word;
! function ExtractSecs(aTime : TDateTime) : Word;
! function ExtractMSecs(aTime : TDateTime) : Word;
! function FirstOfMonth(aDate : TDateTime) : TDateTime;
function GetDayOfNthDOW(Year, Month, DOW, N: Word): Word;
function GetWeeksInMonth(Year, Month: Word; StartOfWeek: Integer): Word;
--- 56,67 ----
ONE_MILLISECOND = ONE_SECOND / 1000;
! function ExtractYear(aDate: TDateTime): Word;
! function ExtractMonth(aDate: TDateTime): Word;
! function ExtractDay(aDate: TDateTime): Word;
! function ExtractHours(aTime: TDateTime): Word;
! function ExtractMins(aTime: TDateTime): Word;
! function ExtractSecs(aTime: TDateTime): Word;
! function ExtractMSecs(aTime: TDateTime): Word;
! function FirstOfMonth(aDate: TDateTime): TDateTime;
function GetDayOfNthDOW(Year, Month, DOW, N: Word): Word;
function GetWeeksInMonth(Year, Month: Word; StartOfWeek: Integer): Word;
***************
*** 69,91 ****
procedure IncBorlDOW(var BorlDOW: Integer; N: Integer = 1);
procedure IncDOW(var DOW: TTFDayOfWeek; N: Integer = 1);
! procedure IncDays(var aDate : TDateTime; N: Integer = 1);
procedure IncWeeks(var aDate: TDateTime; N: Integer = 1);
procedure IncMonths(var aDate: TDateTime; N: Integer = 1);
procedure IncYears(var aDate: TDateTime; N: Integer = 1);
! function EndOfMonth(aDate: TDateTime) : TDateTime;
! function IsFirstOfMonth(aDate : TDateTime) : Boolean;
! function IsEndOfMonth(aDate : TDateTime) : Boolean;
procedure EnsureMonth(Month: Word);
procedure EnsureDOW(DOW: Word);
! function EqualDates(D1, D2 : TDateTime) : Boolean;
! function Lesser(N1, N2 : Integer) : Integer;
! function Greater(N1, N2 : Integer) : Integer;
! function GetDivLength(TotalLength, DivCount, DivNum : Integer) : Integer;
! function GetDivNum(TotalLength, DivCount, X : Integer) : Integer;
! function GetDivStart(TotalLength, DivCount, DivNum : Integer) : Integer;
! function DOWToBorl(aDOW : TTFDayOfWeek) : Integer;
! function BorlToDOW(BorlDOW : Integer) : TTFDayOfWeek;
! function DateToDOW(aDate : TDateTime) : TTFDayOfWeek;
procedure CalcTextPos(HostRect: TRect; var TextLeft, TextTop: Integer;
--- 69,91 ----
procedure IncBorlDOW(var BorlDOW: Integer; N: Integer = 1);
procedure IncDOW(var DOW: TTFDayOfWeek; N: Integer = 1);
! procedure IncDays(var aDate: TDateTime; N: Integer = 1);
procedure IncWeeks(var aDate: TDateTime; N: Integer = 1);
procedure IncMonths(var aDate: TDateTime; N: Integer = 1);
procedure IncYears(var aDate: TDateTime; N: Integer = 1);
! function EndOfMonth(aDate: TDateTime): TDateTime;
! function IsFirstOfMonth(aDate: TDateTime): Boolean;
! function IsEndOfMonth(aDate: TDateTime): Boolean;
procedure EnsureMonth(Month: Word);
procedure EnsureDOW(DOW: Word);
! function EqualDates(D1, D2: TDateTime): Boolean;
! function Lesser(N1, N2: Integer): Integer;
! function Greater(N1, N2: Integer): Integer;
! function GetDivLength(TotalLength, DivCount, DivNum: Integer): Integer;
! function GetDivNum(TotalLength, DivCount, X: Integer): Integer;
! function GetDivStart(TotalLength, DivCount, DivNum: Integer): Integer;
! function DOWToBorl(aDOW: TTFDayOfWeek): Integer;
! function BorlToDOW(BorlDOW: Integer): TTFDayOfWeek;
! function DateToDOW(aDate: TDateTime): TTFDayOfWeek;
procedure CalcTextPos(HostRect: TRect; var TextLeft, TextTop: Integer;
***************
*** 97,103 ****
VAlign: TJvTFVAlignment; aTxt: String);
! Function RectWidth(aRect : TRect) : Integer;
! Function RectHeight(aRect : TRect) : Integer;
! function EmptyRect : TRect;
function IsClassByName(Obj: TObject; ClassName: ShortString): Boolean;
--- 97,103 ----
VAlign: TJvTFVAlignment; aTxt: String);
! Function RectWidth(aRect: TRect): Integer;
! Function RectHeight(aRect: TRect): Integer;
! function EmptyRect: TRect;
function IsClassByName(Obj: TObject; ClassName: ShortString): Boolean;
***************
*** 107,111 ****
uses
JvResources;
! {$ENDIF}
{$IFNDEF USEJVCL}
--- 107,111 ----
uses
JvResources;
! {$ENDIF USEJVCL}
{$IFNDEF USEJVCL}
***************
*** 114,143 ****
RsEInvalidMonthValue = 'Invalid Month Value (%d)';
RsEInvalidDayOfWeekValue = 'Invalid value for day of week (%d)';
! {$ENDIF}
! function ExtractYear(aDate : TDateTime) : Word;
var
! M, D : Word;
begin
DecodeDate(aDate, Result, M, D);
end;
! function ExtractMonth(aDate : TDateTime) : Word;
var
! Y, D : Word;
begin
DecodeDate(aDate, Y, Result, D);
end;
! function ExtractDay(aDate : TDateTime) : Word;
var
! Y, M : Word;
begin
DecodeDate(aDate, Y, M, Result);
end;
! function FirstOfMonth(aDate : TDateTime) : TDateTime;
var
! Y, M, D : Word;
begin
DecodeDate(aDate, Y, M, D);
--- 114,143 ----
RsEInvalidMonthValue = 'Invalid Month Value (%d)';
RsEInvalidDayOfWeekValue = 'Invalid value for day of week (%d)';
! {$ENDIF USEJVCL}
! function ExtractYear(aDate: TDateTime): Word;
var
! M, D: Word;
begin
DecodeDate(aDate, Result, M, D);
end;
! function ExtractMonth(aDate: TDateTime): Word;
var
! Y, D: Word;
begin
DecodeDate(aDate, Y, Result, D);
end;
! function ExtractDay(aDate: TDateTime): Word;
var
! Y, M: Word;
begin
DecodeDate(aDate, Y, M, Result);
end;
! function FirstOfMonth(aDate: TDateTime): TDateTime;
var
! Y, M, D: Word;
begin
DecodeDate(aDate, Y, M, D);
***************
*** 147,152 ****
function GetDayOfNthDOW(Year, Month, DOW, N: Word): Word;
var
! FirstDayDOW : Word;
! WorkDate : TDateTime;
begin
WorkDate := EncodeDate(Year, Month, 1);
--- 147,152 ----
function GetDayOfNthDOW(Year, Month, DOW, N: Word): Word;
var
! FirstDayDOW: Word;
! WorkDate: TDateTime;
begin
WorkDate := EncodeDate(Year, Month, 1);
***************
*** 166,175 ****
end;
! function GetWeeksInMonth(Year, Month : Word; StartOfWeek: Integer): Word;
var
DOW,
! EndOfWeek : Integer;
EOM,
! WorkDate : TDateTime;
begin
// Get the end of the week
--- 166,175 ----
end;
! function GetWeeksInMonth(Year, Month: Word; StartOfWeek: Integer): Word;
var
DOW,
! EndOfWeek: Integer;
EOM,
! WorkDate: TDateTime;
begin
// Get the end of the week
***************
*** 214,218 ****
// N defaults to 1
var
! BorlDOW : Integer;
begin
BorlDOW := DOWToBorl(DOW);
--- 214,218 ----
// N defaults to 1
var
! BorlDOW: Integer;
begin
BorlDOW := DOWToBorl(DOW);
***************
*** 221,225 ****
end;
! procedure IncDays(var aDate : TDateTime; N: Integer);
// N defaults to 1
begin
--- 221,225 ----
end;
! procedure IncDays(var aDate: TDateTime; N: Integer);
// N defaults to 1
begin
***************
*** 238,242 ****
// N defaults to 1
var
! Y, M, D, EOMD : Word;
begin
DecodeDate(aDate, Y, M, D);
--- 238,242 ----
// N defaults to 1
var
! Y, M, D, EOMD: Word;
begin
DecodeDate(aDate, Y, M, D);
***************
*** 258,262 ****
// N defaults to 1
var
! Y, M, D, EOMD : Word;
begin
DecodeDate(aDate, Y, M, D);
--- 258,262 ----
// N defaults to 1
var
! Y, M, D, EOMD: Word;
begin
DecodeDate(aDate, Y, M, D);
***************
*** 274,280 ****
end;
! function EndOfMonth(aDate: TDateTime) : TDateTime;
var
! Y, M, D : Word;
begin
DecodeDate(aDate, Y, M, D);
--- 274,280 ----
end;
! function EndOfMonth(aDate: TDateTime): TDateTime;
var
! Y, M, D: Word;
begin
DecodeDate(aDate, Y, M, D);
***************
*** 288,294 ****
end;
! function IsFirstOfMonth(aDate : TDateTime) : Boolean;
var
! Y, M, D : Word;
begin
DecodeDate(aDate, Y, M, D);
--- 288,294 ----
end;
! function IsFirstOfMonth(aDate: TDateTime): Boolean;
var
! Y, M, D: Word;
begin
DecodeDate(aDate, Y, M, D);
***************
*** 296,300 ****
end;
! function IsEndOfMonth(aDate : TDateTime) : Boolean;
begin
Result := EqualDates(aDate, EndOfMonth(aDate));
--- 296,300 ----
end;
! function IsEndOfMonth(aDate: TDateTime): Boolean;
begin
Result := EqualDates(aDate, EndOfMonth(aDate));
***************
*** 313,350 ****
end;
! function EqualDates(D1, D2 : TDateTime) : Boolean;
begin
Result := Trunc(D1) = Trunc(D2);
end;
! function ExtractHours(aTime : TDateTime) : Word;
var
! M, S, MS : Word;
begin
DecodeTime(aTime, Result, M, S, MS);
end;
! function ExtractMins(aTime : TDateTime) : Word;
var
! H, S, MS : Word;
begin
DecodeTime(aTime, H, Result, S, MS);
end;
! function ExtractSecs(aTime : TDateTime) : Word;
var
! H, M, MS : Word;
begin
DecodeTime(aTime, H, M, Result, MS);
end;
! function ExtractMSecs(aTime : TDateTime) : Word;
var
! H, M, S : Word;
begin
DecodeTime(aTime, H, M, S, Result);
end;
! ...
[truncated message content] |