Changeset 13

Timestamp:

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

Author:

chronos

Message:

• Modified: Implementing base tabbed opened file list.

Location:

trunk/StudioPackage

Files:

• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (4 diffs)
• Languages/UDataModule.po (added)
• UDataModule.pas (modified) (5 diffs)

trunk/StudioPackage/Forms/UFormMain.lfm

@@ -715 +715 @@
       Caption = 'New...'
       ImageIndex = 4
+      OnExecute = AFileNewExecute
       ShortCut = 16462
     end

trunk/StudioPackage/Forms/UFormMain.pas

@@ -105 +105 @@
     procedure AExitExecute(Sender: TObject);
     procedure AFileCloseExecute(Sender: TObject);
+    procedure AFileNewExecute(Sender: TObject);
     procedure AFileOpenExecute(Sender: TObject);
     procedure AViewModulesExecute(Sender: TObject);
@@ -115 +116 @@
     procedure DockInit;
   public
-    procedure OpenFileExecute(OpenedFile: TOpenedFile);
+    procedure OpenedFileChange(Sender: TObject);
   end;
 
@@ -137 +138 @@
 procedure TFormMain.AFileCloseExecute(Sender: TObject);
 begin
-//  DataModule1.OpenedFiles.Close(DataModule1.OpenedFiles.Selected);
+  DataModule1.OpenedFiles.CloseFile(DataModule1.OpenedFiles.Selected.FileName);
+end;
+
+procedure TFormMain.AFileNewExecute(Sender: TObject);
+begin
+  DataModule1.OpenedFiles.NewFile;
 end;
 
@@ -185 +191 @@
 }end;
 
-procedure TFormMain.OpenFileExecute(OpenedFile: TOpenedFile);
+procedure TFormMain.OpenedFileChange(Sender: TObject);
 var
   NewTabSheet: TTabSheet;
-begin
-  NewTabSheet := PageControlCenter.AddTabSheet;
-  OpenedFile.Form.ManualDock(NewTabSheet, nil, alClient);
-  OpenedFile.Form.Align := alClient;
-  OpenedFile.Form.Show;
+  I: Integer;
+begin
+  with DataModule1.OpenedFiles do begin
+    for I := 0 to Count - 1 do
+    with TOpenedFile(Items[I]) do begin
+      if not Assigned(Form.Parent) then begin
+        NewTabSheet := PageControlCenter.AddTabSheet;
+        NewTabSheet.Caption := ExtractFileName(FileName);
+        //NewTabSheet.PopupMenu := ;
+        Form.ManualDock(NewTabSheet, nil, alClient);
+        Form.Align := alClient;
+        Form.Show;
+      end;
+    end;
+  end;
 end;
 

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);