diff --git a/components/jvcllaz/examples/JVTimeLine/TimeLineDemo.lpi b/components/jvcllaz/examples/JVTimeLine/TimeLineDemo.lpi
index a9a26d5d3..2257f0390 100644
--- a/components/jvcllaz/examples/JVTimeLine/TimeLineDemo.lpi
+++ b/components/jvcllaz/examples/JVTimeLine/TimeLineDemo.lpi
@@ -13,7 +13,6 @@
-
diff --git a/components/jvcllaz/examples/JVTimeLine/TimelineMainFormU.lfm b/components/jvcllaz/examples/JVTimeLine/TimelineMainFormU.lfm
index 608e508f5..9d3aa8a92 100644
--- a/components/jvcllaz/examples/JVTimeLine/TimelineMainFormU.lfm
+++ b/components/jvcllaz/examples/JVTimeLine/TimelineMainFormU.lfm
@@ -43,7 +43,7 @@ object TimelineMainForm: TTimelineMainForm
Top = 3
Width = 731
Align = alClient
- Color = clInfoBk
+ Color = clCream
HelperYears = False
PopupMenu = PopupMenu1
ParentShowHint = False
@@ -240,6 +240,7 @@ object TimelineMainForm: TTimelineMainForm
end>
ItemHeight = 40
HorzSupports = True
+ SupportsColor = clSilver
OnItemClick = TimeLine1ItemClick
OnDrawItem = TimeLine1DrawItem
OnSaveItem = TimeLine1SaveItem
@@ -282,7 +283,7 @@ object TimelineMainForm: TTimelineMainForm
AnchorSideTop.Side = asrCenter
Left = 12
Height = 15
- Top = 4
+ Top = 6
Width = 45
BorderSpacing.Left = 12
Caption = '&Caption:'
@@ -295,11 +296,10 @@ object TimelineMainForm: TTimelineMainForm
AnchorSideTop.Side = asrBottom
Left = 12
Height = 15
- Top = 62
+ Top = 64
Width = 64
BorderSpacing.Top = 8
Caption = 'ImageInde&x:'
- FocusControl = edImIndex
ParentColor = False
end
object lblDate: TLabel
@@ -308,7 +308,7 @@ object TimelineMainForm: TTimelineMainForm
AnchorSideTop.Side = asrCenter
Left = 12
Height = 15
- Top = 35
+ Top = 37
Width = 27
Caption = '&Date:'
FocusControl = dtpItemdate
@@ -320,7 +320,7 @@ object TimelineMainForm: TTimelineMainForm
AnchorSideTop.Control = lblImIndex
Left = 104
Height = 15
- Top = 62
+ Top = 64
Width = 30
Caption = 'Le&vel:'
FocusControl = edLevel
@@ -336,7 +336,7 @@ object TimelineMainForm: TTimelineMainForm
Width = 75
Caption = '&Add'
OnClick = btnAddClick
- TabOrder = 7
+ TabOrder = 5
end
object edCaption: TEdit
AnchorSideLeft.Control = lblCaption
@@ -346,40 +346,27 @@ object TimelineMainForm: TTimelineMainForm
AnchorSideRight.Side = asrBottom
Left = 65
Height = 23
- Top = 0
+ Top = 2
Width = 115
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 8
+ BorderSpacing.Top = 2
BorderSpacing.Right = 12
TabOrder = 0
Text = 'New item'
end
- object edImIndex: TEdit
- AnchorSideLeft.Control = lblImIndex
- AnchorSideTop.Control = lblImIndex
- AnchorSideTop.Side = asrBottom
- AnchorSideRight.Control = udImIndex
- Left = 12
- Height = 23
- Top = 81
- Width = 61
- Anchors = [akTop, akLeft, akRight]
- BorderSpacing.Top = 4
- TabOrder = 1
- Text = '0'
- end
object dtpItemdate: TDateTimePicker
AnchorSideLeft.Control = edCaption
AnchorSideTop.Control = edCaption
AnchorSideTop.Side = asrBottom
Left = 65
Height = 23
- Top = 31
+ Top = 33
Width = 79
CenturyFrom = 1941
MaxDate = 2958465
MinDate = -53780
- TabOrder = 6
+ TabOrder = 4
BorderSpacing.Top = 8
TrailingSeparator = False
LeadingZeros = True
@@ -394,30 +381,15 @@ object TimelineMainForm: TTimelineMainForm
MonthNames = 'Long'
CalAlignment = dtaLeft
end
- object udImIndex: TUpDown
- AnchorSideRight.Control = Bevel1
- Left = 73
- Height = 23
- Top = 81
- Width = 15
- Anchors = [akTop, akRight]
- Associate = edImIndex
- Max = 8
- Min = 0
- Position = 0
- TabOrder = 2
- Wrap = False
- end
object edLevel: TEdit
AnchorSideLeft.Control = lblLevel
- AnchorSideTop.Control = edImIndex
AnchorSideRight.Control = udLevel
Left = 104
Height = 23
Top = 81
Width = 61
Anchors = [akTop, akLeft, akRight]
- TabOrder = 3
+ TabOrder = 1
Text = '0'
end
object udLevel: TUpDown
@@ -432,7 +404,7 @@ object TimelineMainForm: TTimelineMainForm
Max = 8
Min = 0
Position = 0
- TabOrder = 4
+ TabOrder = 2
Wrap = False
end
object btnColor: TButton
@@ -445,7 +417,7 @@ object TimelineMainForm: TTimelineMainForm
BorderSpacing.Left = 16
Caption = 'Color...'
OnClick = btnColorClick
- TabOrder = 5
+ TabOrder = 3
end
object Bevel1: TBevel
AnchorSideLeft.Control = GroupBox1
@@ -456,6 +428,23 @@ object TimelineMainForm: TTimelineMainForm
Width = 16
Shape = bsSpacer
end
+ object CbImgIndex: TComboBoxEx
+ AnchorSideLeft.Control = lblImIndex
+ AnchorSideTop.Control = lblImIndex
+ AnchorSideTop.Side = asrBottom
+ AnchorSideRight.Control = Bevel1
+ Left = 12
+ Height = 24
+ Top = 81
+ Width = 76
+ Anchors = [akTop, akLeft, akRight]
+ BorderSpacing.Top = 2
+ DropDownCount = 24
+ Images = ImageList1
+ ItemHeight = 16
+ ItemsEx = <>
+ TabOrder = 6
+ end
end
object GroupBox2: TGroupBox
Left = 240
@@ -646,10 +635,10 @@ object TimelineMainForm: TTimelineMainForm
AnchorSideTop.Control = GroupBox3
Left = 12
Height = 15
- Top = 4
+ Top = 2
Width = 47
BorderSpacing.Left = 12
- BorderSpacing.Top = 4
+ BorderSpacing.Top = 2
Caption = '&Year size:'
FocusControl = edYrSize
ParentColor = False
@@ -658,7 +647,7 @@ object TimelineMainForm: TTimelineMainForm
AnchorSideTop.Control = lblYrSize
Left = 111
Height = 15
- Top = 4
+ Top = 2
Width = 61
Caption = 'Item&height:'
FocusControl = edItemHeight
@@ -670,7 +659,7 @@ object TimelineMainForm: TTimelineMainForm
AnchorSideTop.Side = asrBottom
Left = 12
Height = 15
- Top = 54
+ Top = 52
Width = 87
BorderSpacing.Top = 8
Caption = '&First visible date:'
@@ -703,7 +692,7 @@ object TimelineMainForm: TTimelineMainForm
AnchorSideTop.Side = asrBottom
Left = 12
Height = 23
- Top = 23
+ Top = 21
Width = 50
BorderSpacing.Top = 4
TabOrder = 0
@@ -712,7 +701,7 @@ object TimelineMainForm: TTimelineMainForm
object udYrSize: TUpDown
Left = 62
Height = 23
- Top = 23
+ Top = 21
Width = 15
Associate = edYrSize
Increment = 120
@@ -728,7 +717,7 @@ object TimelineMainForm: TTimelineMainForm
AnchorSideTop.Control = edYrSize
Left = 111
Height = 23
- Top = 23
+ Top = 21
Width = 50
TabOrder = 2
Text = '36'
@@ -736,7 +725,7 @@ object TimelineMainForm: TTimelineMainForm
object udItemHeight: TUpDown
Left = 161
Height = 23
- Top = 23
+ Top = 21
Width = 15
Associate = edItemHeight
Min = 0
@@ -751,7 +740,7 @@ object TimelineMainForm: TTimelineMainForm
AnchorSideTop.Side = asrBottom
Left = 12
Height = 23
- Top = 73
+ Top = 71
Width = 79
CenturyFrom = 1941
MaxDate = 2958465
diff --git a/components/jvcllaz/examples/JVTimeLine/TimelineMainFormU.pas b/components/jvcllaz/examples/JVTimeLine/TimelineMainFormU.pas
index 69b3d3296..011a4cc76 100644
--- a/components/jvcllaz/examples/JVTimeLine/TimelineMainFormU.pas
+++ b/components/jvcllaz/examples/JVTimeLine/TimelineMainFormU.pas
@@ -33,7 +33,7 @@ interface
uses
LCLIntf, LCLType,
SysUtils, Classes, Graphics, Controls, Forms, Dialogs, DateTimePicker,
- ComCtrls, StdCtrls, ExtCtrls, Menus, ImgList, JvTimeLine;
+ ComCtrls, StdCtrls, ExtCtrls, Menus, ImgList, ComboEx, JvTimeLine;
type
@@ -42,6 +42,7 @@ type
TTimelineMainForm = class(TForm)
Bevel1: TBevel;
Bevel2: TBevel;
+ CbImgIndex: TComboBoxEx;
ImageList1: TImageList;
Splitter1: TSplitter;
PopupMenu1: TPopupMenu;
@@ -65,9 +66,7 @@ type
lblLevel: TLabel;
btnAdd: TButton;
edCaption: TEdit;
- edImIndex: TEdit;
dtpItemdate: TDateTimePicker;
- udImIndex: TUpDown;
edLevel: TEdit;
udLevel: TUpDown;
btnColor: TButton;
@@ -177,11 +176,11 @@ var aItem: TJvTimeItem;
begin
aItem := TimeLine1.Items.Add;
aItem.Caption := edCaption.Text;
- aItem.ImageIndex := StrToIntDef(edImIndex.Text, -1);
+ aItem.ImageIndex := CbImgIndex.ItemIndex;
aItem.Level := StrToIntDef(edLevel.Text, 0);
aItem.Date := dtpItemDate.Date;
aItem.Color := FCurColor;
- if FCurColor <> clWhite then
+ if Integer(GetRValue(FCurColor)) + GetGValue(FCurColor) + GetBValue(FCurColor) < 3*128-1 then
aItem.TextColor := clWhite
else
aItem.TextColor := clBlack;
@@ -381,13 +380,20 @@ end;
{ save all notes data and dispose of memory }
procedure TTimelineMainForm.FormCreate(Sender: TObject);
+var
+ i: Integer;
begin
FCurColor := TimeLine1.Color;
cbDragging.ItemIndex := 0;
TimelineNotesForm := TTimelineNotesForm.Create(nil);
cbDraggingChange(nil);
+
TimeLine1.ShowSelection := false;
TimeLine1.DoubleBuffered := false;
+
+ for i := 0 to ImageList1.Count-1 do
+ CbImgIndex.Add(IntToStr(i), 0, i);
+ CbImgIndex.ItemIndex := 0;
end;
@@ -559,7 +565,7 @@ procedure TTimelineMainForm.FormDestroy(Sender: TObject);
var
i: integer;
begin
- TimelineNotesForm.free;
+ TimelineNotesForm.Free;
{ free allocated memory }
for i := 0 to TimeLine1.Items.Count - 1 do
if TimeLine1.Items[i].Data <> nil then
diff --git a/components/jvcllaz/examples/JVTimeLine/TimelineNotesFormU.lfm b/components/jvcllaz/examples/JVTimeLine/TimelineNotesFormU.lfm
index 20a350572..0076e1485 100644
--- a/components/jvcllaz/examples/JVTimeLine/TimelineNotesFormU.lfm
+++ b/components/jvcllaz/examples/JVTimeLine/TimelineNotesFormU.lfm
@@ -18,7 +18,7 @@ object TimelineNotesForm: TTimelineNotesForm
Top = 0
Width = 207
Align = alClient
- Color = clInfoBk
+ Color = clCream
Font.Color = clWindowText
ParentFont = False
TabOrder = 0