Changeset 62

Timestamp:

Dec 4, 2014, 11:46:40 AM (10 years ago)

Author:

chronos

Message:

• Modified: Project openned state as property instead of checking FileName.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (10 diffs)
• Languages/LazFuckIDE.cs.po (modified) (4 diffs)
• Languages/LazFuckIDE.po (modified) (1 diff)
• UProject.pas (modified) (1 diff)

trunk/Forms/UFormMain.pas

@@ -154 +154 @@
     procedure LastOpenedListChange(Sender: TObject);
   public
-    LastFileName: string;
     procedure LoadFromRegistry(Root: HKEY; Key: string);
     procedure SaveToRegistry(Root: HKEY; Key: string);
@@ -182 +181 @@
   SCompileStart = 'Compiling...';
   SDone = 'Done';
+  SChanged = 'Changed';
 
 { TMainForm }
@@ -264 +264 @@
   Core.LastOpenedList.AddItem(FileName);
   Core.Project.FileName := FileName;
-  Core.Project.Modified := False;
+  Core.Project.Openned := True;
   CurrentTarget.Compiled := False;
   UpdateInterface;
@@ -319 +319 @@
     OpenKey(Key, True);
     TargetName := ReadStringWithDefault('TargetName', 'Interpretter');
-    LastFileName := ReadStringWithDefault('LastFileName',
-      ExtractFileDir(Application.ExeName) + DirectorySeparator + 'Examples');
     CurrentTarget := Core.Targets.FindByName(TargetName);
     if not Assigned(CurrentTarget) then CurrentTarget := TTarget(Core.Targets[0]);
@@ -335 +333 @@
     OpenKey(Key, True);
     WriteString('TargetName', CurrentTarget.Name);
-    WriteString('LastFileName', LastFileName);
   finally
     Free;
@@ -345 +342 @@
   Title: string;
 begin
+  Title := '';
+  if Core.Project.FileName <> '' then Title := Core.Project.FileName;
+  if Core.Project.Modified then Title := Title + ' (' + SChanged + ')';
+  Title:= Title + ' - ' + Core.ApplicationInfo.AppName;
+  Caption := Title;
   AProjectSave.Enabled := Core.Project.Modified;
-  Title := Core.ApplicationInfo.AppName;
-  if Core.Project.FileName <> '' then Title := Core.Project.FileName + ' - ' + Title;
-  if Core.Project.Modified then Title := Title + ' *';
-  Caption := Title;
-  FormSourceCode.MemoSource.Enabled := Core.Project.FileName <> '';
-  AProjectClose.Enabled := Core.Project.FileName <> '';
+  FormSourceCode.MemoSource.Enabled := Core.Project.Openned;
+  AProjectClose.Enabled := Core.Project.Openned;
+  AProjectSaveAs.Enabled := Core.Project.Openned;
   AProgramRun.Enabled := (tcRun in CurrentTarget.Capabilities) and
-    (Core.Project.FileName <> '') and (CurrentTarget.State = rsStopped) or (CurrentTarget.State = rsPaused);
+    Core.Project.Openned and (CurrentTarget.State = rsStopped) or (CurrentTarget.State = rsPaused);
   AProgramPause.Enabled := (tcPause in CurrentTarget.Capabilities) and
-    (Core.Project.FileName <> '') and (CurrentTarget.State = rsRunning);
+    Core.Project.Openned and (CurrentTarget.State = rsRunning);
   AProgramStop.Enabled := (tcStop in CurrentTarget.Capabilities) and
-    (Core.Project.FileName <> '') and (CurrentTarget.State <> rsStopped);
+    Core.Project.Openned and (CurrentTarget.State <> rsStopped);
   AProgramCompile.Enabled := (tcCompile in CurrentTarget.Capabilities) and
-    (Core.Project.FileName <> '');
+    Core.Project.Openned;
   AProgramStepInto.Enabled := (tcStepInto in CurrentTarget.Capabilities) and
-    (Core.Project.FileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
+    Core.Project.Openned and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
   AProgramStepOut.Enabled := (tcStepOut in CurrentTarget.Capabilities) and
-    (Core.Project.FileName <> '') and (CurrentTarget.State = rsPaused);
+    Core.Project.Openned and (CurrentTarget.State = rsPaused);
   AProgramRunToCursor.Enabled := (tcRunToCursor in CurrentTarget.Capabilities) and
-    (Core.Project.FileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
+    Core.Project.Openned and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
   AProgramStepOver.Enabled := (tcStepOver in CurrentTarget.Capabilities) and
-    (Core.Project.FileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
+    Core.Project.Openned and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
   AProgramShowExecutionPoint.Enabled := (tcPause in CurrentTarget.Capabilities) and
-    (Core.Project.FileName <> '') and (CurrentTarget.State = rsPaused);
+    Core.Project.Openned and (CurrentTarget.State = rsPaused);
   AShowSourcePosition.Enabled := CurrentTarget.Compiled;
   AShowTargetPosition.Enabled := CurrentTarget.Compiled;
@@ -568 +567 @@
   if Core.Project.Modified then AProjectSaveAs.Execute;
   AProgramStop.Execute;
-  Core.Project.FileName := '';
+  Core.Project.Openned := False;
   FormSourceCode.MemoSource.Clear;
-  Core.Project.Modified := False;
   UpdateInterface;
 end;
@@ -579 +577 @@
   Core.Project.FileName := 'Examples' + DirectorySeparator + SNewProject + '.b';
   FormSourceCode.MemoSource.Clear;
-  Core.Project.Modified := False;
+  Core.Project.Openned := True;
   CurrentTarget.Compiled := False;
   UpdateInterface;
@@ -592 +590 @@
 begin
   AProjectClose.Execute;
-  OpenDialog1.FileName := LastFileName;
-  OpenDialog1.InitialDir := ExtractFileDir(LastFileName);
+  if Core.LastOpenedList.Items.Count > 0 then
+    OpenDialog1.FileName := Core.LastOpenedList.Items[0]
+    else OpenDialog1.FileName := ExtractFileDir(Application.ExeName) + DirectorySeparator + 'Examples';
+  OpenDialog1.InitialDir := ExtractFileDir(OpenDialog1.FileName);
   if OpenDialog1.Execute then begin
-    LastFileName := OpenDialog1.FileName;
     ProjectOpen(OpenDialog1.FileName);
   end;
@@ -614 +613 @@
 procedure TMainForm.AProjectSaveExecute(Sender: TObject);
 begin
-  if Core.Project.Modified then AProjectSaveAs.Execute;
+  if Core.Project.Modified and FileExistsUTF8(Core.Project.FileName) then begin
+    FormSourceCode.MemoSource.Lines.SaveToFile(UTF8Decode(Core.Project.FileName));
+    Core.Project.Modified := False;
+    UpdateInterface;
+  end else AProjectSaveAs.Execute;
 end;
 

trunk/Languages/LazFuckIDE.cs.po

@@ -104 +104 @@
 msgctxt "tformlog.caption"
 msgid "Log"
-msgstr ""
+msgstr "Záznam"
 
 #: tformmemory.caption
@@ -436 +436 @@
 msgctxt "tmainform.aviewlog.caption"
 msgid "Log"
-msgstr ""
+msgstr "Záznam"
 
 #: tmainform.caption
@@ -612 +612 @@
 msgstr " kroků/s"
 
+#: uformmain.schanged
+msgid "Changed"
+msgstr "Změněno"
+
 #: uformmain.scompilestart
 msgid "Compiling..."
@@ -739 +743 @@
 msgid "Read input error"
 msgstr "Chyba čtení vstupu"
-

trunk/Languages/LazFuckIDE.po

@@ -599 +599 @@
 msgstr ""
 
+#: uformmain.schanged
+msgid "Changed"
+msgstr ""
+
 #: uformmain.scompilestart
 msgid "Compiling..."

trunk/UProject.pas

@@ -9 +9 @@
 
 type
+
+  { TProject }
+
   TProject = class
+  private
+    FOpenned: Boolean;
+    procedure SetOpenned(AValue: Boolean);
+  public
     Modified: Boolean;
     FileName: string;
+    property Openned: Boolean read FOpenned write SetOpenned;
   end;
 
 implementation
 
+{ TProject }
+
+
+procedure TProject.SetOpenned(AValue: Boolean);
+begin
+  if FOpenned = AValue then Exit;
+  FOpenned := AValue;
+  if AValue then begin
+    Modified := False;
+  end else begin
+    FileName := '';
+  end;
+end;
+
 end.