Changeset 41 for trunk/Forms

Timestamp:

Feb 19, 2012, 5:26:03 PM (13 years ago)

Author:

chronos

Message:

• Added: New Java target.

Location:

trunk/Forms

Files:

• UFormMain.lfm (modified) (2 diffs)
• UFormMain.lrt (modified) (1 diff)
• UFormMain.pas (modified) (6 diffs)

trunk/Forms/UFormMain.lfm

@@ -951 +951 @@
         Action = AViewCompilers
       end
-      object MenuItem19: TMenuItem
-        Action = AViewInterpretter
-      end
     end
     object MenuItem10: TMenuItem
@@ -1079 +1076 @@
       OnExecute = AProgramStopExecute
       ShortCut = 16497
-    end
-    object AViewInterpretter: TAction
-      Category = 'View'
-      Caption = 'Interpretter'
-      OnExecute = AViewInterpretterExecute
     end
     object AProgramStepInto: TAction

trunk/Forms/UFormMain.lrt

@@ -25 +25 @@
 TMAINFORM.APROGRAMPAUSE.CAPTION=Pause
 TMAINFORM.APROGRAMSTOP.CAPTION=Stop
-TMAINFORM.AVIEWINTERPRETTER.CAPTION=Interpretter
 TMAINFORM.APROGRAMSTEPINTO.CAPTION=Step into
 TMAINFORM.APROGRAMSTEPOVER.CAPTION=Step over

trunk/Forms/UFormMain.pas

@@ -34 +34 @@
     AProgramStepOver: TAction;
     AProgramStepInto: TAction;
-    AViewInterpretter: TAction;
     AProgramPause: TAction;
     AProgramStop: TAction;
@@ -61 +60 @@
     MenuItem17: TMenuItem;
     MenuItem18: TMenuItem;
-    MenuItem19: TMenuItem;
     MenuItem2: TMenuItem;
     MenuItem20: TMenuItem;
@@ -198 +196 @@
 
 uses
-  UFormCPU, UApplicationInfo, UFormOptions, UFormMessages,
+  UFormCPU, UApplicationInfo, UFormOptions, UFormMessages, UTargetJava,
   UTargetDelphi, UTargetPHP, UTargetC, UFormTargets, UFormOutput, UFormInput,
   UFormMemory;
@@ -394 +392 @@
   AProgramStop.Enabled := (tcStop in CurrentTarget.Capabilities) and
     (ProjectFileName <> '') and (CurrentTarget.State <> rsStopped);
-  AProgramCompile.Enabled := (tcCompile in CurrentTarget.Capabilities);
+  AProgramCompile.Enabled := (tcCompile in CurrentTarget.Capabilities) and
+    (ProjectFileName <> '');
   AProgramStepInto.Enabled := (tcStepInto in CurrentTarget.Capabilities) and
     (ProjectFileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
@@ -437 +436 @@
   Targets.Add(TTargetPHP.Create);
   Targets.Add(TTargetC.Create);
+  Targets.Add(TTargetJava.Create);
   UpdateTargetList;
   LastOpenedList := TLastOpenedList.Create;
@@ -577 +577 @@
     Optimization := coNormal;
     SourceCode := MemoSource.Text;
-    ProgramName := ExtractFileNameOnly(ProjectFileName);
+    ProjectFileName := Self.ProjectFileName;
+    ProgramName := ExtractFileNameOnly(Self.ProjectFileName);
     CurrentTarget.Messages.AddMessage('Compiling...');
     Compile;