Changeset 65

Timestamp:

Dec 5, 2014, 8:34:59 PM (9 years ago)

Author:

chronos

Message:

• Added: Confirmation dialog for closing and saving file.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (8 diffs)
• Languages/LazFuckIDE.cs.po (modified) (5 diffs)
• Languages/LazFuckIDE.po (modified) (3 diffs)
• UTarget.pas (modified) (4 diffs)

trunk/Forms/UFormMain.pas

@@ -180 +180 @@
   SDone = 'Done';
   SChanged = 'Changed';
+  SUnsavedChanges = 'Unsaved changes';
+  SDoYouWantToSaveProject = 'There are unsaved changes in project. Do you want to save them?';
+  SCloseProjectFirst = 'Project need to be closed before it can be openned';
 
 { TMainForm }
@@ -259 +262 @@
 procedure TMainForm.ProjectOpen(FileName: string);
 begin
-  AProjectClose.Execute;
+  if Core.Project.Openned then
+    raise Exception.Create(SCloseProjectFirst);
   FormSourceCode.MemoSource.Lines.LoadFromFile(UTF8Decode(FileName));
   Core.LastOpenedList.AddItem(FileName);
@@ -455 +459 @@
 procedure TMainForm.FormCloseQuery(Sender: TObject; var CanClose: boolean);
 begin
-  if Core.Project.Modified then AProjectSaveAs.Execute;
+  if Core.Project.Modified then begin
+    AProjectClose.Execute;
+    if Core.Project.Openned then CanClose := False;
+  end;
 end;
 
@@ -564 +571 @@
 
 procedure TMainForm.AProjectCloseExecute(Sender: TObject);
-begin
-  if Core.Project.Modified then AProjectSaveAs.Execute;
-  AProgramStop.Execute;
-  Core.Project.Openned := False;
-  FormSourceCode.MemoSource.Clear;
-  UpdateInterface;
+var
+  DialogResult: TModalResult;
+begin
+  DialogResult := mrNo;
+  if Core.Project.Modified then begin
+    DialogResult := MessageDlg(SUnsavedChanges, SDoYouWantToSaveProject, mtConfirmation, [mbYes, mbNo, mbCancel], 0);
+    if DialogResult = mrYes then begin
+      AProjectSave.Execute;
+    end;
+  end;
+  if (DialogResult = mrNo) or (DialogResult = mrYes) then begin
+    AProgramStop.Execute;
+    Core.Project.Openned := False;
+    FormSourceCode.MemoSource.Clear;
+    UpdateInterface;
+  end;
 end;
 
@@ -575 +592 @@
 begin
   AProjectClose.Execute;
+  if Core.Project.Openned then Exit;
   Core.Project.FileName := 'Examples' + DirectorySeparator + SNewProject + '.b';
   FormSourceCode.MemoSource.Clear;
@@ -584 +602 @@
 procedure TMainForm.AProjectOpenRecentExecute(Sender: TObject);
 begin
+  AProjectClose.Execute;
+  if Core.Project.Openned then Exit;
   ProjectOpen(Core.LastOpenedList.Items[TMenuItem(Sender).MenuIndex]);
 end;
@@ -589 +609 @@
 procedure TMainForm.AProjectOpenExecute(Sender: TObject);
 begin
-  AProjectClose.Execute;
   if Core.LastOpenedList.Items.Count > 0 then
     OpenDialog1.FileName := Core.LastOpenedList.Items[0]
@@ -595 +614 @@
   OpenDialog1.InitialDir := ExtractFileDir(OpenDialog1.FileName);
   if OpenDialog1.Execute then begin
+    AProjectClose.Execute;
+    if Core.Project.Openned then Exit;
     ProjectOpen(OpenDialog1.FileName);
   end;

trunk/Languages/LazFuckIDE.cs.po

@@ -549 +549 @@
 #: toptionsform.label4.caption
 msgid "Compiler optimizations:"
-msgstr ""
+msgstr "Optimalizace překladače:"
 
 #: toptionsform.labeldpi.caption
@@ -620 +620 @@
 msgstr "Změněno"
 
+#: uformmain.scloseprojectfirst
+msgid "Project need to be closed before it can be openned"
+msgstr "Projekt musí bÃœt uzavřen před tím, něş můşe bÃœt otevřen"
+
 #: uformmain.scompilestart
 msgid "Compiling..."
@@ -627 +631 @@
 msgid "Done"
 msgstr "Dokončeno"
+
+#: uformmain.sdoyouwanttosaveproject
+msgid "There are unsaved changes in project. Do you want to save them?"
+msgstr "V projektu Jsou neuloÅŸené změny. Chcete je uloÅŸit?"
 
 #: uformmain.snewproject
@@ -645 +653 @@
 msgstr "Program zastaven"
 
+#: uformmain.sunsavedchanges
+msgid "Unsaved changes"
+msgstr "NeuloÅŸené změny"
+
 #: uformsourcecode.senternumber
 msgctxt "uformsourcecode.senternumber"
@@ -750 +762 @@
 #: utargetinterpretter.sunsupportedcommand
 msgid "Unsupported command"
-msgstr ""
-
+msgstr "NepodporovanÃœ příkaz"

trunk/Languages/LazFuckIDE.po

@@ -607 +607 @@
 msgstr ""
 
+#: uformmain.scloseprojectfirst
+msgid "Project need to be closed before it can be openned"
+msgstr ""
+
 #: uformmain.scompilestart
 msgid "Compiling..."
@@ -613 +617 @@
 #: uformmain.sdone
 msgid "Done"
+msgstr ""
+
+#: uformmain.sdoyouwanttosaveproject
+msgid "There are unsaved changes in project. Do you want to save them?"
 msgstr ""
 
@@ -632 +640 @@
 msgstr ""
 
+#: uformmain.sunsavedchanges
+msgid "Unsaved changes"
+msgstr ""
+
 #: uformsourcecode.senternumber
 msgctxt "uformsourcecode.senternumber"

trunk/UTarget.pas

@@ -32 +32 @@
     function SearchByTargetPos(Pos: Integer): TDebugStep;
     procedure AddStep(SourcePos, TargetPos: Integer; Operation: TStepOperation);
+    procedure UpdateTargetPos(Old, New: Integer);
   end;
 
@@ -271 +272 @@
 end;
 
+procedure TDebugStepList.UpdateTargetPos(Old, New: Integer);
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) do begin
+    if TDebugStep(Items[I]).TargetPosition = Old then
+      TDebugStep(Items[I]).TargetPosition := New;
+    Inc(I);
+  end;
+end;
+
 
 { TTargetList }
@@ -594 +607 @@
       end;
     end;
+    DebugSteps.UpdateTargetPos(FProgramIndex, NewProgramIndex);
     Inc(FProgramIndex);
     Inc(NewProgramIndex);
@@ -734 +748 @@
     end;
     PreviousCommand := FProgram[FProgramIndex].Command;
+    DebugSteps.UpdateTargetPos(FProgramIndex, NewProgramIndex);
     Inc(FProgramIndex);
     Inc(NewProgramIndex);