Changeset 33 for trunk/Forms


Ignore:
Timestamp:
Feb 18, 2012, 11:08:44 PM (12 years ago)
Author:
chronos
Message:
  • Modified: CompiledForm replaced by compiled source tab in PageControl on MainForm.
  • Added: Function for switching position between source code and target code.
Location:
trunk/Forms
Files:
3 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Forms/UInterpretterForm.lfm

    r30 r33  
    229229    end
    230230    object ToolButton4: TToolButton
    231       Left = 70
     231      Left = 139
    232232      Top = 2
    233233      Action = MainForm.AProgramRunToCursor
     
    244244    end
    245245    object ToolButton7: TToolButton
    246       Left = 139
    247       Top = 2
    248       Action = MainForm.AProgramStopOver
     246      Left = 70
     247      Top = 2
     248      Action = MainForm.AProgramStepOver
    249249    end
    250250  end
  • trunk/Forms/UMainForm.lfm

    r32 r33  
    1414  LCLVersion = '0.9.31'
    1515  WindowState = wsMaximized
    16   object MemoSource: TMemo
    17     Left = 0
    18     Height = 363
    19     Top = 56
    20     Width = 643
    21     Align = alClient
    22     Font.Height = -12
    23     Font.Name = 'Courier New'
    24     OnChange = MemoSourceChange
    25     OnKeyDown = MemoSourceKeyDown
    26     OnKeyPress = MemoSourceKeyPress
    27     OnKeyUp = MemoSourceKeyUp
    28     OnMouseDown = MemoSourceMouseDown
    29     ParentFont = False
    30     PopupMenu = PopupMenuSource
    31     ScrollBars = ssAutoBoth
    32     TabOrder = 0
    33   end
    3416  object StatusBar1: TStatusBar
    3517    Left = 0
     
    5739    ParentShowHint = False
    5840    ShowHint = True
    59     TabOrder = 2
     41    TabOrder = 1
    6042    object ToolButton1: TToolButton
    6143      Left = 1
     
    11799      Left = 241
    118100      Top = 2
    119       Caption = 'ToolButton12'
     101      Action = AProgramStepOver
    120102    end
    121103    object ToolButton13: TToolButton
    122104      Left = 264
    123105      Top = 2
    124       Caption = 'ToolButton13'
     106      Action = AProgramStepInto
    125107    end
    126108    object ToolButton14: TToolButton
    127109      Left = 287
    128110      Top = 2
    129       Caption = 'ToolButton14'
     111      Action = AProgramStepOut
    130112    end
    131113    object ToolButton15: TToolButton
    132114      Left = 310
    133115      Top = 2
    134       Caption = 'ToolButton15'
     116      Action = AProgramRunToCursor
    135117    end
    136118  end
    137   object TabControl1: TTabControl
     119  object PageControl1: TPageControl
    138120    Left = 0
    139     Height = 30
     121    Height = 393
    140122    Top = 26
    141123    Width = 643
    142     Align = alTop
    143     TabOrder = 3
    144     Visible = False
     124    ActivePage = TabSheetTarget
     125    Align = alClient
     126    ParentFont = False
     127    TabIndex = 1
     128    TabOrder = 2
     129    object TabSheetSource: TTabSheet
     130      Caption = 'Source code'
     131      ClientHeight = 366
     132      ClientWidth = 641
     133      object MemoSource: TMemo
     134        Left = 0
     135        Height = 366
     136        Top = 0
     137        Width = 641
     138        Align = alClient
     139        Font.Height = -12
     140        Font.Name = 'Courier New'
     141        OnChange = MemoSourceChange
     142        OnKeyDown = MemoSourceKeyDown
     143        OnKeyPress = MemoSourceKeyPress
     144        OnKeyUp = MemoSourceKeyUp
     145        OnMouseDown = MemoSourceMouseDown
     146        ParentFont = False
     147        PopupMenu = PopupMenuSource
     148        ScrollBars = ssAutoBoth
     149        TabOrder = 0
     150      end
     151    end
     152    object TabSheetTarget: TTabSheet
     153      Caption = 'Target code'
     154      ClientHeight = 366
     155      ClientWidth = 641
     156      object MemoTarget: TMemo
     157        Left = 0
     158        Height = 366
     159        Top = 0
     160        Width = 641
     161        Align = alClient
     162        PopupMenu = PopupMenuTarget
     163        ReadOnly = True
     164        ScrollBars = ssAutoBoth
     165        TabOrder = 0
     166      end
     167    end
    145168  end
    146169  object MainMenu1: TMainMenu
     
    666689        Action = AViewInterpretter
    667690      end
    668       object MenuItem20: TMenuItem
    669         Action = AViewCompiled
    670       end
    671691    end
    672692    object MenuItem10: TMenuItem
     
    804824      OnExecute = AViewInterpretterExecute
    805825    end
    806     object AViewCompiled: TAction
    807       Category = 'View'
    808       Caption = 'Compiled'
    809       OnExecute = AViewCompiledExecute
    810     end
    811826    object AProgramStepInto: TAction
    812827      Category = 'Program'
    813828      Caption = 'Step into'
     829      ImageIndex = 15
    814830      ShortCut = 118
    815831    end
     
    817833      Category = 'Program'
    818834      Caption = 'Step over'
     835      ImageIndex = 17
    819836      ShortCut = 119
    820837    end
     
    822839      Category = 'Program'
    823840      Caption = 'Run to cursor'
     841      ImageIndex = 14
    824842      ShortCut = 115
    825843    end
     
    827845      Category = 'Program'
    828846      Caption = 'Step out'
     847      ImageIndex = 16
    829848      ShortCut = 8311
    830849    end
     
    861880      OnExecute = AViewCompilersExecute
    862881    end
     882    object AShowTargetPosition: TAction
     883      Caption = 'Show position in target'
     884      OnExecute = AShowTargetPositionExecute
     885    end
     886    object AShowSourcePosition: TAction
     887      Caption = 'Show position in source'
     888      OnExecute = AShowSourcePositionExecute
     889    end
    863890  end
    864891  object ImageList1: TImageList
     
    866893    top = 96
    867894    Bitmap = {
    868       4C690E0000001000000010000000000000000000000000000000000000000000
     895      4C69120000001000000010000000000000000000000000000000000000000000
    869896      0000000000000000000000000000000000000000000000000000000000000000
    870897      000000000000000000000000000000000000000000FF000000FF000000FF0000
     
    13141341      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
    13151342      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1343      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1344      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1345      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1346      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D7D7D74CCCCCCCA0CCCCCCA0CCCC
     1347      CCA0CCCCCCA0CCCCCCA0D7D7D74CFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1348      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00CCCCCCA0000000FF000000FF0000
     1349      00FF000000FF000000FFCCCCCCA0FFFFFF000000000800000006FFFFFF00FFFF
     1350      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D7D7D74CCCCCCCA0BEBEBED50000
     1351      00FFBEBEBED5CCCCCCA0D7D7D74CFFFFFF0000000028004000DB002E00790000
     1352      0006FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00CCCCCCA00000
     1353      00FFCCCCCCA0FFFFFF00FFFFFF00FFFFFF0000000028006C00FF007C00FF0051
     1354      00D30031007800000006FFFFFF00FFFFFF00FFFFFF00FFFFFF00CCCCCCA00000
     1355      00FFCCCCCCA0FFFFFF00FFFFFF00FFFFFF0000000028006C00FF008000FF0080
     1356      00FF007D00FF005200D30031007700000006FFFFFF00FFFFFF00CCCCCCA00000
     1357      00FFCCCCCCA0FFFFFF00FFFFFF00FFFFFF0000000028006C00FF008000FF0080
     1358      00FF008000FF008000FF007D00FF005300D20031007700000006CCCCCCA00000
     1359      00FFCCCCCCA0FFFFFF00FFFFFF00FFFFFF0000000028006C00FF008000FF0080
     1360      00FF008000FF008000FF007D00FF005300D20031007700000006CCCCCCA00000
     1361      00FFCCCCCCA0FFFFFF00FFFFFF00FFFFFF0000000028006C00FF008000FF0080
     1362      00FF007D00FF005200D30031007700000006FFFFFF00FFFFFF00CCCCCCA00000
     1363      00FFCCCCCCA0FFFFFF00FFFFFF00FFFFFF0000000028006C00FF007C00FF0051
     1364      00D30031007800000006FFFFFF00FFFFFF00FFFFFF00FFFFFF00CCCCCCA00000
     1365      00FFCCCCCCA0FFFFFF00FFFFFF00FFFFFF0000000028004000DB002E00790000
     1366      0006FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00CCCCCCA00000
     1367      00FFCCCCCCA0FFFFFF00FFFFFF00FFFFFF000000000800000006FFFFFF00FFFF
     1368      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D7D7D74CCCCCCCA0BEBEBED50000
     1369      00FFBEBEBED5CCCCCCA0D7D7D74CFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1370      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00CCCCCCA0000000FF000000FF0000
     1371      00FF000000FF000000FFCCCCCCA0FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1372      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D7D7D74CCCCCCCA0CCCCCCA0CCCC
     1373      CCA0CCCCCCA0CCCCCCA0D7D7D74CFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1374      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1375      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1376      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1377      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1378      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1379      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AB4C0000AAD10000
     1380      AAFF0000AAFF0000AAFF0000AAFF0000AAC0FFFFFF00FFFFFF00FFFFFF00FFFF
     1381      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAD10000A838FFFF
     1382      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1383      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1384      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1385      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1386      FF00FFFFFF00000000FF000000FF000000FF000000FF000000FF000000FF0000
     1387      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1388      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1389      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1390      FF00FFFFFF00FFFFFF00FFFFFF00000000FF000000FF000000FF000000FF0000
     1391      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1392      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1393      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAD10000A8380000
     1394      ABA60000AB5B0000AA06FFFFFF00000000FF000000FF000000FF000000FF0000
     1395      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000AB4C0000AAD10000
     1396      AAFF0000AAFF0000AADB0000AA1BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1397      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
     1398      ABA60000AB5B0000AA06FFFFFF00000000FF000000FF000000FF000000FF0000
     1399      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1400      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1401      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1402      FF00FFFFFF00000000FF000000FF000000FF000000FF000000FF000000FF0000
     1403      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1404      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1405      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1406      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1407      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1408      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1409      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1410      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1411      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1412      FF00FFFFFF00000000FF000000FF000000FF000000FF000000FF000000FF0000
     1413      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1414      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1415      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1416      FF00FFFFFF00FFFFFF00FFFFFF00000000FF000000FF000000FF000000FF0000
     1417      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000AB4C0000AAD10000
     1418      AAFF0000AAFF0000AAC0FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1419      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAD10000A838FFFF
     1420      FF00FFFFFF00FFFFFF00FFFFFF00000000FF000000FF000000FF000000FF0000
     1421      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1422      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1423      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1424      FF00FFFFFF00FFFFFF00FFFFFF00000000FF000000FF000000FF000000FF0000
     1425      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1426      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1427      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1428      FF00FFFFFF00000000FF000000FF000000FF000000FF000000FF000000FF0000
     1429      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1430      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1431      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAD10000A838FFFF
     1432      FF00FFFFFF00FFFFFF000000ABA60000AB5B0000AA06FFFFFF00FFFFFF00FFFF
     1433      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AB4C0000AAD10000
     1434      AAFF0000AAFF0000AAFF0000AAFF0000AAFF0000AADB0000AA1BFFFFFF00FFFF
     1435      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1436      FF00FFFFFF00FFFFFF000000ABA60000AB5B0000AA06FFFFFF00FFFFFF00FFFF
     1437      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1438      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1439      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1440      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1441      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AB4C0000AAD10000
     1442      AAFF0000AAFF0000AAFF0000AAFF0000AAC0FFFFFF00FFFFFF00FFFFFF00FFFF
     1443      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAD10000A838FFFF
     1444      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1445      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1446      FF00FFFFFF00000000FF000000FF000000FF000000FF000000FF000000FF0000
     1447      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1448      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1449      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1450      FF00FFFFFF00FFFFFF00FFFFFF00000000FF000000FF000000FF000000FF0000
     1451      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1452      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1453      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1454      FF00FFFFFF00FFFFFF00FFFFFF00000000FF000000FF000000FF000000FF0000
     1455      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1456      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1457      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1458      FF00FFFFFF00FFFFFF00FFFFFF00000000FF000000FF000000FF000000FF0000
     1459      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1460      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1461      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1462      FF00FFFFFF00000000FF000000FF000000FF000000FF000000FF000000FF0000
     1463      00FF000000FFFFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAFFFFFFFF00FFFF
     1464      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1465      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AAD10000A838FFFF
     1466      FF00FFFFFF00FFFFFF000000ABA60000AB5B0000AA06FFFFFF00FFFFFF00FFFF
     1467      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000AB4C0000AAD10000
     1468      AAFF0000AAFF0000AAFF0000AAFF0000AAFF0000AADB0000AA1BFFFFFF00FFFF
     1469      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
     1470      FF00FFFFFF00FFFFFF000000ABA60000AB5B0000AA06FFFFFF00FFFFFF00FFFF
    13161471      FF00FFFFFF00FFFFFF00FFFFFF00
    13171472    }
     
    14221577      }
    14231578    end
     1579    object MenuItem36: TMenuItem
     1580      Action = AShowTargetPosition
     1581    end
     1582  end
     1583  object PopupMenuTarget: TPopupMenu
     1584    left = 92
     1585    top = 136
     1586    object MenuItem20: TMenuItem
     1587      Action = AShowSourcePosition
     1588    end
    14241589  end
    14251590end
  • trunk/Forms/UMainForm.lrt

    r32 r33  
    11TMAINFORM.CAPTION=LazFuck
    2 TMAINFORM.TOOLBUTTON12.CAPTION=ToolButton12
    3 TMAINFORM.TOOLBUTTON13.CAPTION=ToolButton13
    4 TMAINFORM.TOOLBUTTON14.CAPTION=ToolButton14
    5 TMAINFORM.TOOLBUTTON15.CAPTION=ToolButton15
     2TMAINFORM.TABSHEETSOURCE.CAPTION=Source code
     3TMAINFORM.TABSHEETTARGET.CAPTION=Target code
    64TMAINFORM.MENUITEM1.CAPTION=Project
    75TMAINFORM.MENUITEMOPENRECENT.CAPTION=Open recent
     
    2725TMAINFORM.APROGRAMSTOP.CAPTION=Stop
    2826TMAINFORM.AVIEWINTERPRETTER.CAPTION=Interpretter
    29 TMAINFORM.AVIEWCOMPILED.CAPTION=Compiled
    3027TMAINFORM.APROGRAMSTEPINTO.CAPTION=Step into
    3128TMAINFORM.APROGRAMSTEPOVER.CAPTION=Step over
     
    3835TMAINFORM.AGENERATENUMBER.CAPTION=Generate code for number
    3936TMAINFORM.AVIEWCOMPILERS.CAPTION=Compilers
     37TMAINFORM.ASHOWTARGETPOSITION.CAPTION=Show position in target
     38TMAINFORM.ASHOWSOURCEPOSITION.CAPTION=Show position in source
  • trunk/Forms/UMainForm.pas

    r32 r33  
    1818
    1919  TMainForm = class(TForm)
     20    AShowSourcePosition: TAction;
     21    AShowTargetPosition: TAction;
    2022    AProgramCompile: TAction;
    2123    AAbout: TAction;
     
    3133    AProgramStepOver: TAction;
    3234    AProgramStepInto: TAction;
    33     AViewCompiled: TAction;
    3435    AViewInterpretter: TAction;
    3536    AProgramPause: TAction;
     
    4748    ImageList1: TImageList;
    4849    MainMenu1: TMainMenu;
     50    MemoTarget: TMemo;
    4951    MemoSource: TMemo;
    5052    MenuItem1: TMenuItem;
     
    7678    MenuItem34: TMenuItem;
    7779    MenuItem35: TMenuItem;
     80    MenuItem36: TMenuItem;
    7881    MenuItemOpenRecent: TMenuItem;
    7982    MenuItemTarget: TMenuItem;
     
    8689    MenuItem9: TMenuItem;
    8790    OpenDialog1: TOpenDialog;
     91    PageControl1: TPageControl;
     92    PopupMenuTarget: TPopupMenu;
    8893    PopupMenuSource: TPopupMenu;
    8994    SaveDialog1: TSaveDialog;
    9095    StatusBar1: TStatusBar;
    91     TabControl1: TTabControl;
     96    TabSheetSource: TTabSheet;
     97    TabSheetTarget: TTabSheet;
    9298    ToolBar1: TToolBar;
    9399    ToolButton1: TToolButton;
     
    121127    procedure AProjectSaveExecute(Sender: TObject);
    122128    procedure AProgramRunExecute(Sender: TObject);
     129    procedure AShowSourcePositionExecute(Sender: TObject);
     130    procedure AShowTargetPositionExecute(Sender: TObject);
    123131    procedure AShrinkSourceExecute(Sender: TObject);
    124     procedure AViewCompiledExecute(Sender: TObject);
    125132    procedure AViewCompilersExecute(Sender: TObject);
    126133    procedure AViewInterpretterExecute(Sender: TObject);
     
    167174
    168175uses
    169   UInterpretterForm, UApplicationInfo, UCompiledForm, UOptionsForm,
     176  UInterpretterForm, UApplicationInfo, UOptionsForm,
    170177  UTargetDelphi, UTargetPHP, UTargetC, UCompilersForm;
    171178
     
    179186procedure TMainForm.FormShow(Sender: TObject);
    180187begin
     188  PageControl1.TabIndex := 0;
    181189  if OpenProjectOnStart and (LastOpenedList.Count > 0) then
    182190    ProjectOpen(LastOpenedList[0])
     
    188196begin
    189197  Modified := True;
     198  CurrentTarget.Compiled := False;
    190199  UpdateInterface;
    191200end;
     
    236245  UpdateInterface;
    237246  Modified := False;
     247  CurrentTarget.Compiled := False;
    238248end;
    239249
     
    247257    TTarget(Targets[I]).OnChangeState := nil;
    248258  FCurrentTarget.OnChangeState := BrainFuckInterpreterChangeState;
     259  UpdateInterface;
    249260end;
    250261
     
    364375  if CurrentTarget is TTargetInterpretter then
    365376    TTargetInterpretter(CurrentTarget).Input := InterpreterForm.MemoInput.Lines.Text;
    366   CurrentTarget.Source := MemoSource.Text;
     377  CurrentTarget.SourceCode := MemoSource.Text;
    367378  CurrentTarget.Run;
     379end;
     380
     381procedure TMainForm.AShowSourcePositionExecute(Sender: TObject);
     382var
     383  DebugStep: TDebugStep;
     384begin
     385  DebugStep := CurrentTarget.DebugSteps.SearchByTargetPos(MemoSource.SelStart);
     386  MemoTarget.SelStart := DebugStep.SourcePosition;
     387  PageControl1.TabIndex := 0;
     388end;
     389
     390procedure TMainForm.AShowTargetPositionExecute(Sender: TObject);
     391var
     392  DebugStep: TDebugStep;
     393begin
     394  DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(MemoSource.SelStart);
     395  MemoTarget.SelStart := DebugStep.TargetPosition;
     396  PageControl1.TabIndex := 1;
    368397end;
    369398
     
    384413  SetLength(Source, Pos - 1);
    385414  MemoSource.Text := Source;
    386 end;
    387 
    388 procedure TMainForm.AViewCompiledExecute(Sender: TObject);
    389 begin
    390   CompiledForm.Show;
    391415end;
    392416
     
    466490  with CurrentTarget do begin
    467491    Optimization := coNormal;
    468     Source := MemoSource.Text;
     492    SourceCode := MemoSource.Text;
    469493    ProgramName := ExtractFileNameOnly(ProjectFileName);
    470494    Compile;
    471     CompiledForm.MemoCompiled.Text := Output;
    472     CompiledForm.Show;
     495    MemoTarget.Text := TargetCode;
    473496  end;
    474497end;
     
    483506  with CurrentTarget do begin
    484507    Optimization := coNormal;
    485     Source := MemoSource.Text;
     508    SourceCode := MemoSource.Text;
    486509    ProgramName := ExtractFileNameOnly(ProjectFileName);
    487510    ProjectFileName := Self.ProjectFileName;
     
    515538  MemoSource.Clear;
    516539  Modified := False;
     540  CurrentTarget.Compiled := False;
    517541  UpdateInterface;
    518542end;
Note: See TracChangeset for help on using the changeset viewer.