Minor fixes

Shane

git-svn-id: trunk@118 -

ide/compiler.pp

@@ -92,7 +92,6 @@ var
 
   TheProcess : TProcess;
 begin
-  Writeln('In Compile');
 
   Texts := '';
   FOutputList.Clear;
@@ -237,8 +236,8 @@ end.
 
 {
   $Log$
-  Revision 1.3  2001/01/13 03:09:37  lazarus
-  Minor changes
+  Revision 1.4  2001/01/13 06:11:06  lazarus
+  Minor fixes
   Shane
 
   Revision 1.2  2000/12/20 20:04:30  lazarus

ide/compileroptions.pp

@@ -799,16 +799,19 @@ begin
     switches := switches + ' ' + '@' + ConfigFilePath;
 
   { ------------- Search Paths Tab ---------------- }
-
+  Writeln('Switchs = '+Switches);
   if (IncludeFiles <> '') then
     switches := switches + ' ' + ParseSearchPaths('-Fi', IncludeFiles);
-    
+  Writeln('Switchs = '+Switches);
+
   if (Libraries <> '') then
     switches := switches + ' ' + ParseSearchPaths('-Fl', Libraries);
-    
+  Writeln('Switchs = '+Switches);
+
   if (OtherUnitFiles <> '') then
     switches := switches + ' ' + ParseSearchPaths('-Fu', OtherUnitFiles);
-    
+  Writeln('Switchs = '+Switches);
+
   { CompilerPath - Nothing needs to be done with this one }
 
   { TODO: Implement the following switches. They need to be added

ide/dlgmessage.pp

@@ -27,7 +27,7 @@ unit dlgMessage;
 interface
 
 uses
-  classes, sysutils, controls, stdctrls,forms;
+  classes, sysutils, controls, stdctrls,forms,LResources;
 
  type
 
@@ -123,5 +123,7 @@ if (MessageView.Items.Count > 0) and (MessageView.SelCount > 0) then
    end;
 end;
 
+
+
 end.
 

ide/idecomp.pp

@@ -211,7 +211,6 @@ pixmap1 := LoadImageintoPixmap;
     Glyph := Pixmap1;
     Visible := True;
 
-
    end;
 result := FSpeedButton;
 end;

ide/lazarus.pp

@@ -32,6 +32,7 @@ uses
   splash,
   main,
   compileroptions,
+  dlgMessage,
   viewunit_dlg,  //dialog used to list the units in a project
   viewform_dlg;  //dialog to display the forms in the project
 
@@ -51,9 +52,10 @@ begin
    end;
 
    Application.CreateForm(TMainIDE, MainIDE);
-   Application.CreateForm(TfrmCompilerOptions, frmCompilerOptions);
    Application.CreateForm(TViewUnits1, ViewUnits1);
    Application.CreateForm(TViewForms1, ViewForms1);
+//   Application.CreateForm(TMessageDlg, MessageDlg);
+   Application.CreateForm(TfrmCompilerOptions, frmCompilerOptions);
    SplashForm.StartTimer;
    Application.Run;
 end.
@@ -61,6 +63,10 @@ end.
 
 {
   $Log$
+  Revision 1.8  2001/01/13 06:11:06  lazarus
+  Minor fixes
+  Shane
+
   Revision 1.7  2001/01/08 23:48:33  lazarus
   MWE:
     ~ Changed makefiles

ide/main.pp

@@ -1843,10 +1843,8 @@ end;
 
 initialization
 {$I images/laz_images.lrs}
-
 {$I dlgmessage.lrs}
-{$I viewunits1.lrs}
-{$I viewforms1.lrs}
+
 { $I mainide.lrs}
 { $I finddialog1.lrs}
 
@@ -1858,6 +1856,10 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.42  2001/01/13 06:11:06  lazarus
+  Minor fixes
+  Shane
+
   Revision 1.41  2001/01/13 03:09:37  lazarus
   Minor changes
   Shane

ide/uniteditor.pp

@@ -91,7 +91,7 @@ type
     Function GotoMethodDeclaration(Value : String) : Integer;
 
     Procedure CreateEditor(AOwner : TComponent; AParent: TWinControl);
-
+    Procedure CreateFormFromUnit;
   protected
     ToggleMenuItem : TMenuItem;
     Procedure DisplayControl;
@@ -846,6 +846,42 @@ Begin
 tempSource.Free;
 end;
 
+{____________________________________________}
+{                 CREATEFORMFROMUNIT         }
+{This method checks to see if the loaded unit is a form unit.
+ If so, it creates the form                                  }
+Procedure TSourceEditor.CreateFormFromUnit;
+Var
+  I,X : Integer;
+  Found : Boolean;
+  Texts : String;
+Begin
+  for I := 0 to Source.Count -1 do
+      begin
+        Found := (Pos('initialization',lowercase(Source.Strings[i])) <> 0);
+        if Found then break;
+      end;
+
+  if Not Found then exit;
+
+  For X := I to Source.Count-1 do
+      Begin
+      Found := (pos('{<LAZARUSFORMDEF>}',Source.Strings[x]) <> 0);
+      if Found then Break;
+      end;
+
+  if Not Found then exit;
+  inc(x);
+  Texts := Source.Strings[x];
+  //grab the file name
+  Texts := Copy(Texts,pos('{$I ',Texts)+4,Length(Texts));
+  Texts := Copy(Texts,1,pos('.',Texts)+3);
+  Writeln('the resource file is '+Texts);
+
+
+end;
+
+
 Procedure TSourceEditor.CreateNewUnit;
 Var
   I : Integer;
@@ -897,6 +933,8 @@ Begin
     FEditor.Lines.LoadFromFile(FileName);
     FUnitName := Filename;
     FModified := False;
+    //see if this is a form file
+    CreateFormfromUnit;
   except
     Result := False;
   end;

ide/viewform_dlg.pp

@@ -28,7 +28,7 @@ unit ViewForm_Dlg;
 interface
 
 uses
-  Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,buttons,stdctrls;
+  Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,LResources,buttons,stdctrls;
 
 
 type
@@ -157,10 +157,19 @@ if Listbox1.Items.Count > 0 then
 end;
 
 
+initialization
+{$I viewforms1.lrs}
+
+
+
 
 end.
 {
   $Log$
+  Revision 1.3  2001/01/13 06:11:07  lazarus
+  Minor fixes
+  Shane
+
   Revision 1.2  2001/01/05 17:44:37  lazarus
   ViewUnits1, ViewForms1 and MessageDlg are all loaded from their resources and all controls are auto-created on them.
   There are still a few problems with some controls so I haven't converted all forms.

ide/viewunit_dlg.pp

@@ -28,7 +28,7 @@ unit ViewUnit_Dlg;
 interface
 
 uses
-  Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,buttons,stdctrls;
+  Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,LResources,buttons,stdctrls;
 
 
 type
@@ -152,9 +152,20 @@ if Listbox1.Items.Count > 0 then
    end;
 end;
 
+
+
+initialization
+{$I viewunits1.lrs}
+
+
+
 end.
 {
   $Log$
+  Revision 1.3  2001/01/13 06:11:07  lazarus
+  Minor fixes
+  Shane
+
   Revision 1.2  2001/01/05 17:44:37  lazarus
   ViewUnits1, ViewForms1 and MessageDlg are all loaded from their resources and all controls are auto-created on them.
   There are still a few problems with some controls so I haven't converted all forms.