irgendwas gemacht

7 files changed, 148 insertions, 48 deletions

diff --git a/raetsel.lpi b/raetsel.lpi
index 70967d1..4f62b02 100644
--- a/raetsel.lpi
+++ b/raetsel.lpi
@@ -32,7 +32,7 @@
         <PackageName Value="LCL"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="2">
+    <Units Count="3">
       <Unit0>
         <Filename Value="raetsel.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -41,9 +41,16 @@
         <Filename Value="unit1.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="Unit1"/>
       </Unit1>
+      <Unit2>
+        <Filename Value="unit2.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="Form2"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="Unit2"/>
+      </Unit2>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/raetsel.lpr b/raetsel.lpr
index 2f603cd..22187bf 100644
--- a/raetsel.lpr
+++ b/raetsel.lpr
@@ -7,7 +7,7 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, Unit1
+  Forms, unit1, Unit2
   { you can add units after this };
 
 {$R *.res}
@@ -16,6 +16,7 @@ begin
   RequireDerivedFormResource:=True;
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
+  Application.CreateForm(TForm2, Form2);
   Application.Run;
 end.
 
diff --git a/raetsel.lps b/raetsel.lps
index 04c7bd4..d287696 100644
--- a/raetsel.lps
+++ b/raetsel.lps
@@ -3,7 +3,7 @@
   <ProjectSession>
     <Version Value="9"/>
     <BuildModes Active="Default"/>
-    <Units Count="6">
+    <Units Count="7">
       <Unit0>
         <Filename Value="raetsel.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -11,16 +11,17 @@
         <WindowIndex Value="-1"/>
         <TopLine Value="-1"/>
         <CursorPos X="-1" Y="-1"/>
-        <UsageCount Value="20"/>
+        <UsageCount Value="25"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="Unit1"/>
-        <CursorPos X="83" Y="8"/>
-        <UsageCount Value="20"/>
+        <IsVisibleTab Value="True"/>
+        <CursorPos X="24" Y="38"/>
+        <UsageCount Value="25"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -38,22 +39,35 @@
       </Unit3>
       <Unit4>
         <Filename Value="raetselFileUnit.pas"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="-1"/>
         <CursorPos X="28" Y="11"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit4>
       <Unit5>
         <Filename Value="ori_Unit1.pas"/>
+        <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="-1"/>
         <CursorPos X="15" Y="13"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit5>
+      <Unit6>
+        <Filename Value="unit2.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="Form2"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="Unit2"/>
+        <EditorIndex Value="1"/>
+        <TopLine Value="6"/>
+        <CursorPos X="35" Y="45"/>
+        <UsageCount Value="24"/>
+        <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
+      </Unit6>
     </Units>
-    <JumpHistory Count="14" HistoryIndex="13">
+    <JumpHistory Count="10" HistoryIndex="9">
       <Position1>
         <Filename Value="unit1.pas"/>
         <Caret Line="9" Column="4"/>
@@ -63,53 +77,36 @@
         <Caret Line="8" Column="83"/>
       </Position2>
       <Position3>
-        <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="13" Column="15"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="18" Column="3"/>
       </Position3>
       <Position4>
-        <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="132" Column="14" TopLine="96"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="35" Column="6"/>
       </Position4>
       <Position5>
-        <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="1532" Column="18" TopLine="1496"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="30" Column="3"/>
       </Position5>
       <Position6>
-        <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="1579" Column="15" TopLine="1544"/>
+        <Filename Value="unit2.pas"/>
       </Position6>
       <Position7>
-        <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="1727" Column="15" TopLine="1692"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="37" Column="7"/>
       </Position7>
       <Position8>
-        <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="1891" Column="30" TopLine="1855"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="38" Column="33"/>
       </Position8>
       <Position9>
-        <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="13" Column="15"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="40" Column="33"/>
       </Position9>
       <Position10>
-        <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="132" Column="14" TopLine="96"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="45" Column="35" TopLine="6"/>
       </Position10>
-      <Position11>
-        <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="1532" Column="18" TopLine="1496"/>
-      </Position11>
-      <Position12>
-        <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="1579" Column="15" TopLine="1544"/>
-      </Position12>
-      <Position13>
-        <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="1727" Column="15" TopLine="1692"/>
-      </Position13>
-      <Position14>
-        <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="1891" Column="30" TopLine="1855"/>
-      </Position14>
     </JumpHistory>
   </ProjectSession>
 </CONFIG>
diff --git a/unit1.lfm b/unit1.lfm
index e6d4251..8ec305b 100644
--- a/unit1.lfm
+++ b/unit1.lfm
@@ -3,6 +3,7 @@ object Form1: TForm1
   Height = 240
   Top = 197
   Width = 320
-  Caption = 'Form1'
+  Caption = 'Rätsel'
+  OnCreate = FormCreate
   LCLVersion = '1.6.0.4'
 end
diff --git a/unit1.pas b/unit1.pas
index 79a1d82..c1584cb 100644
--- a/unit1.pas
+++ b/unit1.pas
@@ -1,4 +1,4 @@
-unit Unit1;
+unit unit1;
 
 {$mode objfpc}{$H+}
 
@@ -8,7 +8,11 @@ uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, raetselFileUnit;
 
 type
+
+  { TForm1 }
+
   TForm1 = class(TForm)
+    procedure FormCreate(Sender: TObject);
   private
     { private declarations }
   public
@@ -22,5 +26,18 @@ implementation
 
 {$R *.lfm}
 
+uses
+  unit2;
+
+{ TForm1 }
+
+procedure TForm1.FormCreate(Sender: TObject);
+begin
+  case form2.showmodal of
+    mrBuchstabenraetsel: ;
+    mrHochhausraetsel: ;
+  end;
+end;
+
 end.
 
diff --git a/unit2.lfm b/unit2.lfm
new file mode 100644
index 0000000..d067523
--- /dev/null
+++ b/unit2.lfm
@@ -0,0 +1,28 @@
+object Form2: TForm2
+  Left = 1690
+  Height = 240
+  Top = 197
+  Width = 320
+  Caption = 'Form2'
+  ClientHeight = 240
+  ClientWidth = 320
+  LCLVersion = '1.6.0.4'
+  object Button1: TButton
+    Left = 80
+    Height = 25
+    Top = 16
+    Width = 160
+    Caption = 'Hochhausrätsel'
+    OnClick = Button1Click
+    TabOrder = 0
+  end
+  object Button2: TButton
+    Left = 80
+    Height = 25
+    Top = 76
+    Width = 160
+    Caption = 'Buchstabenrätsel'
+    OnClick = Button2Click
+    TabOrder = 1
+  end
+end
diff --git a/unit2.pas b/unit2.pas
new file mode 100644
index 0000000..9403550
--- /dev/null
+++ b/unit2.pas
@@ -0,0 +1,49 @@
+unit Unit2;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls;
+
+type
+
+  { TForm2 }
+
+  TForm2 = class(TForm)
+    Button1: TButton;
+    Button2: TButton;
+    procedure Button1Click(Sender: TObject);
+    procedure Button2Click(Sender: TObject);
+  private
+    { private declarations }
+  public
+    { public declarations }
+  end;
+
+var
+  Form2: TForm2;
+
+const
+  mrHochhausraetsel = 314;
+  mrBuchstabenraetsel = 315;
+
+implementation
+
+{$R *.lfm}
+
+{ TForm2 }
+
+procedure TForm2.Button1Click(Sender: TObject);
+begin
+  modalResult:=mrHochhausraetsel;
+end;
+
+procedure TForm2.Button2Click(Sender: TObject);
+begin
+  modalResult:=mrBuchstabenraetsel;
+end;
+
+end.
+