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
This commit is contained in:
lazarus-bart
2020-01-04 14:49:55 +00:00
parent e154c5a902
commit 7b4b0cb513
4 changed files with 70 additions and 71 deletions

View File

@@ -1,27 +1,31 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<PathDelim Value="/"/> <Version Value="12"/>
<Version Value="5"/>
<General> <General>
<MainUnit Value="0"/> <Flags>
<IconPath Value="./"/> <LRSInOutputDirectory Value="False"/>
<TargetFileExt Value=""/> <CompatibilityMode Value="True"/>
<ActiveEditorIndexAtStart Value="0"/> </Flags>
</General> </General>
<LazDoc Paths=""/> <BuildModes Count="1">
<Item1 Name="default" Default="True"/>
</BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
<IgnoreBinaries Value="False"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<UseExcludeFileFilter Value="True"/>
<ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
</PublishOptions> </PublishOptions>
<RunParams> <RunParams>
<local> <local>
<FormatVersion Value="1"/> <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local> </local>
<FormatVersion Value="2"/>
<Modes Count="1">
<Mode0 Name="default">
<local>
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local>
</Mode0>
</Modes>
</RunParams> </RunParams>
<RequiredPackages Count="1"> <RequiredPackages Count="1">
<Item1> <Item1>
@@ -32,72 +36,78 @@
<Unit0> <Unit0>
<Filename Value="sudoku.lpr"/> <Filename Value="sudoku.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="sudoku"/>
<CursorPos X="1" Y="26"/>
<TopLine Value="1"/>
<EditorIndex Value="2"/> <EditorIndex Value="2"/>
<CursorPos Y="26"/>
<UsageCount Value="241"/> <UsageCount Value="241"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="sudokumain.pas"/> <Filename Value="sudokumain.pas"/>
<ComponentName Value="Form1"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ResourceFilename Value="sudokumain.lrs"/> <ComponentName Value="Form1"/>
<UnitName Value="sudokumain"/> <HasResources Value="True"/>
<CursorPos X="1" Y="23"/> <ResourceBaseClass Value="Form"/>
<TopLine Value="1"/> <IsVisibleTab Value="True"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<TopLine Value="66"/>
<CursorPos X="59" Y="81"/>
<UsageCount Value="241"/> <UsageCount Value="241"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="sudokutype.pas"/> <Filename Value="sudokutype.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="sudokutype"/> <CursorPos Y="24"/>
<CursorPos X="1" Y="24"/>
<TopLine Value="1"/>
<EditorIndex Value="0"/>
<UsageCount Value="241"/> <UsageCount Value="241"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="origineel/sudokutype.pas"/> <Filename Value="origineel/sudokutype.pas"/>
<UnitName Value="sudokutype"/>
<CursorPos X="1" Y="202"/>
<TopLine Value="166"/> <TopLine Value="166"/>
<CursorPos Y="202"/>
<UsageCount Value="5"/> <UsageCount Value="5"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="home/matthijs/Projecten/Lazarus/suntime/SunTime.pas"/> <Filename Value="home/matthijs/Projecten/Lazarus/suntime/SunTime.pas"/>
<UnitName Value="SunTime"/>
<CursorPos X="30" Y="133"/>
<TopLine Value="121"/> <TopLine Value="121"/>
<CursorPos X="30" Y="133"/>
<UsageCount Value="12"/> <UsageCount Value="12"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="home/matthijs/Projecten/Lazarus/suntime/suntime_com.pas"/> <Filename Value="home/matthijs/Projecten/Lazarus/suntime/suntime_com.pas"/>
<UnitName Value="suntime_com"/>
<CursorPos X="9" Y="218"/>
<TopLine Value="197"/> <TopLine Value="197"/>
<CursorPos X="9" Y="218"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit5> </Unit5>
</Units> </Units>
<JumpHistory Count="1" HistoryIndex="0"> <JumpHistory Count="4" HistoryIndex="3">
<Position1> <Position1>
<Filename Value="sudokutype.pas"/> <Filename Value="sudokutype.pas"/>
<Caret Line="45" Column="1" TopLine="21"/> <Caret Line="45" TopLine="21"/>
</Position1> </Position1>
<Position2>
<Filename Value="sudokutype.pas"/>
<Caret Line="24"/>
</Position2>
<Position3>
<Filename Value="sudokumain.pas"/>
<Caret Line="73" Column="59" TopLine="58"/>
</Position3>
<Position4>
<Filename Value="sudokumain.pas"/>
<Caret Line="81" Column="26" TopLine="66"/>
</Position4>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="5"/> <Version Value="11"/>
<SearchPaths> <Parsing>
<SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/"/> <SyntaxOptions>
</SearchPaths> <UseAnsiStrings Value="False"/>
<CodeGeneration> </SyntaxOptions>
<Generate Value="Faster"/> </Parsing>
</CodeGeneration>
<Linking> <Linking>
<Options> <Options>
<Win32> <Win32>
@@ -105,9 +115,6 @@
</Win32> </Win32>
</Options> </Options>
</Linking> </Linking>
<Other>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions> </CompilerOptions>
<Debugging> <Debugging>
<Exceptions Count="2"> <Exceptions Count="2">

View File

@@ -9,14 +9,13 @@ object Form1: TForm1
Caption = 'Form1' Caption = 'Form1'
ClientHeight = 281 ClientHeight = 281
ClientWidth = 272 ClientWidth = 272
PixelsPerInch = 75 LCLVersion = '2.1.0.0'
object Label1: TLabel object Label1: TLabel
Left = 44 Left = 44
Height = 13 Height = 15
Top = 8 Top = 8
Width = 39 Width = 34
Caption = 'Label1' Caption = 'Label1'
Color = clNone
ParentColor = False ParentColor = False
end end
object StringGrid1: TStringGrid object StringGrid1: TStringGrid
@@ -26,17 +25,12 @@ object Form1: TForm1
Width = 182 Width = 182
ColCount = 9 ColCount = 9
DefaultColWidth = 20 DefaultColWidth = 20
FixedColor = clBtnFace
FixedCols = 0 FixedCols = 0
FixedRows = 0 FixedRows = 0
GridLineWidth = 0 GridLineWidth = 0
Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goSmoothScroll] Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goSmoothScroll]
RowCount = 9 RowCount = 9
ScrollBars = ssAutoBoth
TabOrder = 2 TabOrder = 2
TabStop = True
VisibleColCount = 9
VisibleRowCount = 9
OnDrawCell = StringGrid1DrawCell OnDrawCell = StringGrid1DrawCell
OnSetEditText = StringGrid1SetEditText OnSetEditText = StringGrid1SetEditText
end end

View File

@@ -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' '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' +'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 +'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' +#11'ClientWidth'#3#16#1#10'LCLVersion'#6#7'2.1.0.0'#0#6'TLabel'#6'Label1'#4
+#2','#6'Height'#2#13#3'Top'#2#8#5'Width'#2''''#7'Caption'#6#6'Label1'#5'Colo' +'Left'#2','#6'Height'#2#15#3'Top'#2#8#5'Width'#2'"'#7'Caption'#6#6'Label1'#11
+'r'#7#6'clNone'#11'ParentColor'#8#0#0#11'TStringGrid'#11'StringGrid1'#4'Left' +'ParentColor'#8#0#0#11'TStringGrid'#11'StringGrid1'#4'Left'#2','#6'Height'#3
+#2','#6'Height'#3#182#0#3'Top'#2'('#5'Width'#3#182#0#8'ColCount'#2#9#15'Defa' +#182#0#3'Top'#2'('#5'Width'#3#182#0#8'ColCount'#2#9#15'DefaultColWidth'#2#20
+'ultColWidth'#2#20#10'FixedColor'#7#9'clBtnFace'#9'FixedCols'#2#0#9'FixedRow' +#9'FixedCols'#2#0#9'FixedRows'#2#0#13'GridLineWidth'#2#0#7'Options'#11#15'go'
+'s'#2#0#13'GridLineWidth'#2#0#7'Options'#11#15'goFixedVertLine'#15'goFixedHo' +'FixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLine'#13'goRange'
+'rzLine'#10'goVertLine'#10'goHorzLine'#13'goRangeSelect'#9'goEditing'#14'goS' +'Select'#9'goEditing'#14'goSmoothScroll'#0#8'RowCount'#2#9#8'TabOrder'#2#2#10
+'moothScroll'#0#8'RowCount'#2#9#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2 +'OnDrawCell'#7#19'StringGrid1DrawCell'#13'OnSetEditText'#7#22'StringGrid1Set'
+#2#7'TabStop'#9#15'VisibleColCount'#2#9#15'VisibleRowCount'#2#9#10'OnDrawCel' +'EditText'#0#0#7'TButton'#10'ButtonFill'#4'Left'#2','#6'Height'#2#25#3'Top'#3
+'l'#7#19'StringGrid1DrawCell'#13'OnSetEditText'#7#22'StringGrid1SetEditText' +#228#0#5'Width'#2'K'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#4'Fill'#7
+#0#0#7'TButton'#10'ButtonFill'#4'Left'#2','#6'Height'#2#25#3'Top'#3#228#0#5 +'OnClick'#7#15'ButtonFillClick'#8'TabOrder'#2#0#0#0#7'TButton'#11'ButtonSolv'
+'Width'#2'K'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#4'Fill'#7'OnClic' +'e'#4'Left'#3#151#0#6'Height'#2#25#3'Top'#3#228#0#5'Width'#2'K'#25'BorderSpa'
+'k'#7#15'ButtonFillClick'#8'TabOrder'#2#0#0#0#7'TButton'#11'ButtonSolve'#4'L' +'cing.InnerBorder'#2#2#7'Caption'#6#5'Solve'#7'OnClick'#7#16'ButtonSolveClic'
+'eft'#3#151#0#6'Height'#2#25#3'Top'#3#228#0#5'Width'#2'K'#25'BorderSpacing.I' +'k'#8'TabOrder'#2#1#0#0#0
+'nnerBorder'#2#2#7'Caption'#6#5'Solve'#7'OnClick'#7#16'ButtonSolveClick'#8'T'
+'abOrder'#2#1#0#0#0
]); ]);

View File

@@ -70,7 +70,7 @@ begin
for c := 0 to pred(StringGrid1.ColCount) do for c := 0 to pred(StringGrid1.ColCount) do
for r := 0 to pred(StringGrid1.RowCount) do for r := 0 to pred(StringGrid1.RowCount) do
StringGrid1.Cells[c, r] := ''; StringGrid1.Cells[c, r] := '';
Include(StringGrid1.Options, goEditing); StringGrid1.Options := StringGrid1.Options + [goEditing];
StringGrid1.SetFocus; StringGrid1.SetFocus;
end; end;
@@ -78,7 +78,7 @@ procedure TForm1.ButtonSolveClick(Sender: TObject);
var var
c, r: Integer; c, r: Integer;
begin begin
Exclude(StringGrid1.Options, goEditing); StringGrid1.Options := StringGrid1.Options - [goEditing];
SolveSudoku; SolveSudoku;
StringGrid1.Clean; StringGrid1.Clean;
for c := 1 to 9 do begin for c := 1 to 9 do begin