MG: fixed splashform showing

git-svn-id: trunk@350 -

ide/lazarus.pp

@@ -40,17 +40,13 @@ uses
   MsgView,
   FindReplaceDialog;
 
-var
-  SplashForm: TSplashForm;
-
 begin
   Application.Initialize;
     // calls InitProcedure which starts up the interface (e.g. GTK)
    
   // Show splashform
   SplashForm := TSplashForm.Create(nil);
-  with SplashForm do
+  with SplashForm do begin
-  begin
     Show;
     Paint;
   end;
@@ -71,8 +67,8 @@ end.
 
 {
   $Log$
-  Revision 1.21  2001/10/15 13:11:27  lazarus
+  Revision 1.22  2001/10/15 17:41:30  lazarus
-  MG: added complete code
+  MG: fixed splashform showing
 
   Revision 1.20  2001/08/02 12:58:35  lazarus
   MG: win32 interface patch from Keith Bowes

ide/main.pp

@@ -3773,7 +3773,9 @@ procedure TMainIDE.OnControlSelectionChanged(Sender: TObject);
 var NewSelectedComponents : TComponentSelectionList;
   i: integer;
 begin
+{$IFDEF IDE_DEBUG}
 writeln('[TMainIDE.OnControlSelectionChanged]');
+{$ENDIF}
   if (TheControlSelection=nil) or (FormEditor1=nil) then exit;
   NewSelectedComponents:=TComponentSelectionList.Create;
   for i:=0 to TheControlSelection.Count-1 do begin
@@ -3781,7 +3783,9 @@ writeln('[TMainIDE.OnControlSelectionChanged]');
   end;
   FormEditor1.SelectedComponents:=NewSelectedComponents;
   NewSelectedComponents.Free;
+{$IFDEF IDE_DEBUG}
 writeln('[TMainIDE.OnControlSelectionChanged] END');
+{$ENDIF}
 end;
 
 // -----------------------------------------------------------------------------
@@ -4018,8 +4022,8 @@ end.
 { =============================================================================
 
   $Log$
-  Revision 1.120  2001/10/15 13:11:27  lazarus
+  Revision 1.121  2001/10/15 17:41:30  lazarus
-  MG: added complete code
+  MG: fixed splashform showing
 
   Revision 1.115  2001/10/09 09:46:49  lazarus
   MG: added codetools, fixed synedit unindent, fixed MCatureHandle

ide/splash.pp

@@ -36,13 +36,17 @@ type
     procedure HideFormTimer(Sender : TObject);
   protected
     procedure Click; override;
-    procedure Paint; override;
   public
+    procedure Paint; override;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     procedure StartTimer;
   end;
 
+var
+  SplashForm: TSplashForm;
+
+
 implementation
 
 
@@ -320,7 +324,7 @@ begin
   FTimer := TTimer.Create(self);
   with FTimer do
   begin
-    Interval := 2000;
+    Interval := 500;
     OnTimer := @HideFormTimer;
     Enabled := False;
   end;
@@ -338,12 +342,14 @@ end;
 procedure TSplashForm.Click; 
 begin
   Hide;
-  FTimer.Enabled := False;
+  if FTimer<>nil then begin
-  //Release resources
+    FTimer.Enabled := False;
-  FTimer.Free;
+    //Release resources
-  FTimer:=nil;
+    FTimer.Free;
-  FBitmap.Free;
+    FTimer:=nil;
-  FBitmap:=nil;
+    FBitmap.Free;
+    FBitmap:=nil;
+  end;
 end;
 
 procedure TSplashForm.HideFormTimer(Sender : TObject);
@@ -369,6 +375,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.5  2001/10/15 17:41:31  lazarus
+  MG: fixed splashform showing
+
   Revision 1.4  2001/03/20 16:59:15  lazarus
   MG: fixed many bugs (mem leaks, canvas)
 

ide/uniteditor.pp

@@ -38,7 +38,7 @@ uses
   FindReplaceDialog, EditorOptions, CustomFormEditor, KeyMapping, StdCtrls,
   Compiler, MsgView, WordCompletion, CodeToolManager, CodeCache, SourceLog,
   SynEdit, SynEditHighlighter, SynHighlighterPas, SynEditAutoComplete,
-  SynEditKeyCmds,SynCompletion, Graphics, Extctrls, Menus;
+  SynEditKeyCmds,SynCompletion, Graphics, Extctrls, Menus, Splash;
 
 type
   // --------------------------------------------------------------------------
@@ -1089,7 +1089,9 @@ var
   NewName: string;
   i: integer;
 Begin
+{$IFDEF IDE_DEBUG}
 writeln('TSourceEditor.CreateEditor  A ');
+{$ENDIF}
   if not assigned(FEditor) then Begin
     i:=0;
     repeat
@@ -1550,6 +1552,8 @@ begin
   IdentCompletionTimer := TTimer.Create(self);
   IdentCompletionTimer.Enabled := False;
   IdentCompletionTimer.Interval := 500;
+
+  Visible:=false;
 end;
 
 destructor TSourceNotebook.Destroy;
@@ -2091,17 +2095,25 @@ End;
 
 Function TSourceNotebook.NewSE(PageNum : Integer) : TSourceEditor;
 Begin
+{$IFDEF IDE_DEBUG}
 writeln('TSourceNotebook.NewSE A ');
+{$ENDIF}
   if CreateNotebook then Pagenum := 0;
+{$IFDEF IDE_DEBUG}
 writeln('TSourceNotebook.NewSE A2 ');
+{$ENDIF}
   if Pagenum < 0 then begin
     // add a new page right to the current
     Pagenum := Notebook.PageIndex+1;
     Notebook.Pages.Insert(PageNum,FindUniquePageName('',-1));
   end;
+{$IFDEF IDE_DEBUG}
 writeln('TSourceNotebook.NewSE B  ',Notebook.PageIndex,',',NoteBook.Pages.Count);
+{$ENDIF}
   Result := TSourceEditor.Create(Self,Notebook.Page[PageNum]);
+{$IFDEF IDE_DEBUG}
 writeln('TSourceNotebook.NewSE C ');
+{$ENDIF}
   FSourceEditorList.Add(Result);
   Result.FShortName:=Notebook.Pages[PageNum];
   Result.CodeTemplates:=CodeTemplateModul;
@@ -2109,7 +2121,9 @@ writeln('TSourceNotebook.NewSE C ');
   Result.EditorComponent.BookMarkOptions.BookmarkImages := MarksImgList;
   Result.PopupMenu:=SrcPopupMenu;
   Result.OnEditorChange := @EditorChanged;
+{$IFDEF IDE_DEBUG}
 writeln('TSourceNotebook.NewSE end ');
+{$ENDIF}
 end;
 
 Procedure TSourceNotebook.DisplayCodeforControl(Control : TObject);
@@ -2424,13 +2438,24 @@ Begin
 writeln('[TSourceNotebook.NewFile] A ');
 {$ENDIF}
   TempEditor := NewSE(-1);
+{$IFDEF IDE_DEBUG}
 writeln('[TSourceNotebook.NewFile] B ');
+{$ENDIF}
   TempEditor.ShortName := NewShortName;
+{$IFDEF IDE_DEBUG}
 writeln('[TSourceNotebook.NewFile] C ');
+{$ENDIF}
   TempEditor.CodeBuffer:=ASource;
+{$IFDEF IDE_DEBUG}
 writeln('[TSourceNotebook.NewFile] D ');
+{$ENDIF}
   Notebook.Pages[Notebook.PageIndex] :=
     FindUniquePageName(NewShortName,Notebook.PageIndex);
+  if (SplashForm.Visible) and (Notebook.Pages.Count=1) then begin
+    SplashForm.Hide;
+    SplashForm.Show;
+    Application.ProcessMessages;
+  end;
 {$IFDEF IDE_DEBUG}
 writeln('[TSourceNotebook.NewFile] end');
 {$ENDIF}