Changeset 13 for trunk/StudioPackage/UDataModule.pas

Timestamp:

Aug 3, 2012, 4:03:59 PM (12 years ago)

Author:

chronos

Message:

• Modified: Implementing base tabbed opened file list.

File:

• trunk/StudioPackage/UDataModule.pas (modified) (5 diffs)

trunk/StudioPackage/UDataModule.pas

@@ -23 +23 @@
   end;
 
-  TOpenFileEvent = procedure (OpenedFile: TOpenedFile) of object;
-
   { TOpenedFiles }
 
   TOpenedFiles = class(TListObject)
   private
-    FOnOpenFile: TOpenFileEvent;
+    FOnChange: TNotifyEvent;
   public
     Selected: TOpenedFile;
-    procedure CloseFile(OpenedFile: TOpenedFile);
+    function FindByFileName(Value: string): TOpenedFile;
+    procedure CloseFile(FileName: string);
     procedure OpenFile(FileName: string);
     procedure NewFile;
-    property OnOpenFile: TOpenFileEvent read FOnOpenFile write FOnOpenFile;
+    property OnChange: TNotifyEvent read FOnChange write FOnChange;
   end;
 
@@ -62 +61 @@
   UFormSourceCode, UFormMain, UFormSettings, UFormModuleList;
 
+resourcestring
+  SNewFile = 'New file';
+
 procedure TOpenedFile.SetFileName(AValue: string);
 begin
@@ -72 +74 @@
 { TOpenedFiles }
 
-procedure TOpenedFiles.CloseFile(OpenedFile: TOpenedFile);
+function TOpenedFiles.FindByFileName(Value: string): TOpenedFile;
+var
+  I: Integer;
 begin
+  I := 0;
+  while (I < Count) and (TOpenedFile(Items[I]).FileName <> Value) do Inc(I);
+  if I < Count then Result := TOpenedFile(Items[I])
+    else Result := nil;
+end;
+
+procedure TOpenedFiles.CloseFile(FileName: string);
+var
+  OpenedFile: TOpenedFile;
+begin
+  OpenedFile := FindByFileName(FileName);
   FreeAndNil(OpenedFile.Form);
+  Remove(OpenedFile);
+  if Assigned(FOnChange) then FOnChange(Self);
 end;
 
@@ -87 +104 @@
   NewFile.Form.Visible := True;
   Selected := NewFile;
-  if Assigned(FOnOpenFile) then
-    FOnOpenFile(NewFile);
+  if Assigned(FOnChange) then FOnChange(Self);
 end;
 
 procedure TOpenedFiles.NewFile;
+var
+  NewFile: TOpenedFile;
 begin
-
+  NewFile := TOpenedFile(AddNew(TOpenedFile.Create));
+  NewFile.FileName := SNewFile;
+  NewFile.Form := TFormSourceCode.Create(nil);
+  NewFile.Form.Caption := ExtractFileName(NewFile.FileName);
+  NewFile.Form.Visible := True;
+  Selected := NewFile;
+  if Assigned(FOnChange) then FOnChange(Self);
 end;
 
@@ -109 +133 @@
   FormMain := TFormMain.Create(nil);
   Application.UpdateMainForm(FormMain);
-  OpenedFiles.OnOpenFile := FormMain.OpenFileExecute;
+  OpenedFiles.OnChange := FormMain.OpenedFileChange;
   FormSourceCode := TFormSourceCode.Create(nil);
   FormSettings := TFormSettings.Create(nil);