From 5b0181c2971d0327a4f34b8ef82cb9859f91b144 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sat, 30 May 2015 14:01:10 +0000 Subject: [PATCH] fpspreadsheet: Improved usability of the TsSpreadsheetInspector. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4164 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../fpspreadsheet/examples/visual/fpsctrls/main.lfm | 13 +++++++------ components/fpspreadsheet/fpsnumformatparser.pas | 6 ++++-- components/fpspreadsheet/fpspreadsheetctrls.pas | 2 ++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm b/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm index ca278654b..f3f2d2676 100644 --- a/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm +++ b/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm @@ -13,7 +13,7 @@ object MainForm: TMainForm Left = 0 Height = 518 Top = 83 - Width = 682 + Width = 654 TabIndex = 0 Tabs.Strings = ( 'Sheet1' @@ -25,7 +25,7 @@ object MainForm: TMainForm Left = 2 Height = 493 Top = 23 - Width = 678 + Width = 650 FrozenCols = 0 FrozenRows = 0 ReadFormulas = False @@ -50,10 +50,10 @@ object MainForm: TMainForm end end object InspectorTabControl: TTabControl - Left = 687 + Left = 659 Height = 518 Top = 83 - Width = 253 + Width = 281 OnChange = InspectorTabControlChange TabIndex = 0 Tabs.Strings = ( @@ -69,8 +69,9 @@ object MainForm: TMainForm Left = 2 Height = 493 Top = 23 - Width = 249 + Width = 277 Align = alClient + MouseWheelOption = mwGrid RowCount = 30 TabOrder = 1 TitleStyle = tsNative @@ -120,7 +121,7 @@ object MainForm: TMainForm end end object InspectorSplitter: TSplitter - Left = 682 + Left = 654 Height = 518 Top = 83 Width = 5 diff --git a/components/fpspreadsheet/fpsnumformatparser.pas b/components/fpspreadsheet/fpsnumformatparser.pas index 0a9338c96..9709a1211 100644 --- a/components/fpspreadsheet/fpsnumformatparser.pas +++ b/components/fpspreadsheet/fpsnumformatparser.pas @@ -616,8 +616,10 @@ begin end; end; - // If we get here the token is isolated. In case we assume that it is a - // month - that's the way Excel does it. + // If we get here the token is isolated. In this case we assume + // that it is a month - that's the way Excel does it when reading files + // (for editing of a worksheet, however, Excel distinguishes between + // uppercase "M" for "month" and lowercase "m" for "minute".) ASection.Elements[i].Token := nftMonth; Include(ASection.Kind, nfkDate); end; diff --git a/components/fpspreadsheet/fpspreadsheetctrls.pas b/components/fpspreadsheet/fpspreadsheetctrls.pas index e99f4cee6..fc505b145 100644 --- a/components/fpspreadsheet/fpspreadsheetctrls.pas +++ b/components/fpspreadsheet/fpspreadsheetctrls.pas @@ -434,6 +434,8 @@ type property DisplayOptions default [doColumnTitles, doAutoColResize]; {@@ inherited from TValueListEditor. Turns of the fixed column by default} property FixedCols default 0; + {@@ inherited from TStringGrid, but not published in TValueListEditor. } + property ExtendedColSizing; end; var