Changeset 6 for trunk/Forms/UInstanceOptions.pas

Timestamp:

Feb 4, 2011, 9:45:01 AM (13 years ago)

Author:

chronos

Message:

• Modified: Source selection separated to single form.
• Added: Starting compiler and IDE with updated paths in configuration files.

File:

• trunk/Forms/UInstanceOptions.pas (modified) (3 diffs)

trunk/Forms/UInstanceOptions.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ComCtrls, ExtCtrls, DOM, XMLWrite, XMLRead, HTTPSend, USource, UInstance;
+  ComCtrls, ExtCtrls, DOM, XMLWrite, XMLRead, HTTPSend, USource, UInstance,
+  USourceSelection;
 
 type
@@ -14 +15 @@
 
   TInstanceOptionsForm = class(TForm)
-    ButtonUpdateSource: TButton;
+    Button1: TButton;
+    Button2: TButton;
     ButtonCancel: TButton;
     ButtonOk: TButton;
     Edit1: TEdit;
+    Edit2: TEdit;
+    Edit3: TEdit;
     Label1: TLabel;
     Label2: TLabel;
     Label3: TLabel;
-    ListView1: TListView;
-    ListView2: TListView;
-    Panel1: TPanel;
-    Panel2: TPanel;
-    Panel3: TPanel;
+    procedure Button1Click(Sender: TObject);
+    procedure Button2Click(Sender: TObject);
     procedure ButtonCancelClick(Sender: TObject);
     procedure ButtonOkClick(Sender: TObject);
-    procedure ButtonUpdateSourceClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
-    procedure ListView1Data(Sender: TObject; Item: TListItem);
-    procedure ListView2Data(Sender: TObject; Item: TListItem);
   private
-    procedure ReloadList;
+    IsNew: Boolean;
   public
     Instance: TInstance;
-    FPCSources: TSourceList;
-    IDESources: TSourceList;
+    FPCSource: TSource;
+    IDESource: TSource;
   end;
 
@@ -54 +52 @@
 { TInstanceOptionsForm }
 
-procedure TInstanceOptionsForm.ButtonUpdateSourceClick(Sender: TObject);
-var
-  fs: TFileStream;
-begin
-  fs := TFileStream.Create(ExtractFileName(MainForm.SourceURL), fmOpenWrite or fmCreate);
-  try
-    HttpGetBinary(MainForm.SourceURL, fs);
-  finally
-    fs.Free;
-  end;
-  MainForm.Sources.UpdateFormFile(ExtractFileName(MainForm.SourceURL));
-  ReloadList;
-end;
-
 procedure TInstanceOptionsForm.ButtonOkClick(Sender: TObject);
 begin
   Instance.Name := Edit1.Text;
-  if Assigned(ListView1.Selected) then
-    Instance.FPCSource := TSource(ListView1.Selected.Data)
-    else Instance.FPCSource := nil;
-  if Assigned(ListView2.Selected) then
-    Instance.IDESource := TSource(ListView2.Selected.Data)
-    else Instance.IDESource := nil;
+  Instance.FPCSource := FPCSource;
+  Instance.IDESource := IDESource;
 end;
 
 procedure TInstanceOptionsForm.ButtonCancelClick(Sender: TObject);
 begin
-  Instance.Free;
+  if IsNew then Instance.Free;
+end;
+
+procedure TInstanceOptionsForm.Button1Click(Sender: TObject);
+begin
+  SourceSelectionForm.ProjectType := 'Compiler';
+  if SourceSelectionForm.ShowModal = mrOk then begin
+    if Assigned(SourceSelectionForm.ListView1.Selected) then
+      FPCSource := TSource(SourceSelectionForm.ListView1.Selected.Data)
+      else FPCSource := nil;
+    if Assigned(FPCSource) then
+      Edit2.Text := FPCSource.GetName
+      else Edit2.Text := '';
+  end;
+end;
+
+procedure TInstanceOptionsForm.Button2Click(Sender: TObject);
+begin
+  SourceSelectionForm.ProjectType := 'IDE';
+  if SourceSelectionForm.ShowModal = mrOk then begin
+    if Assigned(SourceSelectionForm.ListView1.Selected) then
+      IDESource := TSource(SourceSelectionForm.ListView1.Selected.Data)
+      else IDESource := nil;
+    if Assigned(IDESource) then
+      Edit3.Text := IDESource.GetName
+      else Edit3.Text := '';
+  end;
 end;
 
 procedure TInstanceOptionsForm.FormCreate(Sender: TObject);
 begin
-  FPCSources := TSourceList.Create;
-  FPCSources.OwnsObjects := False;
-  IDESources := TSourceList.Create;
-  IDESources.OwnsObjects := False;
 end;
 
 procedure TInstanceOptionsForm.FormDestroy(Sender: TObject);
 begin
-  FPCSources.Free;
-  IDESources.Free;
 end;
 
 procedure TInstanceOptionsForm.FormShow(Sender: TObject);
 begin
-  ReloadList;
   if not Assigned(Instance) then begin
     Instance := TInstance.Create;
     Instance.Id := MainForm.Instances.GetNewId;
     Instance.Name := 'Instance ' + IntToStr(Instance.Id);
-  end;
-  //    ListView1.Items[;
+    IsNew := True;
+  end else IsNew := False;
+
   Edit1.Text := Instance.Name;
-end;
-
-procedure TInstanceOptionsForm.ListView1Data(Sender: TObject; Item: TListItem);
-begin
-  if Item.Index < FPCSources.Count then
-  with TSource(FPCSources[Item.Index]) do begin
-    Item.Caption := ProjectName;
-    Item.Data := FPCSources[Item.Index];
-    Item.SubItems.Add(VersionType);
-    Item.SubItems.Add(VersionNumber);
-    Item.SubItems.Add('');
-    Item.SubItems.Add('');
-    Item.SubItems.Add(SubversionURL);
-  end;
-end;
-
-procedure TInstanceOptionsForm.ListView2Data(Sender: TObject; Item: TListItem);
-begin
-  if Item.Index < IDESources.Count then
-  with TSource(IDESources[Item.Index]) do begin
-    Item.Caption := ProjectName;
-    Item.Data := IDESources[Item.Index];
-    Item.SubItems.Add(VersionType);
-    Item.SubItems.Add(VersionNumber);
-    Item.SubItems.Add('');
-    Item.SubItems.Add('');
-    Item.SubItems.Add(SubversionURL);
-  end;
-end;
-
-procedure TInstanceOptionsForm.ReloadList;
-var
-  I: Integer;
-begin
-  FPCSources.Clear;
-  for I := 0 to MainForm.Sources.Count - 1 do
-    if TSource(MainForm.Sources[I]).ProjectType = 'Compiler' then
-      FPCSources.Add(MainForm.Sources[I]);
-  if ListView1.Items.Count <> FPCSources.Count then
-    ListView1.Items.Count := FPCSources.Count;
-  ListView1.Items[-1]; // workaround
-  ListView1.Refresh;
-  IDESources.Clear;
-  for I := 0 to MainForm.Sources.Count - 1 do
-    if TSource(MainForm.Sources[I]).ProjectType = 'IDE' then
-      IDESources.Add(MainForm.Sources[I]);
-  if ListView2.Items.Count <> IDESources.Count then
-    ListView2.Items.Count := IDESources.Count;
-  ListView2.Items[-1]; // workaround
-  ListView2.Refresh;
+  if Assigned(Instance.FPCSource) then
+    Edit2.Text := Instance.FPCSource.GetName
+    else Edit2.Text := '';
+  if Assigned(Instance.IDESource) then
+    Edit3.Text := Instance.IDESource.GetName
+    else Edit3.Text := '';
 end;