Changeset 54 for trunk/IDE/Forms

Timestamp:

Jun 26, 2012, 7:41:11 AM (12 years ago)

Author:

chronos

Message:

• Modified: Project instance is now freed in closed state.
• Added: Toolbar button Open now provide dropdown list of recent opened projects.

Location:

trunk/IDE/Forms

Files:

• UFormMain.lfm (modified) (4 diffs)
• UFormMain.pas (modified) (8 diffs)
• UFormProject.pas (modified) (1 diff)
• UFormSourceCode.pas (modified) (2 diffs)
• UFormTargetCode.pas (modified) (1 diff)
• UFormTargetProject.pas (modified) (1 diff)

trunk/IDE/Forms/UFormMain.lfm

@@ -43 +43 @@
       Top = 2
       Action = AProjectOpen
+      DropdownMenu = PopupMenu1
+      Style = tbsDropDown
     end
     object ToolButton3: TToolButton
-      Left = 47
+      Left = 59
       Top = 2
       Action = AProjectSave
     end
     object ToolButton4: TToolButton
-      Left = 70
+      Left = 82
       Top = 2
       Action = AProjectClose
     end
     object ToolButton5: TToolButton
-      Left = 93
+      Left = 105
       Top = 2
       Width = 10
@@ -61 +63 @@
     end
     object ToolButton6: TToolButton
-      Left = 103
+      Left = 115
       Top = 2
       Action = AViewOptions
     end
     object ToolButton7: TToolButton
-      Left = 126
+      Left = 138
       Top = 2
       Action = ABuild
     end
     object ToolButton8: TToolButton
-      Left = 149
+      Left = 161
       Top = 2
       Action = ARun
     end
     object ToolButton9: TToolButton
-      Left = 172
+      Left = 184
       Top = 2
       Action = APause
     end
     object ToolButton10: TToolButton
-      Left = 195
+      Left = 207
       Top = 2
       Action = AStop
@@ -869 +871 @@
   end
   object ImageList1: TImageList
-    left = 344
-    top = 184
+    left = 112
+    top = 272
     Bitmap = {
       4C690E0000001000000010000000000000000000000000000000000000000000
@@ -1323 +1325 @@
     }
   end
+  object PopupMenu1: TPopupMenu
+    left = 196
+    top = 54
+  end
 end

trunk/IDE/Forms/UFormMain.pas

@@ -88 +88 @@
     PageControlRight: TPageControl;
     PageControlBottom: TPageControl;
+    PopupMenu1: TPopupMenu;
     SaveDialog1: TSaveDialog;
     Splitter1: TSplitter;
@@ -144 +145 @@
     procedure DockInit;
     procedure UpdateMenu;
-    procedure UpdateToolbar;
+    procedure UpdateTitle;
   public
     procedure LoadFromRegistry(Root: HKEY; Key: string);
@@ -290 +291 @@
 
 procedure TFormMain.UpdateInterface;
-var
-  I: Integer;
-  Title: string;
 begin
   with Core do begin
-  Title := ApplicationInfo.Name;
-  if Project.FileName <> '' then Title := Project.FileName + ' - ' + Title;
-  if Project.Modified then Title := Title + ' *';
-  Caption := Title;
-  AProjectClose.Enabled := Project.Active;
-  AProjectSave.Enabled := Project.Active and Project.Modified;
-  AProjectSaveAs.Enabled := Project.Active;
+  UpdateTitle;
+  AProjectClose.Enabled := Assigned(Project);
+  AProjectSave.Enabled := Assigned(Project) and Project.Modified;
+  AProjectSaveAs.Enabled := Assigned(Project);
   (*AProgramRun.Enabled := Project.Active and (BrainFuckInterpreter.State = rsStopped);
   AProgramPause.Enabled := Project.Active and (BrainFuckInterpreter.State = rsRunning);
   AProgramStop.Enabled := Project.Active and (BrainFuckInterpreter.State <> rsStopped);*)
-  ABuild.Enabled := Project.Active and Assigned(Compiler.Target) and
+  ABuild.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
     Assigned(Compiler.Target.Producer);
-  APause.Enabled := Project.Active and Assigned(Compiler.Target) and
+  APause.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
     Assigned(Compiler.Target.Executor) and (Compiler.Target.Executor.State = rsRunning);
-  ARun.Enabled := Project.Active and Assigned(Compiler.Target) and
+  ARun.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
     Assigned(Compiler.Target.Executor) and ((Compiler.Target.Executor.State = rsStopped) or
     (Compiler.Target.Executor.State = rsPaused));
-  AStop.Enabled := Project.Active and Assigned(Compiler.Target) and
+  AStop.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
     Assigned(Compiler.Target.Executor) and ((Compiler.Target.Executor.State = rsRunning) or
     (Compiler.Target.Executor.State = rsPaused));
-  AStepIn.Enabled := Project.Active and Assigned(Compiler.Target) and
+  AStepIn.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
     Assigned(Compiler.Target.Executor) and ((Compiler.Target.Executor.State = rsRunning) or
     (Compiler.Target.Executor.State = rsPaused));
@@ -324 +319 @@
 
   UpdateMenu;
-  UpdateToolbar;
   FormSourceCode.UpdateInterface;
   FormTargetCode.UpdateInterface;
@@ -443 +437 @@
 end;
 
-procedure TFormMain.UpdateToolbar;
-var
-  I: Integer;
-begin
-  for I := 0 to ToolBar1.ButtonCount - 1 do
-    TToolButton(ToolBar1.Buttons[I]).Hint := TToolButton(ToolBar1.Buttons[I]).Caption;
+procedure TFormMain.UpdateTitle;
+var
+  Title: string;
+begin
+  Title := ApplicationInfo.Name;
+  if Assigned(Core.Project) then begin
+    if Core.Project.FileName <> '' then Title := Core.Project.FileName + ' - ' + Title;
+    if Core.Project.Modified then Title := Title + ' *';
+  end;
+  Caption := Title;
 end;
 
@@ -503 +501 @@
 begin
   //if Project.Modified then ;
-  Core.Project.Active := False;
+  FreeAndNil(Core.Project);
   UpdateInterface;
 end;
@@ -532 +530 @@
 begin
   if FormProjectNew.ShowModal = mrOk then begin
-    if Assigned(FormProjectNew.ListView1.Selected) then
+    if Assigned(FormProjectNew.ListView1.Selected) then begin
+      Core.ProjectNew;
       TProjectTemplate(FormProjectNew.ListView1.Selected.Data).InitProject(Core.Project);
+    end;
   end;
   UpdateInterface;
@@ -540 +540 @@
 procedure TFormMain.AProjectSaveAsExecute(Sender: TObject);
 begin
+  if Assigned(Core.Project) then
   if SaveDialog1.Execute then begin
-    Core.Project.Active := True;
     Core.Project.SaveToFile(SaveDialog1.FileName);
     FormSourceCode.Save;

trunk/IDE/Forms/UFormProject.pas

@@ -74 +74 @@
     BeginUpdate;
     Clear;
-    if Project.Active then begin
+    if Assigned(Project) then begin
       NewNode := AddChild(nil, ExtractFileNameOnly(Project.FileName));
       UpdateProjectFiles(NewNode, Project.Files);

trunk/IDE/Forms/UFormSourceCode.pas

@@ -40 +40 @@
 procedure TFormSourceCode.SynEditSourceChange(Sender: TObject);
 begin
-  if Core.Project.Active then
+  if Assigned(Core.Project) then
     ProjectFile.Modified := True;
 end;
@@ -61 +61 @@
 procedure TFormSourceCode.UpdateInterface;
 begin
-  SynEditSource.Enabled := Core.Project.Active;
-  if not Core.Project.Active then SynEditSource.ClearAll;
+  SynEditSource.Enabled := Assigned(Core.Project);
+  if not Assigned(Core.Project) then SynEditSource.ClearAll;
 end;
 

trunk/IDE/Forms/UFormTargetCode.pas

@@ -48 +48 @@
 procedure TFormTargetCode.UpdateInterface;
 begin
-  SynEdit1.Enabled := Core.Project.Active;
-  if not Core.Project.Active then SynEdit1.ClearAll;
+  SynEdit1.Enabled := Assigned(Core.Project);
+  if not Assigned(Core.Project) then SynEdit1.ClearAll;
 end;
 

trunk/IDE/Forms/UFormTargetProject.pas

@@ -41 +41 @@
     BeginUpdate;
     Clear;
-    if Project.Active then begin
+    if Assigned(Project) then begin
       NewNode := AddChild(nil, ExtractFileNameOnly(TargetProject.FileName));
       UpdateProjectFiles(NewNode, TargetProject.Files);