From ee602a31cdcfd036c0d44f861c47ff7492d883ae Mon Sep 17 00:00:00 2001
From: lazarus-bart <lazarus-bart@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 4 Jan 2020 14:55:32 +0000
Subject: [PATCH] Sudoku: use fpc-type resource instead of old Lazarus .lrs
 style resource.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7219 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 applications/sudoku/sudoku.lpi     | 25 +++++++++++++++++--------
 applications/sudoku/sudokumain.lrs | 21 ---------------------
 applications/sudoku/sudokumain.pas |  6 +-----
 3 files changed, 18 insertions(+), 34 deletions(-)
 delete mode 100644 applications/sudoku/sudokumain.lrs

diff --git a/applications/sudoku/sudoku.lpi b/applications/sudoku/sudoku.lpi
index 9615e1117..d7b4b86e4 100644
--- a/applications/sudoku/sudoku.lpi
+++ b/applications/sudoku/sudoku.lpi
@@ -7,6 +7,7 @@
         <LRSInOutputDirectory Value="False"/>
         <CompatibilityMode Value="True"/>
       </Flags>
+      <ResourceType Value="res"/>
     </General>
     <BuildModes Count="1">
       <Item1 Name="default" Default="True"/>
@@ -36,10 +37,9 @@
       <Unit0>
         <Filename Value="sudoku.lpr"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="-1"/>
         <CursorPos Y="26"/>
         <UsageCount Value="241"/>
-        <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
@@ -49,9 +49,8 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
-        <EditorIndex Value="1"/>
-        <TopLine Value="66"/>
-        <CursorPos X="59" Y="81"/>
+        <TopLine Value="121"/>
+        <CursorPos Y="150"/>
         <UsageCount Value="241"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -59,7 +58,9 @@
       <Unit2>
         <Filename Value="sudokutype.pas"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos Y="24"/>
+        <EditorIndex Value="1"/>
+        <TopLine Value="89"/>
+        <CursorPos Y="119"/>
         <UsageCount Value="241"/>
         <Loaded Value="True"/>
       </Unit2>
@@ -82,7 +83,7 @@
         <UsageCount Value="10"/>
       </Unit5>
     </Units>
-    <JumpHistory Count="4" HistoryIndex="3">
+    <JumpHistory Count="6" HistoryIndex="5">
       <Position1>
         <Filename Value="sudokutype.pas"/>
         <Caret Line="45" TopLine="21"/>
@@ -97,8 +98,16 @@
       </Position3>
       <Position4>
         <Filename Value="sudokumain.pas"/>
-        <Caret Line="81" Column="26" TopLine="66"/>
+        <Caret Line="81" Column="59" TopLine="66"/>
       </Position4>
+      <Position5>
+        <Filename Value="sudokumain.pas"/>
+        <Caret Line="16" TopLine="16"/>
+      </Position5>
+      <Position6>
+        <Filename Value="sudokumain.pas"/>
+        <Caret Line="61" Column="2" TopLine="45"/>
+      </Position6>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/applications/sudoku/sudokumain.lrs b/applications/sudoku/sudokumain.lrs
deleted file mode 100644
index fce8f214a..000000000
--- a/applications/sudoku/sudokumain.lrs
+++ /dev/null
@@ -1,21 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-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#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 cefd3d061..38c8aaa5a 100644
--- a/applications/sudoku/sudokumain.pas
+++ b/applications/sudoku/sudokumain.pas
@@ -58,8 +58,7 @@ var
 
 implementation
 
-// Voor delphi is de volgende regel noodzakelijk. Spatie tussen { en $ verwijderen
-{ $R *.dfm }
+{$R *.lfm }
 
 { TForm1 }
 
@@ -148,8 +147,5 @@ begin
   ShowMessage('Sudoku solved in ' + IntToStr(Stappen) + ' steps.');
 end;
 
-initialization
-// Voor lazarus is deze regel nodig.
-  {$I sudokumain.lrs}
 end.