Changeset 57 for trunk/IDE

Timestamp:

Jul 16, 2012, 4:11:47 PM (12 years ago)

Author:

chronos

Message:

• Modified: Testing interpretter.

Location:

trunk/IDE

Files:

• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMessages.lfm (modified) (1 diff)
• Forms/UFormMessages.pas (modified) (1 diff)
• Forms/UFormProject.lfm (modified) (1 diff)
• Forms/UFormProjectNew.lfm (modified) (2 diffs)
• Forms/UFormProjectNew.pas (modified) (2 diffs)
• Forms/UFormSourceCode.lfm (modified) (1 diff)
• Forms/UFormSourceCode.pas (modified) (1 diff)
• Forms/UFormTargetProject.lfm (modified) (1 diff)
• Transpascal.lpi (modified) (2 diffs)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (3 diffs)
• UProject.pas (modified) (6 diffs)

trunk/IDE/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 217
+  Left = 140
   Height = 501
-  Top = 104
+  Top = 52
   Width = 695
   Caption = 'Transpascal IDE'

trunk/IDE/Forms/UFormMessages.lfm

@@ -7 +7 @@
   ClientHeight = 251
   ClientWidth = 415
-  LCLVersion = '0.9.31'
+  LCLVersion = '1.1'
   object ListView1: TListView
     Left = 0

trunk/IDE/Forms/UFormMessages.pas

@@ -72 +72 @@
     ProjectFile := Project.Files.SearchFile(FileName);
     if Assigned(ProjectFile) then
-      SynEditSource.Lines.Assign(ProjectFile.Source);
+      SynEditSource.Lines.Assign(ProjectFile.Source)
+      else if FileExistsUTF8(FileName) then
+        SynEditSource.Lines.LoadFromFile(FileName);
     SynEditSource.CaretXY := Position;
     TForm(SynEditSource.Owner).Show;

trunk/IDE/Forms/UFormProject.lfm

@@ -1 +1 @@
 object FormProject: TFormProject
-  Left = 505
+  Left = 507
   Height = 253
-  Top = 195
+  Top = 197
   Width = 331
   Caption = 'Project manager'

trunk/IDE/Forms/UFormProjectNew.lfm

@@ -8 +8 @@
   ClientWidth = 519
   OnShow = FormShow
-  LCLVersion = '0.9.31'
+  LCLVersion = '1.1'
   object ButtonOk: TButton
     Left = 424
@@ -40 +40 @@
     ViewStyle = vsIcon
     OnChange = ListView1Change
+    OnDblClick = ListView1DblClick
     OnSelectItem = ListView1SelectItem
   end

trunk/IDE/Forms/UFormProjectNew.pas

@@ -20 +20 @@
     procedure ListView1Change(Sender: TObject; Item: TListItem;
       Change: TItemChange);
+    procedure ListView1DblClick(Sender: TObject);
     procedure ListView1SelectItem(Sender: TObject; Item: TListItem;
       Selected: Boolean);
@@ -52 +53 @@
 end;
 
+procedure TFormProjectNew.ListView1DblClick(Sender: TObject);
+begin
+  ButtonOk.Click;
+end;
+
 procedure TFormProjectNew.ListView1SelectItem(Sender: TObject; Item: TListItem;
   Selected: Boolean);

trunk/IDE/Forms/UFormSourceCode.lfm

@@ -1 +1 @@
 object FormSourceCode: TFormSourceCode
-  Left = 352
+  Left = 353
   Height = 426
-  Top = 95
+  Top = 97
   Width = 535
   Caption = 'Source code'

trunk/IDE/Forms/UFormSourceCode.pas

@@ -40 +40 @@
 procedure TFormSourceCode.SynEditSourceChange(Sender: TObject);
 begin
-  if Assigned(Core.Project) then
+  if Assigned(Core.Project) and Assigned(ProjectFile) then
     ProjectFile.Modified := True;
 end;

trunk/IDE/Forms/UFormTargetProject.lfm

@@ -1 +1 @@
 object FormTargetProject: TFormTargetProject
-  Left = 256
+  Left = 258
   Height = 240
-  Top = 81
+  Top = 83
   Width = 320
   Caption = 'FormTargetProject'

trunk/IDE/Transpascal.lpi

@@ -150 +150 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormMessages"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UFormMessages"/>
@@ -202 +203 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormProjectNew"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UFormProjectNew"/>

trunk/IDE/UCore.lfm

@@ -4 +4 @@
   OldCreateOrder = False
   Height = 290
-  HorizontalOffset = 308
-  VerticalOffset = 75
+  HorizontalOffset = 309
+  VerticalOffset = 77
   Width = 347
   object LastOpenedFiles: TLastOpenedList

trunk/IDE/UCore.pas

@@ -28 +28 @@
     procedure LastOpenedFilesChange(Sender: TObject);
   private
+    procedure ProjectChange(Sender: TObject);
   public
     ReopenLastOpenedFile: Boolean;
@@ -68 +69 @@
   Project := TProject.Create;
   Project.FileName := SNewProject;
+  Project.OnChange := ProjectChange;
 end;
 
@@ -109 +111 @@
   LastOpenedFiles.LoadToMenuItem(FormMain.PopupMenu1.Items,
     FormMain.OpenRecentClick);
+end;
+
+procedure TCore.ProjectChange(Sender: TObject);
+begin
+  FormMain.UpdateInterface;
 end;
 

trunk/IDE/UProject.pas

@@ -73 +73 @@
   TProject = class
   private
-    FActive: Boolean;
     FModified: Boolean;
     FOnChange: TNotifyEvent;
@@ -239 +238 @@
 var
   I: Integer;
-begin
+  ParentDir: string;
+begin
+  ParentDir := ExtractFileDir(Parent.FileName);
+  if Copy(FileName, 1, Length(ParentDir)) = ParentDir then
+    System.Delete(FileName, 1, Length(ParentDir) + 1);
   I := 0;
   while (I < Count) and (TProjectFile(Items[I]).FileName <> FileName) do Inc(I);
@@ -309 +312 @@
 procedure TProjectFile.Save;
 begin
-  if Modified then
-    Source.SaveToFile(FileName);
+  Source.SaveToFile(AbsoluteFileName);
 end;
 
@@ -319 +321 @@
   if FModified = AValue then Exit;
   FModified := AValue;
+  if Assigned(FOnChange) then FOnChange(Self);
 end;
 
@@ -364 +367 @@
 begin
   Doc := TXMLDocument.Create;
+  Self.FileName := FileName;
   with Doc do try
     RootNode := CreateElement('Project');
@@ -395 +399 @@
 
 procedure TProject.Save;
+var
+  I: Integer;
 begin
   Files.Save;
   Packages.Save;
+  for I := 0 to Files.Count - 1 do
+    TProjectFile(Files[I]).Modified := False;
+  Modified := False;
 end;