pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

tvplanmit: In TaskEditorDialog, replace the time combobox with Lazarus' TimeEdit.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4726 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-06-12 13:20:21 +00:00
parent 968af22828
commit 8b2fe7e075
2 changed files with 53 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
components/tvplanit/source/vpevnteditdlg.lfm
View File

@ -124,7 +124,7 @@ object DlgEventEdit: TDlgEventEdit
ParentColor = False ParentColor = False
end end
object Image2: TImage object Image2: TImage
Left = 352 Left = 368
Height = 18 Height = 18
Top = 81 Top = 81
Width = 18 Width = 18
@ -153,7 +153,7 @@ object DlgEventEdit: TDlgEventEdit
} }
end end
object RecurringLbl: TLabel object RecurringLbl: TLabel
Left = 379 Left = 395
Height = 13 Height = 13
Top = 87 Top = 87
Width = 187 Width = 187
@ -162,7 +162,7 @@ object DlgEventEdit: TDlgEventEdit
ParentColor = False ParentColor = False
end end
object Bevel3: TBevel object Bevel3: TBevel
Left = 339 Left = 350
Height = 76 Height = 76
Top = 78 Top = 78
Width = 2 Width = 2
@ -261,10 +261,10 @@ object DlgEventEdit: TDlgEventEdit
} }
end end
object RecurrenceEndsLbl: TLabel object RecurrenceEndsLbl: TLabel
Left = 352 Left = 368
Height = 13 Height = 13
Top = 135 Top = 135
Width = 80 Width = 88
Alignment = taRightJustify Alignment = taRightJustify
AutoSize = False AutoSize = False
Caption = 'Until:' Caption = 'Until:'
@ -286,27 +286,7 @@ object DlgEventEdit: TDlgEventEdit
Width = 74 Width = 74
Caption = '&Reminder:' Caption = '&Reminder:'
OnClick = AlarmSetClick OnClick = AlarmSetClick
TabOrder = 12 TabOrder = 10
end
object StartTime: TComboBox
Left = 231
Height = 23
Top = 104
Width = 93
ItemHeight = 15
OnChangeBounds = StartTimeChange
OnExit = StartTimeExit
TabOrder = 5
end
object EndTime: TComboBox
Left = 231
Height = 23
Top = 131
Width = 93
ItemHeight = 15
OnChangeBounds = EndTimeChange
OnExit = EndTimeExit
TabOrder = 7
end end
object Category: TComboBox object Category: TComboBox
Left = 484 Left = 484
@ -320,14 +300,14 @@ object DlgEventEdit: TDlgEventEdit
TabOrder = 2 TabOrder = 2
end end
object RecurringType: TComboBox object RecurringType: TComboBox
Left = 379 Left = 395
Height = 23 Height = 23
Top = 104 Top = 104
Width = 187 Width = 171
ItemHeight = 15 ItemHeight = 15
OnChange = RecurringTypeChange OnChange = RecurringTypeChange
Style = csDropDownList Style = csDropDownList
TabOrder = 8 TabOrder = 6
end end
object IntervalUpDown: TUpDown object IntervalUpDown: TUpDown
Left = 652 Left = 652
@ -339,7 +319,7 @@ object DlgEventEdit: TDlgEventEdit
Min = 0 Min = 0
OnClick = IntervalUpDownClick OnClick = IntervalUpDownClick
Position = 0 Position = 0
TabOrder = 10 TabOrder = 8
Wrap = False Wrap = False
end end
object AlarmAdvanceType: TComboBox object AlarmAdvanceType: TComboBox
@ -349,7 +329,7 @@ object DlgEventEdit: TDlgEventEdit
Width = 93 Width = 93
ItemHeight = 15 ItemHeight = 15
Style = csDropDownList Style = csDropDownList
TabOrder = 15 TabOrder = 13
end end
object AdvanceUpDown: TUpDown object AdvanceUpDown: TUpDown
Left = 194 Left = 194
@ -361,11 +341,11 @@ object DlgEventEdit: TDlgEventEdit
Min = 1 Min = 1
OnClick = AdvanceUpDownClick OnClick = AdvanceUpDownClick
Position = 1 Position = 1
TabOrder = 14 TabOrder = 12
Wrap = False Wrap = False
end end
object CBAllDay: TCheckBox object CBAllDay: TCheckBox
Left = 104 Left = 86
Height = 19 Height = 19
Top = 80 Top = 80
Width = 89 Width = 89
@ -378,7 +358,7 @@ object DlgEventEdit: TDlgEventEdit
Height = 23 Height = 23
Top = 104 Top = 104
Width = 65 Width = 65
TabOrder = 9 TabOrder = 7
Text = 'Placeholder control' Text = 'Placeholder control'
Visible = False Visible = False
end end
@ -482,10 +462,10 @@ object DlgEventEdit: TDlgEventEdit
NumGlyphs = 1 NumGlyphs = 1
MaxLength = 0 MaxLength = 0
OnChangeBounds = EndDateChange OnChangeBounds = EndDateChange
TabOrder = 6 TabOrder = 5
end end
object RepeatUntil: TDateEdit object RepeatUntil: TDateEdit
Left = 440 Left = 464
Height = 23 Height = 23
Top = 131 Top = 131
Width = 100 Width = 100
@ -532,7 +512,7 @@ object DlgEventEdit: TDlgEventEdit
} }
NumGlyphs = 1 NumGlyphs = 1
MaxLength = 0 MaxLength = 0
TabOrder = 11 TabOrder = 9
end end
object AlarmAdvance: TEdit object AlarmAdvance: TEdit
Left = 130 Left = 130
@ -540,7 +520,7 @@ object DlgEventEdit: TDlgEventEdit
Top = 168 Top = 168
Width = 64 Width = 64
OnChange = AlarmAdvanceChange OnChange = AlarmAdvanceChange
TabOrder = 13 TabOrder = 11
Text = 'AlarmAdvance' Text = 'AlarmAdvance'
end end
object LocationLbl: TLabel object LocationLbl: TLabel

43
components/tvplanit/source/vpevnteditdlg.pas
View File

@ -35,14 +35,13 @@ interface
uses uses
{$IFDEF LCL} {$IFDEF LCL}
LMessages, LCLProc, LCLType, LCLIntf, LResources, LMessages, LCLProc, LCLType, LCLIntf, LResources, EditBtn,
{$ELSE} {$ELSE}
Windows, Messages, Mask, Windows, Messages, Mask,
{$ENDIF} {$ENDIF}
SysUtils, {$IFDEF VERSION6}Variants,{$ENDIF} Classes, SysUtils, {$IFDEF VERSION6}Variants,{$ENDIF} Classes,
Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, VpData, VpEdPop, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls, Buttons,
ComCtrls, VpBase, VpBaseDS, VpDlg, VpConst, VpData, VpBase, VpBaseDS, VpDlg, VpConst; //VpEdPop,
Buttons, EditBtn;
type type
{ forward declarations } { forward declarations }
@ -87,8 +86,6 @@ type
SpeedButton1: TSpeedButton; SpeedButton1: TSpeedButton;
DescriptionEdit: TEdit; DescriptionEdit: TEdit;
AlarmSet: TCheckBox; AlarmSet: TCheckBox;
StartTime: TComboBox;
EndTime: TComboBox;
Category: TComboBox; Category: TComboBox;
RecurringType: TComboBox; RecurringType: TComboBox;
IntervalUpDown: TUpDown; IntervalUpDown: TUpDown;
@ -119,6 +116,14 @@ type
procedure StartTimeExit(Sender: TObject); procedure StartTimeExit(Sender: TObject);
procedure EndTimeExit(Sender: TObject); procedure EndTimeExit(Sender: TObject);
private { Private declarations } private { Private declarations }
{$IFDEF LCL}
StartTime: TTimeEdit;
EndTime: TTimeEdit;
{$ENDIF}
{$IFDEF DELPHI}
StartTime: TComboBox;
EndTime: TComboBox;
{$ENDIF}
AAVerifying: Boolean; AAVerifying: Boolean;
CIVerifying: Boolean; CIVerifying: Boolean;
FCustomInterval : TVpRightAlignedEdit; FCustomInterval : TVpRightAlignedEdit;
@ -184,11 +189,31 @@ end;
procedure TDlgEventEdit.FormCreate(Sender: TObject); procedure TDlgEventEdit.FormCreate(Sender: TObject);
begin begin
{$IFDEF LCL}
StartTime := TTimeEdit.Create(self);
{$ELSE}
StartTime := TCombobox.Create(self);
StartTime.Width := 93;
StartTime.ItemIndex := -1;
{$ENDIF}
StartTime.Parent := AppointmentGroupbox;
StartTime.Left := AlarmAdvanceType.Left;
StartTime.Top := StartDate.Top;
{$IFDEF LCL}
EndTime := TTimeEdit.Create(self);
{$ELSE}
EndTime := TCombobox.Create(self);
EndTime.Width := 93;
EndTime.ItemIndex := -1;
{$ENDIF}
EndTime.Parent := AppointmentGroupbox;
EndTime.Left := AlarmAdvanceType.Left;
EndTime.Top := EndDate.Top;
ReturnCode := rtAbandon; ReturnCode := rtAbandon;
PopLists; PopLists;
LoadCaptions; LoadCaptions;
StartTime.ItemIndex := -1;
EndTime.ItemIndex := -1;
EndDate.Enabled := False; EndDate.Enabled := False;
FCustomInterval := TVpRightAlignedEdit.Create(Self); FCustomInterval := TVpRightAlignedEdit.Create(Self);
@ -449,6 +474,7 @@ var
I, Hour, Minute: Integer; I, Hour, Minute: Integer;
MinStr, AMPMStr: string; MinStr, AMPMStr: string;
begin begin
{$IFDEF DELPHI}
{ Time Lists } { Time Lists }
StringList := TStringList.Create; StringList := TStringList.Create;
try try
@ -479,6 +505,7 @@ begin
finally finally
StringList.Free; StringList.Free;
end; end;
{$ENDIF}
{ RecurringList } { RecurringList }
RecurringType.Items.Add(RSNone); RecurringType.Items.Add(RSNone);