Changeset 8

Timestamp:

Aug 3, 2012, 12:14:25 PM (12 years ago)

Author:

chronos

Message:

• Modified: Enhanced OpenedFiles list structure.

Location:

trunk

Files:

• Studio/LibreDevelopStudio.lpi (modified) (2 diffs)
• Studio/LibreDevelopStudio.lpr (modified) (1 diff)
• Studio/UCore.pas (modified) (4 diffs)
• StudioCommon/USource.pas (modified) (1 diff)
• StudioModules/LDModulePascal (modified) (1 prop)
• StudioModules/LDModulePascal/LDModulePascal.lpk (added)
• StudioModules/LDModulePascal/LDModulePascal.pas (added)
• StudioModules/LDModulePascal/ULDModulePascal.pas (added)
• StudioPackage/Forms/UFormMain.lfm (modified) (6 diffs)
• StudioPackage/Forms/UFormMain.pas (modified) (7 diffs)
• StudioPackage/UDataModule.pas (modified) (3 diffs)

trunk/Studio/LibreDevelopStudio.lpi

@@ -33 +33 @@
       </local>
     </RunParams>
-    <RequiredPackages Count="4">
+    <RequiredPackages Count="5">
       <Item1>
-        <PackageName Value="LDModuleBrainfuck"/>
+        <PackageName Value="LDModulePascal"/>
       </Item1>
       <Item2>
-        <PackageName Value="LDModuleDebug"/>
+        <PackageName Value="LDModuleBrainfuck"/>
       </Item2>
       <Item3>
-        <PackageName Value="LibreDevelopStudio"/>
+        <PackageName Value="LDModuleDebug"/>
       </Item3>
       <Item4>
+        <PackageName Value="LibreDevelopStudio"/>
+      </Item4>
+      <Item5>
         <PackageName Value="LCL"/>
-      </Item4>
+      </Item5>
     </RequiredPackages>
     <Units Count="2">
@@ -79 +82 @@
     </Parsing>
     <Linking>
+      <Debugging>
+        <UseHeaptrc Value="True"/>
+      </Debugging>
       <Options>
         <Win32>

trunk/Studio/LibreDevelopStudio.lpr

@@ -16 +16 @@
   Application.Initialize;
   Application.CreateForm(TCore, Core);
-  Application.CreateForm(TDataModule1, DataModule1);
   Core.Init;
   Application.Run;

trunk/Studio/UCore.pas

@@ -31 +31 @@
 
 uses
-  ULDModuleDebug, UFormMain, ULDModuleBrainfuck, UDataModule;
+  ULDModuleDebug, UFormMain, ULDModuleBrainfuck, UDataModule, ULDModulePascal;
 
 { TCore }
@@ -37 +37 @@
 procedure TCore.DataModuleCreate(Sender: TObject);
 begin
+  DataModule1 := TDataModule1.Create(nil);
   API := TLDStudioAPI.Create;
   ModuleManager := TModuleManager.Create(nil);
@@ -46 +47 @@
   FreeAndNil(ModuleManager);
   FreeAndNil(API);
+  FreeAndNil(DataModule1);
 end;
 
@@ -52 +54 @@
   ModuleManager.RegisterModule(TLDModuleDebug.Create, True);
   ModuleManager.RegisterModule(TLDModuleBrainfuck.Create, True);
+  ModuleManager.RegisterModule(TLDModulePascal.Create, True);
   ModuleManager.InstallMarked;
 end;

trunk/StudioCommon/USource.pas

@@ -59 +59 @@
   end;
 
+
 implementation
 

trunk/StudioPackage/Forms/UFormMain.lfm

@@ -8 +8 @@
   ClientWidth = 747
   Menu = MainMenu
+  OnCreate = FormCreate
   OnShow = FormShow
   LCLVersion = '1.1'
@@ -46 +47 @@
     end
   end
-  object PageControl1: TPageControl
+  object PageControlRight: TPageControl
     Left = 547
     Height = 350
@@ -60 +61 @@
     end
   end
-  object PageControl2: TPageControl
+  object PageControlLeft: TPageControl
     Left = 0
     Height = 350
@@ -74 +75 @@
     end
   end
-  object PageControl3: TPageControl
+  object PageControlBottom: TPageControl
     Left = 0
     Height = 105
@@ -101 +102 @@
     ResizeAnchor = akRight
   end
-  object PageControl4: TPageControl
+  object PageControlCenter: TPageControl
     Left = 205
     Height = 350
@@ -1431 +1432 @@
   end
   object OpenDialogFile: TOpenDialog
-    Filter = 'kkk|.kk|jj|.jj'
     left = 82
     top = 210

trunk/StudioPackage/Forms/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
-  ActnList, ComCtrls, ExtCtrls;
+  ActnList, ComCtrls, ExtCtrls, UDataModule;
 
 type
@@ -75 +75 @@
     MenuItem9: TMenuItem;
     OpenDialogFile: TOpenDialog;
-    PageControl1: TPageControl;
-    PageControl2: TPageControl;
-    PageControl3: TPageControl;
-    PageControl4: TPageControl;
+    PageControlRight: TPageControl;
+    PageControlLeft: TPageControl;
+    PageControlBottom: TPageControl;
+    PageControlCenter: TPageControl;
     SaveDialogFile: TSaveDialog;
     Splitter1: TSplitter;
@@ -96 +96 @@
     procedure AViewProjectManagerExecute(Sender: TObject);
     procedure AViewSettingsExecute(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
   private
     procedure DockInit;
   public
-    { public declarations }
+    procedure OpenFileExecute(OpenedFile: TOpenedFile);
   end;
 
@@ -111 +112 @@
 
 uses
-  UFormProject, UFormSourceCode, UFormSettings, UDataModule;
+  UFormProject, UFormSourceCode, UFormSettings;
 
 { TFormMain }
@@ -123 +124 @@
 begin
   OpenDialogFile.Filter := DataModule1.FileTypes.GetDialogFilter;
-  if OpenDialogFile.Execute then ;
+  if OpenDialogFile.Execute then begin
+    DataModule1.OpenedFiles.OpenFile(OpenDialogFile.FileName);
+  end;
 end;
 
@@ -134 +137 @@
 begin
   FormSettings.ShowModal;
+end;
+
+procedure TFormMain.FormCreate(Sender: TObject);
+begin
 end;
 
@@ -151 +158 @@
 end;
 
+procedure TFormMain.OpenFileExecute(OpenedFile: TOpenedFile);
+var
+  NewTabSheet: TTabSheet;
+begin
+  NewTabSheet := PageControlCenter.AddTabSheet;
+  OpenedFile.Form.ManualDock(NewTabSheet, nil, alClient);
+  OpenedFile.Form.Align := alClient;
+  OpenedFile.Form.Show;
+end;
+
 end.
 

trunk/StudioPackage/UDataModule.pas

@@ -9 +9 @@
 
 type
+
+  { TOpenedFile }
+
+  TOpenedFile = class
+  private
+    FFileName: string;
+    procedure SetFileName(AValue: string);
+  public
+    Modified: Boolean;
+    Form: TForm;
+    property FileName: string read FFileName write SetFileName;
+  end;
+
+  TOpenFileEvent = procedure (OpenedFile: TOpenedFile) of object;
+
+  { TOpenedFiles }
+
+  TOpenedFiles = class(TListObject)
+  private
+    FOnOpenFile: TOpenFileEvent;
+  public
+    procedure OpenFile(FileName: string);
+    procedure NewFile;
+    property OnOpenFile: TOpenFileEvent read FOnOpenFile write FOnOpenFile;
+  end;
+
   { TDataModule1 }
 
@@ -19 +45 @@
     Project: TProject;
     FileTypes: TFileTypes;
+    OpenedFiles: TOpenedFiles;
   end;
 
@@ -32 +59 @@
   UFormSourceCode, UFormMain, UFormProject, UFormSettings;
 
+procedure TOpenedFile.SetFileName(AValue: string);
+begin
+  if FFileName = AValue then Exit;
+  FFileName := AValue;
+  if Assigned(Form) then
+    Form.Caption := ExtractFileName(FFileName);
+end;
+
+{ TOpenedFiles }
+
+procedure TOpenedFiles.OpenFile(FileName: string);
+var
+  NewFile: TOpenedFile;
+begin
+  NewFile := TOpenedFile(AddNew(TOpenedFile.Create));
+  NewFile.FileName := FileName;
+  NewFile.Form := TFormSourceCode.Create(nil);
+  NewFile.Form.Caption := ExtractFileName(NewFile.FileName);
+  NewFile.Form.Visible := True;
+  if Assigned(FOnOpenFile) then
+    FOnOpenFile(NewFile);
+end;
+
+procedure TOpenedFiles.NewFile;
+begin
+
+end;
+
 { TDataModule1 }
 
 procedure TDataModule1.DataModuleCreate(Sender: TObject);
 begin
+  FileTypes := TFileTypes.Create;
+  FileTypes.OwnsObjects := False;
+  OpenedFiles := TOpenedFiles.Create;
+
   Application.CreateForm(TFormMain, FormMain);
+  OpenedFiles.OnOpenFile := FormMain.OpenFileExecute;
   Application.CreateForm(TFormProject, FormProject);
   Application.CreateForm(TFormSourceCode, FormSourceCode);
   Application.CreateForm(TFormSettings, FormSettings);
-  FileTypes := TFileTypes.Create;
 end;
 
 procedure TDataModule1.DataModuleDestroy(Sender: TObject);
 begin
+  FreeAndNil(OpenedFiles);
   FreeAndNil(FileTypes);
 end;