From 7b4b0cb51389e8fc1bad60daf60339b1974a157a Mon Sep 17 00:00:00 2001 From: lazarus-bart Date: Sat, 4 Jan 2020 14:49:55 +0000 Subject: [PATCH] Sudoku: fix errors during loading the project and fix complilation errors, fix project paths. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7218 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- applications/sudoku/sudoku.lpi | 95 ++++++++++++++++-------------- applications/sudoku/sudokumain.lfm | 12 +--- applications/sudoku/sudokumain.lrs | 30 +++++----- applications/sudoku/sudokumain.pas | 4 +- 4 files changed, 70 insertions(+), 71 deletions(-) diff --git a/applications/sudoku/sudoku.lpi b/applications/sudoku/sudoku.lpi index 0cff6489c..9615e1117 100644 --- a/applications/sudoku/sudoku.lpi +++ b/applications/sudoku/sudoku.lpi @@ -1,27 +1,31 @@ - + - - + - - - - + + + + - + + + - - - - - - + + + + + + + + + @@ -32,72 +36,78 @@ - - - + + - - - - - + + + + + + + - - - - + - - + - - + - - + - + - + + + + + + + + + + + + + - - - - - - - + + + + + + @@ -105,9 +115,6 @@ - - - diff --git a/applications/sudoku/sudokumain.lfm b/applications/sudoku/sudokumain.lfm index ae4fcad99..c85cf736a 100644 --- a/applications/sudoku/sudokumain.lfm +++ b/applications/sudoku/sudokumain.lfm @@ -9,14 +9,13 @@ object Form1: TForm1 Caption = 'Form1' ClientHeight = 281 ClientWidth = 272 - PixelsPerInch = 75 + LCLVersion = '2.1.0.0' object Label1: TLabel Left = 44 - Height = 13 + Height = 15 Top = 8 - Width = 39 + Width = 34 Caption = 'Label1' - Color = clNone ParentColor = False end object StringGrid1: TStringGrid @@ -26,17 +25,12 @@ object Form1: TForm1 Width = 182 ColCount = 9 DefaultColWidth = 20 - FixedColor = clBtnFace FixedCols = 0 FixedRows = 0 GridLineWidth = 0 Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goSmoothScroll] RowCount = 9 - ScrollBars = ssAutoBoth TabOrder = 2 - TabStop = True - VisibleColCount = 9 - VisibleRowCount = 9 OnDrawCell = StringGrid1DrawCell OnSetEditText = StringGrid1SetEditText end diff --git a/applications/sudoku/sudokumain.lrs b/applications/sudoku/sudokumain.lrs index 8006f0115..fce8f214a 100644 --- a/applications/sudoku/sudokumain.lrs +++ b/applications/sudoku/sudokumain.lrs @@ -4,20 +4,18 @@ LazarusResources.Add('TForm1','FORMDATA',[ 'TPF0'#6'TForm1'#5'Form1'#4'Left'#3';'#2#6'Height'#3#25#1#3'Top'#3'c'#1#5'Wid' +'th'#3#16#1#18'HorzScrollBar.Page'#3#15#1#18'VertScrollBar.Page'#3#24#1#13'A' +'ctiveControl'#7#10'ButtonFill'#7'Caption'#6#5'Form1'#12'ClientHeight'#3#25#1 - +#11'ClientWidth'#3#16#1#13'PixelsPerInch'#2'K'#0#6'TLabel'#6'Label1'#4'Left' - +#2','#6'Height'#2#13#3'Top'#2#8#5'Width'#2''''#7'Caption'#6#6'Label1'#5'Colo' - +'r'#7#6'clNone'#11'ParentColor'#8#0#0#11'TStringGrid'#11'StringGrid1'#4'Left' - +#2','#6'Height'#3#182#0#3'Top'#2'('#5'Width'#3#182#0#8'ColCount'#2#9#15'Defa' - +'ultColWidth'#2#20#10'FixedColor'#7#9'clBtnFace'#9'FixedCols'#2#0#9'FixedRow' - +'s'#2#0#13'GridLineWidth'#2#0#7'Options'#11#15'goFixedVertLine'#15'goFixedHo' - +'rzLine'#10'goVertLine'#10'goHorzLine'#13'goRangeSelect'#9'goEditing'#14'goS' - +'moothScroll'#0#8'RowCount'#2#9#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2 - +#2#7'TabStop'#9#15'VisibleColCount'#2#9#15'VisibleRowCount'#2#9#10'OnDrawCel' - +'l'#7#19'StringGrid1DrawCell'#13'OnSetEditText'#7#22'StringGrid1SetEditText' - +#0#0#7'TButton'#10'ButtonFill'#4'Left'#2','#6'Height'#2#25#3'Top'#3#228#0#5 - +'Width'#2'K'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#4'Fill'#7'OnClic' - +'k'#7#15'ButtonFillClick'#8'TabOrder'#2#0#0#0#7'TButton'#11'ButtonSolve'#4'L' - +'eft'#3#151#0#6'Height'#2#25#3'Top'#3#228#0#5'Width'#2'K'#25'BorderSpacing.I' - +'nnerBorder'#2#2#7'Caption'#6#5'Solve'#7'OnClick'#7#16'ButtonSolveClick'#8'T' - +'abOrder'#2#1#0#0#0 + +#11'ClientWidth'#3#16#1#10'LCLVersion'#6#7'2.1.0.0'#0#6'TLabel'#6'Label1'#4 + +'Left'#2','#6'Height'#2#15#3'Top'#2#8#5'Width'#2'"'#7'Caption'#6#6'Label1'#11 + +'ParentColor'#8#0#0#11'TStringGrid'#11'StringGrid1'#4'Left'#2','#6'Height'#3 + +#182#0#3'Top'#2'('#5'Width'#3#182#0#8'ColCount'#2#9#15'DefaultColWidth'#2#20 + +#9'FixedCols'#2#0#9'FixedRows'#2#0#13'GridLineWidth'#2#0#7'Options'#11#15'go' + +'FixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLine'#13'goRange' + +'Select'#9'goEditing'#14'goSmoothScroll'#0#8'RowCount'#2#9#8'TabOrder'#2#2#10 + +'OnDrawCell'#7#19'StringGrid1DrawCell'#13'OnSetEditText'#7#22'StringGrid1Set' + +'EditText'#0#0#7'TButton'#10'ButtonFill'#4'Left'#2','#6'Height'#2#25#3'Top'#3 + +#228#0#5'Width'#2'K'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#4'Fill'#7 + +'OnClick'#7#15'ButtonFillClick'#8'TabOrder'#2#0#0#0#7'TButton'#11'ButtonSolv' + +'e'#4'Left'#3#151#0#6'Height'#2#25#3'Top'#3#228#0#5'Width'#2'K'#25'BorderSpa' + +'cing.InnerBorder'#2#2#7'Caption'#6#5'Solve'#7'OnClick'#7#16'ButtonSolveClic' + +'k'#8'TabOrder'#2#1#0#0#0 ]); diff --git a/applications/sudoku/sudokumain.pas b/applications/sudoku/sudokumain.pas index 3d4e714c4..cefd3d061 100644 --- a/applications/sudoku/sudokumain.pas +++ b/applications/sudoku/sudokumain.pas @@ -70,7 +70,7 @@ begin for c := 0 to pred(StringGrid1.ColCount) do for r := 0 to pred(StringGrid1.RowCount) do StringGrid1.Cells[c, r] := ''; - Include(StringGrid1.Options, goEditing); + StringGrid1.Options := StringGrid1.Options + [goEditing]; StringGrid1.SetFocus; end; @@ -78,7 +78,7 @@ procedure TForm1.ButtonSolveClick(Sender: TObject); var c, r: Integer; begin - Exclude(StringGrid1.Options, goEditing); + StringGrid1.Options := StringGrid1.Options - [goEditing]; SolveSudoku; StringGrid1.Clean; for c := 1 to 9 do begin