Changeset 115


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
Files:
8 added
4 deleted
19 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;

  • trunk/Languages/LazFuck.cs.po

    r111 r115  
    1212"Language: cs\n"
    1313
    14 #: tformabout.buttonclose.caption
    15 msgctxt "tformabout.buttonclose.caption"
    16 msgid "Close"
    17 msgstr "Zavřít"
    18 
    19 #: tformabout.buttonhomepage.caption
    20 msgid "Home page"
    21 msgstr "Domovská stránka"
    22 
    23 #: tformabout.caption
    24 msgctxt "tformabout.caption"
    25 msgid "About"
    26 msgstr "O programu"
    27 
    28 #: tformabout.labelcontent.caption
    29 msgctxt "tformabout.labelcontent.caption"
    30 msgid "   "
    31 msgstr "   "
    32 
    3314#: tformcpu.caption
    3415msgctxt "tformcpu.caption"
    … …  
    539520msgstr "Cesta překladače"
    540521
    541 #: uformabout.slicense
    542 msgid "License"
    543 msgstr "Licence"
    544 
    545 #: uformabout.sreleasedate
    546 msgid "Release date"
    547 msgstr "Datum uvolnění"
    548 
    549 #: uformabout.sversion
    550 msgid "Version"
    551 msgstr "Verze"
    552 
    553522#: uformcpu.sstepspersecond
    554523msgctxt "uformcpu.sstepspersecond"

  • trunk/Languages/LazFuck.po

    r103 r115  
    11msgid ""
    22msgstr "Content-Type: text/plain; charset=UTF-8"
    3 
    4 #: tformabout.buttonclose.caption
    5 msgctxt "tformabout.buttonclose.caption"
    6 msgid "Close"
    7 msgstr ""
    8 
    9 #: tformabout.buttonhomepage.caption
    10 msgid "Home page"
    11 msgstr ""
    12 
    13 #: tformabout.caption
    14 msgctxt "tformabout.caption"
    15 msgid "About"
    16 msgstr ""
    17 
    18 #: tformabout.labelcontent.caption
    19 msgctxt "tformabout.labelcontent.caption"
    20 msgid "   "
    21 msgstr ""
    223
    234#: tformcpu.caption
    … …  
    495476msgstr ""
    496477
    497 #: uformabout.slicense
    498 msgid "License"
    499 msgstr ""
    500 
    501 #: uformabout.sreleasedate
    502 msgid "Release date"
    503 msgstr ""
    504 
    505 #: uformabout.sversion
    506 msgid "Version"
    507 msgstr ""
    508 
    509478#: uformcpu.sstepspersecond
    510479msgid " steps/s"

  • trunk/LazFuck.lpi

    r111 r115  
    7575      </Modes>
    7676    </RunParams>
    77     <RequiredPackages Count="5">
     77    <RequiredPackages Count="4">
    7878      <Item1>
    7979        <PackageName Value="FCL"/>
    8080      </Item1>
    8181      <Item2>
    82         <PackageName Value="CoolTranslator"/>
    83         <DefaultFilename Value="Packages\CoolTranslator\CoolTranslator.lpk" Prefer="True"/>
     82        <PackageName Value="Common"/>
     83        <DefaultFilename Value="Packages\Common\Common.lpk" Prefer="True"/>
    8484      </Item2>
    8585      <Item3>
    86         <PackageName Value="Common"/>
    87         <DefaultFilename Value="Packages\Common\Common.lpk" Prefer="True"/>
     86        <PackageName Value="SynEdit"/>
    8887      </Item3>
    8988      <Item4>
    90         <PackageName Value="SynEdit"/>
     89        <PackageName Value="LCL"/>
    9190      </Item4>
    92       <Item5>
    93         <PackageName Value="LCL"/>
    94       </Item5>
    9591    </RequiredPackages>
    96     <Units Count="28">
     92    <Units Count="27">
    9793      <Unit0>
    9894        <Filename Value="LazFuck.lpr"/>
    … …  
    227223      </Unit22>
    228224      <Unit23>
    229         <Filename Value="Forms\UFormAbout.pas"/>
    230         <IsPartOfProject Value="True"/>
    231         <ComponentName Value="FormAbout"/>
    232         <HasResources Value="True"/>
    233         <ResourceBaseClass Value="Form"/>
     225        <Filename Value="Target\UTargetPython.pas"/>
     226        <IsPartOfProject Value="True"/>
    234227      </Unit23>
    235228      <Unit24>
    236         <Filename Value="Target\UTargetPython.pas"/>
     229        <Filename Value="Target\UTargetCSharp.pas"/>
    237230        <IsPartOfProject Value="True"/>
    238231      </Unit24>
    239232      <Unit25>
    240         <Filename Value="Target\UTargetCSharp.pas"/>
     233        <Filename Value="UBFHighlighter.pas"/>
    241234        <IsPartOfProject Value="True"/>
    242235      </Unit25>
    243236      <Unit26>
    244         <Filename Value="UBFHighlighter.pas"/>
     237        <Filename Value="Target\UTargetJavascript.pas"/>
    245238        <IsPartOfProject Value="True"/>
    246239      </Unit26>
    247       <Unit27>
    248         <Filename Value="Target\UTargetJavascript.pas"/>
    249         <IsPartOfProject Value="True"/>
    250       </Unit27>
    251240    </Units>
    252241  </ProjectOptions>

  • trunk/LazFuck.lpr

    r111 r115  
    1313  UFormOutput, UFormInput, UFormMemory, UFormMessages, UFormSourceCode,
    1414  UFormTargetCode, UFormTargetOptions, UCore, Common,
    15   CoolTranslator, UFormLog, UProject, UBFTarget, SysUtils;
     15  UFormLog, UProject, UBFTarget, SysUtils;
    1616
    1717{$R *.res}

  • trunk/Packages/Common/Common.lpk

    r102 r115  
    4040    <License Value="GNU/GPL"/>
    4141    <Version Minor="7"/>
    42     <Files Count="22">
     42    <Files Count="26">
    4343      <Item1>
    4444        <Filename Value="StopWatch.pas"/>
    … …  
    139139        <UnitName Value="UStringTable"/>
    140140      </Item22>
     141      <Item23>
     142        <Filename Value="UTranslator.pas"/>
     143        <HasRegisterProc Value="True"/>
     144        <UnitName Value="UTranslator"/>
     145      </Item23>
     146      <Item24>
     147        <Filename Value="ULanguages.pas"/>
     148        <UnitName Value="ULanguages"/>
     149      </Item24>
     150      <Item25>
     151        <Filename Value="UFormAbout.pas"/>
     152        <UnitName Value="UFormAbout"/>
     153      </Item25>
     154      <Item26>
     155        <Filename Value="UAboutDialog.pas"/>
     156        <HasRegisterProc Value="True"/>
     157        <UnitName Value="UAboutDialog"/>
     158      </Item26>
    141159    </Files>
    142160    <i18n>

  • trunk/Packages/Common/Common.pas

    r102 r115  
    1212  UMemory, UResetableThread, UPool, ULastOpenedList, URegistry,
    1313  UJobProgressView, UXMLUtils, UApplicationInfo, USyncCounter, UListViewSort,
    14   UPersistentForm, UFindFile, UScaleDPI, UTheme, UStringTable,
    15   LazarusPackageIntf;
     14  UPersistentForm, UFindFile, UScaleDPI, UTheme, UStringTable, UAboutDialog,
     15  UTranslator, ULanguages, UFormAbout, LazarusPackageIntf;
    1616
    1717implementation
    … …  
    2929  RegisterUnit('UScaleDPI', @UScaleDPI.Register);
    3030  RegisterUnit('UTheme', @UTheme.Register);
     31  RegisterUnit('UAboutDialog', @UAboutDialog.Register);
     32  RegisterUnit('UTranslator', @UTranslator.Register);
    3133end;
    3234

  • trunk/Packages/Common/UApplicationInfo.pas

    r93 r115  
    66
    77uses
    8   SysUtils, Classes, Forms, URegistry, Controls;
     8  SysUtils, Classes, Forms, URegistry, Controls, Graphics;
    99
    1010type
    … …  
    1515  private
    1616    FDescription: TCaption;
     17    FIcon: TBitmap;
    1718    FIdentification: Byte;
    1819    FLicense: string;
    … …  
    3334  public
    3435    constructor Create(AOwner: TComponent); override;
     36    destructor Destroy; override;
    3537    property Version: string read GetVersion;
    3638    function GetRegistryContext: TRegistryContext;
    … …  
    5254    property RegistryRoot: TRegistryRoot read FRegistryRoot write FRegistryRoot;
    5355    property License: string read FLicense write FLicense;
     56    property Icon: TBitmap read FIcon write FIcon;
    5457  end;
    5558
    … …  
    8083  FRegistryKey := '\Software\' + FAppName;
    8184  FRegistryRoot := rrKeyCurrentUser;
     85  FIcon := TBitmap.Create;
     86end;
     87
     88destructor TApplicationInfo.Destroy;
     89begin
     90  FreeAndNil(FIcon);
     91  inherited Destroy;
    8292end;
    8393

  • trunk/Packages/Common/URegistry.pas

    r102 r115  
    11unit URegistry;
    22
    3 {$MODE Delphi}
     3{$MODE delphi}
    44
    55interface
    … …  
    1717    RootKey: HKEY;
    1818    Key: string;
     19    class function Create(RootKey: TRegistryRoot; Key: string): TRegistryContext; static; overload;
     20    class function Create(RootKey: HKEY; Key: string): TRegistryContext; static; overload;
    1921    class operator Equal(A, B: TRegistryContext): Boolean;
    20     function Create(RootKey: TRegistryRoot; Key: string): TRegistryContext; overload;
    21     function Create(RootKey: HKEY; Key: string): TRegistryContext; overload;
    2222  end;
    2323
    … …  
    5858end;
    5959
    60 function TRegistryContext.Create(RootKey: TRegistryRoot; Key: string): TRegistryContext;
     60class function TRegistryContext.Create(RootKey: TRegistryRoot; Key: string): TRegistryContext;
    6161begin
    6262  Result.RootKey := RegistryRootHKEY[RootKey];
    … …  
    6464end;
    6565
    66 function TRegistryContext.Create(RootKey: HKEY; Key: string): TRegistryContext;
     66class function TRegistryContext.Create(RootKey: HKEY; Key: string): TRegistryContext;
    6767begin
    6868  Result.RootKey := RootKey;
    … …  
    133133begin
    134134  {$IFDEF Linux}
    135   CloseKey;
     135  //CloseKey;
    136136  {$ENDIF}
    137137  Result := inherited OpenKey(Key, CanCreate);

  • trunk/UBFTarget.pas

    r114 r115  
    1919    Parameter: Integer;
    2020    RelIndex: Integer;
    21     function Create(Command: TMachineCommand; Parameter, RelIndex: Integer): TMachineOperation;
     21    class function Create(Command: TMachineCommand; Parameter, RelIndex: Integer): TMachineOperation; static;
    2222  end;
    2323
    … …  
    6565{ TMachineOperation }
    6666
    67 function TMachineOperation.Create(Command: TMachineCommand; Parameter,
     67class function TMachineOperation.Create(Command: TMachineCommand; Parameter,
    6868  RelIndex: Integer): TMachineOperation;
    6969begin
    … …  
    150150  PreviousCommand: TMachineCommand;
    151151  FirstIndex: Integer;
    152   NewTextIndex: Integer;
     152  NewTargetIndex: Integer;
    153153begin
    154154  // Merge together cmInc, cmDec, cmSet
    … …  
    159159
    160160  FProgramIndex := 0;
    161   NewTextIndex := 0;
     161  NewTargetIndex := 0;
    162162  while (FProgramIndex < Length(FProgram)) do begin
    163163    FirstIndex := FProgramIndex;
    … …  
    272272    end;
    273273    PreviousCommand := FProgram[FProgramIndex].Command;
    274     DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTextIndex);
    275     Inc(NewTextIndex, Length(GetOperationText(NewProgram[NewProgramIndex])));
     274    DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTargetIndex);
     275    Inc(NewTargetIndex, Length(GetOperationText(NewProgram[NewProgramIndex])));
    276276    Inc(FProgramIndex);
    277277    Inc(NewProgramIndex);
    … …  
    297297  RelIndex: Integer;
    298298  FirstIndex: Integer;
    299   NewTextIndex: Integer;
     299  NewTargetIndex: Integer;
    300300begin
    301301  NewProgramIndex := 0;
    … …  
    304304  RelIndex := 0;
    305305  FProgramIndex := 0;
    306   NewTextIndex := 0;
     306  NewTargetIndex := 0;
    307307  while (FProgramIndex < Length(FProgram)) do begin
    308308    FirstIndex := FProgramIndex;
    … …  
    338338      else raise Exception.Create(Format('Unsupported command %d', [FProgram[FProgramIndex].Command]));
    339339    end;
    340     DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTextIndex);
    341     Inc(NewTextIndex, Length(GetOperationText(NewProgram[NewProgramIndex])));
     340    DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTargetIndex);
     341    Inc(NewTargetIndex, Length(GetOperationText(NewProgram[NewProgramIndex])));
    342342    Inc(FProgramIndex);
    343343    Inc(NewProgramIndex);

  • trunk/UCore.lfm

    r113 r115  
    2525    RegistryRoot = rrKeyCurrentUser
    2626    License = 'CC0'
     27    Icon.Data = {
     28      36400000424D3640000000000000360000002800000040000000400000000100
     29      2000000000000040000064000000640000000000000000000000000000000000
     30      0000000000000000000000000000000000000000000000000000000000000000
     31      0000000000000000000000000000000000000000000000000000000000000000
     32      000000000000000000000000000000000000000000000000007F000000FF0000
     33      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     34      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     35      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     36      00FF000000FF000000FF0000007F000000000000000000000000000000000000
     37      0000000000000000000000000000000000000000000000000000000000000000
     38      0000000000000000000000000000000000000000000000000000000000000000
     39      0000000000000000000000000000000000000000000000000000000000000000
     40      000000000000000000000000000000000000000000004B4B4BFF000000FF0000
     41      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     42      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     43      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     44      00FF010101FF030303FF00000000000000000000000000000000000000000000
     45      0000000000000000000000000000000000000000000000000000000000000000
     46      0000000000000000000000000000000000000000000000000000000000000000
     47      0000000000000000000000000000000000000000000000000000000000000000
     48      00000000000000000000000000000000000000000000060606FF000000FF0000
     49      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     50      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     51      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     52      00FF020202FF565656BF00000000000000000000000000000000000000000000
     53      0000000000000000000000000000000000000000000000000000000000000000
     54      0000000000000000000000000000000000000000000000000000000000000000
     55      0000000000000000000000000000000000000000000000000000000000000000
     56      00000000000000000000000000000000000000000000000000FF000000FF0000
     57      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     58      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     59      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     60      00FF000000FFB5B5B53F00000000000000000000000000000000000000000000
     61      0000000000000000000000000000000000000000000000000000000000000000
     62      0000000000000000000000000000000000000000000000000000000000000000
     63      0000000000000000000000000000000000000000000000000000000000000000
     64      00000000000000000000000000000000000000000000000000FF000000FF0000
     65      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     66      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     67      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     68      00FF080808FF0000000000000000000000000000000000000000000000000000
     69      0000000000000000000000000000000000000000000000000000000000000000
     70      0000000000000000000000000000000000000000000000000000000000000000
     71      0000000000000000000000000000000000000000000000000000000000000000
     72      0000000000000000000000000000000000009F9F9F3F010101FF000000FF0000
     73      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     74      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     75      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     76      00FF4F4F4FFF0000000000000000000000000000000000000000000000000000
     77      0000000000000000000000000000000000000000000000000000000000000000
     78      0000000000000000000000000000000000000000000000000000000000000000
     79      0000000000000000000000000000000000000000000000000000000000000000
     80      0000000000000000000000000000CCCCCC3F0C0C0CFF020202FF000000FF0000
     81      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     82      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     83      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     84      00FF0000007F0000000000000000000000000000000000000000000000000000
     85      0000000000000000000000000000000000000000000000000000000000000000
     86      0000000000000000000000000000000000000000000000000000000000000000
     87      0000000000000000000000000000000000000000000000000000D5D5D53FBFBF
     88      BF7F8A8A8A7F4747477F0000007F101010FF000000FF010101FF000000FF0000
     89      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     90      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     91      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     92      00FF0000007F0000000000000000000000000000000000000000000000000000
     93      0000000000000000000000000000000000000000000000000000000000000000
     94      0000000000000000000000000000000000000000000000000000000000000000
     95      0000000000000000003F3C3C3CBF070707FF000000FF000000FF000000FF0000
     96      00FF010101FF000000FF010101FF000000FF000000FF000000FF000000FF0000
     97      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     98      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     99      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     100      00FF3F3F3F7F0000000000000000000000000000000000000000000000000000
     101      0000000000000000000000000000000000000000000000000000000000000000
     102      0000000000000000000000000000000000000000000000000000000000000000
     103      00002A2A2A3F000000FF000000FF000000FF000000FF000000FF000000FF0000
     104      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     105      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     106      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     107      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0101
     108      01FF7B7B7B7F0000000000000000000000000000000000000000000000000000
     109      0000000000000000000000000000000000000000000000000000000000000000
     110      0000000000000000000000000000000000000000000000000000000000000000
     111      0000272727FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     112      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     113      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     114      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     115      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     116      00FFA4A4A47F0000000000000000000000000000000000000000000000000000
     117      0000000000000000000000000000000000000000000000000000000000000000
     118      000000000000000000000000000000000000000000000000000000000000A3A3
     119      A37F010101FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     120      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     121      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     122      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     123      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     124      00FFA6A6A67F0000000000000000000000000000000000000000000000000000
     125      0000000000000000000000000000000000000000000000000000000000000000
     126      0000000000000000000000000000000000000000000000000000000000003838
     127      387F000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     128      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     129      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     130      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     131      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0101
     132      01FF6C6C6C7F0000000000000000000000000000000000000000000000000000
     133      0000000000000000000000000000000000000000000000000000000000000000
     134      0000000000000000000000000000000000000000000000000000000000008484
     135      847F000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     136      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     137      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     138      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     139      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     140      00FF2525257F0000000000000000000000000000000000000000000000000000
     141      0000000000000000000000000000000000000000000000000000000000000000
     142      0000000000000000000000000000000000000000000000000000000000000000
     143      0000000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     144      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     145      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     146      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     147      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0101
     148      01FF0000007F0000000000000000000000000000000000000000000000000000
     149      0000000000000000000000000000000000000000000000000000000000000000
     150      0000000000000000000000000000000000000000000000000000000000000000
     151      0000070707FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     152      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     153      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     154      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     155      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     156      00FF323232BF0000000000000000000000000000000000000000000000000000
     157      0000000000000000000000000000000000000000000000000000000000000000
     158      0000000000000000000000000000000000000000000000000000000000006B6B
     159      6B7F000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     160      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     161      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     162      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     163      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     164      00FF161616FF0000000000000000000000000000000000000000000000000000
     165      0000000000000000000000000000000000000000000000000000000000000000
     166      00000000000000000000000000000000000000000000000000007676763F0202
     167      02FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     168      00FF000000FF000000FF000000FF910088FFFE00EEFFBA00AFFF010001FF8100
     169      79FFFE00EEFFFE00EEFFFE00EEFFFD00EDFFF800E8FFD500C8FF7B0073FF0A00
     170      09FF000000FF000000FF000000FF7E0076FFFE00EEFFFE00EEFFFE00EEFFFE00
     171      EEFFFE00EEFFFE00EEFFFE00EEFFFB00EBFF380034FF000000FF000000FF0000
     172      00FF000000FFC9C9C93F00000000000000000000000000000000000000000000
     173      0000000000000000000000000000000000000000000000000000000000000000
     174      00000000000000000000000000000000000000000000000000008F8F8F3F0505
     175      05FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     176      00FF000000FF000000FF000000FF910088FFFE00EEFFBA00AFFF010001FF8100
     177      79FFFE00EEFFFE00EEFFFE00EEFFFE00EEFFFE00EEFFFE00EEFFFE00EEFFB900
     178      AEFF060006FF000000FF000000FF7E0076FFFE00EEFFFE00EEFFFE00EEFFFE00
     179      EEFFFE00EEFFFE00EEFFFE00EEFFFB00EBFF380034FF000000FF000000FF0000
     180      00FF000000FF3B3B3BBF00000000000000000000000000000000000000000000
     181      0000000000000000000000000000000000000000000000000000000000000000
     182      0000000000000000000000000000000000000000000000000000CCCCCC3F0909
     183      09FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     184      00FF000000FF000000FF000000FF910088FFFE00EEFFBA00AFFF010001FF8100
     185      79FFFE00EEFFCB00BEFF0F000EFF0C000BFF180016FF700069FFF900E9FFFD00
     186      EDFF66005FFF000000FF000000FF7E0076FFFE00EEFFCE00C1FF0F000EFF0C00
     187      0BFF0C000BFF0C000BFF0C000BFF0B000AFF020002FF000000FF000000FF0000
     188      00FF000000FF080808FF00000000000000000000000000000000000000000000
     189      0000000000000000000000000000000000000000000000000000000000000000
     190      00000000000000000000000000000000000000000000000000002B2B2BFF0404
     191      04FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     192      00FF000000FF000000FF000000FF910088FFFE00EEFFBA00AFFF010001FF8100
     193      79FFFE00EEFFC800BCFF030003FF000000FF000000FF010001FFA4009AFFFE00
     194      EEFFC400B8FF020002FF000000FF7E0076FFFE00EEFFCC00BFFF030003FF0000
     195      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     196      00FF000000FF000000FF5B5B5B7F000000000000000000000000000000000000
     197      0000000000000000000000000000000000000000000000000000000000000000
     198      0000000000000000000000000000000000000000000000000000000000FF0000
     199      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     200      00FF000000FF000000FF000000FF910088FFFE00EEFFBA00AFFF010001FF8100
     201      79FFFE00EEFFC800BCFF030003FF000000FF000000FF000000FF66005FFFFE00
     202      EEFFF200E3FF0B000AFF000000FF7E0076FFFE00EEFFCC00BFFF030003FF0000
     203      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     204      00FF000000FF000000FF0B0B0BBF000000000000000000000000000000000000
     205      0000000000000000000000000000000000000000000000000000000000000000
     206      0000000000000000000000000000000000000000000000000000373737FF0000
     207      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     208      00FF000000FF000000FF000000FF910088FFFE00EEFFBA00AFFF010001FF8100
     209      79FFFE00EEFFC800BCFF030003FF000000FF000000FF000000FF50004BFFFD00
     210      EDFFF800E8FF1B0019FF000000FF7E0076FFFE00EEFFFE00EEFFFE00EEFFFE00
     211      EEFFFE00EEFFFE00EEFFFE00EEFF900087FF000000FF000000FF000000FF0000
     212      00FF000000FF000000FF000000FF9696963F0000000000000000000000000000
     213      0000000000000000000000000000000000000000000000000000000000000000
     214      00000000000000000000000000000000000000000000000000000000007F0000
     215      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     216      00FF000000FF000000FF000000FF910088FFFE00EEFFBA00AFFF010001FF8100
     217      79FFFE00EEFFC800BCFF030003FF000000FF000000FF000000FF50004BFFFD00
     218      EDFFF700E7FF190017FF000000FF7E0076FFFE00EEFFFE00EEFFFE00EEFFFE00
     219      EEFFFE00EEFFFE00EEFFFE00EEFF900087FF000000FF000000FF000000FF0000
     220      00FF000000FF000000FF000000FF242424BF0000000000000000000000000000
     221      0000000000000000000000000000000000000000000000000000000000000000
     222      0000000000000000000000000000000000004848487F292929BF010101FF0000
     223      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     224      00FF000000FF000000FF000000FF910088FFFE00EEFFBA00AFFF010001FF8100
     225      79FFFE00EEFFC800BCFF030003FF000000FF000000FF000000FF680061FFFE00
     226      EEFFF000E1FF090008FF000000FF7E0076FFFE00EEFFCE00C1FF0F000EFF0C00
     227      0BFF0C000BFF0C000BFF0C000BFF060006FF000000FF000000FF000000FF0000
     228      00FF000000FF000000FF000000FF000000FF0E0E0E3F00000000000000000000
     229      0000000000000000000000000000000000000000000000000000000000000000
     230      00000000000000000000000000002E2E2EFF010101FF000000FF000000FF0000
     231      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     232      00FF000000FF000000FF000000FF910088FFFE00EEFFBA00AFFF010001FF8100
     233      79FFFE00EEFFC800BCFF030003FF000000FF000000FF010001FFB200A7FFFE00
     234      EEFFC300B7FF020002FF000000FF7E0076FFFE00EEFFCC00BFFF030003FF0000
     235      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     236      00FF000000FF000000FF000000FF000000FF000000FF00000000000000000000
     237      0000000000000000000000000000000000000000000000000000000000000000
     238      000000000000000000002727277F040404FF000000FF000000FF000000FF0000
     239      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     240      00FF000000FF000000FF000000FF910088FFFE00EEFFBA00AFFF010001FF8100
     241      79FFFE00EEFFCB00BEFF130012FF120011FF260023FF8B0083FFFC00ECFFFD00
     242      EDFF65005EFF000000FF000000FF7E0076FFFE00EEFFCF00C2FF130012FF1000
     243      0FFF10000FFF10000FFF10000FFF0F000EFF000000FF000000FF000000FF0000
     244      00FF000000FF000000FF000000FF000000FF010101FF434343BF000000000000
     245      0000000000000000000000000000000000000000000000000000000000000000
     246      000000000000000000002D2D2D7F000000FF000000FF000000FF000000FF0000
     247      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     248      00FF000000FF000000FF000000FF910088FFFE00EEFFBA00AFFF010001FF8100
     249      79FFFE00EEFFFE00EEFFFE00EEFFFE00EEFFFE00EEFFFE00EEFFFD00EDFFB300
     250      A8FF050005FF000000FF000000FF7E0076FFFE00EEFFFE00EEFFFE00EEFFFE00
     251      EEFFFE00EEFFFE00EEFFFE00EEFFF300E4FF070007FF000000FF000000FF0000
     252      00FF000000FF000000FF000000FF000000FF000000FF010101FF8F8F8F3F0000
     253      0000000000000000000000000000000000000000000000000000000000000000
     254      0000000000000000000000000000000000BF030303FF000000FF000000FF0000
     255      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     256      00FF000000FF000000FF000000FF910088FFFE00EEFFBA00AFFF010001FF8100
     257      79FFFE00EEFFFE00EEFFFE00EEFFFD00EDFFF700E7FFD600C9FF790071FF0700
     258      07FF000000FF000000FF000000FF7E0076FFFE00EEFFFE00EEFFFE00EEFFFE00
     259      EEFFFE00EEFFFE00EEFFFE00EEFFF300E4FF070007FF000000FF000000FF0000
     260      00FF000000FF000000FF000000FF000000FF000000FF010101FF232323BF0000
     261      0000000000000000000000000000000000000000000000000000000000000000
     262      00000000000000000000000000000000003F0B0B0BFF000000FF000000FF0000
     263      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     264      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     265      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     266      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     267      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     268      00FF000000FF000000FF000000FF000000FF000000FF000000FF010101FF0000
     269      0000000000000000000000000000000000000000000000000000000000000000
     270      0000000000000000000000000000000000006161617F010101FF000000FF0000
     271      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     272      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     273      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     274      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     275      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     276      00FF000000FF000000FF000000FF000000FF000000FF000000FF010101FF1313
     277      137F000000000000000000000000000000000000000000000000000000000000
     278      00000000000000000000000000000000000000000000050505BF000000FF0000
     279      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     280      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     281      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     282      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     283      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     284      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF2A2A
     285      2AFF000000000000000000000000000000000000000000000000000000000000
     286      000000000000000000000000000000000000000000000000003F000000FF0000
     287      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     288      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     289      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     290      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     291      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     292      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     293      00FF5454547F0000000000000000000000000000000000000000000000000000
     294      0000000000000000000000000000000000000000000000000000383838BF0101
     295      01FF000000FF000000FF000000FF000000FF003685FF0067FEFF0067FEFF0067
     296      FEFF00255CFF000000FF000000FF000000FF000000FF000000FF000000FF0000
     297      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     298      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     299      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     300      00FF00265EFF0067FEFF0067FEFF0067FEFF003684FF000000FF000000FF0101
     301      01FF0000007F0000000000000000000000000000000000000000000000000000
     302      0000000000000000000000000000000000000000000000000000000000000000
     303      00BF020202FF000000FF000000FF000000FF003685FF0067FEFF005FEBFF0056
     304      D3FF001F4CFF000000FF000000FF000000FF000000FF000000FF000000FF0000
     305      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     306      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     307      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     308      00FF00204EFF0056D3FF005FEBFF0067FEFF003684FF000000FF000000FF0101
     309      01FF3A3A3AFF0000000000000000000000000000000000000000000000000000
     310      000000000000000000000000000000000000000000000000000000000000C1C1
     311      C13F000000FF000000FF000000FF000000FF003685FF0067FEFF003B90FF0000
     312      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     313      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     314      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     315      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     316      00FF000000FF000000FF00398DFF0067FEFF003684FF000000FF000000FF0000
     317      00FF080808FF0000000000000000000000000000000000000000000000000000
     318      0000000000000000000000000000000000000000000000000000000000000000
     319      0000454545FF000000FF000000FF000000FF003685FF0067FEFF003B90FF0000
     320      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     321      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     322      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     323      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     324      00FF000000FF000000FF00398DFF0067FEFF003684FF000000FF000000FF0000
     325      00FF000000FF0000000000000000000000000000000000000000000000000000
     326      0000000000000000000000000000000000000000000000000000000000000000
     327      00000E0E0EFF000000FF000000FF000000FF003685FF0067FEFF003B90FF0000
     328      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     329      00FF000000FF000103FF00255CFF00050CFF000000FF000000FF000000FF0000
     330      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     331      00FF000000FF000000FF000000FF000000FF000000FF000000FF00040AFF0024
     332      59FF000103FF000000FF00398DFF0067FEFF003684FF000000FF000000FF0000
     333      00FF000000FF0000000000000000000000000000000000000000000000000000
     334      0000000000000000000000000000000000000000000000000000000000006161
     335      617F020202FF000000FF000000FF000000FF003685FF0067FEFF003B90FF0000
     336      00FF000000FF000000FF000000FF000307FF0063F5FF0064F6FF000409FF0000
     337      00FF000000FF000206FF005CE3FF005FEBFF003581FF000916FF000000FF0000
     338      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     339      00FF000000FF000000FF000000FF000000FF000814FF00337EFF005EE8FF005D
     340      E5FF000206FF000000FF00398DFF0067FEFF003684FF000000FF000000FF0000
     341      00FF000000FF0000000000000000000000000000000000000000000000000000
     342      0000000000000000000000000000000000000000000000000000000000002B2B
     343      2BFF000000FF000000FF000000FF000000FF003685FF0067FEFF003B90FF0000
     344      00FF000000FF000000FF000000FF000307FF0063F5FF0064F6FF000409FF0000
     345      00FF000000FF000204FF0053CCFF0067FDFF0067FEFF0063F4FF003D95FF000F
     346      24FF000000FF000000FF000102FF004DBEFF0067FEFF0067FEFF0067FEFF0039
     347      8CFF000000FF000000FF000D21FF003B91FF0062F2FF0067FEFF0067FEFF0055
     348      D1FF000204FF000000FF00398DFF0067FEFF003684FF000000FF000000FF0000
     349      00FF000000FF0000000000000000000000000000000000000000000000000000
     350      0000000000000000000000000000000000000000000000000000000000000000
     351      00FF000000FF000000FF000000FF000000FF003685FF0067FEFF003B90FF0000
     352      00FF000000FF000000FF000000FF000307FF0063F5FF0064F6FF000409FF0000
     353      00FF000000FF000000FF000204FF00204FFF004BB9FF0066FCFF0067FEFF0065
     354      FAFF0045A9FF001535FF000102FF004DBEFF0067FEFF0067FEFF0067FEFF0039
     355      8CFF001432FF0043A5FF0065F9FF0067FEFF0066FCFF004EBFFF002255FF0002
     356      05FF000000FF000000FF00398DFF0067FEFF003684FF000000FF000000FF0000
     357      00FF0D0D0DFF0000000000000000000000000000000000000000000000000000
     358      0000000000000000000000000000000000000000000000000000000000003A3A
     359      3AFF000000FF000000FF000000FF000000FF003685FF0067FEFF003B90FF0000
     360      00FF000307FF0063F5FF0067FEFF0067FEFF0067FEFF0067FEFF0067FEFF0067
     361      FEFF0064F6FF000409FF000000FF000000FF000000FF001027FF003A8FFF0060
     362      EDFF0067FEFF005FE9FF000206FF00193FFF002254FF002254FF002254FF0015
     363      34FF005CE3FF0067FEFF0062F1FF003D96FF00122DFF000000FF000000FF0000
     364      00FF000000FF000000FF00398DFF0067FEFF003684FF000000FF000000FF0000
     365      00FF464646FF0000000000000000000000000000000000000000000000000000
     366      0000000000000000000000000000000000000000000000000000000000007171
     367      71BF000000FF000000FF000000FF000000FF003685FF0067FEFF003B90FF0000
     368      00FF000307FF0063F5FF0067FEFF0067FEFF0067FEFF0067FEFF0067FEFF0067
     369      FEFF0064F6FF000409FF000000FF000000FF000000FF000F25FF00398BFF005F
     370      EAFF0067FEFF005FE9FF000206FF000000FF000000FF000000FF000000FF0002
     371      06FF005CE3FF0067FEFF005FEAFF00398BFF000F26FF000000FF000000FF0000
     372      00FF000000FF000000FF00398DFF0067FEFF003684FF000000FF000000FF0000
     373      00FF0000007F0000000000000000000000000000000000000000000000000000
     374      0000000000000000000000000000000000000000000000000000000000000000
     375      0000010101FF000000FF000000FF000000FF003685FF0067FEFF003B90FF0000
     376      00FF000001FF00112AFF00122CFF001432FF0064F6FF0064F7FF001533FF0012
     377      2CFF00112AFF000001FF000204FF002151FF004BB8FF0066FBFF0067FEFF0065
     378      F9FF0043A6FF001534FF000000FF000000FF000000FF000000FF000000FF0000
     379      00FF001534FF0044A7FF0065F9FF0067FEFF0066FCFF004CBBFF002254FF0002
     380      06FF000000FF000000FF00398DFF0067FEFF003684FF000000FF000000FF0101
     381      01FF0000007F0000000000000000000000000000000000000000000000000000
     382      0000000000000000000000000000000000000000000000000000000000000000
     383      00002B2B2BBF000000FF000000FF000000FF003685FF0067FEFF003B90FF0000
     384      00FF000000FF000000FF000000FF000307FF0063F5FF0064F6FF000409FF0000
     385      00FF000000FF000204FF0054CFFF0067FEFF0067FEFF0062F2FF003B91FF000D
     386      21FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     387      00FF000000FF000000FF000E23FF003C93FF0062F2FF0067FEFF0067FEFF0056
     388      D3FF000205FF000000FF00398DFF0067FEFF003684FF000000FF000000FF0000
     389      00FF8F8F8F3F0000000000000000000000000000000000000000000000000000
     390      0000000000000000000000000000000000000000000000000000000000000000
     391      00001414147F000000FF000000FF000000FF003685FF0067FEFF003B90FF0000
     392      00FF000000FF000000FF000000FF000307FF0063F5FF0064F6FF000409FF0000
     393      00FF000000FF000206FF005CE3FF005DE6FF00327CFF000813FF000000FF0000
     394      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     395      00FF000000FF000000FF000000FF000000FF000814FF00337EFF005EE8FF005D
     396      E5FF000206FF000000FF00398DFF0067FEFF003684FF000000FF000000FF4747
     397      47FF000000000000000000000000000000000000000000000000000000000000
     398      0000000000000000000000000000000000000000000000000000000000000000
     399      0000A8A8A83F000000FF000000FF000000FF003685FF0067FEFF0060EDFF0057
     400      D7FF00204EFF000000FF000000FF000103FF00327BFF00327CFF000204FF0000
     401      00FF000000FF000103FF002254FF000409FF000000FF000000FF000000FF0000
     402      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     403      00FF000000FF000000FF000000FF000000FF000000FF000000FF00040AFF0024
     404      58FF002151FF0056D3FF005FEBFF0067FEFF003684FF000000FF020202FF1919
     405      197F000000000000000000000000000000000000000000000000000000000000
     406      0000000000000000000000000000000000000000000000000000000000000000
     407      000000000000212121FF000000FF000000FF003685FF0067FEFF0067FEFF0067
     408      FEFF00255CFF000000FF000000FF000000FF000000FF000000FF000000FF0000
     409      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     410      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     411      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     412      00FF00265EFF0067FEFF0067FEFF0067FEFF003684FF000000FF000000FF0000
     413      0000000000000000000000000000000000000000000000000000000000000000
     414      0000000000000000000000000000000000000000000000000000000000000000
     415      000000000000444444BF000000FF000000FF000000FF000000FF000000FF0000
     416      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     417      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     418      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     419      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     420      00FF000000FF000000FF000000FF000000FF000000FF000000FF151515BF0000
     421      0000000000000000000000000000000000000000000000000000000000000000
     422      0000000000000000000000000000000000000000000000000000000000000000
     423      0000000000002A2A2A3F010101FF000000FF000000FF000000FF000000FF0000
     424      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     425      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     426      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     427      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     428      00FF000000FF000000FF000000FF000000FF000000FF020202FF2525253F0000
     429      0000000000000000000000000000000000000000000000000000000000000000
     430      0000000000000000000000000000000000000000000000000000000000000000
     431      00000000000000000000282828FF010101FF000000FF000000FF000000FF0000
     432      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     433      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     434      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     435      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     436      00FF000000FF000000FF000000FF000000FF020202FF151515BF000000000000
     437      0000000000000000000000000000000000000000000000000000000000000000
     438      0000000000000000000000000000000000000000000000000000000000000000
     439      000000000000000000000000003F020202FF000000FF000000FF000000FF0000
     440      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     441      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     442      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     443      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     444      00FF000000FF000000FF000000FF000000FF010101FF0000003F000000000000
     445      0000000000000000000000000000000000000000000000000000000000000000
     446      0000000000000000000000000000000000000000000000000000000000000000
     447      0000000000000000000000000000080808BF010101FF000000FF000000FF0000
     448      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     449      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     450      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     451      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     452      00FF000000FF000000FF000000FF010101FF5454547F00000000000000000000
     453      0000000000000000000000000000000000000000000000000000000000000000
     454      0000000000000000000000000000000000000000000000000000000000000000
     455      00000000000000000000000000009696963F090909FF010101FF000000FF0000
     456      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     457      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     458      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     459      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     460      00FF000000FF000000FF010101FF5F5F5FBF0000000000000000000000000000
     461      0000000000000000000000000000000000000000000000000000000000000000
     462      0000000000000000000000000000000000000000000000000000000000000000
     463      0000000000000000000000000000000000003F3F3F7F020202FF000000FF0000
     464      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     465      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     466      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     467      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     468      00FF000000FF000000FF131313BF000000000000000000000000000000000000
     469      0000000000000000000000000000000000000000000000000000000000000000
     470      0000000000000000000000000000000000000000000000000000000000000000
     471      00000000000000000000000000000000000000000000444444BF030303FF0000
     472      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     473      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     474      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     475      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     476      00FF040404FF010101BF00000000000000000000000000000000000000000000
     477      0000000000000000000000000000000000000000000000000000000000000000
     478      0000000000000000000000000000000000000000000000000000000000000000
     479      00000000000000000000000000000000000000000000000000000000003F1616
     480      16FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     481      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     482      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     483      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0303
     484      03FF4C4C4CBF0000000000000000000000000000000000000000000000000000
     485      0000000000000000000000000000000000000000000000000000000000000000
     486      0000000000000000000000000000000000000000000000000000000000000000
     487      000000000000000000000000000000000000000000000000000000000000C1C1
     488      C13F1F1F1FFF020202FF000000FF000000FF000000FF000000FF000000FF0000
     489      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     490      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     491      00FF000000FF000000FF000000FF000000FF000000FF020202FF000000FF7171
     492      71BF000000000000000000000000000000000000000000000000000000000000
     493      0000000000000000000000000000000000000000000000000000000000000000
     494      0000000000000000000000000000000000000000000000000000000000000000
     495      0000000000000000000000000000000000000000000000000000000000000000
     496      0000000000004444447F101010FF030303FF000000FF000000FF000000FF0000
     497      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     498      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     499      00FF000000FF000000FF000000FF000000FF000000FF000000BF0000003F0000
     500      0000000000000000000000000000000000000000000000000000000000000000
     501      0000000000000000000000000000000000000000000000000000000000000000
     502      0000000000000000000000000000000000000000000000000000000000000000
     503      0000000000000000000000000000000000000000000000000000000000000000
     504      00000000000000000000000000001313137F131313FF000000FF010101FF0000
     505      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     506      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     507      00FF030303FF000000FF000000FF121212BF0000003F00000000000000000000
     508      0000000000000000000000000000000000000000000000000000000000000000
     509      0000000000000000000000000000000000000000000000000000000000000000
     510      0000000000000000000000000000000000000000000000000000000000000000
     511      0000000000000000000000000000000000000000000000000000000000000000
     512      000000000000000000000000000000000000000000004343433F0000007F1A1A
     513      1AFF000000FF010101FF020202FF000000FF000000FF000000FF000000FF0101
     514      01FF010101FF010101FF000000FF010101FF000000FF000000FF000000FF1616
     515      16FF404040BF3F3F3F7F00000000000000000000000000000000000000000000
     516      0000000000000000000000000000000000000000000000000000000000000000
     517      0000000000000000000000000000000000000000000000000000000000000000
     518      0000000000000000000000000000000000000000000000000000000000000000
     519      0000000000000000000000000000000000000000000000000000000000000000
     520      0000000000000000000000000000000000000000000000000000000000000000
     521      00007171717F0000007F0000007F434343BF555555FF4C4C4CFF464646FF4646
     522      46FF4B4B4BFF5A5A5AFF444444BF0000007F0000007F0A0A0A7F9C9C9C7F0000
     523      0000000000000000000000000000000000000000000000000000000000000000
     524      0000000000000000000000000000000000000000000000000000000000000000
     525      0000000000000000000000000000000000000000000000000000000000000000
     526      0000000000000000000000000000000000000000000000000000000000000000
     527      0000000000000000000000000000000000000000000000000000000000000000
     528      0000000000000000000000000000000000000000000000000000000000000000
     529      0000000000000000000000000000000000000000000000000000000000000000
     530      0000000000000000000000000000000000000000000000000000000000000000
     531      0000000000000000000000000000000000000000000000000000000000000000
     532      0000000000000000000000000000000000000000000000000000000000000000
     533      0000000000000000000000000000000000000000000000000000000000000000
     534      0000000000000000000000000000000000000000000000000000000000000000
     535      0000000000000000000000000000000000000000000000000000000000000000
     536      0000000000000000000000000000000000000000000000000000000000000000
     537      0000000000000000000000000000000000000000000000000000000000000000
     538      0000000000000000000000000000000000000000000000000000000000000000
     539      0000000000000000000000000000000000000000000000000000000000000000
     540      0000000000000000000000000000000000000000000000000000000000000000
     541      0000000000000000000000000000000000000000000000000000
     542    }
    27543    left = 108
    28544    top = 24
    29545  end
    30   object CoolTranslator1: TCoolTranslator
     546  object Translator: TTranslator
    31547    POFilesFolder = 'Languages'
    32548    left = 108
    … …  
    9881504    top = 209
    9891505  end
     1506  object AboutDialog: TAboutDialog
     1507    CoolTranslator = CoolTranslator
     1508    ThemeManager = ThemeManager
     1509    ApplicationInfo = ApplicationInfo
     1510    left = 362
     1511    top = 288
     1512  end
    9901513end

  • trunk/UCore.pas

    r110 r115  
    77uses
    88  Classes, SysUtils, FileUtil, UApplicationInfo, ULastOpenedList, UProject,
    9   UCoolTranslator, UTarget, URegistry, Registry, Graphics, Controls, UScaleDPI,
    10   UPersistentForm, UTheme, UBFTarget;
     9  UTranslator, UTarget, URegistry, Registry, Graphics, Controls, UScaleDPI,
     10  UPersistentForm, UTheme, UAboutDialog, UBFTarget;
    1111
    1212type
    … …  
    1515
    1616  TCore = class(TDataModule)
     17    AboutDialog: TAboutDialog;
    1718    ApplicationInfo: TApplicationInfo;
    18     CoolTranslator1: TCoolTranslator;
     19    Translator: TTranslator;
    1920    ImageListMain: TImageList;
    2021    LastOpenedList: TLastOpenedList;
    … …  
    8283  // If installed in Linux system then use installation directory for po files
    8384  if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
    84     CoolTranslator1.POFilesFolder := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/languages';
     85    Translator.POFilesFolder := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/languages';
    8586  {$ENDIF}
    8687
    … …  
    103104    OpenProjectOnStart := ReadBoolWithDefault('OpenProjectOnStart', True);
    104105    if ValueExists('LanguageCode') then
    105       CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
    106       else CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('');
     106      Translator.Language := Translator.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
     107      else Translator.Language := Translator.Languages.SearchByCode('');
    107108    ScaleDPI1.DPI := Point(ReadIntegerWithDefault('DPIX', 96),
    108109      ReadIntegerWithDefault('DPIY', 96));
    … …  
    134135    WriteInteger('MemorySize', MemorySize);
    135136    WriteInteger('CellSize', CellSize);
    136     if Assigned(CoolTranslator1.Language) and (CoolTranslator1.Language.Code <> '') then
    137       WriteString('LanguageCode', CoolTranslator1.Language.Code)
     137    if Assigned(Translator.Language) and (Translator.Language.Code <> '') then
     138      WriteString('LanguageCode', Translator.Language.Code)
    138139      else DeleteValue('LanguageCode');
    139140    WriteString('Theme', ThemeManager.Theme.Name);
    … …  
    191192begin
    192193  ScaleDPI;
    193   CoolTranslator1.Translate;
     194  Translator.Translate;
    194195end;
    195196
Note: See TracChangeset for help on using the changeset viewer.