spready: Add support for new worksheet option soAutoDetectCellType

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7060 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-07-20 10:23:34 +00:00
parent e71408fc19
commit 42ad68b2bc
3 changed files with 29 additions and 6 deletions

View File

@ -13,7 +13,7 @@ object MainForm: TMainForm
OnDropFiles = FormDropFiles OnDropFiles = FormDropFiles
OnShow = FormShow OnShow = FormShow
ShowHint = True ShowHint = True
LCLVersion = '1.9.0.0' LCLVersion = '2.1.0.0'
object WorkbookTabControl: TsWorkbookTabControl object WorkbookTabControl: TsWorkbookTabControl
Left = 0 Left = 0
Height = 609 Height = 609
@ -98,11 +98,11 @@ object MainForm: TMainForm
'Options=boAutoCalc, boCalcBeforeSaving, boReadFormulas' 'Options=boAutoCalc, boCalcBeforeSaving, boReadFormulas'
'(-) FormatSettings=' '(-) FormatSettings='
' ThousandSeparator=.' ' ThousandSeparator=.'
' DecimalSeparator=.' ' DecimalSeparator=,'
' ListSeparator=;' ' ListSeparator=;'
' DateSeparator=.' ' DateSeparator=.'
' TimeSeparator=:' ' TimeSeparator=:'
' ShortDateFormat=MM.yy' ' ShortDateFormat=dd.MM.yyyy'
' LongDateFormat=dddd, d. MMMM yyyy' ' LongDateFormat=dddd, d. MMMM yyyy'
' ShortTimeFormat=hh:nn' ' ShortTimeFormat=hh:nn'
' LongTimeFormat=hh:nn:ss' ' LongTimeFormat=hh:nn:ss'
@ -349,7 +349,7 @@ object MainForm: TMainForm
Width = 130 Width = 130
WorkbookSource = WorkbookSource WorkbookSource = WorkbookSource
DropDownCount = 24 DropDownCount = 24
ItemIndex = 49 ItemIndex = 69
TabOrder = 0 TabOrder = 0
Text = 'Arial' Text = 'Arial'
end end
@ -1931,6 +1931,7 @@ object MainForm: TMainForm
Category = 'Settings' Category = 'Settings'
AutoCheck = True AutoCheck = True
Caption = 'Update row heights after loading' Caption = 'Update row heights after loading'
Hint = 'Automatically update the row heights'
OnExecute = AcSettingsAutoUpdateRowheightsExecute OnExecute = AcSettingsAutoUpdateRowheightsExecute
end end
object AcWorksheetShowGrid: TAction object AcWorksheetShowGrid: TAction
@ -1955,6 +1956,14 @@ object MainForm: TMainForm
Hint = 'Zoom worksheet' Hint = 'Zoom worksheet'
OnExecute = AcZoomMoreExecute OnExecute = AcZoomMoreExecute
end end
object AcSettingsAutoDetectCellType: TAction
Category = 'Settings'
AutoCheck = True
Caption = 'Automatically detect cell type'
Checked = True
Hint = 'Automatically detect the type of the cell content.'
OnExecute = AcSettingsAutoDetectCellTypeExecute
end
end end
object ImageList: TImageList object ImageList: TImageList
left = 176 left = 176
@ -4848,6 +4857,10 @@ object MainForm: TMainForm
Action = AcSettingsAutoUpdateRowheights Action = AcSettingsAutoUpdateRowheights
AutoCheck = True AutoCheck = True
end end
object MenuItem197: TMenuItem
Action = AcSettingsAutoDetectCellType
AutoCheck = True
end
end end
object MnuHelp: TMenuItem object MnuHelp: TMenuItem
Caption = 'Help' Caption = 'Help'

View File

@ -39,6 +39,7 @@ type
AcColWidth: TAction; AcColWidth: TAction;
AcSettingsReadFormulas: TAction; AcSettingsReadFormulas: TAction;
AcSettingsAutoUpdateRowheights: TAction; AcSettingsAutoUpdateRowheights: TAction;
AcSettingsAutoDetectCellType: TAction;
AcWorksheetShowHeaders: TAction; AcWorksheetShowHeaders: TAction;
AcWorksheetShowGrid: TAction; AcWorksheetShowGrid: TAction;
AcWorksheetProtection: TAction; AcWorksheetProtection: TAction;
@ -101,6 +102,7 @@ type
MenuItem194: TMenuItem; MenuItem194: TMenuItem;
MenuItem195: TMenuItem; MenuItem195: TMenuItem;
MenuItem196: TMenuItem; MenuItem196: TMenuItem;
MenuItem197: TMenuItem;
MenuItem2: TMenuItem; MenuItem2: TMenuItem;
MenuItem3: TMenuItem; MenuItem3: TMenuItem;
MenuItem4: TMenuItem; MenuItem4: TMenuItem;
@ -456,6 +458,7 @@ type
procedure AcRowAddExecute(Sender: TObject); procedure AcRowAddExecute(Sender: TObject);
procedure AcRowDeleteExecute(Sender: TObject); procedure AcRowDeleteExecute(Sender: TObject);
procedure AcRowHeightExecute(Sender: TObject); procedure AcRowHeightExecute(Sender: TObject);
procedure AcSettingsAutoDetectCellTypeExecute(Sender: TObject);
procedure AcSettingsAutoUpdateRowheightsExecute(Sender: TObject); procedure AcSettingsAutoUpdateRowheightsExecute(Sender: TObject);
procedure AcSettingsReadFormulasExecute(Sender: TObject); procedure AcSettingsReadFormulasExecute(Sender: TObject);
procedure AcSortColAscExecute(Sender: TObject); procedure AcSortColAscExecute(Sender: TObject);
@ -799,6 +802,11 @@ begin
SearchForm.Execute(WorkbookSource.Workbook); SearchForm.Execute(WorkbookSource.Workbook);
end; end;
procedure TMainForm.AcSettingsAutoDetectCellTypeExecute(Sender: TObject);
begin
WorksheetGrid.AutoDetectCellType := AcSettingsautoDetectCellType.Checked;
end;
procedure TMainForm.AcSettingsCSVParamsExecute(Sender: TObject); procedure TMainForm.AcSettingsCSVParamsExecute(Sender: TObject);
var var
F: TCSVParamsForm; F: TCSVParamsForm;

View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="spready"/> <Title Value="spready"/>
<UseAppBundle Value="False"/> <UseAppBundle Value="False"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>