Changeset 36 for trunk

Timestamp:

Feb 13, 2012, 4:07:34 PM (13 years ago)

Author:

chronos

Message:

• Modified: Partialy solved project open/close/save management.

Location:

trunk/IDE

Files:

• . (modified) (1 prop)
• Forms/UCodeForm.pas (modified) (2 diffs)
• Forms/UMainForm.lfm (modified) (2 diffs)
• Forms/UMainForm.pas (modified) (11 diffs)
• Forms/UProjectManager.pas (modified) (2 diffs)
• Transpascal.lpi (modified) (1 diff)
• Transpascal.lpr (modified) (1 diff)
• UProject.pas (modified) (6 diffs)

trunk/IDE

@@ -4 +4 @@
 Transpascal.lps
 Transpascal.exe
+heaptrclog.trc

@@ -4 +4 @@
 Transpascal.lps
 Transpascal.exe
+heaptrclog.trc

trunk/IDE/Forms/UCodeForm.pas

@@ -23 +23 @@
     property ProjectFile: TProjectFile read FProjectFile write SetProjectFile;
     procedure Save;
+    procedure UpdateInterface;
   end; 
 
@@ -57 +58 @@
 end;
 
+procedure TCodeForm.UpdateInterface;
+begin
+  SynPasSyn1.Enabled := MainForm.Project.Active;
+end;
+
 end.
 

trunk/IDE/Forms/UMainForm.lfm

@@ -1 +1 @@
 object MainForm: TMainForm
-  Left = 240
+  Left = 217
   Height = 501
-  Top = 119
+  Top = 104
   Width = 695
   Caption = 'Transpascal IDE'
@@ -320 +320 @@
   end
   object OpenDialog1: TOpenDialog
-    Filter = 'Project file (*.*)|*.tppr|Any file (*.*)|*.*'
+    DefaultExt = '.tppr'
+    Filter = 'Project file (*.tppr)|*.tppr|Any file (*.*)|*.*'
     left = 115
     top = 52
   end
   object SaveDialog1: TSaveDialog
-    Filter = 'Project file (*.*)|*.tppr|Any file (*.*)|*.*'
+    DefaultExt = '.tppr'
+    Filter = 'Project file (*.tppr)|*.tppr|Any file (*.*)|*.*'
     left = 115
     top = 104

trunk/IDE/Forms/UMainForm.pas

@@ -119 +119 @@
     procedure LoadFromRegistry(Root: HKEY; Key: string);
     procedure SaveToRegistry(Root: HKEY; Key: string);
-    procedure OpenProject(FileName: string);
+    procedure ProjectOpen(FileName: string);
     procedure UpdateMenu;
   public
@@ -235 +235 @@
   AProgramStop.Enabled := Project.Active and (BrainFuckInterpreter.State <> rsStopped);*)
   UpdateMenu;
+  CodeForm.UpdateInterface;
+  ProjectManager.UpdateInterface;
 end;
 
@@ -332 +334 @@
 end;
 
-procedure TMainForm.OpenProject(FileName: string);
+procedure TMainForm.ProjectOpen(FileName: string);
 begin
   Project.LoadFromFile(FileName);
@@ -382 +384 @@
 procedure TMainForm.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  Project.Save;
+  AProjectClose.Execute;
   SaveToRegistry(RegistryRootKey, ApplicationInfo.RegistryKey);
 end;
@@ -413 +415 @@
 begin
   if Sender is TMenuItem then
-     OpenProject(StringReplace(TMenuItem(Sender).Caption, '&', '', [rfReplaceAll]));
+    ProjectOpen(StringReplace(TMenuItem(Sender).Caption, '&', '', [rfReplaceAll]));
 end;
 
@@ -424 +426 @@
 
   if ReopenLastOpenedFile and (LastOpenedFiles.Count > 0) then begin
-    OpenProject(LastOpenedFiles[0]);
+    ProjectOpen(LastOpenedFiles[0]);
   end;
 
@@ -438 +440 @@
 begin
   if OpenDialog1.Execute then begin
-    OpenProject(OpenDialog1.FileName);
+    ProjectOpen(OpenDialog1.FileName);
   end;
 end;
@@ -444 +446 @@
 procedure TMainForm.AProjectCloseExecute(Sender: TObject);
 begin
+  //if Project.Modified then ;
+  Project.Active := False;
+  UpdateInterface;
+end;
+
+procedure TMainForm.AExitExecute(Sender: TObject);
+begin
   Close;
 end;
 
-procedure TMainForm.AExitExecute(Sender: TObject);
-begin
-  Close;
-end;
-
 procedure TMainForm.AAboutExecute(Sender: TObject);
 begin
@@ -464 +468 @@
 procedure TMainForm.AProjectNewExecute(Sender: TObject);
 begin
-  Project.Clear;
+  AProjectClose.Execute;
+  Project.Active := True;
   Project.Name := SNewProject;
-  ProjectManager.UpdateProjectTree;
-  Caption := ApplicationInfo.Name + ' - ' + Project.Name;
+  UpdateInterface;
 end;
 
@@ -473 +477 @@
 begin
   if SaveDialog1.Execute then begin
+    Project.Active := True;
     Project.SaveToFile(SaveDialog1.FileName);
     CodeForm.Save;
     Project.Save;
+    UpdateInterface;
+    LastOpenedFiles.AddItem(SaveDialog1.FileName);
+    LastOpenedFiles.ReloadMenu;
   end;
 end;
@@ -482 +490 @@
 begin
   CodeForm.Save;
-  Project.SaveToFile(Project.GetDir(True) + Project.Name + '.tppr');
+  if not FileExistsUTF8(Project.FileName) then AProjectSaveAs.Execute
+    else Project.SaveToFile(Project.FileName);
 end;
 

trunk/IDE/Forms/UProjectManager.pas

@@ -18 +18 @@
   public
     procedure UpdateProjectTree;
+    procedure UpdateInterface;
   end;
 
@@ -84 +85 @@
 end;
 
+procedure TProjectManager.UpdateInterface;
+begin
+  UpdateProjectTree;
+end;
+
 procedure TProjectManager.UpdateProjectGroup(Node: TTreeNode; Group: TProjectGroup);
 var

trunk/IDE/Transpascal.lpi

@@ -247 +247 @@
         <UseMsgFile Value="True"/>
       </CompilerMessages>
+      <CustomOptions Value="-dDEBUG"/>
       <CompilerPath Value="$(CompPath)"/>
     </Other>

trunk/IDE/Transpascal.lpr

@@ -16 +16 @@
 {$R *.res}
 
+{$IFDEF DEBUG}
 const
   HeapTraceLog = 'heaptrclog.trc';
+{$ENDIF}
 
 begin
   Application.Title := 'Transpascal IDE';
+  {$IFDEF DEBUG}
   // Heap trace
-//  DeleteFile(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
-//  SetHeapTraceOutput(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  DeleteFile(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  SetHeapTraceOutput(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  {$ENDIF}
 
   Application.Initialize;

trunk/IDE/UProject.pas

@@ -9 +9 @@
   Classes, SysUtils, Dialogs, DOM, XMLWrite, XMLRead, FileUtil,
   SpecializedList;
+
+const
+  ProjectExt = '.tppr';
 
 type
@@ -63 +66 @@
     FActive: Boolean;
     function GetActive: Boolean;
+    function GetFileName: string;
     procedure SetActive(AValue: Boolean);
   public
@@ -75 +79 @@
     procedure Clear;
     property Active: Boolean read GetActive write SetActive;
+    property FileName: string read GetFileName;
   end;
 
@@ -236 +241 @@
 end;
 
+function TProject.GetFileName: string;
+begin
+  Result := GetDir(True) + Name + ProjectExt;
+end;
+
 procedure TProject.SetActive(AValue: Boolean);
 begin
+  if FActive = AValue then Exit;
   FActive := AValue;
+  if FActive then Clear;
 end;
 
@@ -264 +276 @@
     Doc.Free;
   end;
+  FModified := False;
 end;
 
@@ -310 +323 @@
     Free;
   end;
+  FModified := False;
   inherited Save;
 end;

@@ -4 +4 @@
 Transpascal.lps
 Transpascal.exe
+heaptrclog.trc