Changeset 115 for trunk/Forms


Ignore:
Timestamp:
Oct 13, 2020, 8:05:14 PM (4 years ago)
Author:
chronos
Message:
  • Fixed: Build with Lazarus 2.0.10.
  • Modified: CoolTranslator package replaced by Translator in Common package.
  • Modified: About dialog moved to Common package.
Location:
trunk/Forms
Files:
3 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Forms/UFormLog.pas

    r96 r115  
    3535procedure TFormLog.FormCreate(Sender: TObject);
    3636begin
    37   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     37  Core.Translator.TranslateComponentRecursive(Self);
    3838  Core.ThemeManager.UseTheme(Self);
    3939end;

  • trunk/Forms/UFormMain.lfm

    r113 r115  
    11object FormMain: TFormMain
    2   Left = 405
     2  Left = 430
    33  Height = 703
    4   Top = 226
     4  Top = 249
    55  Width = 1032
    66  Caption = 'LazFuck'
    … …  
    1414  OnDestroy = FormDestroy
    1515  OnShow = FormShow
    16   LCLVersion = '2.0.2.0'
     16  LCLVersion = '2.0.10.0'
    1717  WindowState = wsMaximized
    1818  object StatusBarMain: TStatusBar
    1919    Left = 0
    20     Height = 28
    21     Top = 641
     20    Height = 27
     21    Top = 642
    2222    Width = 1032
    2323    Panels = <   
    … …  
    7373    end
    7474    object ToolButton6: TToolButton
    75       Left = 239
     75      Left = 237
    7676      Top = 2
    7777      Action = AProgramRun
    7878    end
    7979    object ToolButton7: TToolButton
    80       Left = 204
     80      Left = 202
    8181      Top = 2
    8282      Action = AProgramCompile
    … …  
    8888    end
    8989    object ToolButton9: TToolButton
    90       Left = 344
     90      Left = 342
    9191      Top = 2
    9292      Action = ABreakpointToggle
    9393    end
    9494    object ToolButton10: TToolButton
    95       Left = 274
     95      Left = 272
    9696      Top = 2
    9797      Action = AProgramPause
    9898    end
    9999    object ToolButton11: TToolButton
    100       Left = 309
     100      Left = 307
    101101      Top = 2
    102102      Action = AProgramStop
    103103    end
    104104    object ToolButton12: TToolButton
    105       Left = 379
     105      Left = 377
    106106      Top = 2
    107107      Action = AProgramStepOver
    108108    end
    109109    object ToolButton13: TToolButton
    110       Left = 414
     110      Left = 412
    111111      Top = 2
    112112      Action = AProgramStepInto
    113113    end
    114114    object ToolButton14: TToolButton
    115       Left = 449
     115      Left = 447
    116116      Top = 2
    117117      Action = AProgramStepOut
    118118    end
    119119    object ToolButton15: TToolButton
    120       Left = 484
     120      Left = 482
    121121      Top = 2
    122122      Action = AProgramRunToCursor
    123123    end
    124124    object ToolButtonTarget: TToolButton
    125       Left = 519
     125      Left = 517
    126126      Hint = 'Target select'
    127127      Top = 2
    … …  
    133133  object PageControlRight: TPageControl
    134134    Left = 560
    135     Height = 610
     135    Height = 611
    136136    Top = 31
    137137    Width = 472
    … …  
    144144    object TabSheetDebug: TTabSheet
    145145      Caption = 'Debug'
    146       ClientHeight = 606
     146      ClientHeight = 607
    147147      ClientWidth = 390
    148148      ParentFont = False
    … …  
    206206      object PanelMemory: TPanel
    207207        Left = 0
    208         Height = 97
     208        Height = 98
    209209        Top = 509
    210210        Width = 390
    … …  
    218218  object Splitter1: TSplitter
    219219    Left = 554
    220     Height = 610
     220    Height = 611
    221221    Top = 31
    222222    Width = 6
    … …  
    226226  object PanelLeft: TPanel
    227227    Left = 0
    228     Height = 610
     228    Height = 611
    229229    Top = 31
    230230    Width = 554
    231231    Align = alClient
    232232    BevelOuter = bvNone
    233     ClientHeight = 610
     233    ClientHeight = 611
    234234    ClientWidth = 554
    235235    ParentFont = False
    … …  
    237237    object PageControlMain: TPageControl
    238238      Left = 0
    239       Height = 462
     239      Height = 463
    240240      Top = 0
    241241      Width = 554
    … …  
    257257      Left = 0
    258258      Height = 142
    259       Top = 468
     259      Top = 469
    260260      Width = 554
    261261      ActivePage = TabSheetMessages
    … …  
    274274      Left = 0
    275275      Height = 6
    276       Top = 462
     276      Top = 463
    277277      Width = 554
    278278      Align = alBottom
    … …  
    282282  object MainMenu1: TMainMenu
    283283    Images = Core.ImageListMain
    284     left = 259
    285     top = 163
     284    Left = 259
     285    Top = 163
    286286    object MenuItem1: TMenuItem
    287287      Caption = 'Project'
    … …  
    383383  object ActionList1: TActionList
    384384    Images = Core.ImageListMain
    385     left = 259
    386     top = 230
     385    Left = 259
     386    Top = 230
    387387    object AProjectOpen: TAction
    388388      Category = 'Project'
    … …  
    529529    DefaultExt = '.b'
    530530    Filter = 'BrainFuck (*.b)|*.b|Any file (*.*)|*.*'
    531     left = 67
    532     top = 221
     531    Left = 67
     532    Top = 221
    533533  end
    534534  object SaveDialog1: TSaveDialog
    535535    DefaultExt = '.b'
    536536    Filter = 'BrainFuck (*.b)|*.b|Any file (*.*)|*.*'
    537     left = 67
    538     top = 288
     537    Left = 67
     538    Top = 288
    539539  end
    540540  object TimerRefresh: TTimer
    541541    OnTimer = TimerRefreshTimer
    542     left = 67
    543     top = 355
     542    Left = 67
     543    Top = 355
    544544  end
    545545  object PopupMenuRecentFiles: TPopupMenu
    546     left = 67
    547     top = 77
     546    Left = 67
     547    Top = 77
    548548  end
    549549  object PopupMenuTargets: TPopupMenu
    550     Images = Core.ImageListMain
    551     left = 67
    552     top = 143
     550    Left = 67
     551    Top = 143
    553552  end
    554553end

  • trunk/Forms/UFormMain.pas

    r114 r115  
    146146    procedure ProjectOpen(FileName: string);
    147147    procedure UpdateToolBarHints;
     148    procedure DockForm(Form: TForm; DockSite: TWinControl);
    148149    procedure DockInit;
    149150    procedure LastOpenedListChange(Sender: TObject);
    … …  
    170171  UCore, UFormCPU, UFormOptions, UFormMessages, UFormTargets, UFormOutput, UFormInput,
    171172  UFormMemory, UFormSourceCode, UFormTargetCode, UTargetInterpretter, UFormLog,
    172   UBFTarget, UFormAbout;
     173  UBFTarget;
    173174
    174175resourcestring
    … …  
    267268end;
    268269
     270procedure TFormMain.DockForm(Form: TForm; DockSite: TWinControl);
     271begin
     272  Form.ManualDock(DockSite, nil, alClient);
     273  Form.Align := alClient;
     274  Form.Show;
     275end;
     276
    269277procedure TFormMain.DockInit;
    270278begin
    271   FormSourceCode.ManualDock(TabSheetSource, nil, alClient);
    272   FormSourceCode.Align := alClient;
    273   FormSourceCode.Show;
    274   FormTargetCode.ManualDock(TabSheetTarget, nil, alClient);
    275   FormTargetCode.Align := alClient;
    276   FormTargetCode.Show;
    277   FormCPU.ManualDock(PanelCPU, nil, alClient);
    278   FormCPU.Align := alClient;
    279   FormCPU.Show;
    280   FormInput.ManualDock(PanelInput, nil, alClient);
    281   FormInput.Align := alClient;
    282   FormInput.Show;
    283   FormOutput.ManualDock(PanelOutput, nil, alClient);
    284   FormOutput.Align := alClient;
    285   FormOutput.Show;
    286   FormMemory.ManualDock(PanelMemory, nil, alClient);
    287   FormMemory.Align := alClient;
    288   FormMemory.Show;
    289   FormMessages.ManualDock(TabSheetMessages, nil, alClient);
    290   FormMessages.Align := alClient;
    291   FormMessages.Show;
     279  DockForm(FormSourceCode, TabSheetSource);
     280  DockForm(FormTargetCode, TabSheetTarget);
     281  DockForm(FormCPU, PanelCPU);
     282  DockForm(FormInput, PanelInput);
     283  DockForm(FormOutput, PanelOutput);
     284  DockForm(FormMemory, PanelMemory);
     285  DockForm(FormMessages, TabSheetMessages);
    292286  PageControlRight.Width := FormMain.Width div 3;
    293287  PageControlBottom.Height := FormMain.Height div 5;
    … …  
    534528procedure TFormMain.AAboutExecute(Sender: TObject);
    535529begin
    536   FormAbout := TFormAbout.Create(nil);
    537   try
    538     FormAbout.ApplicationInfo := Core.ApplicationInfo;
    539     FormAbout.CoolTranslator := Core.CoolTranslator1;
    540     Core.ScaleDPI1.ScaleControl(FormAbout, Core.ScaleDPI1.DesignDPI);
    541     FormAbout.ShowModal;
    542   finally
    543     FreeAndNil(FormAbout);
    544   end;
     530  Core.AboutDialog.Show;
    545531end;
    546532

  • trunk/Forms/UFormOptions.pas

    r96 r115  
    8888procedure TFormOptions.Load;
    8989begin
    90   ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.CoolTranslator1.Language);
     90  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Translator.Language);
    9191  if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
    9292  ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(Core.ThemeManager.Theme);
    … …  
    109109begin
    110110  if ComboBoxLanguage.ItemIndex <> -1 then
    111     Core.CoolTranslator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
     111    Core.Translator.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
    112112  if ComboBoxTheme.ItemIndex <> -1 then
    113113    Core.ThemeManager.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
    … …  
    137137procedure TFormOptions.FormCreate(Sender: TObject);
    138138begin
    139   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     139  Core.Translator.TranslateComponentRecursive(Self);
    140140  Core.ThemeManager.UseTheme(Self);
    141141  Core.ThemeManager.Themes.LoadToStrings(ComboBoxTheme.Items);
    142   Core.CoolTranslator1.LanguageListToStrings(ComboBoxLanguage.Items);
     142  Core.Translator.LanguageListToStrings(ComboBoxLanguage.Items);
    143143end;
    144144

  • trunk/Forms/UFormSourceCode.lfm

    r109 r115  
    11object FormSourceCode: TFormSourceCode
    22  Left = 459
    3   Height = 491
     3  Height = 589
    44  Top = 278
    5   Width = 560
     5  Width = 672
    66  Caption = 'Source code'
    7   ClientHeight = 491
    8   ClientWidth = 560
    9   DesignTimePPI = 120
     7  ClientHeight = 589
     8  ClientWidth = 672
     9  DesignTimePPI = 144
    1010  OnCreate = FormCreate
    1111  OnDestroy = FormDestroy
    … …  
    1717    Width = 560
    1818    Align = alClient
    19     Font.Height = -13
     19    Font.Height = -16
    2020    Font.Name = 'Courier New'
    2121    Font.Pitch = fpFixed
    … …  
    2929    OnKeyUp = MemoSourceKeyUp
    3030    OnMouseDown = MemoSourceMouseDown
    31     Gutter.Width = 67
     31    Gutter.Width = 80
    3232    Gutter.MouseActions = <>
    3333    RightGutter.Width = 0
    … …  
    479479    inline SynLeftGutterPartList1: TSynGutterPartList
    480480      object SynGutterMarks1: TSynGutterMarks
    481         Width = 30
     481        Width = 36
    482482        MouseActions = <>
    483483      end
    484484      object SynGutterLineNumber1: TSynGutterLineNumber
    485         Width = 17
     485        Width = 21
    486486        MouseActions = <>
    487487        MarkupInfo.Background = clBtnFace
    … …  
    493493      end
    494494      object SynGutterChanges1: TSynGutterChanges
    495         Width = 5
     495        Width = 6
    496496        MouseActions = <>
    497497        ModifiedColor = 59900
    … …  
    506506      object SynGutterCodeFolding1: TSynGutterCodeFolding
    507507        AutoSize = False
    508         Width = 12
     508        Width = 14
    509509        MouseActions = <>
    510510        MarkupInfo.Background = clNone
    … …  
    517517  object PopupMenuSource: TPopupMenu
    518518    Images = Core.ImageListMain
    519     left = 128
    520     top = 128
     519    left = 154
     520    top = 154
    521521    object MenuItem23: TMenuItem
    522522      Action = FormMain.ABreakpointToggle
    … …  
    591591  object ActionList1: TActionList
    592592    Images = Core.ImageListMain
    593     left = 128
    594     top = 56
     593    left = 154
     594    top = 67
    595595    object AGenerateNumber: TAction
    596596      Caption = 'Generate number'
    … …  
    645645    DefaultFilter = 'Soubory Java (*.java)|*.java'
    646646    Enabled = False
    647     left = 405
    648     top = 263
     647    left = 486
     648    top = 316
    649649  end
    650650end

  • trunk/Forms/UFormTargetOptions.lfm

    r103 r115  
    11object FormTargetOptions: TFormTargetOptions
    2   Left = 429
    3   Height = 247
    4   Top = 228
    5   Width = 506
     2  Left = 667
     3  Height = 242
     4  Top = 613
     5  Width = 586
    66  Caption = 'Target options'
    7   ClientHeight = 247
    8   ClientWidth = 506
     7  ClientHeight = 242
     8  ClientWidth = 586
    99  DesignTimePPI = 144
    1010  OnClose = FormClose
    1111  OnCreate = FormCreate
    1212  OnShow = FormShow
    13   LCLVersion = '2.0.0.4'
     13  LCLVersion = '2.0.10.0'
    1414  object Edit1: TEdit
    1515    Left = 10
    16     Height = 33
     16    Height = 42
    1717    Top = 38
    18     Width = 389
     18    Width = 469
    1919    Anchors = [akTop, akLeft, akRight]
    2020    ParentFont = False
    … …  
    2323  object Label1: TLabel
    2424    Left = 10
    25     Height = 25
     25    Height = 24
    2626    Top = 8
    27     Width = 144
     27    Width = 155
    2828    Caption = 'Compiler location:'
    2929    ParentColor = False
    … …  
    3131  end
    3232  object ButtonCompiler: TButton
    33     Left = 409
     33    Left = 489
    3434    Height = 37
    3535    Top = 42
    … …  
    4242  end
    4343  object ButtonExecute: TButton
    44     Left = 409
     44    Left = 489
    4545    Height = 37
    4646    Top = 115
    … …  
    5454  object Edit2: TEdit
    5555    Left = 10
    56     Height = 33
     56    Height = 42
    5757    Top = 115
    58     Width = 389
     58    Width = 469
    5959    Anchors = [akTop, akLeft, akRight]
    6060    ParentFont = False
    … …  
    6363  object Label2: TLabel
    6464    Left = 10
    65     Height = 25
     65    Height = 24
    6666    Top = 86
    67     Width = 139
     67    Width = 151
    6868    Caption = 'Executor location:'
    6969    ParentColor = False
    … …  
    7171  end
    7272  object ButtonOk: TButton
    73     Left = 383
     73    Left = 463
    7474    Height = 37
    75     Top = 196
     75    Top = 191
    7676    Width = 109
    7777    Anchors = [akRight, akBottom]
    … …  
    8282  end
    8383  object ButtonCancel: TButton
    84     Left = 248
     84    Left = 328
    8585    Height = 37
    86     Top = 196
     86    Top = 191
    8787    Width = 109
    8888    Anchors = [akRight, akBottom]
    … …  
    9595    DefaultExt = '.exe'
    9696    Filter = 'Program (*.exe)|*.exe|JakÃœkoliv soubor (*.*)|*.*'
    97     left = 118
    98     top = 145
     97    Left = 118
     98    Top = 145
    9999  end
    100100end

  • trunk/Forms/UFormTargetOptions.pas

    r96 r115  
    6868procedure TFormTargetOptions.FormCreate(Sender: TObject);
    6969begin
    70   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     70  Core.Translator.TranslateComponentRecursive(Self);
    7171  Core.ThemeManager.UseTheme(Self);
    7272end;

  • trunk/Forms/UFormTargets.pas

    r96 r115  
    4444procedure TFormTargets.FormCreate(Sender: TObject);
    4545begin
    46   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     46  Core.Translator.TranslateComponentRecursive(Self);
    4747  Core.ThemeManager.UseTheme(Self);
    4848end;
Note: See TracChangeset for help on using the changeset viewer.