Changeset 75 for trunk/IDE

Timestamp:

Jun 4, 2024, 12:22:49 AM (6 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.
• Modified: Updated Common package.

Location:

trunk/IDE

Files:

• Core.lfm (moved) (moved from trunk/IDE/UCore.lfm ) (3 diffs)
• Core.pas (moved) (moved from trunk/IDE/UCore.pas ) (10 diffs)
• Forms/FormCodeTree.lfm (moved) (moved from trunk/IDE/Forms/UFormCodeTree.lfm )
• Forms/FormCodeTree.pas (moved) (moved from trunk/IDE/Forms/UFormCodeTree.pas ) (2 diffs)
• Forms/FormExternalProducerOutput.lfm (moved) (moved from trunk/IDE/Forms/UFormExternalProducerOutput.lfm )
• Forms/FormExternalProducerOutput.pas (moved) (moved from trunk/IDE/Forms/UFormExternalProducerOutput.pas ) (2 diffs)
• Forms/FormMain.lfm (moved) (moved from trunk/IDE/Forms/UFormMain.lfm ) (12 diffs)
• Forms/FormMain.pas (moved) (moved from trunk/IDE/Forms/UFormMain.pas ) (23 diffs)
• Forms/FormMessages.lfm (moved) (moved from trunk/IDE/Forms/UFormMessages.lfm )
• Forms/FormMessages.pas (moved) (moved from trunk/IDE/Forms/UFormMessages.pas ) (8 diffs)
• Forms/FormOptions.lfm (moved) (moved from trunk/IDE/Forms/UFormOptions.lfm )
• Forms/FormOptions.pas (moved) (moved from trunk/IDE/Forms/UFormOptions.pas ) (4 diffs)
• Forms/FormProject.lfm (moved) (moved from trunk/IDE/Forms/UFormProject.lfm ) (4 diffs)
• Forms/FormProject.pas (moved) (moved from trunk/IDE/Forms/UFormProject.pas ) (9 diffs)
• Forms/FormProjectNew.lfm (moved) (moved from trunk/IDE/Forms/UFormProjectNew.lfm )
• Forms/FormProjectNew.pas (moved) (moved from trunk/IDE/Forms/UFormProjectNew.pas ) (4 diffs)
• Forms/FormSourceCode.lfm (moved) (moved from trunk/IDE/Forms/UFormSourceCode.lfm )
• Forms/FormSourceCode.pas (moved) (moved from trunk/IDE/Forms/UFormSourceCode.pas ) (5 diffs)
• Forms/FormTargetCode.lfm (moved) (moved from trunk/IDE/Forms/UFormTargetCode.lfm ) (8 diffs)
• Forms/FormTargetCode.pas (moved) (moved from trunk/IDE/Forms/UFormTargetCode.pas ) (5 diffs)
• Forms/FormTargetOptions.lfm (moved) (moved from trunk/IDE/Forms/UFormTargetOptions.lfm )
• Forms/FormTargetOptions.pas (moved) (moved from trunk/IDE/Forms/UFormTargetOptions.pas ) (3 diffs)
• Forms/FormTargetProject.lfm (moved) (moved from trunk/IDE/Forms/UFormTargetProject.lfm )
• Forms/FormTargetProject.pas (moved) (moved from trunk/IDE/Forms/UFormTargetProject.pas ) (6 diffs)
• Forms/FormTargets.lfm (moved) (moved from trunk/IDE/Forms/UFormTargets.lfm ) (2 diffs)
• Forms/FormTargets.pas (moved) (moved from trunk/IDE/Forms/UFormTargets.pas ) (7 diffs)
• Forms/UAboutForm.lrt (deleted)
• Forms/UCodeForm.lrt (deleted)
• Forms/UCompiledForm.lrt (deleted)
• Forms/UCompilersForm.lrt (deleted)
• Forms/UFormAbout.lfm (deleted)
• Forms/UFormAbout.lrt (deleted)
• Forms/UFormAbout.pas (deleted)
• Forms/UFormCodeTree.lrt (deleted)
• Forms/UFormExternalProducerOutput.lrt (deleted)
• Forms/UFormMain.lrt (deleted)
• Forms/UFormMessages.lrt (deleted)
• Forms/UFormOptions.lrt (deleted)
• Forms/UFormProject.lrt (deleted)
• Forms/UFormProjectNew.lrt (deleted)
• Forms/UFormSourceCode.lrt (deleted)
• Forms/UFormTargetCode.lrt (deleted)
• Forms/UFormTargetOptions.lrt (deleted)
• Forms/UFormTargetProject.lrt (deleted)
• Forms/UFormTargets.lrt (deleted)
• Forms/UMainForm.lrt (deleted)
• Forms/UMessagesForm.lrt (deleted)
• Forms/UProjectManager.lrt (deleted)
• Languages/Transpascal.cs.po (modified) (6 diffs)
• Languages/Transpascal.po (deleted)
• Languages/Transpascal.pot (added)
• Languages/ULanguages.cs.po (deleted)
• Modules/Pascal/IDEModulePascal.pas (moved) (moved from trunk/IDE/Modules/Pascal/UIDEModulePascal.pas ) (2 diffs)
• Project.pas (moved) (moved from trunk/IDE/UProject.pas ) (19 diffs)
• ProjectTemplates.pas (moved) (moved from trunk/IDE/UProjectTemplates.pas ) (1 diff)
• TextSource.pas (moved) (moved from trunk/IDE/UTextSource.pas ) (1 diff)
• Transpascal.lpi (modified) (11 diffs)
• Transpascal.lpr (modified) (3 diffs)
• Transpascal.res (modified) ( previous)
• UProducerTreeView.pas (modified) (1 diff)

trunk/IDE/Core.lfm

@@ -3 +3 @@
   OnDestroy = DataModuleDestroy
   OldCreateOrder = False
-  Height = 381
-  HorizontalOffset = 652
-  VerticalOffset = 519
-  Width = 466
+  Height = 572
+  HorizontalOffset = 978
+  VerticalOffset = 779
+  Width = 699
+  PPI = 144
   object LastOpenedFiles: TLastOpenedList
     MaxCount = 10
     OnChange = LastOpenedFilesChange
-    left = 48
-    top = 24
+    Left = 72
+    Top = 36
   end
-  object CoolTranslator1: TCoolTranslator
+  object Translator1: TTranslator
     POFilesFolder = 'Languages'
-    left = 48
-    top = 80
+    Left = 72
+    Top = 120
   end
   object DebugLog1: TDebugLog
@@ -22 +23 @@
     FileName = 'DebugLog.txt'
     MaxCount = 100
-    left = 48
-    top = 136
+    Left = 72
+    Top = 204
   end
   object ApplicationInfo: TApplicationInfo
@@ -40 +41 @@
     RegistryKey = '\Software\Chronosoft\Transpascal'
     RegistryRoot = rrKeyCurrentUser
-    left = 48
-    top = 200
+    Left = 72
+    Top = 300
   end
   object ModuleManager1: TModuleManager
     Options = []
-    left = 242
-    top = 98
+    Left = 363
+    Top = 147
   end
 end

trunk/IDE/Core.pas

@@ -1 @@
-unit UCore;
-
-{$mode delphi}
+unit Core;
 
 interface
 
 uses
-  Classes, SysUtils, FileUtil, ULastOpenedList, UProject, UApplicationInfo,
-  UCompiler, URegistry, Registry, UDebugLog, UCoolTranslator, UTarget,
-  USourceCodePascal, UModularSystem;
+  Classes, SysUtils, FileUtil, LastOpenedList, Project, ApplicationInfo,
+  Compiler, Registry, RegistryEx, DebugLog, Translator, Target,
+  SourceCodePascal, ModularSystem;
 
 type
@@ -32 +30 @@
   TCore = class(TDataModule)
     ApplicationInfo: TApplicationInfo;
-    CoolTranslator1: TCoolTranslator;
+    Translator1: TTranslator;
     DebugLog1: TDebugLog;
     LastOpenedFiles: TLastOpenedList;
@@ -47 +45 @@
     LogParsing: Boolean;
     Project: TProject;
-    ProjectTemplates: TProjectTemplateList;
+    ProjectTemplates: TProjectTemplates;
     TargetProject: TProject;
     Compiler: TCustomCompiler;
@@ -69 +67 @@
 
 uses
-  UFormMain, UProjectTemplates, UIDEModulePascal, UModulePascal, UModuleGCC,
-  UModuleInterpretter, UModuleDelphi, UModulePHP, UModuleJava, UModuleASM8051;
+  FormMain, ProjectTemplates, IDEModulePascal, ModulePascal, ModuleGCC,
+  ModuleInterpretter, ModuleDelphi, ModulePHP, ModuleJava, ModuleASM8051;
 
 { TCore }
@@ -79 +77 @@
   Project.LoadFromFile(FileName);
   LastOpenedFiles.AddItem(FileName);
-  FormMain.UpdateInterface;
+  FormMain.FormMain.UpdateInterface;
 end;
 
@@ -102 +100 @@
   //Compiler.OnSaveTarget := SaveSourceFile;
   Project := TProject.Create;
-  ProjectTemplates := TProjectTemplateList.Create;
+  ProjectTemplates := TProjectTemplates.Create;
   TargetProject := TProject.Create;
   LastOpenedFiles := TLastOpenedList.Create(nil);
@@ -136 +134 @@
 procedure TCore.LastOpenedFilesChange(Sender: TObject);
 begin
-  LastOpenedFiles.LoadToMenuItem(FormMain.MenuItemOpenRecent,
-    FormMain.OpenRecentClick);
-  LastOpenedFiles.LoadToMenuItem(FormMain.PopupMenu1.Items,
-    FormMain.OpenRecentClick);
+  LastOpenedFiles.LoadToMenuItem(FormMain.FormMain.MenuItemOpenRecent,
+    FormMain.FormMain.OpenRecentClick);
+  LastOpenedFiles.LoadToMenuItem(FormMain.FormMain.PopupMenu1.Items,
+    FormMain.FormMain.OpenRecentClick);
 end;
 
 procedure TCore.ProjectChange(Sender: TObject);
 begin
-  FormMain.UpdateInterface;
+  FormMain.FormMain.UpdateInterface;
 end;
 
 function TCore.LoadSourceFile(FileName: string; var Content: string): Boolean;
 begin
-
 end;
 
 function TCore.SaveSourceFile(FileName: string; const Content: string): Boolean;
 begin
-
 end;
 
@@ -173 +169 @@
         else LogParsing := False;
       if ValueExists('LanguageCode') then
-        CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadString('LanguageCode'))
-        else CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('');
+        Translator1.Language := Translator1.Languages.SearchByCode(ReadString('LanguageCode'))
+        else Translator1.Language := Translator1.Languages.SearchByCode('');
     finally
       Free;
     end;
-  LastOpenedFiles.LoadFromRegistry(RegContext(Root, Key + '\LastOpenedFiles')); //Root, Key + '\LastOpenedFiles');
+  LastOpenedFiles.LoadFromRegistry(TRegistryContext.Create(Root, Key + '\LastOpenedFiles')); //Root, Key + '\LastOpenedFiles');
   Compiler.LoadFromRegistry(Root, Key + '\Compiler');
-  FormMain.LoadFromRegistry(Root, Key);
+  FormMain.FormMain.LoadFromRegistry(Root, Key);
 end;
 
@@ -194 +190 @@
         else WriteString('TargetName', '');
       WriteBool('LogParsing', LogParsing);
-      if Assigned(CoolTranslator1.Language) and (CoolTranslator1.Language.Code <> '') then
-        WriteString('LanguageCode', CoolTranslator1.Language.Code)
+      if Assigned(Translator1.Language) and (Translator1.Language.Code <> '') then
+        WriteString('LanguageCode', Translator1.Language.Code)
         else WriteString('LanguageCode', '');
     finally
       Free;
     end;
-  LastOpenedFiles.SaveToRegistry(RegContext(Root, Key + '\LastOpenedFiles'));
+  LastOpenedFiles.SaveToRegistry(TRegistryContext.Create(Root, Key + '\LastOpenedFiles'));
   Compiler.SaveToRegistry(Root, Key + '\Compiler');
-  FormMain.SaveToRegistry(Root, Key);
+  FormMain.FormMain.SaveToRegistry(Root, Key);
 end;
 
@@ -237 +233 @@
     Name := 'System';
     Internal := True;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'Byte';
       Size := 1;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'ShortInt';
       Size := 1;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'Word';
       Size := 2;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'SmallInt';
       Size := 2;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'Cardinal';
       Size := 4;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'Integer';
       Size := 4;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'UInt64';
       Size := 8;
       Internal := True;
     end;
-    with TType(Body.Types.AddNew(TType.Create)) do begin
+    with Body.Types.AddNew do begin
       Name := 'Int64';
       Size := 8;
       Internal := True;
     end;
-    with TFunction(Body.Functions.AddNew(TFunction.Create)) do begin
+    with Body.Functions.AddNew do begin
       Name := 'WriteLn';
       Internal := True;

trunk/IDE/Forms/FormCodeTree.pas

@@ -1 @@
-unit UFormCodeTree;
-
-{$mode Delphi}{$H+}
+unit FormCodeTree;
 
 interface
@@ -20 +18 @@
   end; 
 
-var
-  FormCodeTree: TFormCodeTree;
 
 implementation

trunk/IDE/Forms/FormExternalProducerOutput.pas

@@ -1 @@
-unit UFormExternalProducerOutput;
-
-{$mode delphi}
+unit FormExternalProducerOutput;
 
 interface
@@ -20 +18 @@
   end;
 
-var
-  FormExternalProducerOutput: TFormExternalProducerOutput;
 
 implementation

trunk/IDE/Forms/FormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
   Left = 799
-  Height = 501
+  Height = 752
   Top = 435
-  Width = 695
+  Width = 1042
   Caption = 'Transpascal IDE'
-  ClientHeight = 467
-  ClientWidth = 695
-  Font.Height = -11
+  ClientHeight = 752
+  ClientWidth = 1042
+  DesignTimePPI = 144
+  Font.Height = -17
   Font.Name = 'Tahoma'
   Menu = MainMenu
@@ -15 +16 @@
   OnShow = FormShow
   Position = poDesktopCenter
-  LCLVersion = '1.8.0.4'
+  LCLVersion = '3.2.0.0'
   object Splitter3: TSplitter
     Cursor = crVSplit
     Left = 0
-    Height = 5
-    Top = 462
-    Width = 695
+    Height = 8
+    Top = 744
+    Width = 1042
     Align = alBottom
     ResizeAnchor = akBottom
@@ -27 +28 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 26
+    Height = 39
     Top = 0
-    Width = 695
+    Width = 1042
     Images = ImageList1
     ParentShowHint = False
@@ -40 +41 @@
     end
     object ToolButton2: TToolButton
-      Left = 24
+      Left = 36
       Top = 2
       Action = AProjectOpen
@@ -47 +48 @@
     end
     object ToolButton3: TToolButton
-      Left = 59
+      Left = 89
       Top = 2
       Action = AProjectSave
     end
     object ToolButton4: TToolButton
-      Left = 82
+      Left = 124
       Top = 2
       Action = AProjectClose
     end
     object ToolButton5: TToolButton
-      Left = 105
-      Height = 22
+      Left = 159
+      Height = 33
       Top = 2
       Style = tbsSeparator
     end
     object ToolButton6: TToolButton
-      Left = 113
+      Left = 167
       Top = 2
       Action = AViewOptions
     end
     object ToolButton7: TToolButton
-      Left = 136
+      Left = 202
       Top = 2
       Action = ABuild
     end
     object ToolButton8: TToolButton
-      Left = 159
+      Left = 237
       Top = 2
       Action = ARun
     end
     object ToolButton9: TToolButton
-      Left = 182
+      Left = 272
       Top = 2
       Action = APause
     end
     object ToolButton10: TToolButton
-      Left = 205
+      Left = 307
       Top = 2
       Action = AStop
     end
     object ComboBoxTarget: TComboBox
-      Left = 228
+      Left = 342
       Height = 40
       Top = 2
-      Width = 100
+      Width = 150
       ItemHeight = 0
-      OnChange = ComboBoxTargetChange
       Style = csDropDownList
       TabOrder = 0
+      OnChange = ComboBoxTargetChange
     end
     object ToolButton11: TToolButton
-      Left = 328
+      Left = 492
       Top = 2
       Action = AViewTargets
@@ -104 +105 @@
   end
   object Splitter1: TSplitter
-    Left = 490
-    Height = 330
-    Top = 26
-    Width = 5
+    Left = 734
+    Height = 545
+    Top = 39
+    Width = 8
     Align = alRight
     ResizeAnchor = akRight
   end
   object PageControlRight: TPageControl
-    Left = 495
-    Height = 330
-    Top = 26
-    Width = 200
+    Left = 742
+    Height = 545
+    Top = 39
+    Width = 300
     ActivePage = TabSheetExternalProducer
     Align = alRight
@@ -136 +137 @@
   object PageControlBottom: TPageControl
     Left = 0
-    Height = 101
-    Top = 361
-    Width = 695
+    Height = 152
+    Top = 592
+    Width = 1042
     ActivePage = TabSheetMessages
     Align = alBottom
@@ -154 +155 @@
     Cursor = crVSplit
     Left = 0
-    Height = 5
-    Top = 356
-    Width = 695
+    Height = 8
+    Top = 584
+    Width = 1042
     Align = alBottom
     ResizeAnchor = akBottom
@@ -162 +163 @@
   object PageControlMain: TPageControl
     Left = 0
-    Height = 330
-    Top = 26
-    Width = 490
-    ActivePage = TabSheetSource
+    Height = 545
+    Top = 39
+    Width = 734
+    ActivePage = TabSheetTarget
     Align = alClient
-    TabIndex = 0
+    TabIndex = 1
     TabOrder = 6
     object TabSheetSource: TTabSheet
@@ -178 +179 @@
   object MainMenu: TMainMenu
     Images = ImageList1
-    left = 115
-    top = 160
+    Left = 173
+    Top = 240
     object MenuItem1: TMenuItem
       Caption = 'Project'
@@ -288 +289 @@
   object ActionList1: TActionList
     Images = ImageList1
-    left = 112
-    top = 216
+    Left = 168
+    Top = 324
     object AProjectNew: TAction
       Category = 'Project'
@@ -448 +449 @@
     DefaultExt = '.tppr'
     Filter = 'Project file (*.tppr)|*.tppr|Any file (*.*)|*.*'
-    left = 115
-    top = 54
+    Left = 173
+    Top = 81
   end
   object SaveDialogProject: TSaveDialog
     DefaultExt = '.tppr'
     Filter = 'Project file (*.tppr)|*.tppr|Any file (*.*)|*.*'
-    left = 115
-    top = 104
+    Left = 173
+    Top = 156
   end
   object ImageList1: TImageList
-    left = 112
-    top = 272
+    Left = 168
+    Top = 408
     Bitmap = {
-      4C690F0000001000000010000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000FF000000FF0000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000FF000000FF800080FF800080FF000000FF00000000000000000000
-      0000000000000000000000000000000000000000000000000000000000FF0000
-      00FF800080FF800080FF800080FF800080FF800080FF000000FF000000000000
-      000000000000000000000000000000000000000000FF000000FF800080FF8000
-      80FF800080FF800080FF800080FF800080FF800080FF800080FF000000FF0000
-      0000000000000000000000000000000000FFC0C0C0FF800080FF800080FF8000
-      80FF800080FF800080FF800080FF800080FF800080FF800080FF800080FF0000
-      00FF000000000000000000000000000000FF800080FFC0C0C0FF800080FF8000
-      80FF800080FF800080FF800080FF800080FF800080FF800080FF800080FF8000
-      80FF000000FF0000000000000000000000FF800080FF800080FFC0C0C0FF8000
-      80FF800080FF800080FF800080FF800080FF800080FF800080FF800080FF8000
-      80FF800080FF000000FF00000000000000FF800080FF800080FF800080FFC0C0
-      C0FF800080FF800080FF800080FF800080FF800080FF800080FF800080FF8000
-      80FF800080FF000000FF000000FF000000FF800080FF800080FF800080FF8000
-      80FFC0C0C0FF800080FF800080FF800080FF800080FF800080FF800080FF0000
-      00FF000000FF808080FF0000000000000000000000FF800080FF800080FF8000
-      80FF800080FFC0C0C0FF800080FF800080FF800080FF000000FF000000FF8080
-      80FFFFFFFFFF808080FF000000000000000000000000000000FF800080FF8000
-      80FF800080FF800080FFC0C0C0FF000000FF000000FF808080FFC0C0C0FFFFFF
-      FFFFC0C0C0FF000000FF000000FF000000000000000000000000000000FF8000
-      80FF800080FF800080FF000000FF808080FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0
-      C0FF000000FF000000FF00000000000000000000000000000000000000000000
-      00FF800080FF800080FF000000FFFFFFFFFFC0C0C0FFFFFFFFFF000000FF0000
-      00FF000000000000000000000000000000000000000000000000000000000000
-      0000000000FF800080FF000000FF808080FF000000FF000000FF000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000FF000000FF000000FF0000000000000000000000000000
-      0000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000A4000000A6000000
-      A9200000AA7E0000AAB20000AAC80000AAB20000AA7E0000A9200000A6000000
-      A400FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000A4000000A6410A0A
-      AEC13F3FD5E76060EDF86A6AF3FE6060ECF83E3ED4E70A0AADC10000A6410000
-      A400FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000A3200A0AABC15555
-      E3F35A5AE2FF5656DEFF5656DEFF5656DEFF5959E1FF5050DEF30909AAC10000
-      A320FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000009E7E3939CCE64A4A
-      D2FF4545CDFF4545CDFF4545CDFF4545CDFF4545CDFF4848D0FF3131C3E60000
-      9E7EFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000009AB24A4AD4F83737
-      BFFF3737BFFF3131BAFF2727B0FF1C1CA6FF1616A0FF12129CFF2323AEF80000
-      9AB2FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00000095C84848D0FE2E2E
-      B8FF1D1DADFF1212A5FF1111A4FF1111A4FF1111A4FF1111A4FF1B1BADFE0000
-      95C8FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000008FB23434C3F81414
-      B2FF1111B1FF1111B1FF1111B1FF1111B1FF1111B1FF1111B1FF1414B0F80000
-      8FB2FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000897E1818AFE61414
-      C1FF1111BFFF1111BFFF1111BFFF1111BFFF1111BFFF1111BFFF0A0AA6E60000
-      897EFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000008420030389C11515
-      BFF31212CDFF1111CCFF1111CCFF1111CCFF1111CCFF0E0EBCF3020288C10000
-      8420FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000008100000078410202
-      7DC10A0AA8E70F0FCAF81111D5FE0F0FCAF80A0AA8E702027DC1000078410000
-      8100FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000008100000075000000
-      64200000607E000060B2000060C8000060B20000607E00006420000075000000
-      8100FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000001818C0FF1818C0FFC0C0
-      C0FF000000000000000000000000000000000000000000000000000000000000
-      00001818C0FF1818C0FFC0C0C0FF00000000000000002020C8FF2020C8FF2020
-      C8FF2020C8FFC0C0C0FF00000000000000000000000000000000000000002020
-      C8FF2020C8FFC0C0C0FF000000000000000000000000000000002626CEFF2626
-      CEFF2626CEFF2626CEFFC0C0C0FF0000000000000000000000002626CEFF2626
-      CEFFC0C0C0FF0000000000000000000000000000000000000000000000000000
-      00002929D1FF2929D1FF2929D1FFC0C0C0FF000000002929D1FFC0C0C0FF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000002C2CD4FF2C2CD4FF2C2CD4FF2C2CD4FF2C2CD4FFC0C0C0FF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000002F2FD7FF2F2FD7FF2F2FD7FFC0C0C0FF000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000003232DAFF3232DAFF3232DAFF3232DAFF3232DAFFC0C0C0FF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00003535DDFF3535DDFF3535DDFFC0C0C0FF000000003535DDFF3535DDFFC0C0
-      C0FF000000000000000000000000000000000000000000000000000000003838
-      E0FF3838E0FF3838E0FFC0C0C0FF0000000000000000000000003838E0FF3838
-      E0FFC0C0C0FF00000000000000000000000000000000000000003A3AE2FF3A3A
-      E2FF3A3AE2FFC0C0C0FF00000000000000000000000000000000000000003A3A
-      E2FFC0C0C0FF00000000000000000000000000000000000000003A3AE2FF3A3A
-      E2FF3A3AE2FFC0C0C0FF00000000000000000000000000000000000000000000
-      00003A3AE2FFC0C0C0FF00000000000000000000000000000000000000003A3A
-      E2FFC0C0C0FF0000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000003A3AE2FFC0C0C0FF000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000FF000000FF000000FF0000
-      00FF000000FF000000FF000000FF000000FF0000000000000000000000000000
-      000000000000000000000000000000000000000000FF000000FFFFFFFFFFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FF0000000000000000000000000000
-      000000000000000000000000000000000000000000FF008484FF000000FFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FF0000000000000000000000000000
-      0000840000FF000000000000000000000000000000FF008484FF008484FF0000
-      00FFFFFFFFFFFFFFFFFFFFFFFFFF000000FF0000000000000000000000008400
-      00FF840000FF000000000000000000000000000000FF008484FF008484FF0084
-      84FF000000FFFFFFFFFFFFFFFFFF000000FF0000000000000000840000FF8400
-      00FF840000FF840000FF840000FF00000000000000FF008484FF008484FF0084
-      84FF000000FFFFFFFFFFFFFFFFFF000000FF00000000840000FF840000FF8400
-      00FF840000FF840000FF840000FF00000000000000FF008484FF008484FF0084
-      84FF000000FFFFFFFFFFFFFFFFFF000000FF0000000000000000840000FF8400
-      00FF840000FF840000FF840000FF00000000000000FF008484FF008484FF0084
-      84FF000000FFFFFFFFFFFFFFFFFF000000FF0000000000000000000000008400
-      00FF840000FF000000000000000000000000000000FF008484FF008484FF0000
-      00FF000000FFFFFFFFFFFFFFFFFF000000FF0000000000000000000000000000
-      0000840000FF000000000000000000000000000000FF008484FF008484FF0084
-      84FF000000FFFFFFFFFFFFFFFFFF000000FF0000000000000000000000000000
-      0000000000000000000000000000000000FF000000FF008484FF008484FF0084
-      84FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
-      00FF0000000000000000000000000000000000000000000000FF008484FF0084
-      84FF000000FF0000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000FF0084
-      84FF000000FF0000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00FF000000FF0000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000FF0000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000000000000000000000C584
-      44FFC28342FFD89C6DFFD69668FFD49463FFD69668FFB2793CFFB1783BFF0000
-      0000000000000000000000000000000000000000000000000000C58442FFDCA2
-      77FFF3DAC7FFFCF7F1FFFFFEFEFFFFFEFEFFFCF4EDFFF1D6C0FFC7935DFFA66F
-      33FF0000000000000000000000000000000000000000C48443FFE5B999FFFCF4
-      EDFFFBD2C1FFFAA887FFFD8757FFFD8454FFF8A582FFF7CEBDFFFAF1E7FFD2A7
-      7AFFA36A2AFF000000000000000000000000C48445FFDCA277FFFCF4EDFFFABF
-      A6FFFF7A43FFFFBB9EFFFFF6F3FFFFFEFEFFFEEDE5FFFA9970FFF3B69CFFF8F0
-      E6FFBB8B56FF986426FF0000000000000000C48341FFF0DAC3FFFAD1C0FFFF79
-      40FFFF986EFFFFFEFEFFFFC9B2FFFD9164FFFAC6AFFFFEF5F1FFF5773DFFEDC5
-      B2FFE4CBB3FF905D21FF0000000000000000D1834CFFFCF7F1FFFAA582FFFF73
-      3AFFFF844EFFFFAE8AFFFE6C2DFFF76727FFF19268FFFFFEFEFFE98354FFD785
-      60FFF8F1ECFF81551FFF0000000000000000CD844EFFFFFEFEFFFC814CFFFF70
-      31FFFF6B2CFFFD6928FFF86523FFF49265FFFDF5F1FFF4D4C5FFC65018FFBA59
-      27FFFEFEFDFF834A1CFF0000000000000000CD8147FFFFFEFEFFF87A46FFF968
-      29FFF66525FFF16020FFF18653FFFFFEFEFFF0BFA8FFC55A24FFB64C15FFB757
-      24FFFEFEFDFF7F481AFF0000000000000000CD7F45FFFCF4EDFFEC9772FFE860
-      21FFE05A1DFFDB5819FFEDAA89FFFFFEFEFFC84E12FFB94C11FFB34C13FFC77B
-      53FFF6F0ECFF7A4319FF0000000000000000B4793AFFEFD6C1FFEDC5B2FFDD5A
-      1AFFD55617FFD25313FFD87D4DFFE3A686FFBB4C11FFB34A12FFB64A10FFDEB9
-      A6FFDCC9B8FF563C0DFF0000000000000000B67734FFD6996BFFF9F0E7FFDDA4
-      88FFC75013FFC04E11FFDCA688FFFFFEFEFFB54911FFB64A10FFD59E82FFF3EC
-      E7FF9A7352FF49340DFF000000000000000000000000B2702BFFDBAB80FFF8EF
-      E7FFE2BBA6FFCC7E56FFC15823FFC05722FFC97F56FFDEBAA7FFF2EBE7FFB393
-      76FF483108FF0000000000000000000000000000000000000000A1692CFFC088
-      58FFE0C9B4FFF7F1ECFFFEFDFCFFFEFDFCFFF5F0ECFFDCC9B8FF9E7857FF4731
-      08FF000000000000000000000000000000000000000000000000000000009164
-      29FF855A24FF885015FF824A1DFF7E4719FF794417FF583C0EFF49340DFF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000063000000B7FFFF
-      FF00FFFFFF00000000FF000000FF000000B7FFFFFF00FFFFFF00000000FF0000
-      00FF0000008BFFFFFF00FFFFFF00FFFFFF0000000040000000FF000000B7FFFF
-      FF0000000063000000B7FFFFFF00000000B700000063000000630000008B0000
-      0020000000FF00000020FFFFFF0000000020000000FF000000FF000000B7FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF000000008B0000008BFFFFFF00FFFFFF00FFFF
-      FF00000000FF00000040FFFFFF0000000020000000B70000008B000000B7FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00000000FF0000008BFFFFFF00FFFFFF000000
-      0020000000FF00000020FFFFFF00FFFFFF00FFFFFF000000008B000000B7FFFF
-      FF00FFFFFF00FFFFFF000000008B000000FF00000040FFFFFF00FFFFFF000000
-      00FF00000040FFFFFF00FFFFFF00FFFFFF00FFFFFF000000008B000000B7FFFF
-      FF00FFFFFF0000000040000000FF000000B7FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00000000FF00000063FFFFFF00FFFFFF00FFFFFF000000008B000000B7FFFF
-      FF00FFFFFF00000000FF000000FF00000020FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00000000FF0000008BFFFFFF00FFFFFF00FFFFFF000000008B000000B7FFFF
-      FF0000000063000000FF00000063FFFFFF00FFFFFF0000000063000000B70000
-      0020000000FF00000063FFFFFF00FFFFFF00FFFFFF000000008B000000B7FFFF
-      FF000000008B000000FF000000FF000000FF0000008BFFFFFF00000000B70000
-      00FF000000B7FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000FF000000FF000000FF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000FF0000000000000000000000000000
-      00FF00000000000000FF00000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000FF000000FF0000000000000000000000FF000000FF000000FF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00FF000000FF000000FF00000000000000FF00FFFFFFFFFFFFFF00FFFFFF0000
-      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000000000
-      0000000000000000000000000000000000FFFFFFFFFF00FFFFFFFFFFFFFF00FF
-      FFFFFFFFFFFF00FFFFFFFFFFFFFF00FFFFFFFFFFFFFF000000FF000000000000
-      0000000000000000000000000000000000FF00FFFFFFFFFFFFFF00FFFFFFFFFF
-      FFFF00FFFFFFFFFFFFFF00FFFFFFFFFFFFFF00FFFFFF000000FF000000000000
-      0000000000000000000000000000000000FFFFFFFFFF00FFFFFFFFFFFFFF00FF
-      FFFF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
-      00FF000000FF000000FF000000FF000000FF00FFFFFFFFFFFFFF00FFFFFF0000
-      00FF008484FF008484FF008484FF008484FF008484FF008484FF008484FF0084
-      84FF008484FF000000FF00000000000000FFFFFFFFFF00FFFFFF000000FF0084
-      84FF008484FF008484FF008484FF008484FF008484FF008484FF008484FF0084
-      84FF000000FF0000000000000000000000FF00FFFFFF000000FF008484FF0084
-      84FF008484FF008484FF008484FF008484FF008484FF008484FF008484FF0000
-      00FF000000000000000000000000000000FF000000FF008484FF008484FF0084
-      84FF008484FF008484FF008484FF008484FF008484FF008484FF000000FF0000
-      0000000000000000000000000000000000FF000000FF000000FF000000FF0000
-      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000DE9077BFDA8A
-      70FFD88367FFD57C61FF0000000000000000DE9077BFDA8A70FFD88367FFD57C
-      61FF000000000000000000000000000000000000000000000000D9866CBFEBB0
-      9DFFF0BBABFFD27457FF0000000000000000D9866CBFEBB09DFFF0BBABFFD274
-      57FF000000000000000000000000000000000000000000000000D57C61BFE8A7
-      93FFEDB6A3FFCD6849FF0000000000000000D57C61BFE8A793FFEDB6A3FFCD68
-      49FF000000000000000000000000000000000000000000000000D27457BFE5A1
-      8BFFEBAF9AFFC95E3EFF0000000000000000D27457BFE5A18BFFEBAF9AFFC95E
-      3EFF000000000000000000000000000000000000000000000000CD6849BFE198
-      81FFE8A793FFC45432FF0000000000000000CD6849BFE19881FFE8A793FFC454
-      32FF000000000000000000000000000000000000000000000000C86A4DBFE7A5
-      90FFE5A18BFFBF4A27FF0000000000000000C86A4DBFE7A590FFE5A18BFFBF4A
-      27FF000000000000000000000000000000000000000000000000B95435BFE299
-      84FFE29A85FFB5401DFF0000000000000000B95435BFE29984FFE29A85FFB540
-      1DFF000000000000000000000000000000000000000000000000BF4A27C0D985
-      6BFFDF957EFFAA3A18FF0000000000000000BF4A27C0D9856BFFDF957EFFAA3A
-      18FF000000000000000000000000000000000000000000000000B5401DBFD57C
-      61FFDE9077FF993414FF0000000000000000B5401DBFD57C61FFDE9077FF9934
-      14FF000000000000000000000000000000000000000000000000AA3A18BFD375
-      58FFDC8B71FF8A2C0FFF0000000000000000AA3A18BFD37558FFDC8B71FF8A2C
-      0FFF000000000000000000000000000000000000000000000000993414BFCF6F
-      50FFDA886DFF7F270BFF0000000000000000993414BFCF6F50FFDA886DFF7F27
-      0BFF0000000000000000000000000000000000000000000000008A2C0FBF842A
-      0EFF7C260BFF7A250AFF00000000000000008A2C0FBF842A0EFF7C260BFF7A25
-      0AFF000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000FF000000FF000000FF0000
-      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
-      00FF000000FF000000FF0000000000000000000000FF008484FF000000FFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000
-      00FFFFFFFFFF000000FF0000000000000000000000FF008484FF000000FFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000
-      00FF000000FF000000FF0000000000000000000000FF008484FF000000FFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000
-      00FF008484FF000000FF0000000000000000000000FF008484FF000000FFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000
-      00FF008484FF000000FF0000000000000000000000FF008484FF000000FFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000
-      00FF008484FF000000FF0000000000000000000000FF008484FF000000FFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000
-      00FF008484FF000000FF0000000000000000000000FF008484FF008484FF0000
-      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0084
-      84FF008484FF000000FF0000000000000000000000FF008484FF008484FF0084
-      84FF008484FF008484FF008484FF008484FF008484FF008484FF008484FF0084
-      84FF008484FF000000FF0000000000000000000000FF008484FF008484FF0000
-      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
-      00FF008484FF000000FF0000000000000000000000FF008484FF008484FF0000
-      00FF000000FF000000FF000000FF000000FF000000FFFFFFFFFFFFFFFFFF0000
-      00FF008484FF000000FF0000000000000000000000FF008484FF008484FF0000
-      00FF000000FF000000FF000000FF000000FF000000FFFFFFFFFFFFFFFFFF0000
-      00FF008484FF000000FF0000000000000000000000FF008484FF008484FF0000
-      00FF000000FF000000FF000000FF000000FF000000FFFFFFFFFFFFFFFFFF0000
-      00FF008484FF000000FF000000000000000000000000000000FF000000FF0000
-      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
-      00FF000000FF000000FF00000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000000000000000FF000000FF0000
-      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000000000
-      00000000000000000000000000000000000000000000000000FFFFFFFFFFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FF000000FF0000
-      00000000000000000000000000000000000000000000000000FFFFFFFFFFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFBDBDBDFF0000
-      00FF0000000000000000000000000000000000000000000000FFFFFFFFFFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FF000000FF0000
-      00FF000000FF00000000000000000000000000000000000000FFFFFFFFFFFFFF
-      FFFFFF0000FFFF0000FFFF0000FFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-      FFFF000000FF00000000000000000000000000000000000000FFFFFFFFFFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-      FFFF000000FF00000000000000000000000000000000000000FFFFFFFFFFFFFF
-      FFFFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFFFFFFFFFFFF
-      FFFF000000FF00000000000000000000000000000000000000FFFFFFFFFFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-      FFFF000000FF00000000000000000000000000000000000000FFFFFFFFFFFFFF
-      FFFFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFFFFFFFFFFFF
-      FFFF000000FF00000000000000000000000000000000000000FFFFFFFFFFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-      FFFF000000FF00000000000000000000000000000000000000FFFFFFFFFFFFFF
-      FFFFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFFFFFFFFFFFF
-      FFFF000000FF00000000000000000000000000000000000000FFFFFFFFFFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-      FFFF000000FF00000000000000000000000000000000000000FFFFFFFFFFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-      FFFF000000FF00000000000000000000000000000000000000FF000000FF0000
-      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
-      00FF000000FF0000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000A37B48FFA37B48FFA27A47FFA27946FFA178
-      45FFA07744FFA07643FF9F7542FF9E7441FF9E7340FF9D723FFF9C713EFF9C70
-      3DFF9B6F3CFF9A6E3BFF9A6D3AFFA37B48FFBEA27FFFBEA17EFFBDA17DFFBDA0
-      7CFFBD9F7CFFBC9F7BFFBB9E7AFFBB9D7AFFBB9D79FFBA9C78FFB99B78FFB99A
-      77FFB89A76FFB89975FF996C39FFA27A47FFFFFFFFFFFFFFFFFFFEFEFEFFFEFE
-      FEFFFDFDFDFFFDFDFCFFFCFCFBFFFCFBFBFFFBFBFAFFFBFAF9FFFAFAF9FFFAF9
-      F8FFF9F9F7FFF9F8F7FF986B37FFA17946FFFFFFFFFF878787FF5D5D5DFFA0A0
-      A0FFFDFCFCFFFCFCFBFFFCFBFBFFFBFBFAFFFBFAF9FFFAFAF9FFFAF9F8FFF9F8
-      F7FFF8F8F7FFF8F7F6FF976A36FFA17844FFFEFEFEFF5F5F5FFF949494FF5353
-      53FFFCFCFBFF7B7B7BFF797979FF757575FF727272FF6E6E6EFF6A6A69FF6666
-      66FF626262FFF7F7F5FF966935FFA07643FFFEFDFDFF8C8C8CFF525252FFA4A4
-      A4FFFBFBFAFFFBFBFAFFFAFAF9FFFAF9F8FFF9F9F8FFF9F8F7FFF8F8F6FFF8F7
-      F6FFF7F7F5FFF7F6F4FF966734FF9F7542FFFDFDFCFFFCFCFCFFFCFCFBFFFBFB
-      FAFFFBFAFAFFFAFAF9FFFAF9F8FFF9F9F8FFF9F8F7FFF8F8F6FFF8F7F6FFF7F6
-      F5FFF7F6F4FFF6F5F4FF956633FF9E7441FFFCFCFCFFB5B5B5FF848484FFBEBD
-      BDFFFAFAF9FFFAF9F8FFF9F9F7FFF9F8F7FFF8F8F6FFF8F7F5FFF7F6F5FFF7F6
-      F4FFF6F5F3FFF6F5F3FF946531FF9D7340FFFCFBFBFF818181FFC4C4C4FF8F8F
-      8FFFFAF9F8FF7B7B7AFF797979FF757574FF727171FF6D6D6DFF696969FF6666
-      65FF626261FFF5F4F2FF936430FF9D723EFFFBFBFAFF9F9F9EFF7F7F7FFFAEAE
-      ADFFF9F8F7FFF8F8F7FFF8F7F6FFF7F7F5FFF7F6F5FFF6F6F4FFF6F5F3FFF5F4
-      F3FFF5F4F2FFF4F3F1FF92622FFF9C703DFFFAFAF9FFFAF9F9FFF9F9F8FFF9F8
-      F7FFF8F8F7FFF8F7F6FFF7F7F5FFF7F6F5FFF6F5F4FFF6F5F3FFF5F4F3FFF5F4
-      F2FFF4F3F1FFF4F3F0FF92612EFF9B6F3CFFFAF9F8FFBEBEBDFF929292FFBCBC
-      BBFFF8F7F6FFF7F7F5FFF7F6F4FFF6F5F4FFF6F5F3FFF5F4F2FFF5F4F2FFF4F3
-      F1FFF4F2F0FFF3F2F0FF91602DFF9A6E3BFFF9F9F8FF7C7C7CFFC4C4C4FF8787
-      87FFF7F6F5FF7A7A7AFF787878FF747474FF717170FF6D6D6CFF696968FF6565
-      65FF616161FFF2F1EFFF905F2BFF996D3AFFF9F8F7FF959594FF878787FF9B9A
-      9AFFF7F6F4FFF6F5F3FFF6F5F3FFF5F4F2FFF4F3F1FFF4F3F1FFF3F2F0FFF3F2
-      EFFFF2F1EFFFF2F1EEFF8F5E2AFF996C38FFF8F7F6FFF8F7F5FFF7F6F5FFF6F6
-      F4FFF6F5F3FFF5F5F3FFF5F4F2FFF4F3F1FFF4F3F1FFF3F2F0FFF3F2EFFFF2F1
-      EFFFF2F0EEFFF1F0EDFF8E5D29FF986B37FF976A36FF966935FF966734FF9566
-      33FF946532FF946531FF936430FF92622FFF92612EFF91602DFF90602CFF905F
-      2BFF8F5D2AFF8E5C29FF8D5B28FF000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000339966FF0000
-      00000000000066CC99FF009933FF009933FF009933FF339966FF000000000000
-      0000000000000000000000000000000000000000000000000000009933FF3399
-      66FF009933FF009933FF009933FF009933FF009933FF339966FF339966FF0000
-      0000000000000000000000000000000000000000000000000000009933FF0099
-      33FF009933FF009933FF66CC99FF000000000000000066CC99FF009933FF66CC
-      99FF000000000000000000000000000000000000000000000000009933FF0099
-      33FF009933FF339966FF0000000000000000000000000000000066CC99FF0099
-      33FF000000000000000000000000000000000000000000000000009933FF0099
-      33FF009933FF009933FF339966FF000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000339966FF009933FF009933FF009933FF0099
-      33FF000000000000000000000000000000000000000000000000009933FF66CC
-      99FF00000000000000000000000000000000339966FF009933FF009933FF0099
-      33FF00000000000000000000000000000000000000000000000066CC99FF0099
-      33FF66CC99FF000000000000000066CC99FF009933FF009933FF009933FF0099
-      33FF000000000000000000000000000000000000000000000000000000003399
-      66FF339966FF009933FF009933FF009933FF009933FF009933FF339966FF0099
-      33FF000000000000000000000000000000000000000000000000000000000000
-      0000339966FF009933FF009933FF009933FF66CC99FF00000000000000003399
-      66FF000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00FF0000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00FF00FF00FF00000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00FF00FF00FF00FF00FF000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00FF00FF00FF00FF00FF00FF00FF0000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00FF00FF00FF00FF00FF00FF00FF0000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00FF00FF00FF00FF00FF000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00FF00FF00FF00000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000FF00FF0000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000003131312F313131FF3030301F00000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000002E2E2E3F2E2E2EFF2E2E2E3F00000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00002A2A2A7F2A2A2ADF2B2B2BFF2B2B2BFF2B2B2BFF2A2A2ADF2A2A2A7F0000
-      0000000000000000000000000000000000000000000000000000000000002727
-      279F272727FF282828AF2828284F272727FF2828284F282828AF272727FF2727
-      279F0000000000000000000000000000000000000000000000002424247F2424
-      24FF2424245F0000000000000000242424FF00000000000000002424245F2424
-      24FF2424247F0000000000000000000000000000000000000000202020DF2020
-      20AF000000000000000000000000202020FF0000000000000000000000002020
-      20AF202020DF0000000000000000000000001C1C1C1F1C1C1C3F1D1D1DFF1D1D
-      1D4F0000000000000000000000001D1D1DFF0000000000000000000000001D1D
-      1D4F1D1D1DFF1C1C1C3F1C1C1C1F1A1A1A1F1A1A1AFF1A1A1AFF1A1A1AFF1A1A
-      1AFF1A1A1AFF1A1A1AFF1A1A1AFF1A1A1ABF1A1A1AFF1A1A1AFF1A1A1AFF1A1A
-      1AFF1A1A1AFF1A1A1AFF1A1A1AFF000000001818182F1818183F161616FF1616
-      167F1818183F1818183F1818183F161616FF1818183F1818183F1818183F1616
-      167F161616FF1818183F1818181F000000000000000000000000131313DF1313
-      13AF000000000000000000000000131313FF0000000000000000000000001313
-      13AF131313DF00000000000000000000000000000000000000000F0F0F7F0F0F
-      0FFF0E0E0E5F00000000000000000F0F0FFF00000000000000000E0E0E5F0F0F
-      0FFF1010106F0000000000000000000000000000000000000000000000000D0D
-      0D9F0C0C0CFF0C0C0CAF0B0B0B4F0C0C0CFF0B0B0B4F0C0C0CAF0C0C0CFF0D0D
-      0D9F000000000000000000000000000000000000000000000000000000000000
-      00000909097F090909DF090909FF090909FF090909FF090909DF0909096F0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000505053F050505FF0505053F00000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000202022F020202FF0303031F00000000000000000000
-      0000000000000000000000000000
+      4C7A0F00000010000000100000008C0A00000000000078DAED9A0B544DF91EC7
+      CFCAB2D6154A8A89A9A5B98C94A644AEC7186118B40C2D8F3CEE6D3AA1282291
+      9E3A2244EE44629454485C16998C6772EA62702F732F17638CD7984B73178D4E
+      A7C7E975BEF7FFDF9D73DA67B7CF3E2F83B1FA9DF5B5CFFEEDDFE7F7FBBFF63E
+      7BEF88446DA66D80B0DAF8779B6FB3577932A96412B75AB49A911139B438B6F4
+      E4D0C91990032525257A59811C8CDF8C1C1ABF8939B4FC86E660CD6DAB634239
+      34CCEAD5BC7DD09583CD51E3F03A73B039BA4F8DED17CAC1AE6700DB2A077331
+      62B1469C0F5AF54D3C8F0CE268B3DE0689447944F9447F7312890E251015125D
+      516D139AFDF94C9C003FDAD2F268A9B7F7ED32B1B85C111A2A578AC52F142347
+      DE2AB3B43C524A8FEBE6F739595A1E2E9D31E367F99C394FE0E7F750A3D9B37F
+      82AFEF4379870E874A691C3F9F9D306CD8B5673E3E37316EDCF5569A30E1DFF0
+      F4BCF08CC6F1F399853E3EB71443864841E5E97916CECEC7E0E0908FEEDD73D1
+      B56B167AF73EAAA071FCFCF62BA486D2DDFD341C1D8F90F8FDB0B1C9D3D2FBEF
+      1F51D2387E3EB5D0CBEB82C2CEAE90C47ECD2B3BBB630A1AC7CF6F4CB0B72F78
+      6667574A62A5BCB2B4CC7F46E3F8F924A776ED369676EB269577ED7A9DC45FD3
+      9295D539B9854572298DE3E71389A2475B58AC2AB5B43C58666DFD0F858DCD6D
+      25DDD27DEAA7C7699C6E3E92683E596762B2DEC464DD89AFA8B609CDFE48912E
+      FEF7AAB7C5ECED4B40A5BABE1A1DEBE474056CE9CA2374BC6FDFEFC016374697
+      9F6B2E2E37A0963A96FDDD107373BB05AE8CE1A979787C0FB58C65070EBC07AE
+      0CCD3178F003A8A566B8FBBA6CE8D0C7508B1BABCBAFB6E1C39F402DA1187378
+      4372183BD6A6D8EBAA63C2BD069F0CE2F9CC603E298937071F9FC473DFC7F03C
+      39B83C6505794E0E36AF66D93294E7638DE1CDAD6F70FF397369F4F8EBA9AF73
+      ED717813D6239737ED3C308F37E799999BE38DD8A5A4B1F8FBDA31B89B15863B
+      3B16E256FA3C665B1833025F477F0C61760CEEEF8D82FCDE6534D6CA00A59251
+      63553964774A70799B3FF2970EE2CD7131E9533C3D93C1C436DC2C45FDC10D68
+      DA30134D49D3A1D8BF06B5DF15A35E56869B0762B12FD415DAEC38A62E65EBA5
+      F940ECA7405136502367EA2BCB9FA23E231CF2935950543C43518A1F76CEEFAB
+      C97171ED6854DCBB80FA1BE4392F6614B0734973DBAF16A269EB7CD47F5B0065
+      B50CD5519FA0FC5221FEFBCFE3D8E2FF8186BFB17612D3DF7AD24E2C1F0E244D
+      068E6E8272F147A85DE00C59DA4226DFFFD64EC7F7EBC450C85E2071462F0D7F
+      9DC6D3714A9C04847B028BDCD014D20F8AA0DEA84A0B4213A95D75EB12BEF5B5
+      C7D9D9CE24B4096B7D1C5AF8C4F10CAF88FD0C750B5D5013F421646227C8D64F
+      63FC15D283B834A70F4E4EEA865333FB30BC6442CF165E328E19BB175F45E017
+      F107783CC7113FCEEA81F2431B19FECAE4AE3833C906C727D9E272DC34D454BC
+      2043DC43C37F13331C2FEF943263F3604E4FDCF67B0F37A7D9E2EEAACFF173FE
+      7A1451D6A72B4EFA74C1C333F9B87FF534FC4674D6F027A3BC70276311EA2ACA
+      F0202F19977D6D5132D906F7F39399FA2726DA30ECEDEC3590BF2843E6F2A998
+      E8D5596B0D1486F7C78F875743F1B20C4F8AF2712DC10FA5B37AA364E61F7155
+      E28787670FA0F279198E6F5B89099E7FE05D837B42DC50923C0B8FAF7E835A32
+      47CAA64646D5A4BFB4CDD9D133315E07ABB6ADF35DB08E8C75B26F37ACF17144
+      C2F81E8819FB1E668DB06AD5E657F3B61B6D6A7E0E9A47748AB5AFBE0EF3F952
+      38EC28762C3B17DDAAF6A952E823882AD64975DC89AF162B770A4F3DFACF2816
+      7F4A15C7C76BB5975B9F53E7148F4F538B5B5B88E78E094F9BE6E9E1C1D74EBE
+      3E7179D5586BD550CF09ABFFF304F814CEFD420A6B2E79FBD4F6FC6FFEBB4803
+      EF65F00AEE715ABD4337F65945AB1DEA7B55ED77BC06DF77AA59C1ADD07DAB3E
+      560FAF23D6707159F6BDB82EB1C6CF0C56D37F1359FEE707C359919163D56602
+      F6704B94F4DEA670DC5DBB00B7E303A1CFCFB51FD62F963E3FB61B1545877173
+      C54CE8F3738DE496FE72601BCA4FEEC3F58513A1CFCF35925BFA744F0A9E1764
+      E2EA1723A1CFCF35925BFAD3CE44D05A17A70F843E3FD7AE847E2E2DDBBF05B4
+      96D4C719FAFC5C3B337DB0F44946129E64AEC389518ED0E7E71AC95DF2C3BA45
+      78B43D018786DB439F9F6B24B794CE2F996F6478D9419F9F6B24B7F43F91B370
+      3F651936B959439F9F6B24B7F45F4B7D712F390C12E78ED0E7E71AC92D4D72B5
+      427CDF8E88FDD012FAFCEFE0DFF961E2F550E7FB3BBEF7793CBF8746F1E6D6E7
+      FD0D7A177843DE9DE9FA0D36E4F753E837DCF0777726F1E6F6FF37E645669E3F
+      BF976B809E5711069DB726F3C5C5C57AEF830DBC6E4090E7FEA733C3FEA60143
+      CDE8FA9C76B4D5FF8DEB9BC8BF89737F5FDC0450ED8D1D8FBD319F614FF438E4
+      468D45EECA4F91133906D92B46237BF928EC8EF046D6B291C80AFF04BB968E40
+      E6928F9119369C61CFEF95E0FC9E0414EF5985E2DC7814E7C4E35C4E1C8AB263
+      51B49B2A0667B3A27166175166144E67AEC4E98C48642C1EC6D4559B92BE6B27
+      6A6A6A226A446363031A1B1AD0D0508F86FA3AD453D5295057578B3A452D762E
+      1A823DA4CDD4366CD8007F7F7FE4E6E6A2A95180259C82AAB6065F85FE89F477
+      2C5333202000E9E9E998366D1AC3C6C5C521262606919191888888C092254B10
+      1A1A82E0E060CC9D3B17B5B5D5D811329819272569EFE6CD9B3175EA54E4E5E5
+      35D7246A69AFBA6E0D5397B2B53555D8B1C08B19E3E6BE36B7B9B9BD026C4D33
+      5B535D85EDC18398F9A1EC89132790447E57CE936B1C779C9AD96A162B67941E
+      E489DD646EE938252626E2E2C58B484D4D65D8B8B85855FF572062D932848585
+      212484F63F88F43F10D55595D8367F005917239936E7E464432291E0E8D1235A
+      635CABAA5BA3AA5B5D2567D82AB90C69733D98F5D4DCDE3A565F396C756BB64A
+      5E81B44077662DD2F69E3F5F8CB4B4349C3B57A435C62D6C650B5B590139D156
+      F147CC3AA675E3E3E399FED375446BC6C6C6223A3A1A2B56ACC0B265E1A4FF8B
+      49FF1722282808818181A894BDC49680FEC820E7006DF3F6EDE90CBB2B33536B
+      8C5BDA2B636ACA2B5F326CA5EC57A47EE14ACE81A14C7B15DC7112622B7E85AC
+      A21C5FFABB30E7005DC7742DD2F544D7447AD040666EE9FCD031A6E344FBBA45
+      ECC6B439D5DF155FFEC5057FFD73BF77EA59645046B0A63FC1D73220CA18A411
+      FB984E53C7B13836AF37078761DAC0690FDB27C4F3D5D2F4C9C0FA06F5F975CC
+      09773C05DACF373EAD72E830BE31E6AE03C1FAAA5A426B401FCFD75E767BDE86
+      39790D4F02309B372707581F7379537280E7632E6F4C0E087CDE54FD3735FE6F
+      6AFDB599C8D3D3D3830803060CE8650AEFEEEEEE4D04BA358673757595103DEA
+      DFBF3FD4A2FBD4AF8F757676CE2142BF7EFD0A88A6A8BE4FA1FBF43B3DAE8BED
+      D3A78F840844012C1F58DF0354C779DBE1E4E4F488A880E30367BF80C6B17D0E
+      0E0EBD88BC1D1D1D4134857D8CFA38FB53A88FC653AE67CF9E54109054E838CD
+      696F6FEF41E4DDBD7B771049E877B5A88FB32F61F9B4D685ADADED23A2028E0F
+      9CFD021AC7377ED6D6D6122258595905B07C1A9EFAE97E972E5D96EA9AC3CE9D
+      3BE774EAD40944051D3B769C42BFABB605F43B3DAE6F0D75E8D04142F488082C
+      D1FDA5C6ACE3F6EDDB7B13816E4D397F2C2C2C3C88D0AE5D3B9DE7DFFF0101C8
+      8363
     }
   end
   object PopupMenu1: TPopupMenu
-    left = 196
-    top = 54
+    Left = 294
+    Top = 81
   end
 end

trunk/IDE/Forms/FormMain.pas

@@ -1 @@
-unit UFormMain;
-
-{$MODE Delphi}
+unit FormMain;
 
 interface
@@ -7 +5 @@
 uses
   SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls,
-  ComCtrls, ExtCtrls, SynEdit, SynHighlighterPas, Registry,
-  UProject, FileUtil, Menus, ActnList, DateUtils,
-  UFormTargetCode, UFormCodeTree, URegistry;
+  ComCtrls, ExtCtrls, SynEdit, SynHighlighterPas, Registry, Project, FileUtil,
+  Menus, ActnList, DateUtils, FormTargetCode, FormCodeTree, RegistryEx,
+  FormMessages, FormSourceCode, FormProject, FormTargetProject, FormTargets,
+  FormExternalProducerOutput;
 
 type
@@ -145 +144 @@
     procedure UpdateTitle;
     procedure ProducerProcessOutput(Text: string);
+    procedure ShowProject(ProjectFile: TProjectFile);
+    procedure ShowTargetCode(ProjectFile: TProjectFile);
   public
+    FormMessages: TFormMessages;
+    FormSourceCode: TFormSourceCode;
+    FormProject: TFormProject;
+    FormTargetCode: TFormTargetCode;
+    FormTargetProject: TFormTargetProject;
+    FormExternalProducerOutput: TFormExternalProducerOutput;
+    FormTargets: TFormTargets;
+    FormCodeTree: TFormCodeTree;
     procedure LoadFromRegistry(Root: HKEY; const Key: string);
     procedure SaveToRegistry(Root: HKEY; const Key: string);
@@ -162 +171 @@
 
 uses
-  UCore, UFormMessages, UFormSourceCode, UFormProject, UCommon, UFormAbout, UFormOptions,
-  UFormTargets, UTarget, UExecutor, UFormProjectNew,
-  UFormTargetProject, UFormExternalProducerOutput;
+  Core, Common, FormAbout, FormOptions, Target, Executor, FormProjectNew;
 
 resourcestring
@@ -175 +182 @@
   FormSourceCode.Save;
   AProjectSave.Execute;
-  with Core do begin
+  with Core.Core do begin
     // Compile project file
     Compiler.Init;
@@ -214 +221 @@
 procedure TFormMain.AResetExecute(Sender: TObject);
 begin
-  Core.Compiler.Target.Executor.Reset;
+  Core.Core.Compiler.Target.Executor.Reset;
 end;
 
@@ -220 +227 @@
 begin
   ABuildExecute(Self);
-  Core.Compiler.Target.Executor.Run;
+  Core.Core.Compiler.Target.Executor.Run;
 end;
 
 procedure TFormMain.ARunToCursorExecute(Sender: TObject);
 begin
-  Core.Compiler.Target.Executor.RunToCursor(0); // determine position
+  Core.Core.Compiler.Target.Executor.RunToCursor(0); // determine position
 end;
 
 procedure TFormMain.AStepInExecute(Sender: TObject);
 begin
-  Core.Compiler.Target.Executor.StepIn;
+  Core.Core.Compiler.Target.Executor.StepIn;
 end;
 
 procedure TFormMain.AStepOutExecute(Sender: TObject);
 begin
-  Core.Compiler.Target.Executor.StepOut;
+  Core.Core.Compiler.Target.Executor.StepOut;
 end;
 
 procedure TFormMain.AStepOverExecute(Sender: TObject);
 begin
-  Core.Compiler.Target.Executor.StepOver;
+  Core.Core.Compiler.Target.Executor.StepOver;
 end;
 
 procedure TFormMain.AStopExecute(Sender: TObject);
 begin
-  Core.Compiler.Target.Executor.Stop;
+  Core.Core.Compiler.Target.Executor.Stop;
 end;
 
@@ -264 +271 @@
 
 procedure TFormMain.AViewOptionsExecute(Sender: TObject);
-begin
-  FormOptions.ShowModal;
+var
+  FormOptions: TFormOptions;
+begin
+  FormOptions := TFormOptions.Create(nil);
+  try
+    FormOptions.ShowModal;
+  finally
+    FormOptions.Free;
+  end;
 end;
 
@@ -280 +294 @@
 procedure TFormMain.AViewSourceEditorExecute(Sender: TObject);
 begin
-
 end;
 
@@ -288 +301 @@
   F: TFileStream;
 begin
-  FileName := ExtractFileDir(Core.Project.FileName) + Name + '.pas';
+  FileName := ExtractFileDir(Core.Core.Project.FileName) + Name + '.pas';
   if FileExists(FileName) then
   try
@@ -303 +316 @@
 procedure TFormMain.UpdateInterface;
 begin
-  with Core do begin
-  UpdateTitle;
-  AProjectClose.Enabled := Assigned(Project);
-  AProjectSave.Enabled := Assigned(Project) and Project.Modified;
-  AProjectSaveAs.Enabled := Assigned(Project);
-  (*AProgramRun.Enabled := Project.Active and (BrainFuckInterpreter.State = rsStopped);
-  AProgramPause.Enabled := Project.Active and (BrainFuckInterpreter.State = rsRunning);
-  AProgramStop.Enabled := Project.Active and (BrainFuckInterpreter.State <> rsStopped);*)
-  ABuild.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
-    Assigned(Compiler.Target.Producer);
-  APause.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
-    Assigned(Compiler.Target.Executor) and (Compiler.Target.Executor.State = rsRunning);
-  ARun.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
-    Assigned(Compiler.Target.Executor) and ((Compiler.Target.Executor.State = rsStopped) or
-    (Compiler.Target.Executor.State = rsPaused));
-  AStop.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
-    Assigned(Compiler.Target.Executor) and ((Compiler.Target.Executor.State = rsRunning) or
-    (Compiler.Target.Executor.State = rsPaused));
-  AStepIn.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
-    Assigned(Compiler.Target.Executor) and ((Compiler.Target.Executor.State = rsRunning) or
-    (Compiler.Target.Executor.State = rsPaused));
-  AStepOut.Enabled := AStepIn.Enabled;
-  AStepOver.Enabled := AStepIn.Enabled;
-  ARunToCursor.Enabled := AStepIn.Enabled;
+  with Core.Core do begin
+    UpdateTitle;
+    AProjectClose.Enabled := Assigned(Project);
+    AProjectSave.Enabled := Assigned(Project) and Project.Modified;
+    AProjectSaveAs.Enabled := Assigned(Project);
+    (*AProgramRun.Enabled := Project.Active and (BrainFuckInterpreter.State = rsStopped);
+    AProgramPause.Enabled := Project.Active and (BrainFuckInterpreter.State = rsRunning);
+    AProgramStop.Enabled := Project.Active and (BrainFuckInterpreter.State <> rsStopped);*)
+    ABuild.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
+      Assigned(Compiler.Target.Producer);
+    APause.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
+      Assigned(Compiler.Target.Executor) and (Compiler.Target.Executor.State = rsRunning);
+    ARun.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
+      Assigned(Compiler.Target.Executor) and ((Compiler.Target.Executor.State = rsStopped) or
+      (Compiler.Target.Executor.State = rsPaused));
+    AStop.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
+      Assigned(Compiler.Target.Executor) and ((Compiler.Target.Executor.State = rsRunning) or
+      (Compiler.Target.Executor.State = rsPaused));
+    AStepIn.Enabled := Assigned(Project) and Assigned(Compiler.Target) and
+      Assigned(Compiler.Target.Executor) and ((Compiler.Target.Executor.State = rsRunning) or
+      (Compiler.Target.Executor.State = rsPaused));
+    AStepOut.Enabled := AStepIn.Enabled;
+    AStepOver.Enabled := AStepIn.Enabled;
+    ARunToCursor.Enabled := AStepIn.Enabled;
   end;
 
   UpdateMenu;
-  Core.Compiler.Targets.LoadToStrings(ComboBoxTarget.Items);
-  ComboBoxTarget.ItemIndex := Core.Compiler.Targets.IndexOf(Core.Compiler.Target);
+  Core.Core.Compiler.Targets.LoadToStrings(ComboBoxTarget.Items);
+  ComboBoxTarget.ItemIndex := Core.Core.Compiler.Targets.IndexOf(Core.Core.Compiler.Target);
   FormSourceCode.UpdateInterface;
   FormTargetCode.UpdateInterface;
@@ -435 +448 @@
 begin
   with TMenuItem(Sender) do begin
-    Core.Compiler.Target := TTarget(Core.Compiler.Targets[MenuIndex]);
+    Core.Core.Compiler.Target := TTarget(Core.Core.Compiler.Targets[MenuIndex]);
     UpdateInterface;
   end;
@@ -446 +459 @@
 begin
   MenuItemProducer.Clear;
-  with Core do
+  with Core.Core do
   for I := 0 to Compiler.Targets.Count - 1 do begin
     NewMenuItem := TMenuItem.Create(MenuItemProducer);
@@ -461 +474 @@
   Title: string;
 begin
-  Title := Core.ApplicationInfo.AppName;
-  if Assigned(Core.Project) then begin
-    if Core.Project.FileName <> '' then Title := Core.Project.FileName + ' - ' + Title;
-    if Core.Project.Modified then Title := Title + ' *';
+  Title := Core.Core.ApplicationInfo.AppName;
+  if Assigned(Core.Core.Project) then begin
+    if Core.Core.Project.FileName <> '' then Title := Core.Core.Project.FileName + ' - ' + Title;
+    if Core.Core.Project.Modified then Title := Title + ' *';
   end;
   Caption := Title;
@@ -474 +487 @@
 end;
 
+procedure TFormMain.ShowProject(ProjectFile: TProjectFile);
+begin
+  FormMain.TabSheetSource.Show;
+  FormSourceCode.ProjectFile := ProjectFile;
+end;
+
+procedure TFormMain.ShowTargetCode(ProjectFile: TProjectFile);
+begin
+  FormTargetCode.ProjectFile := ProjectFile;
+  FormMain.TabSheetTarget.Show;
+  FormTargetCode.SynEdit1.Lines.Assign(ProjectFile.Source);
+end;
+
 procedure TFormMain.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   AProjectClose.Execute;
-  Core.SaveToRegistry(HKEY(Core.ApplicationInfo.RegistryRoot), Core.ApplicationInfo.RegistryKey);
+  Core.Core.SaveToRegistry(HKEY(Core.Core.ApplicationInfo.RegistryRoot), Core.Core.ApplicationInfo.RegistryKey);
 end;
 
@@ -484 +510 @@
   I: Integer;
 begin
-  with Core.Compiler.Targets do
+  FormMessages := TFormMessages.Create(nil);
+  FormSourceCode := TFormSourceCode.Create(nil);
+  FormProject := TFormProject.Create(nil);
+  FormProject.OnShowProject := ShowProject;
+  FormTargetCode := TFormTargetCode.Create(nil);
+  FormTargetProject := TFormTargetProject.Create(nil);
+  FormTargetProject.OnShowTargetCode := ShowTargetCode;
+  FormExternalProducerOutput := TFormExternalProducerOutput.Create(nil);
+  FormTargets := TFormTargets.Create(nil);
+  FormCodeTree := TFormCodeTree.Create(nil);
+
+  with Core.Core.Compiler.Targets do
   for I := 0 to Count - 1 do
   with TTarget(Items[I]) do
@@ -498 +535 @@
 begin
   if Sender is TMenuItem then
-    Core.ProjectOpen(StringReplace(TMenuItem(Sender).Caption, '&', '', [rfReplaceAll]));
+    Core.Core.ProjectOpen(StringReplace(TMenuItem(Sender).Caption, '&', '', [rfReplaceAll]));
 end;
 
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  Core.LoadFromRegistry(HKEY(Core.ApplicationInfo.RegistryRoot), Core.ApplicationInfo.RegistryKey);
+  Core.Core.LoadFromRegistry(HKEY(Core.Core.ApplicationInfo.RegistryRoot), Core.Core.ApplicationInfo.RegistryKey);
   DockInit;
-  Core.ProjectTemplatesInit;
-
-  if Core.ReopenLastOpenedFile and (Core.LastOpenedFiles.Items.Count > 0) then
-  if FileExists(Core.LastOpenedFiles.Items[0]) then
-    Core.ProjectOpen(Core.LastOpenedFiles.Items[0]);
+  Core.Core.ProjectTemplatesInit;
+
+  if Core.Core.ReopenLastOpenedFile and (Core.Core.LastOpenedFiles.Items.Count > 0) then
+  if FileExists(Core.Core.LastOpenedFiles.Items[0]) then
+    Core.Core.ProjectOpen(Core.Core.LastOpenedFiles.Items[0]);
 
   WindowState := wsMaximized;
@@ -517 +554 @@
 procedure TFormMain.AProjectOpenExecute(Sender: TObject);
 begin
-  if Core.LastOpenedFiles.Items.Count > 0 then
-    OpenDialogProject.FileName := Core.LastOpenedFiles.Items[0]
+  if Core.Core.LastOpenedFiles.Items.Count > 0 then
+    OpenDialogProject.FileName := Core.Core.LastOpenedFiles.Items[0]
     else OpenDialogProject.FileName := ExtractFileDir(Application.ExeName);
   if OpenDialogProject.Execute then begin
-    Core.ProjectOpen(OpenDialogProject.FileName);
+    Core.Core.ProjectOpen(OpenDialogProject.FileName);
   end;
 end;
@@ -529 +566 @@
   //if Project.Modified then ;  A
   FormSourceCode.ProjectFile := nil;
-  FreeAndNil(Core.Project);
+  FreeAndNil(Core.Core.Project);
   FormProject.UpdateProjectTree;
   UpdateInterface;
@@ -540 +577 @@
 
 procedure TFormMain.AAboutExecute(Sender: TObject);
-begin
-  FormAbout.ShowModal;
+var
+  FormAbout: TFormAbout;
+begin
+  FormAbout := TFormAbout.Create(nil);
+  try
+    FormAbout.ShowModal;
+  finally
+    FormAbout.Free;
+  end;
 end;
 
 procedure TFormMain.AHomepageExecute(Sender: TObject);
 begin
-  OpenWebPage(Core.ApplicationInfo.HomePage);
+  OpenWebPage(Core.Core.ApplicationInfo.HomePage);
 end;
 
 procedure TFormMain.APauseExecute(Sender: TObject);
 begin
-  Core.Compiler.Target.Executor.Pause;
+  Core.Core.Compiler.Target.Executor.Pause;
 end;
 
 procedure TFormMain.AProjectNewExecute(Sender: TObject);
-begin
+var
+  FormProjectNew: TFormProjectNew;
+begin
+  FormProjectNew := TFormProjectNew.Create(nil);
   if FormProjectNew.ShowModal = mrOk then begin
     if Assigned(FormProjectNew.ListView1.Selected) then begin
       if TProjectTemplate(FormProjectNew.ListView1.Selected.Data).IsProject then
-        Core.ProjectNew;
-      TProjectTemplate(FormProjectNew.ListView1.Selected.Data).InitProject(Core.Project);
+        Core.Core.ProjectNew;
+      TProjectTemplate(FormProjectNew.ListView1.Selected.Data).InitProject(Core.Core.Project);
     end;
   end;
+  FormProjectNew.Free;
   UpdateInterface;
 end;
@@ -568 +616 @@
 procedure TFormMain.AProjectSaveAsExecute(Sender: TObject);
 begin
-  if Core.LastOpenedFiles.Items.Count > 0 then
-    SaveDialogProject.FileName := Core.LastOpenedFiles.Items[0]
+  if Core.Core.LastOpenedFiles.Items.Count > 0 then
+    SaveDialogProject.FileName := Core.Core.LastOpenedFiles.Items[0]
     else SaveDialogProject.FileName := ExtractFileDir(Application.ExeName);
-  if Assigned(Core.Project) then
+  if Assigned(Core.Core.Project) then
   if SaveDialogProject.Execute then begin
-    Core.Project.SaveToFile(SaveDialogProject.FileName);
+    Core.Core.Project.SaveToFile(SaveDialogProject.FileName);
     FormSourceCode.Save;
-    Core.Project.Save;
+    Core.Core.Project.Save;
     UpdateInterface;
-    Core.LastOpenedFiles.AddItem(SaveDialogProject.FileName);
+    Core.Core.LastOpenedFiles.AddItem(SaveDialogProject.FileName);
   end;
 end;
@@ -584 +632 @@
 begin
   FormSourceCode.Save;
-  if not FileExists(Core.Project.FileName) then AProjectSaveAs.Execute
-    else Core.Project.SaveToFile(Core.Project.FileName);
+  if not FileExists(Core.Core.Project.FileName) then AProjectSaveAs.Execute
+    else Core.Core.Project.SaveToFile(Core.Core.Project.FileName);
 end;
 
@@ -591 +639 @@
 begin
   with TMenuItem(Sender) do begin
-    Core.Compiler.Target := TTarget(Core.Compiler.Targets[ComboBoxTarget.ItemIndex]);
+    Core.Core.Compiler.Target := TTarget(Core.Core.Compiler.Targets[ComboBoxTarget.ItemIndex]);
     UpdateInterface;
   end;

trunk/IDE/Forms/FormMessages.pas

@@ -1 @@
-unit UFormMessages;
-
-{$mode objfpc}{$H+}
+unit FormMessages;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ComCtrls, UProject, UCompiler;
+  ComCtrls, Project, Compiler;
 
 type
+  TSelectFileEvent = procedure(FileName: string; Position: TPoint);
 
   { TFormMessages }
@@ -15 +14 @@
   TFormMessages = class(TForm)
     ListView1: TListView;
-    procedure ListBoxMessagesSelectionChange(Sender: TObject; User: boolean);
+    procedure ListBoxMessagesSelectionChange(Sender: TObject; User: Boolean);
     procedure ListView1Click(Sender: TObject);
     procedure ListView1Data(Sender: TObject; Item: TListItem);
@@ -21 +20 @@
       Selected: Boolean);
   private
-    { private declarations }
+    FOnSelectFile: TSelectFileEvent;
   public
     procedure Reload;
+    property OnSelectFile: TSelectFileEvent read FOnSelectFile write FOnSelectFile;
   end; 
 
-var
-  FormMessages: TFormMessages;
 
 implementation
@@ -34 +32 @@
 
 uses
-  UCore, UFormMain, UFormSourceCode;
+  Core, FormMain, FormSourceCode;
 
 { TFormMessages }
 
 procedure TFormMessages.ListBoxMessagesSelectionChange(Sender: TObject;
-  User: boolean);
+  User: Boolean);
 begin
-
 end;
 
@@ -52 +49 @@
 procedure TFormMessages.ListView1Data(Sender: TObject; Item: TListItem);
 begin
-  with Core, FormMain, FormSourceCode do
+  with Core.Core, FormMain.FormMain do
   with TErrorMessage(Compiler.ErrorMessages[Item.Index]) do begin
     if FileName = '' then Item.Caption := ' '
@@ -68 +65 @@
   P: TPoint;
 begin
-  with Core, FormSourceCode do
+  with Core.Core do
   if Assigned(ListView1.Selected) then
   with TErrorMessage(ListView1.Selected.Data) do
   if FileName <> '' then begin
-    ProjectFile := Project.Files.SearchFile(FileName);
-    if Assigned(ProjectFile) then
-      SynEditSource.Lines.Assign(ProjectFile.Source)
-      else if FileExists(FileName) then
-        SynEditSource.Lines.LoadFromFile(FileName);
-    SynEditSource.CaretXY := Position;
-    TForm(SynEditSource.Owner).Show;
-    SynEditSource.SetFocus;
+    if Assigned(FOnSelectFile) then
+      FOnSelectFile(FileName, Position);
   end;
 end;
@@ -85 +76 @@
 procedure TFormMessages.Reload;
 begin
-  ListView1.Items.Count := Core.Compiler.ErrorMessages.Count;
+  ListView1.Items.Count := Core.Core.Compiler.ErrorMessages.Count;
   ListView1.Refresh;
 end;

trunk/IDE/Forms/FormOptions.pas

@@ -1 @@
-unit UFormOptions;
-
-{$mode delphi}
+unit FormOptions;
 
 interface
@@ -26 +24 @@
   end; 
 
-var
-  FormOptions: TFormOptions;
 
 implementation
@@ -34 +30 @@
 
 uses
-  UCore, UFormMain, ULanguages;
+  Core, Languages;
 
 { TFormOptions }
@@ -41 +37 @@
 begin
   if ComboBoxLanguage.ItemIndex <> -1 then
-    Core.CoolTranslator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
-  Core.ReopenLastOpenedFile := CheckBoxReopenProject.Checked;
+    Core.Core.Translator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
+  Core.Core.ReopenLastOpenedFile := CheckBoxReopenProject.Checked;
 end;
 
 procedure TFormOptions.FormShow(Sender: TObject);
 begin
-  Core.CoolTranslator1.LanguageListToStrings(ComboBoxLanguage.Items);
-  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.CoolTranslator1.Language);
+  Core.Core.Translator1.LanguageListToStrings(ComboBoxLanguage.Items);
+  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Core.Translator1.Language);
   if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
-  CheckBoxReopenProject.Checked := Core.ReopenLastOpenedFile;
+  CheckBoxReopenProject.Checked := Core.Core.ReopenLastOpenedFile;
 end;
 

trunk/IDE/Forms/FormProject.lfm

@@ -1 +1 @@
 object FormProject: TFormProject
   Left = 507
-  Height = 253
+  Height = 380
   Top = 197
-  Width = 331
+  Width = 496
   Caption = 'Project manager'
-  ClientHeight = 253
-  ClientWidth = 331
-  LCLVersion = '1.1'
+  ClientHeight = 380
+  ClientWidth = 496
+  DesignTimePPI = 144
+  LCLVersion = '3.2.0.0'
   object TreeViewProject: TTreeView
     Left = 0
-    Height = 253
+    Height = 380
     Top = 0
-    Width = 331
+    Width = 496
     Align = alClient
-    DefaultItemHeight = 16
     PopupMenu = PopupMenuFile
     ReadOnly = True
@@ -24 +24 @@
   object PopupMenuFile: TPopupMenu
     Images = FormMain.ImageList1
-    left = 94
-    top = 38
+    Left = 141
+    Top = 57
     object MenuItem4: TMenuItem
       Action = AShow
@@ -40 +40 @@
   end
   object ActionList1: TActionList
-    left = 184
-    top = 40
+    Left = 276
+    Top = 60
     object AAdd: TAction
       Caption = 'Add'
@@ -60 +60 @@
   end
   object OpenDialog1: TOpenDialog
-    left = 94
-    top = 98
+    Left = 141
+    Top = 147
   end
 end

trunk/IDE/Forms/FormProject.pas

@@ -1 @@
-unit UFormProject;
+unit FormProject;
 
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  Menus, ActnList, UProject;
+  Classes, SysUtils, LazFileUtils, Forms, Controls, Graphics, Dialogs, ComCtrls,
+  Menus, ActnList, Project;
 
 type
+  TShowProjectEvent = procedure (ProjectFile: TProjectFile) of object;
 
   { TFormProject }
@@ -31 +32 @@
     procedure TreeViewProjectDblClick(Sender: TObject);
   private
-    procedure UpdateProjectFiles(Node: TTreeNode; Files: TProjectFileList);
+    FOnShowProject: TShowProjectEvent;
+    procedure UpdateProjectFiles(Node: TTreeNode; Files: TProjectFiles);
   public
     procedure UpdateProjectTree;
     procedure UpdateInterface;
+    property OnShowProject: TShowProjectEvent read FOnShowProject write FOnShowProject;
   end;
 
 var
   FormProject: TFormProject;
+
 
 implementation
@@ -45 +49 @@
 
 uses
-  UCore, UFormMain, UFormSourceCode, UFormTargetCode, UFormCodeTree;
+  Core, FormMain, FormSourceCode, FormTargetCode, FormCodeTree;
 
 resourcestring
@@ -56 +60 @@
   );
 begin
-  with FormMain, FormSourceCode do
   if Assigned(Node) then begin
     if TProjectFile(Node.Data) is TProjectFile then begin
@@ -107 +110 @@
 begin
   if Assigned(TreeViewProject.Selected) then
-    Core.Project.Files.Remove(TreeViewProject.Selected.Data);
+    Core.Core.Project.Files.Remove(TreeViewProject.Selected.Data);
   UpdateProjectTree;
 end;
@@ -126 +129 @@
 begin
   if Assigned(TreeViewProject.Selected) then begin
-    FormMain.TabSheetSource.Show;
-    FormSourceCode.ProjectFile := TProjectFile(TreeViewProject.Selected.Data);
+    if Assigned(FOnShowProject) then
+      FOnShowProject(TProjectFile(TreeViewProject.Selected.Data));
   end;
 end;
@@ -135 +138 @@
   NewNode: TTreeNode;
 begin
-  with Core, TreeViewProject, Items do
+  with Core.Core, TreeViewProject, Items do
   try
     BeginUpdate;
@@ -147 +150 @@
       (TreeViewProject.TopItem.Count > 0) then
       TreeViewProject.TopItem.Items[0].Selected := True
-      else FormSourceCode.ProjectFile := nil;
+      else begin
+        if Assigned(FOnShowProject) then
+          FOnShowProject(nil);
+      end;
   finally
     EndUpdate;
@@ -158 +164 @@
 end;
 
-procedure TFormProject.UpdateProjectFiles(Node: TTreeNode; Files: TProjectFileList);
+procedure TFormProject.UpdateProjectFiles(Node: TTreeNode; Files: TProjectFiles);
 var
   I: Integer;

trunk/IDE/Forms/FormProjectNew.pas

@@ -1 @@
-unit UFormProjectNew;
-
-{$mode delphi}
+unit FormProjectNew;
 
 interface
@@ -23 +21 @@
     procedure ListView1SelectItem(Sender: TObject; Item: TListItem;
       Selected: Boolean);
-  private
-    { private declarations }
   public
     procedure UpdateInterface;
   end;
-
-var
-  FormProjectNew: TFormProjectNew;
 
 
@@ -36 +29 @@
 
 uses
-  UCore, UFormMain, UProject;
+  Core, FormMain, Project;
 
 {$R *.lfm}
@@ -72 +65 @@
     ListView1.BeginUpdate;
     ListView1.Items.Clear;
-    with Core do
+    with Core.Core do
     for I := 0 to ProjectTemplates.Count - 1 do
     with TProjectTemplate(ProjectTemplates[I]) do
-    if (not Assigned(Core.Project) and IsProject) or Assigned(Core.Project) then begin
+    if (not Assigned(Core.Core.Project) and IsProject) or
+    Assigned(Core.Core.Project) then begin
       NewItem := ListView1.Items.Add;
       NewItem.Caption := Name;

trunk/IDE/Forms/FormSourceCode.pas

@@ -1 @@
-unit UFormSourceCode;
-
-{$mode objfpc}{$H+}
+unit FormSourceCode;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
-  SynEdit, SynHighlighterPas, UProject;
+  SynEdit, SynHighlighterPas, Project;
 
 type
@@ -24 +22 @@
     procedure Save;
     procedure UpdateInterface;
+    procedure SelectFile(FileName: string; Position: TPoint);
   end; 
 
-var
-  FormSourceCode: TFormSourceCode;
 
 implementation
 
 uses
-  UFormMain, UCore;
+  FormMain, Core;
 
 {$R *.lfm}
@@ -41 +38 @@
 begin
   Save;
-  if Assigned(Core.Project) and Assigned(ProjectFile) then
+  if Assigned(Core.Core.Project) and Assigned(ProjectFile) then
     ProjectFile.Modified := True;
 end;
@@ -62 +59 @@
 procedure TFormSourceCode.UpdateInterface;
 begin
-  SynEditSource.Enabled := Assigned(Core.Project);
-  if not Assigned(Core.Project) then SynEditSource.ClearAll;
+  SynEditSource.Enabled := Assigned(Core.Core.Project);
+  if not Assigned(Core.Core.Project) then SynEditSource.ClearAll;
+end;
+
+procedure TFormSourceCode.SelectFile(FileName: string; Position: TPoint);
+var
+  ProjectFile: TProjectFile;
+begin
+  with Core.Core do begin
+    ProjectFile := Project.Files.SearchFile(FileName);
+    if Assigned(ProjectFile) then
+      SynEditSource.Lines.Assign(ProjectFile.Source)
+      else if FileExists(FileName) then
+        SynEditSource.Lines.LoadFromFile(FileName);
+    SynEditSource.CaretXY := Position;
+    TForm(SynEditSource.Owner).Show;
+    SynEditSource.SetFocus;
+  end;
 end;
 

trunk/IDE/Forms/FormTargetCode.lfm

@@ -1 +1 @@
 object FormTargetCode: TFormTargetCode
   Left = 403
-  Height = 303
+  Height = 454
   Top = 186
-  Width = 398
+  Width = 597
   Caption = 'Target code'
-  ClientHeight = 303
-  ClientWidth = 398
-  LCLVersion = '0.9.31'
+  ClientHeight = 454
+  ClientWidth = 597
+  DesignTimePPI = 144
+  LCLVersion = '3.2.0.0'
   inline SynEdit1: TSynEdit
     Left = 0
-    Height = 303
+    Height = 454
     Top = 0
-    Width = 398
+    Width = 597
     Align = alClient
-    Font.Height = -13
+    Font.Height = -20
     Font.Name = 'Courier New'
     Font.Pitch = fpFixed
@@ -21 +22 @@
     ParentFont = False
     TabOrder = 0
-    Gutter.Width = 57
+    Gutter.Width = 85
     Gutter.MouseActions = <    
       item
@@ -527 +528 @@
         Command = emcMouseLink
       end>
+    MouseTextActions = <>
     MouseSelActions = <    
       item
@@ -534 +536 @@
     VisibleSpecialChars = [vscSpace, vscTabAtLast]
     ReadOnly = True
+    SelectedColor.BackPriority = 50
+    SelectedColor.ForePriority = 50
+    SelectedColor.FramePriority = 50
+    SelectedColor.BoldPriority = 50
+    SelectedColor.ItalicPriority = 50
+    SelectedColor.UnderlinePriority = 50
+    SelectedColor.StrikeOutPriority = 50
     BracketHighlightStyle = sbhsBoth
     BracketMatchColor.Background = clNone
@@ -547 +556 @@
     inline SynLeftGutterPartList1: TSynGutterPartList
       object SynGutterMarks1: TSynGutterMarks
-        Width = 24
+        Width = 36
         MouseActions = <>
       end
       object SynGutterLineNumber1: TSynGutterLineNumber
-        Width = 17
+        Width = 25
         MouseActions = <>
         MarkupInfo.Background = clBtnFace
@@ -561 +570 @@
       end
       object SynGutterChanges1: TSynGutterChanges
-        Width = 4
+        Width = 6
         MouseActions = <>
         ModifiedColor = 59900
@@ -567 +576 @@
       end
       object SynGutterSeparator1: TSynGutterSeparator
-        Width = 2
+        Width = 3
         MouseActions = <>
+        MarkupInfo.Background = clWhite
+        MarkupInfo.Foreground = clGray
       end
       object SynGutterCodeFolding1: TSynGutterCodeFolding
+        Width = 15
         MouseActions = <        
           item
@@ -625 +637 @@
   object SynPasSyn1: TSynPasSyn
     Enabled = False
-    AsmAttri.FrameEdges = sfeAround
-    CommentAttri.FrameEdges = sfeAround
-    IDEDirectiveAttri.FrameEdges = sfeAround
-    IdentifierAttri.FrameEdges = sfeAround
-    KeyAttri.FrameEdges = sfeAround
-    NumberAttri.FrameEdges = sfeAround
-    SpaceAttri.FrameEdges = sfeAround
-    StringAttri.FrameEdges = sfeAround
-    SymbolAttri.FrameEdges = sfeAround
-    CaseLabelAttri.FrameEdges = sfeAround
-    DirectiveAttri.FrameEdges = sfeAround
     CompilerMode = pcmDelphi
     NestedComments = False
-    left = 174
-    top = 38
+    TypeHelpers = True
+    StringMultilineMode = []
+    Left = 261
+    Top = 57
   end
   object SynCppSyn1: TSynCppSyn
     DefaultFilter = 'Soubory C++ (*.c,*.cpp,*.h,*.hpp,*.hh)|*.c;*.cpp;*.h;*.hpp;*.hh'
     Enabled = False
-    AsmAttri.FrameEdges = sfeAround
-    CommentAttri.FrameEdges = sfeAround
-    DirecAttri.FrameEdges = sfeAround
-    IdentifierAttri.FrameEdges = sfeAround
-    InvalidAttri.FrameEdges = sfeAround
-    KeyAttri.FrameEdges = sfeAround
-    NumberAttri.FrameEdges = sfeAround
-    SpaceAttri.FrameEdges = sfeAround
-    StringAttri.FrameEdges = sfeAround
-    SymbolAttri.FrameEdges = sfeAround
-    left = 176
-    top = 85
+    Left = 264
+    Top = 128
   end
   object SynXMLSyn1: TSynXMLSyn
     DefaultFilter = 'XML Dokument (*.xml,*.xsd,*.xsl,*.xslt,*.dtd)|*.xml;*.xsd;*.xsl;*.xslt;*.dtd'
     Enabled = False
-    ElementAttri.FrameEdges = sfeAround
-    AttributeAttri.FrameEdges = sfeAround
-    NamespaceAttributeAttri.FrameEdges = sfeAround
-    AttributeValueAttri.FrameEdges = sfeAround
-    NamespaceAttributeValueAttri.FrameEdges = sfeAround
-    TextAttri.FrameEdges = sfeAround
-    CDATAAttri.FrameEdges = sfeAround
-    EntityRefAttri.FrameEdges = sfeAround
-    ProcessingInstructionAttri.FrameEdges = sfeAround
-    CommentAttri.FrameEdges = sfeAround
-    DocTypeAttri.FrameEdges = sfeAround
-    SpaceAttri.FrameEdges = sfeAround
-    SymbolAttri.FrameEdges = sfeAround
     WantBracesParsed = False
-    left = 178
-    top = 133
+    Left = 267
+    Top = 200
   end
 end

trunk/IDE/Forms/FormTargetCode.pas

@@ -1 @@
-unit UFormTargetCode;
-
-{$mode Delphi}{$H+}
+unit FormTargetCode;
 
 interface
@@ -8 +6 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, SynEdit,
   SynHighlighterMulti, SynHighlighterVB, SynHighlighterPas, SynHighlighterCpp,
-  SynHighlighterXML, UProject;
+  SynHighlighterXML, Project;
 
 type
@@ -27 +25 @@
   end;
 
-var
-  FormTargetCode: TFormTargetCode;
 
 implementation
@@ -35 +31 @@
 
 uses
-  UCore;
+  Core;
 
 procedure TFormTargetCode.SetProjectFile(AValue: TProjectFile);
@@ -48 +44 @@
 procedure TFormTargetCode.UpdateInterface;
 begin
-  SynEdit1.Enabled := Assigned(Core.Project);
-  if not Assigned(Core.Project) then SynEdit1.ClearAll;
+  SynEdit1.Enabled := Assigned(Core.Core.Project);
+  if not Assigned(Core.Core.Project) then SynEdit1.ClearAll;
 end;
-
 
 end.

trunk/IDE/Forms/FormTargetOptions.pas

@@ -1 @@
-unit UFormTargetOptions;
-
-{$mode delphi}
+unit FormTargetOptions;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  UTarget;
+  Target;
 
 type
@@ -34 +32 @@
   end;
 
-var
-  FormTargetOptions: TFormTargetOptions;
 
 implementation

trunk/IDE/Forms/FormTargetProject.pas

@@ -1 @@
-unit UFormTargetProject;
-
-{$mode delphi}
+unit FormTargetProject;
 
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  UProject;
+  Classes, SysUtils, LazFileUtils, Forms, Controls, Graphics, Dialogs, ComCtrls,
+  Project;
 
 type
+  TShowTargetCodeEvent = procedure(ProjectFile: TProjectFile) of object;
 
   { TFormTargetProject }
@@ -17 +16 @@
     procedure TreeViewProjectChange(Sender: TObject; Node: TTreeNode);
   private
-    procedure UpdateProjectFiles(Node: TTreeNode; Files: TProjectFileList);
+    FOnShowTargetCode: TShowTargetCodeEvent;
+    procedure UpdateProjectFiles(Node: TTreeNode; Files: TProjectFiles);
     procedure UpdateProjectTree;
   public
     procedure UpdateInterface;
+    property OnShowTargetCode: TShowTargetCodeEvent read FOnShowTargetCode
+      write FOnShowTargetCode;
   end;
-
-var
-  FormTargetProject: TFormTargetProject;
 
 
@@ -32 +31 @@
 
 uses
-  UCore, UFormMain, UFormTargetCode;
+  Core, FormMain, FormTargetCode;
 
 procedure TFormTargetProject.UpdateProjectTree;
@@ -38 +37 @@
   NewNode: TTreeNode;
 begin
-  with Core, FormMain, TreeViewProject, Items do begin
+  with Core.Core, FormMain.FormMain, TreeViewProject, Items do begin
     BeginUpdate;
     Clear;
@@ -50 +49 @@
       (TreeViewProject.TopItem.Count > 0) then
       TreeViewProject.TopItem.Items[0].Selected := True
-      else FormTargetCode.ProjectFile := nil;
+      else begin
+        if Assigned(FOnShowTargetCode) then
+          FOnShowTargetCode(nil);
+      end;
   end;
 end;
@@ -62 +64 @@
   Node: TTreeNode);
 begin
-  with FormMain, FormTargetCode do
+  with FormMain.FormMain do
   if Assigned(Node) then begin
     if TProjectFile(Node.Data) is TProjectFile then begin
-      ProjectFile := TProjectFile(Node.Data);
-      FormMain.TabSheetTarget.Show;
-      SynEdit1.Lines.Assign(TProjectFile(Node.Data).Source);
+      if Assigned(FOnShowTargetCode) then
+        FOnShowTargetCode(TProjectFile(Node.Data))
     end;
   end;
 end;
 
-procedure TFormTargetProject.UpdateProjectFiles(Node: TTreeNode; Files: TProjectFileList);
+procedure TFormTargetProject.UpdateProjectFiles(Node: TTreeNode; Files: TProjectFiles);
 var
   I: Integer;

trunk/IDE/Forms/FormTargets.lfm

@@ -1 +1 @@
 object FormTargets: TFormTargets
   Left = 292
-  Height = 343
+  Height = 514
   Top = 138
-  Width = 522
+  Width = 783
   Caption = 'Targets'
-  ClientHeight = 343
-  ClientWidth = 522
+  ClientHeight = 514
+  ClientWidth = 783
+  DesignTimePPI = 144
   OnShow = FormShow
-  LCLVersion = '1.1'
+  LCLVersion = '3.2.0.0'
   object ListView1: TListView
-    Left = 8
-    Height = 327
-    Top = 8
-    Width = 508
+    Left = 12
+    Height = 490
+    Top = 12
+    Width = 762
     Anchors = [akTop, akLeft, akRight, akBottom]
     Columns = <    
       item
         Caption = 'Name'
-        Width = 80
+        Width = 120
       end    
       item
         Caption = 'Compiler path'
-        Width = 200
+        Width = 300
       end    
       item
         Caption = 'Executor path'
-        Width = 200
+        Width = 327
       end>
     OwnerData = True
@@ -39 +40 @@
   object PopupMenu1: TPopupMenu
     Images = FormMain.ImageList1
-    left = 124
-    top = 69
+    Left = 186
+    Top = 104
   end
   object ActionList1: TActionList
-    left = 200
-    top = 72
+    Left = 300
+    Top = 108
     object ATargetOptions: TAction
       Caption = 'Options'

trunk/IDE/Forms/FormTargets.pas

@@ -1 @@
-unit UFormTargets;
-
-{$mode objfpc}{$H+}
+unit FormTargets;
 
 interface
@@ -27 +25 @@
   end; 
 
-var
-  FormTargets: TFormTargets;
 
 implementation
@@ -35 +31 @@
 
 uses
-  UCore, UFormMain, UCompiler, UProducer, UTarget,
-  UFormTargetOptions;
+  Core, FormMain, Compiler, Producer, Target, FormTargetOptions;
 
 resourcestring
@@ -50 +45 @@
 
 procedure TFormTargets.ATargetOptionsExecute(Sender: TObject);
+var
+  FormTargetOptions: TFormTargetOptions;
 begin
   if Assigned(ListView1.Selected) then begin
+    FormTargetOptions := TFormTargetOptions.Create(nil);
     FormTargetOptions.LoadControls(TTarget(ListView1.Selected.Data));
     if FormTargetOptions.ShowModal = mrOk then begin
@@ -57 +55 @@
       ReloadList;
     end;
+    FormTargetOptions.Free;
   end;
 end;
@@ -62 +61 @@
 procedure TFormTargets.ListView1Data(Sender: TObject; Item: TListItem);
 begin
-  if (Item.Index >= 0) and (Item.Index < Core.Compiler.Targets.Count) then
-  with TTarget(Core.Compiler.Targets[Item.Index]) do begin
+  if (Item.Index >= 0) and (Item.Index < Core.Core.Compiler.Targets.Count) then
+  with TTarget(Core.Core.Compiler.Targets[Item.Index]) do begin
     Item.Caption := Name;
-    Item.Data := Core.Compiler.Targets[Item.Index];
+    Item.Data := Core.Core.Compiler.Targets[Item.Index];
     //Item.SubItems.Add(Producer.CompilerPath);
   end;
@@ -72 +71 @@
 procedure TFormTargets.ReloadList;
 begin
-  ListView1.Items.Count := Core.Compiler.Targets.Count;
+  ListView1.Items.Count := Core.Core.Compiler.Targets.Count;
   ListView1.Refresh;
 end;

trunk/IDE/Languages/Transpascal.cs.po

@@ -10 +10 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: taboutform.caption
-msgctxt "taboutform.caption"
-msgid "About"
-msgstr "O programu"
-
-#: taboutform.okbutton.caption
-msgctxt "taboutform.okbutton.caption"
-msgid "OK"
-msgstr "OK"
-
-#: tcodeform.caption
-msgctxt "tcodeform.caption"
-msgid "Source code"
-msgstr "Zdrojový kód"
-
-#: tcompiledform.caption
-msgid "Compiled code"
-msgstr "Přeložený zdroj"
-
-#: tcompilersettingsform.button1.caption
-msgctxt "tcompilersettingsform.button1.caption"
-msgid "Browse"
-msgstr "Procházet..."
-
-#: tcompilersettingsform.buttoncancel.caption
-msgctxt "tcompilersettingsform.buttoncancel.caption"
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: tcompilersettingsform.buttonok.caption
-msgctxt "tcompilersettingsform.buttonok.caption"
-msgid "Ok"
-msgstr "Ok"
-
-#: tcompilersettingsform.caption
-msgctxt "tcompilersettingsform.caption"
+#: formmain.sbuildfinished
+#, object-pascal-format
+msgctxt "formmain.sbuildfinished"
+msgid "Build finished in %s seconds"
+msgstr ""
+
+#: formproject.senternewfilename
+#, fuzzy
+msgctxt "formproject.senternewfilename"
+msgid "Enter new file name"
+msgstr "Zadejte nové jméno souboru"
+
+#: formproject.srenamesourcefile
+#, fuzzy
+msgctxt "formproject.srenamesourcefile"
+msgid "Rename source file"
+msgstr "Přejmenování zdrojového souboru"
+
+#: formtargets.scompileroptions
+#, fuzzy
+msgctxt "formtargets.scompileroptions"
 msgid "Compiler options"
-msgstr "Volbny překladače"
-
-#: tcompilersettingsform.label1.caption
-msgctxt "tcompilersettingsform.label1.caption"
-msgid "Compiler path:"
-msgstr "Cesta překladače:"
-
-#: tformabout.caption
-msgctxt "tformabout.caption"
-msgid "About"
-msgstr "O programu"
-
-#: tformabout.okbutton.caption
-msgctxt "tformabout.okbutton.caption"
-msgid "OK"
-msgstr "OK"
-
-#: tformcodetree.caption
-msgctxt "tformcodetree.caption"
-msgid "Code tree"
-msgstr "Strom kódu"
-
-#: tformcompilers.caption
-msgid "Compilers"
-msgstr "Překladače"
-
-#: tformcompilers.listview1.columns[0].caption
-msgctxt "tformcompilers.listview1.columns[0].caption"
-msgid "Name"
-msgstr "Jméno"
-
-#: tformcompilers.listview1.columns[1].caption
-msgctxt "tformcompilers.listview1.columns[1].caption"
-msgid "Execution path"
-msgstr "Cesta vykonání"
-
-#: tformcompilersettings.button1.caption
-msgctxt "tformcompilersettings.button1.caption"
-msgid "Browse"
-msgstr "Procházet..."
-
-#: tformcompilersettings.buttoncancel.caption
-msgctxt "tformcompilersettings.buttoncancel.caption"
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: tformcompilersettings.buttonok.caption
-msgctxt "tformcompilersettings.buttonok.caption"
-msgid "Ok"
-msgstr "Ok"
-
-#: tformcompilersettings.caption
-msgctxt "tformcompilersettings.caption"
-msgid "Compiler options"
-msgstr "Volbny překladače"
-
-#: tformcompilersettings.label1.caption
-msgctxt "tformcompilersettings.label1.caption"
-msgid "Compiler path:"
-msgstr "Cesta překladače:"
-
-#: tformexternalproduceroutput.caption
-msgctxt "tformexternalproduceroutput.caption"
-msgid "External producer"
-msgstr "Vnější generátor"
+msgstr "Volby překladače"
+
+#: formtargets.scompilerpath
+#, fuzzy
+msgctxt "formtargets.scompilerpath"
+msgid "Compiler path"
+msgstr "Cesta překladače"
+
+#: project.snewproject
+#, fuzzy
+msgctxt "project.snewproject"
+msgid "New project"
+msgstr "Nový projekt"
+
+#: projecttemplates.sconsoleapplication
+#, fuzzy
+msgctxt "projecttemplates.sconsoleapplication"
+msgid "Console application"
+msgstr "Konzolová aplikace"
+
+#: projecttemplates.sguiapplication
+#, fuzzy
+msgctxt "projecttemplates.sguiapplication"
+msgid "GUI application"
+msgstr "GUI aplikace"
+
+#: projecttemplates.spackage
+#, fuzzy
+msgctxt "projecttemplates.spackage"
+msgid "Package"
+msgstr "Balíček"
+
+#: projecttemplates.sunit
+#, fuzzy
+msgctxt "projecttemplates.sunit"
+msgid "Unit"
+msgstr "Jednotka"
 
 #: tformmain.aabout.caption
@@ -149 +106 @@
 
 #: tformmain.aprojectnew.caption
-#| msgid "New"
 msgctxt "tformmain.aprojectnew.caption"
 msgid "New..."
@@ -339 +295 @@
 msgstr "Cílový projekt"
 
-#: tformmessages.caption
-msgctxt "tformmessages.caption"
-msgid "Messages"
-msgstr "Zprávy"
-
-#: tformmessages.listview1.columns[0].caption
-msgctxt "tformmessages.listview1.columns[0].caption"
-msgid "File"
-msgstr "Soubor"
-
-#: tformmessages.listview1.columns[1].caption
-msgctxt "tformmessages.listview1.columns[1].caption"
-msgid "Position"
-msgstr "Pozice"
-
-#: tformmessages.listview1.columns[2].caption
-msgctxt "tformmessages.listview1.columns[2].caption"
-msgid "Message"
-msgstr "Zpráva"
-
-#: tformoptions.buttoncancel.caption
-msgctxt "tformoptions.buttoncancel.caption"
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: tformoptions.buttonok.caption
-msgctxt "tformoptions.buttonok.caption"
-msgid "Ok"
-msgstr "Ok"
-
-#: tformoptions.caption
-msgctxt "tformoptions.caption"
-msgid "Options"
-msgstr "Volby"
-
-#: tformoptions.checkboxreopenproject.caption
-msgid "Reopen last opened project"
-msgstr "Znovuotevřít  naposledy otevřený projekt"
-
-#: tformoptions.label3.caption
-msgid "Interface language:"
-msgstr "Jazyk rozhraní:"
-
-#: tformproducers.caption
-msgctxt "tformproducers.caption"
-msgid "Producers"
-msgstr "Tvůrci"
-
-#: tformproducers.listview1.columns[0].caption
-msgctxt "tformproducers.listview1.columns[0].caption"
-msgid "Name"
-msgstr "Jméno"
-
-#: tformproducers.listview1.columns[1].caption
-msgctxt "tformproducers.listview1.columns[1].caption"
-msgid "Execution path"
-msgstr "Cesta vykonání"
-
 #: tformproject.aadd.caption
 msgid "Add"
-msgstr "Přidat"
+msgstr ""
 
 #: tformproject.adelete.caption
 msgid "Delete"
-msgstr "Smazat"
+msgstr ""
 
 #: tformproject.arename.caption
 msgid "Rename"
-msgstr "Přejmenovat"
+msgstr ""
 
 #: tformproject.ashow.caption
 msgid "Show"
-msgstr "Ukázat"
+msgstr ""
 
 #: tformproject.caption
+#, fuzzy
 msgctxt "tformproject.caption"
 msgid "Project manager"
 msgstr "Správce projektu"
 
-#: tformprojectnew.buttoncancel.caption
-msgctxt "tformprojectnew.buttoncancel.caption"
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: tformprojectnew.buttonok.caption
-msgctxt "tformprojectnew.buttonok.caption"
-msgid "Ok"
-msgstr "Ok"
-
-#: tformprojectnew.caption
-msgid "New item"
-msgstr "Nová položka"
-
-#: tformsourcecode.caption
-msgctxt "tformsourcecode.caption"
-msgid "Source code"
-msgstr "Zdrojový kód"
-
 #: tformtargetcode.caption
+#, fuzzy
 msgctxt "tformtargetcode.caption"
 msgid "Target code"
 msgstr "Cílový kód"
 
-#: tformtargetoptions.button1.caption
-msgctxt "tformtargetoptions.button1.caption"
-msgid "Ok"
-msgstr "Ok"
-
-#: tformtargetoptions.button2.caption
-msgctxt "tformtargetoptions.button2.caption"
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: tformtargetoptions.buttonexecutorselect.caption
-msgctxt "tformtargetoptions.buttonexecutorselect.caption"
-msgid "Select..."
-msgstr "Výběr..."
-
-#: tformtargetoptions.buttonproducerselect.caption
-msgctxt "tformtargetoptions.buttonproducerselect.caption"
-msgid "Select..."
-msgstr "Výběr..."
-
-#: tformtargetoptions.caption
-msgctxt "tformtargetoptions.caption"
-msgid "Target options"
-msgstr "Volby cíle"
-
-#: tformtargetoptions.label1.caption
-msgid "Name:"
-msgstr "Jméno:"
-
-#: tformtargetoptions.label2.caption
-msgctxt "tformtargetoptions.label2.caption"
-msgid "Compiler path:"
-msgstr "Cesta překladače:"
-
-#: tformtargetoptions.label3.caption
-msgid "Executor path:"
-msgstr "Cesta vykonávače:"
-
-#: tformtargetoptions.labelname.caption
-msgid "    "
-msgstr "   "
-
-#: tformtargetproject.caption
-msgid "FormTargetProject"
-msgstr ""
-
 #: tformtargets.atargetoptions.caption
+#, fuzzy
 msgctxt "tformtargets.atargetoptions.caption"
 msgid "Options"
@@ -494 +330 @@
 
 #: tformtargets.atargetoptions.hint
-msgctxt "tformtargets.atargetoptions.hint"
 msgid "Target options"
-msgstr "Volby cíle"
+msgstr ""
 
 #: tformtargets.caption
+#, fuzzy
 msgctxt "tformtargets.caption"
 msgid "Targets"
@@ -504 +340 @@
 
 #: tformtargets.listview1.columns[0].caption
-msgctxt "tformtargets.listview1.columns[0].caption"
 msgid "Name"
-msgstr "Jméno"
+msgstr ""
 
 #: tformtargets.listview1.columns[1].caption
-#| msgid "Execution path"
+#, fuzzy
 msgctxt "tformtargets.listview1.columns[1].caption"
 msgid "Compiler path"
@@ -516 +351 @@
 #: tformtargets.listview1.columns[2].caption
 msgid "Executor path"
-msgstr "Cesta vykonávače"
-
-#: tmainform.aabout.caption
-msgctxt "tmainform.aabout.caption"
-msgid "About..."
-msgstr "O aplikaci..."
-
-#: tmainform.abuild.caption
-msgctxt "tmainform.abuild.caption"
-msgid "Build"
-msgstr "Sestavit"
-
-#: tmainform.aexit.caption
-msgctxt "tmainform.aexit.caption"
-msgid "Exit"
-msgstr "Ukončit"
-
-#: tmainform.ahomepage.caption
-msgctxt "tmainform.ahomepage.caption"
-msgid "Homepage"
-msgstr "Domovská stránka"
-
-#: tmainform.apause.caption
-msgctxt "tmainform.apause.caption"
-msgid "Pause"
-msgstr "Pozastavit"
-
-#: tmainform.aprojectclose.caption
-msgctxt "tmainform.aprojectclose.caption"
-msgid "Close"
-msgstr "Zavřít"
-
-#: tmainform.aprojectnew.caption
-msgctxt "tmainform.aprojectnew.caption"
-msgid "New"
-msgstr "Nový"
-
-#: tmainform.aprojectnew.hint
-msgctxt "tmainform.aprojectnew.hint"
-msgid "Create new project"
-msgstr "Vytvořit nový projekt"
-
-#: tmainform.aprojectopen.caption
-msgctxt "tmainform.aprojectopen.caption"
-msgid "Open..."
-msgstr "Otevřít..."
-
-#: tmainform.aprojectopen.hint
-msgctxt "tmainform.aprojectopen.hint"
-msgid "Open project"
-msgstr "Otevřít projekt"
-
-#: tmainform.aprojectsave.caption
-msgctxt "tmainform.aprojectsave.caption"
-msgid "Save"
-msgstr "Uložit"
-
-#: tmainform.aprojectsave.hint
-msgctxt "tmainform.aprojectsave.hint"
-msgid "Save project to disk"
-msgstr "Uložit projekt na disk"
-
-#: tmainform.aprojectsaveas.caption
-msgctxt "tmainform.aprojectsaveas.caption"
-msgid "Save as..."
-msgstr "Uložit jako..."
-
-#: tmainform.aprojectsaveas.hint
-msgctxt "tmainform.aprojectsaveas.hint"
-msgid "Save project with custom name"
-msgstr "Uložit projekt s vlastním jménem"
-
-#: tmainform.areset.caption
-msgctxt "tmainform.areset.caption"
-msgid "Reset"
-msgstr "Vynulovat"
-
-#: tmainform.arun.caption
-msgctxt "tmainform.arun.caption"
-msgid "Run"
-msgstr "Spustit"
-
-#: tmainform.aruntocursor.caption
-msgctxt "tmainform.aruntocursor.caption"
-msgid "Run to cursor"
-msgstr "Spustit po ukazatel"
-
-#: tmainform.astepin.caption
-msgctxt "tmainform.astepin.caption"
-msgid "Step in"
-msgstr "Vejít do"
-
-#: tmainform.astepout.caption
-msgctxt "tmainform.astepout.caption"
-msgid "Step out"
-msgstr "Vyjít ven"
-
-#: tmainform.astepover.caption
-msgctxt "tmainform.astepover.caption"
-msgid "Step over"
-msgstr "Přejít přes"
-
-#: tmainform.astop.caption
-msgctxt "tmainform.astop.caption"
-msgid "Stop"
-msgstr "Zastavit"
-
-#: tmainform.aviewcodetree.caption
-msgctxt "tmainform.aviewcodetree.caption"
-msgid "Code tree"
-msgstr "Strom kódu"
-
-#: tmainform.aviewcompiledsoruce.caption
-msgctxt "tmainform.aviewcompiledsoruce.caption"
-msgid "Compiled source"
-msgstr "Přeložený zdroj"
-
-#: tmainform.aviewmessages.caption
-msgctxt "tmainform.aviewmessages.caption"
-msgid "Messages"
-msgstr "Zprávy"
-
-#: tmainform.aviewobjectinspector.caption
-msgctxt "tmainform.aviewobjectinspector.caption"
-msgid "Object inspector"
-msgstr "Inspektor objektů"
-
-#: tmainform.aviewoptions.caption
-msgctxt "tmainform.aviewoptions.caption"
-msgid "Options"
-msgstr "Volby"
-
-#: tmainform.aviewproject.caption
-msgctxt "tmainform.aviewproject.caption"
-msgid "Project manager"
-msgstr "Správce projektu"
-
-#: tmainform.aviewsourceeditor.caption
-msgctxt "tmainform.aviewsourceeditor.caption"
-msgid "Source editor"
-msgstr "Zdrojový editor"
-
-#: tmainform.aviewtargets.caption
-msgctxt "tmainform.aviewtargets.caption"
-msgid "Targets"
-msgstr "Cíle"
-
-#: tmainform.caption
-msgctxt "tmainform.caption"
-msgid "Transpascal IDE"
-msgstr "Transpascal IDE"
-
-#: tmainform.menuitem1.caption
-msgctxt "tmainform.menuitem1.caption"
-msgid "Project"
-msgstr "Projekt"
-
-#: tmainform.menuitem12.caption
-msgctxt "tmainform.menuitem12.caption"
-msgid "-"
-msgstr "-"
-
-#: tmainform.menuitem15.caption
-msgctxt "tmainform.menuitem15.caption"
-msgid "View"
-msgstr "Zobrazit"
-
-#: tmainform.menuitem22.caption
-msgctxt "tmainform.menuitem22.caption"
-msgid "-"
-msgstr "-"
-
-#: tmainform.menuitem27.caption
-msgctxt "tmainform.menuitem27.caption"
-msgid "-"
-msgstr "-"
-
-#: tmainform.menuitem7.caption
-msgctxt "tmainform.menuitem7.caption"
-msgid "Run"
-msgstr "Spustit"
-
-#: tmainform.menuitem9.caption
-msgctxt "tmainform.menuitem9.caption"
-msgid "Help"
-msgstr "Nápověda"
-
-#: tmainform.menuitemopenrecent.caption
-msgctxt "tmainform.menuitemopenrecent.caption"
-msgid "Open recent"
-msgstr "Otevřít nedávné"
-
-#: tmainform.menuitemproducer.caption
-#| msgid "Producer"
-msgctxt "tmainform.menuitemproducer.caption"
-msgid "Target"
-msgstr "Cíl"
-
-#: tmainform.tabsheetbreakpoints.caption
-msgctxt "tmainform.tabsheetbreakpoints.caption"
-msgid "Breakpoints"
-msgstr "Body zastavení"
-
-#: tmainform.tabsheetcodetree.caption
-msgctxt "tmainform.tabsheetcodetree.caption"
-msgid "Code Tree"
-msgstr "Strom kódu"
-
-#: tmainform.tabsheetcompiledproject.caption
-msgctxt "tmainform.tabsheetcompiledproject.caption"
-msgid "Target project"
-msgstr "Cílový projekt"
-
-#: tmainform.tabsheetmessages.caption
-msgctxt "tmainform.tabsheetmessages.caption"
-msgid "Messages"
-msgstr "Zprávy"
-
-#: tmainform.tabsheetproject.caption
-msgctxt "tmainform.tabsheetproject.caption"
-msgid "Project"
-msgstr "Projekt"
-
-#: tmainform.tabsheetsource.caption
-msgctxt "tmainform.tabsheetsource.caption"
-msgid "Source code"
-msgstr "Zdrojový kód"
-
-#: tmainform.tabsheettarget.caption
-msgctxt "tmainform.tabsheettarget.caption"
-msgid "Target code"
-msgstr "Cílový kód"
-
-#: tmessagesform.caption
-msgctxt "tmessagesform.caption"
-msgid "Messages"
-msgstr "Zprávy"
-
-#: tmessagesform.listview1.columns[0].caption
-msgctxt "tmessagesform.listview1.columns[0].caption"
-msgid "File"
-msgstr "Soubor"
-
-#: tmessagesform.listview1.columns[1].caption
-msgctxt "tmessagesform.listview1.columns[1].caption"
-msgid "Position"
-msgstr "Pozice"
-
-#: tmessagesform.listview1.columns[2].caption
-msgctxt "tmessagesform.listview1.columns[2].caption"
-msgid "Message"
-msgstr "Zpráva"
-
-#: tprojectmanager.caption
-msgctxt "tprojectmanager.caption"
-msgid "Project manager"
-msgstr "Správce projektu"
-
-#: uaboutform.sapplicationname
-msgctxt "uaboutform.sapplicationname"
-msgid "Application name"
-msgstr "Jméno aplikace"
-
-#: uaboutform.semail
-msgctxt "uaboutform.semail"
-msgid "E-mail"
-msgstr "E-mail"
-
-#: uaboutform.smanufacturer
-msgctxt "uaboutform.smanufacturer"
-msgid "Company"
-msgstr "Společnost"
-
-#: uaboutform.sreleasedate
-msgctxt "uaboutform.sreleasedate"
-msgid "Release date"
-msgstr "Datum uvolnění"
-
-#: uaboutform.sversion
-msgctxt "uaboutform.sversion"
-msgid "Version"
-msgstr "Verze"
-
-#: ucompilersform.scompileroptions
-msgctxt "ucompilersform.scompileroptions"
-msgid "Compiler options"
-msgstr "Volby překladače"
-
-#: ucompilersform.scompilerpath
-msgctxt "ucompilersform.scompilerpath"
-msgid "Compiler path"
-msgstr "Cesta překladače"
-
-#: uformabout.sapplicationname
-msgctxt "uformabout.sapplicationname"
-msgid "Application name"
-msgstr "Jméno aplikace"
-
-#: uformabout.semail
-msgctxt "uformabout.semail"
-msgid "E-mail"
-msgstr "E-mail"
-
-#: uformabout.smanufacturer
-msgctxt "uformabout.smanufacturer"
-msgid "Company"
-msgstr "Společnost"
-
-#: uformabout.sreleasedate
-msgctxt "uformabout.sreleasedate"
-msgid "Release date"
-msgstr "Datum uvolnění"
-
-#: uformabout.sversion
-msgctxt "uformabout.sversion"
-msgid "Version"
-msgstr "Verze"
-
-#: uformmain.sbuildfinished
-msgid "Build finished in %s seconds"
-msgstr ""
-
-#: uformproject.senternewfilename
-msgid "Enter new file name"
-msgstr "Zadejte nové jméno souboru"
-
-#: uformproject.srenamesourcefile
-msgid "Rename source file"
-msgstr "Přejmenování zdrojového souboru"
-
-#: uformtargets.scompileroptions
-msgctxt "uformtargets.scompileroptions"
-msgid "Compiler options"
-msgstr "Volby překladače"
-
-#: uformtargets.scompilerpath
-msgctxt "uformtargets.scompilerpath"
-msgid "Compiler path"
-msgstr "Cesta překladače"
-
-#: umainform.snewproject
-msgctxt "umainform.snewproject"
-msgid "New project"
-msgstr "Nový projekt"
-
-#: uproject.snewproject
-msgctxt "uproject.snewproject"
-msgid "New project"
-msgstr "Nový projekt"
-
-#: uprojecttemplates.sconsoleapplication
-msgid "Console application"
-msgstr "Konzolová aplikace"
-
-#: uprojecttemplates.sguiapplication
-msgid "GUI application"
-msgstr "GUI aplikace"
-
-#: uprojecttemplates.spackage
-msgid "Package"
-msgstr "Balíček"
-
-#: uprojecttemplates.sunit
-msgid "Unit"
-msgstr "Jednotka"
-
+msgstr ""
+

trunk/IDE/Modules/Pascal/IDEModulePascal.pas

@@ -1 @@
-unit UIDEModulePascal;
-
-{$mode delphi}
+unit IDEModulePascal;
 
 interface
 
 uses
-  Classes, SysUtils, UModularSystem;
+  Classes, SysUtils, ModularSystem;
 
 type
@@ -23 +21 @@
 begin
   inherited;
-  Name := 'Pascal';
+  Identification := 'Pascal';
   Title := 'Pascal';
   Version := '0.1';

trunk/IDE/Project.pas

@@ -1 @@
-unit UProject;
-
-{$mode Delphi}{$H+}
+unit Project;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, Dialogs, DOM, XMLWrite, XMLRead, FileUtil,
-  SpecializedList;
+  Generics.Collections;
 
 const
@@ -19 +17 @@
   end;
 
-  { TProjectPackageList }
-
-  TProjectPackageList = class(TListObject)
+  { TProjectPackages }
+
+  TProjectPackages = class(TObjectList<TProjectPackage>)
     Parent: TProject;
     procedure Load;
@@ -33 +31 @@
   end;
 
-  TProjectBuildConfigList = class(TListObject)
+  TProjectBuildConfigs = class(TObjectList<TProjectBuildConfig>)
   end;
 
@@ -57 +55 @@
   end;
 
-  { TProjectFileList }
-
-  TProjectFileList = class(TListObject)
+  { TProjectFiles }
+
+  TProjectFiles = class(TObjectList<TProjectFile>)
     Parent: TProject;
-    procedure DumpFileList(Files: TListString);
-    procedure LoadFromList(Files: TListString);
+    procedure DumpFileList(Files: TStringList);
+    procedure LoadFromList(Files: TStringList);
     procedure Load;
     procedure Save;
@@ -78 +76 @@
   public
     FileName: string;
-    Files: TProjectFileList;
-    Packages: TProjectPackageList;
-    BuildConfigs: TProjectBuildConfigList;
+    Files: TProjectFiles;
+    Packages: TProjectPackages;
+    BuildConfigs: TProjectBuildConfigs;
     MainSource: TProjectFile;
     procedure LoadFromFile(FileName: string);
@@ -104 +102 @@
   end;
 
-  { TProjectTemplateList }
-
-  TProjectTemplateList = class(TListObject)
+  { TProjectTemplates }
+
+  TProjectTemplates = class(TObjectList<TProjectTemplate>)
     procedure AddTemplate(Template: TProjectTemplate);
   end;
@@ -113 +111 @@
   SNewProject = 'New project';
 
+
 implementation
 
-{ TProjectTemplateList }
-
-procedure TProjectTemplateList.AddTemplate(Template: TProjectTemplate);
+{ TProjectTemplates }
+
+procedure TProjectTemplates.AddTemplate(Template: TProjectTemplate);
 begin
   Add(Template);
@@ -136 +135 @@
 destructor TProjectTemplate.Destroy;
 begin
-  Description.Free;
-  inherited Destroy;
-end;
-
-{ TProjectPackageList }
-
-procedure TProjectPackageList.Load;
-begin
-
-end;
-
-procedure TProjectPackageList.Save;
-begin
-
-end;
-
-procedure TProjectPackageList.SaveToXMLNode(Node: TDOMNode);
-begin
-
-end;
-
-procedure TProjectPackageList.LoadFromXMLNode(Node: TDOMNode);
-begin
-
+  FreeAndNil(Description);
+  inherited;
+end;
+
+{ TProjectPackages }
+
+procedure TProjectPackages.Load;
+begin
+end;
+
+procedure TProjectPackages.Save;
+begin
+end;
+
+procedure TProjectPackages.SaveToXMLNode(Node: TDOMNode);
+begin
+end;
+
+procedure TProjectPackages.LoadFromXMLNode(Node: TDOMNode);
+begin
 end;
 
 { TProjectGroup }
 
-procedure TProjectFileList.DumpFileList(Files: TListString);
+procedure TProjectFiles.DumpFileList(Files: TStringList);
 var
   I: Integer;
@@ -173 +168 @@
 end;
 
-procedure TProjectFileList.LoadFromList(Files: TListString);
+procedure TProjectFiles.LoadFromList(Files: TStringList);
 var
   I: Integer;
@@ -190 +185 @@
 end;
 
-procedure TProjectFileList.Load;
+procedure TProjectFiles.Load;
 var
   I: Integer;
@@ -198 +193 @@
 end;
 
-procedure TProjectFileList.Save;
+procedure TProjectFiles.Save;
 var
   I: Integer;
@@ -206 +201 @@
 end;
 
-procedure TProjectFileList.SaveToXMLNode(Node: TDOMNode);
+procedure TProjectFiles.SaveToXMLNode(Node: TDOMNode);
 var
   I: Integer;
@@ -219 +214 @@
 end;
 
-procedure TProjectFileList.LoadFromXMLNode(Node: TDOMNode);
+procedure TProjectFiles.LoadFromXMLNode(Node: TDOMNode);
 var
   NewNode: TDomNode;
@@ -236 +231 @@
 end;
 
-function TProjectFileList.SearchFile(FileName: string): TProjectFile;
+function TProjectFiles.SearchFile(FileName: string): TProjectFile;
 var
   I: Integer;
@@ -250 +245 @@
 end;
 
-function TProjectFileList.AddFile(FileName: string): TProjectFile;
-begin
-  Result := TProjectFile(AddNew(TProjectFile.Create));
+function TProjectFiles.AddFile(FileName: string): TProjectFile;
+begin
+  Result := TProjectFile.Create;
   Result.Parent := Parent;
   Result.FileName := FileName;
+  Add(Result);
 end;
 
@@ -278 +274 @@
 destructor TProjectFile.Destroy;
 begin
-  Source.Free;
-  inherited Destroy;
+  FreeAndNil(Source);
+  inherited;
 end;
 
@@ -419 +415 @@
 constructor TProject.Create;
 begin
-  Files := TProjectFileList.Create;
+  Files := TProjectFiles.Create;
   Files.Parent := Self;
-  Packages := TProjectPackageList.Create;
+  Packages := TProjectPackages.Create;
   Packages.Parent := Self;
 end;
@@ -427 +423 @@
 destructor TProject.Destroy;
 begin
-  Files.Free;
-  Packages.Free;
-  BuildConfigs.Free;
-  inherited Destroy;
+  FreeAndNil(Files);
+  FreeAndNil(Packages);
+  FreeAndNil(BuildConfigs);
+  inherited;
 end;
 

trunk/IDE/ProjectTemplates.pas

@@ -1 @@
-unit UProjectTemplates;
-
-{$mode delphi}
+unit ProjectTemplates;
 
 interface
 
 uses
-  Classes, SysUtils, UProject;
+  Classes, SysUtils, Project;
 
 type

trunk/IDE/TextSource.pas

@@ -1 @@
-unit UTextSource;
-
-{$MODE Delphi}
+unit TextSource;
 
 interface

trunk/IDE/Transpascal.lpi

@@ -2 +2 @@
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="Transpascal IDE"/>
       <ResourceType Value="res"/>
@@ -68 +70 @@
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="8">
+    <RequiredPackages Count="6">
       <Item1>
         <PackageName Value="ModularSystem"/>
@@ -89 +89 @@
       </Item2>
       <Item3>
-        <PackageName Value="CoolTranslator"/>
-        <DefaultFilename Value="..\Packages\CoolTranslator\CoolTranslator.lpk" Prefer="True"/>
+        <PackageName Value="LCLBase"/>
+        <MinVersion Major="1" Release="1" Valid="True"/>
       </Item3>
       <Item4>
-        <PackageName Value="LCLBase"/>
-        <MinVersion Major="1" Release="1" Valid="True"/>
+        <PackageName Value="TranspascalCompiler"/>
+        <DefaultFilename Value="..\Compiler\TranspascalCompiler.lpk" Prefer="True"/>
       </Item4>
       <Item5>
-        <PackageName Value="TemplateGenerics"/>
-        <DefaultFilename Value="..\Packages\TemplateGenerics\TemplateGenerics.lpk" Prefer="True"/>
+        <PackageName Value="SynEdit"/>
+        <MinVersion Major="1" Valid="True"/>
       </Item5>
       <Item6>
-        <PackageName Value="TranspascalCompiler"/>
-        <DefaultFilename Value="..\Compiler\TranspascalCompiler.lpk" Prefer="True"/>
+        <PackageName Value="LCL"/>
       </Item6>
-      <Item7>
-        <PackageName Value="SynEdit"/>
-        <MinVersion Major="1" Valid="True"/>
-      </Item7>
-      <Item8>
-        <PackageName Value="LCL"/>
-      </Item8>
     </RequiredPackages>
-    <Units Count="20">
+    <Units Count="19">
       <Unit0>
         <Filename Value="Transpascal.lpr"/>
@@ -118 +110 @@
       </Unit0>
       <Unit1>
-        <Filename Value="Forms\UFormMain.pas"/>
+        <Filename Value="Forms\FormMain.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormMain"/>
@@ -125 +117 @@
       </Unit1>
       <Unit2>
-        <Filename Value="UTextSource.pas"/>
+        <Filename Value="TextSource.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit2>
       <Unit3>
-        <Filename Value="UProject.pas"/>
+        <Filename Value="Project.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit3>
       <Unit4>
-        <Filename Value="Forms\UFormProject.pas"/>
+        <Filename Value="Forms\FormProject.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormProject"/>
@@ -140 +132 @@
       </Unit4>
       <Unit5>
-        <Filename Value="Forms\UFormSourceCode.pas"/>
+        <Filename Value="Forms\FormSourceCode.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormSourceCode"/>
@@ -147 +139 @@
       </Unit5>
       <Unit6>
-        <Filename Value="Forms\UFormMessages.pas"/>
+        <Filename Value="Forms\FormMessages.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormMessages"/>
@@ -154 +146 @@
       </Unit6>
       <Unit7>
-        <Filename Value="Forms\UFormTargetCode.pas"/>
+        <Filename Value="Forms\FormTargetCode.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormTargetCode"/>
@@ -161 +153 @@
       </Unit7>
       <Unit8>
-        <Filename Value="Forms\UFormCodeTree.pas"/>
+        <Filename Value="Forms\FormCodeTree.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormCodeTree"/>
@@ -168 +160 @@
       </Unit8>
       <Unit9>
-        <Filename Value="Forms\UFormAbout.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="FormAbout"/>
+        <Filename Value="Forms\FormOptions.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormOptions"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit9>
       <Unit10>
-        <Filename Value="Forms\UFormOptions.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="FormOptions"/>
+        <Filename Value="Forms\FormTargets.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormTargets"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit10>
       <Unit11>
-        <Filename Value="Forms\UFormTargets.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="FormTargets"/>
+        <Filename Value="Forms\FormProjectNew.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormProjectNew"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit11>
       <Unit12>
-        <Filename Value="Forms\UFormProjectNew.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="FormProjectNew"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
+        <Filename Value="ProjectTemplates.pas"/>
+        <IsPartOfProject Value="True"/>
       </Unit12>
       <Unit13>
-        <Filename Value="UProjectTemplates.pas"/>
-        <IsPartOfProject Value="True"/>
+        <Filename Value="Forms\FormTargetProject.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormTargetProject"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit13>
       <Unit14>
-        <Filename Value="Forms\UFormTargetProject.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="FormTargetProject"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
+        <Filename Value="Core.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="Core"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="DataModule"/>
       </Unit14>
       <Unit15>
-        <Filename Value="UCore.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="Core"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="DataModule"/>
+        <Filename Value="Forms\FormTargetOptions.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormTargetOptions"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit15>
       <Unit16>
-        <Filename Value="Forms\UFormTargetOptions.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="FormTargetOptions"/>
+        <Filename Value="Forms\FormExternalProducerOutput.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormExternalProducerOutput"/>
         <ResourceBaseClass Value="Form"/>
       </Unit16>
       <Unit17>
-        <Filename Value="Forms\UFormExternalProducerOutput.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="FormExternalProducerOutput"/>
-        <ResourceBaseClass Value="Form"/>
+        <Filename Value="Notes.txt"/>
+        <IsPartOfProject Value="True"/>
       </Unit17>
       <Unit18>
-        <Filename Value="Notes.txt"/>
+        <Filename Value="Modules\Pascal\IDEModulePascal.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit18>
-      <Unit19>
-        <Filename Value="Modules\Pascal\UIDEModulePascal.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit19>
     </Units>
   </ProjectOptions>
@@ -266 +251 @@
     <Linking>
       <Debugging>
+        <DebugInfoType Value="dsDwarf3"/>
         <UseHeaptrc Value="True"/>
         <UseExternalDbgSyms Value="True"/>

trunk/IDE/Transpascal.lpr

@@ -8 +8 @@
   {$ENDIF}{$ENDIF}
   Forms, Interfaces, SysUtils,
-  UFormMain {MainForm},
-  UTextSource, UProject, TranspascalCompiler, UFormProject,
-UFormSourceCode, UFormMessages,
-  UFormTargetCode, UFormCodeTree, TemplateGenerics, CoolTranslator, Common,
-  UFormAbout, UFormOptions, UFormTargets,
-UFormProjectNew, UProjectTemplates, UFormTargetProject, UCore,
-UFormTargetOptions, UFormExternalProducerOutput, UIDEModulePascal;
+  FormMain {MainForm},
+  TextSource, Project, TranspascalCompiler, FormProject,
+  FormSourceCode, FormMessages,
+  FormTargetCode, FormCodeTree, Common,
+  FormOptions, FormTargets,
+  FormProjectNew, ProjectTemplates, FormTargetProject, Core,
+  FormTargetOptions, FormExternalProducerOutput, IDEModulePascal;
 
 {$R *.res}
@@ -24 +24 @@
 
 begin
-  Application.Title := 'Transpascal IDE';
+  Application.Title:='Transpascal IDE';
   {$IFDEF DEBUG}
   // Heap trace
@@ -32 +32 @@
 
   Application.Initialize;
-  Application.CreateForm(TCore, Core);
-  Application.CreateForm(TFormMain, FormMain);
-  Application.CreateForm(TFormProject, FormProject);
-  Application.CreateForm(TFormSourceCode, FormSourceCode);
-  Application.CreateForm(TFormMessages, FormMessages);
-  Application.CreateForm(TFormTargetCode, FormTargetCode);
-  Application.CreateForm(TFormCodeTree, FormCodeTree);
-  Application.CreateForm(TFormAbout, FormAbout);
-  Application.CreateForm(TFormOptions, FormOptions);
-  Application.CreateForm(TFormTargets, FormTargets);
-  Application.CreateForm(TFormProjectNew, FormProjectNew);
-  Application.CreateForm(TFormTargetProject, FormTargetProject);
-  Application.CreateForm(TFormTargetOptions, FormTargetOptions);
-  Application.CreateForm(TFormExternalProducerOutput, FormExternalProducerOutput
-    );
+  Application.CreateForm(TCore, Core.Core);
+  Application.CreateForm(TFormMain, FormMain.FormMain);
   Application.Run;
 end.

trunk/IDE/UProducerTreeView.pas

@@ -1 +1 @@
 unit UProducerTreeView;
 
-{$mode Delphi}{$H+}
-
 interface
 
 uses
-  Classes, SysUtils, USourceCode, ComCtrls, UProducer, StrUtils;
+  Classes, SysUtils, SourceCode, ComCtrls, Producer, StrUtils;
 
 type