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

jvcllaz: Don't always begin JvTimeFrame on Jan 1, 2001, but on user-defined date.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7139 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-08-16 10:15:01 +00:00
parent 38184c0550
commit e63668a359
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/jvcllaz/examples/JvTimeFramework/tfmain.pas
View File

@ -688,7 +688,11 @@ begin
ResourceComboChange(nil); ResourceComboChange(nil);
DaysComboChange(nil); DaysComboChange(nil);
ModeComboChange(nil); ModeComboChange(nil);
GotoDatePicker.Date := EncodeDate(2002, 1, 1);
if GlobalSettings.StartToday then
GotoDatePicker.Date := Date()
else
GotoDatePicker.Date := GlobalSettings.StartDate;
GotoDatePickerChange(nil); GotoDatePickerChange(nil);
TimeIncComboChange(nil); TimeIncComboChange(nil);
end; end;
@ -886,17 +890,12 @@ procedure TMainForm.FormCreate(Sender: TObject);
var var
fn: String; fn: String;
begin begin
with DefaultFormatSettings do begin with FormatSettings do begin
CurrencyFormat := 1;
NegCurrFormat := 5;
ThousandSeparator := ','; ThousandSeparator := ',';
DecimalSeparator := '.'; DecimalSeparator := '.';
CurrencyDecimals := 2; DateSeparator := '/';
DateSeparator := '-';
TimeSeparator := ':'; TimeSeparator := ':';
ListSeparator := ','; ShortDateFormat := 'd/mm/yyyy';
CurrencyString := '$';
ShortDateFormat := 'd/m/y';
LongDateFormat := 'dd" "mmmm" "yyyy'; LongDateFormat := 'dd" "mmmm" "yyyy';
TimeAMString := 'AM'; TimeAMString := 'AM';
TimePMString := 'PM'; TimePMString := 'PM';

6
components/jvcllaz/examples/JvTimeFramework/tfsettings.lfm
View File

@ -258,12 +258,12 @@ object SettingsForm: TSettingsForm
Left = 134 Left = 134
Height = 23 Height = 23
Top = 8 Top = 8
Width = 183 Width = 216
AutoSize = True AutoSize = True
BorderSpacing.Top = 8 BorderSpacing.Top = 8
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 23 ClientHeight = 23
ClientWidth = 183 ClientWidth = 216
TabOrder = 5 TabOrder = 5
object rbStartToday: TRadioButton object rbStartToday: TRadioButton
AnchorSideLeft.Control = StartDatePanel AnchorSideLeft.Control = StartDatePanel
@ -297,7 +297,7 @@ object SettingsForm: TSettingsForm
Left = 80 Left = 80
Height = 23 Height = 23
Top = 0 Top = 0
Width = 103 Width = 136
CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames] CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
OnAcceptDate = deStartDateAcceptDate OnAcceptDate = deStartDateAcceptDate
DefaultToday = True DefaultToday = True

15
components/jvcllaz/examples/JvTimeFramework/tfsettings.pas
View File

@ -80,6 +80,9 @@ implementation
procedure TSettingsForm.ControlsToSettings; procedure TSettingsForm.ControlsToSettings;
begin begin
GlobalSettings.StartToday := rbStartToday.Checked; GlobalSettings.StartToday := rbStartToday.Checked;
if not GlobalSettings.StartToday and (GlobalSettings.StartDate = Date) then
GlobalSettings.StartDate := 0
else
GlobalSettings.StartDate := deStartDate.Date; GlobalSettings.StartDate := deStartDate.Date;
GlobalSettings.Hr2400 := cbTimeFormat.ItemIndex = 0; GlobalSettings.Hr2400 := cbTimeFormat.ItemIndex = 0;
@ -99,10 +102,14 @@ end;
procedure TSettingsForm.SettingsToControls; procedure TSettingsForm.SettingsToControls;
begin begin
rbStartToday.Checked := GlobalSettings.StartToday; if GlobalSettings.StartToday then
deStartDate.Date := GlobalSettings.StartDate; rbStartToday.Checked := true
if not rbStartToday.Checked and (deStartDate.Date <> 0) then else
rbStartDate.Checked := true; rbStartDate.Checked := true;
if GlobalSettings.StartDate = 0 then
deStartDate.Date := Date()
else
deStartDate.Date := GlobalSettings.StartDate;
cbTimeFormat.ItemIndex := ord(not GlobalSettings.Hr2400); cbTimeFormat.ItemIndex := ord(not GlobalSettings.Hr2400);
cbFirstDayOfWeek.ItemIndex := ord(GlobalSettings.FirstDayOfWeek); cbFirstDayOfWeek.ItemIndex := ord(GlobalSettings.FirstDayOfWeek);
@ -128,7 +135,7 @@ begin
try try
cbFirstDayOfWeek.Clear; cbFirstDayOfWeek.Clear;
for i:=1 to 7 do for i:=1 to 7 do
cbFirstDayOfWeek.Items.Add(DefaultFormatSettings.LongDayNames[i]); cbFirstDayOfWeek.Items.Add(FormatSettings.LongDayNames[i]);
finally finally
cbFirstDayOfWeek.Items.EndUpdate; cbFirstDayOfWeek.Items.EndUpdate;
end; end;