create action for edit shape, fix hotspot tool update, sort toolbox

lazpaint/image/uimage.pas

@@ -58,6 +58,7 @@ type
     FDraftOriginal: boolean;
 
     procedure DiscardSelectionLayerAfterMask;
+    function GetIsCursor: boolean;
     function GetIsIconCursor: boolean;
     function GetIsTiff: boolean;
     function GetIsGif: boolean;
@@ -257,6 +258,7 @@ type
     property ZoomFactor: single read GetZoomFactor;
     property DraftOriginal: boolean read FDraftOriginal write SetDraftOriginal;
     property IsIconCursor: boolean read GetIsIconCursor;
+    property IsCursor: boolean read GetIsCursor;
     property IsTiff: boolean read GetIsTiff;
     property IsGif: boolean read GetIsGif;
     constructor Create;
@@ -1191,6 +1193,11 @@ begin
   end;
 end;
 
+function TLazPaintImage.GetIsCursor: boolean;
+begin
+  result := UTF8CompareText(ExtractFileExt(currentFilenameUTF8),'.cur')=0;
+end;
+
 function TLazPaintImage.GetIsIconCursor: boolean;
 begin
   result := SuggestImageFormat(currentFilenameUTF8) in [ifIco,ifCur];

lazpaint/lazpaintinstance.pas

@@ -420,6 +420,7 @@ begin
 
   //needed to attach to the right instance of FMain
   FToolbox.AddButton(FToolbox.Toolbar1, FMain.ToolHand);
+  FToolbox.AddButton(FToolbox.Toolbar1, FMain.ToolColorPicker);
   FToolbox.AddButton(FToolbox.Toolbar1, FMain.ToolPen);
   FToolbox.AddButton(FToolbox.Toolbar1, FMain.ToolBrush);
   FToolbox.AddButton(FToolbox.Toolbar1, FMain.ToolEraser);
@@ -432,20 +433,23 @@ begin
   FToolbox.AddButton(FToolbox.Toolbar2, FMain.ToolSpline);
   FToolbox.AddButton(FToolbox.Toolbar2, FMain.ToolGradient);
   FToolbox.AddButton(FToolbox.Toolbar2, FMain.ToolPhong);
-
-  FToolbox.AddButton(FToolbox.Toolbar3, FMain.ToolSelectRect);
-  FToolbox.AddButton(FToolbox.Toolbar3, FMain.ToolSelectEllipse);
-  FToolbox.AddButton(FToolbox.Toolbar3, FMain.ToolSelectPoly);
-  FToolbox.AddButton(FToolbox.Toolbar3, FMain.ToolSelectSpline);
-  FToolbox.AddButton(FToolbox.Toolbar3, FMain.ToolSelectPen);
-  FToolbox.AddButton(FToolbox.Toolbar3, FMain.ToolText);
-
-  FToolbox.AddButton(FToolbox.Toolbar4, FMain.ToolColorPicker);
+  FToolbox.AddButton(FToolbox.Toolbar2, FMain.ToolText);
+
+  FToolbox.AddButton(FToolbox.Toolbar3, FMain.ToolEditShape);
+  FToolbox.AddButton(FToolbox.Toolbar3, FMain.ToolDeformation);
+  FToolbox.AddButton(FToolbox.Toolbar3, FMain.ToolTextureMapping);
+  FToolbox.AddButton(FToolbox.Toolbar3, FMain.EditSelectAll);
+  FToolbox.AddButton(FToolbox.Toolbar3, FMain.ToolMoveSelection);
+  FToolbox.AddButton(FToolbox.Toolbar3, FMain.ToolRotateSelection);
+  FToolbox.AddButton(FToolbox.Toolbar3, FMain.EditDeselect);
+
+  FToolbox.AddButton(FToolbox.Toolbar4, FMain.ToolSelectRect);
+  FToolbox.AddButton(FToolbox.Toolbar4, FMain.ToolSelectEllipse);
+  FToolbox.AddButton(FToolbox.Toolbar4, FMain.ToolSelectPoly);
+  FToolbox.AddButton(FToolbox.Toolbar4, FMain.ToolSelectSpline);
+  FToolbox.AddButton(FToolbox.Toolbar4, FMain.ToolSelectPen);
   FToolbox.AddButton(FToolbox.Toolbar4, FMain.ToolMagicWand);
-  FToolbox.AddButton(FToolbox.Toolbar4, FMain.ToolMoveSelection);
-  FToolbox.AddButton(FToolbox.Toolbar4, FMain.ToolRotateSelection);
-  FToolbox.AddButton(FToolbox.Toolbar4, FMain.ToolDeformation);
-  FToolbox.AddButton(FToolbox.Toolbar4, FMain.ToolTextureMapping);
+  FToolbox.AddButton(FToolbox.Toolbar4, FMain.ToolHotSpot);
 
   FToolBox.SetImages(Icons[Config.DefaultIconSize(DoScaleX(20,OriginalDPI))]);
 
@@ -459,6 +463,7 @@ begin
   FMain.Layout.DockedToolBoxAddButton(FMain.ToolFloodfill);
   FMain.Layout.DockedToolBoxAddButton(FMain.ToolClone);
 
+  FMain.Layout.DockedToolBoxAddButton(FMain.ToolEditShape);
   FMain.Layout.DockedToolBoxAddButton(FMain.ToolRect);
   FMain.Layout.DockedToolBoxAddButton(FMain.ToolEllipse);
   FMain.Layout.DockedToolBoxAddButton(FMain.ToolPolygon);

lazpaint/lazpaintmainform.lfm

@@ -3641,7 +3641,7 @@ object FMain: TFMain
     left = 48
     top = 672
     Bitmap = {
-      4C697D0000001000000010000000FFFFFF00B6B6B6FFB6B6B6FFB6B6B6FFB6B6
+      4C697E0000001000000010000000FFFFFF00B6B6B6FFB6B6B6FFB6B6B6FFB6B6
       B6FFB6B6B6FFB6B6B6FFB6B6B6FFB6B6B6FFB6B6B6FFB6B6B6EFB6B6B6300000
       000000000000FFFFFF00FFFFFF00FFFFFF00B6B6B6FFFFFFFFFFFFFFFFFFFFFF
       FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB6B6B6FFDDDDDDFFB6B6B6EFB6B6
@@ -7641,7 +7641,39 @@ object FMain: TFMain
       FEFF48EEFEFF48EEFEFF48EEFEFF96BA6CFF96BA6CFF96BA6CFF96BA6CFFFEFF
       B4FFFEFFB4FFFEFFB4FFA2A373FF8A8AA6008585A0FF8585A0FF8585A0FF2E98
       A2FF2E98A2FF2E98A2FF2E98A2FF607745FF607745FF607745FF607745FFA2A3
-      73FFA2A373FFA2A373FFA8A977FF
+      73FFA2A373FFA2A373FFA8A977FF354E54B0476870CD476870CD476870CD4768
+      70CD476870CD476870CD476870CD476870CD476870CD354E54B0000000060000
+      0000000000000000000000000000476870CD9AE2F4FF9DE8F9FF9DE8F9FF9DE8
+      F9FF9DE8F9FF9DE8F9FF9DE8F9FF9DE8F9FF9AE2F4FF476870CD0000000A0000
+      0000000000000000000000000000476870CD9DE8F9FFA1EDFFFFA1EDFFFF9FEA
+      FCFF598089FF98E0F2FFA1EDFFFFA1EDFFFF9DE8F9FF476870CD0000000A0000
+      0000000000000000000000000000476870CD9DE8F9FFA1EDFFFFA1EDFFFF96DD
+      EEFF000000FF404E52FF98E0F2FFA1EDFFFF9DE8F9FF476870CD0000000A0000
+      0000000000000000000000000000476870CD9DE8F9FFA1EDFFFFA1EDFFFF95DC
+      EDFF0A0A0AFF838585FF404E52FF98E0F2FF9DE8F9FF476870CD0000000A0000
+      0000000000000000000000000000476870CD9DE8F9FFA1EDFFFFA1EDFFFF95DC
+      EDFF0D0D0DFFFDFDFDFF818384FF415053FF95DDEDFF476870CD0000000A0000
+      0000000000000000000000000000476870CD9DE8F9FFA1EDFFFFA1EDFFFF95DB
+      ECFF0F0F0FFFFFFFFFFFFDFDFDFF818383FF415053FF43626ACF0000000A0000
+      0000000000000000000000000000476870CD88C8D7FF8ACCDBFF8ACCDBFF7FBC
+      CAFF101010FFFFFFFFFFFFFFFFFFFDFDFDFF7E8081FF2F3536F5000000140000
+      00000000000000000000000000002E4449773C585F8D3C585F8D3C585F8D344D
+      5396101010FFFFFFFFFFFFFFFFFFFFFFFFFFFDFDFDFF7C7C7CFB292929CA0000
+      000A000000000000000000000000000000000000000000000000000000000000
+      0014121212FDFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCFCFCFF747474F82B2B
+      2BC7000000000000000000000000000000000000000000000000000000000000
+      0014121212FDFFFFFFFFFFFFFFFFFFFFFFFFECECECFF8F8F8FF81C1C1CF92929
+      299C000000020000000000000000000000000000000000000000000000000000
+      0015141414FDFDFDFDFFD1D1D1FFF2F2F2FF949494FC1A1A1AD10000001C0000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00150A0A0AFF393939F6171717F6919191F9E7E7E7FF1E1E1EF8000000190000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0004121212870000003E000000201D1D1DFAF2F2F2FF8F8F8FF82727279E0000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000002B2B2BB0959595FD848484FA181818F30000
+      0001000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000032141414F82626269B0000001C0000
+      0000000000000000000000000000
     }
   end
   object ActionList1: TActionList
@@ -7676,71 +7708,6 @@ object FMain: TFMain
       ImageIndex = 7
       OnExecute = ScriptExecute
     end
-    object ToolHand: TAction
-      Category = 'Tool'
-      Caption = 'Hand'
-      Hint = 'Move and scroll picture'
-      ImageIndex = 15
-      OnExecute = ToolAnyExecute
-    end
-    object ToolPen: TAction
-      Category = 'Tool'
-      Caption = 'Pen'
-      Hint = 'Simple pen'
-      ImageIndex = 16
-      OnExecute = ToolAnyExecute
-    end
-    object ToolColorPicker: TAction
-      Category = 'Tool'
-      Hint = 'Color picker'
-      ImageIndex = 17
-      OnExecute = ToolAnyExecute
-    end
-    object ToolEraser: TAction
-      Category = 'Tool'
-      Hint = 'Eraser'
-      ImageIndex = 18
-      OnExecute = ToolAnyExecute
-    end
-    object ToolRect: TAction
-      Category = 'Tool'
-      Hint = 'Rectangle'
-      ImageIndex = 19
-      OnExecute = ToolAnyExecute
-    end
-    object ToolEllipse: TAction
-      Category = 'Tool'
-      Hint = 'Ellipse'
-      ImageIndex = 20
-      OnExecute = ToolAnyExecute
-    end
-    object ToolPolygon: TAction
-      Category = 'Tool'
-      Caption = 'Polygon'
-      Hint = 'Polygon or polyline'
-      ImageIndex = 21
-      OnExecute = ToolAnyExecute
-    end
-    object ToolSpline: TAction
-      Category = 'Tool'
-      Caption = 'Curve'
-      Hint = 'Spline'
-      ImageIndex = 22
-      OnExecute = ToolAnyExecute
-    end
-    object ToolFloodfill: TAction
-      Category = 'Tool'
-      Hint = 'Floodfill'
-      ImageIndex = 23
-      OnExecute = ToolAnyExecute
-    end
-    object ToolGradient: TAction
-      Category = 'Tool'
-      Caption = 'Gradient'
-      Hint = 'Render gradient'
-      ImageIndex = 24
-      OnExecute = ToolAnyExecute
-    end
     object ImageHorizontalFlip: TAction
       Category = 'Image'
       Caption = 'Horizontal flip'
@@ -7898,6 +7865,7 @@ object FMain: TFMain
     object EditSelectAll: TAction
       Category = 'Edit'
       Caption = 'Select all'
+      Hint = 'Select all'
       ImageIndex = 115
       OnExecute = ScriptExecute
       ShortCut = 16449
@@ -8021,20 +7989,6 @@ object FMain: TFMain
       Caption = 'Perlin noise'
       OnExecute = RenderAnyExecute
     end
-    object ToolLoadTexture: TAction
-      Category = 'Tool'
-      Hint = 'Load texture...'
-      ImageIndex = 1
-      OnExecute = ToolLoadTextureExecute
-    end
-    object ToolNoTexture: TAction
-      Category = 'Tool'
-      Enabled = False
-      Hint = 'No texture'
-      ImageIndex = 39
-      OnExecute = ToolNoTextureExecute
-      OnUpdate = ToolNoTextureUpdate
-    end
     object RenderCyclicPerlinNoise: TAction
       Category = 'Render'
       Caption = 'Cyclic Perlin noise'
@@ -8085,13 +8039,6 @@ object FMain: TFMain
       Caption = 'Water'
       OnExecute = RenderAnyExecute
     end
-    object ToolDeformation: TAction
-      Category = 'Tool'
-      Caption = 'Deformation'
-      Hint = 'Deformation grid'
-      ImageIndex = 57
-      OnExecute = ToolAnyExecute
-    end
     object RenderWoodVertical: TAction
       Category = 'Render'
       Caption = 'Vertical wood'
@@ -8125,18 +8072,6 @@ object FMain: TFMain
       OnExecute = ScriptExecute
       ShortCut = 49238
     end
-    object ToolText: TAction
-      Category = 'Tool'
-      Hint = 'Text'
-      ImageIndex = 60
-      OnExecute = ToolAnyExecute
-    end
-    object ToolPhong: TAction
-      Category = 'Tool'
-      Hint = 'Shaded shape'
-      ImageIndex = 70
-      OnExecute = ToolAnyExecute
-    end
     object EditSelection: TAction
       Category = 'Edit'
       Caption = 'Edit selection...'
@@ -8144,12 +8079,6 @@ object FMain: TFMain
       OnUpdate = EditSelectionUpdate
       ShortCut = 16453
     end
-    object ToolTextureMapping: TAction
-      Category = 'Tool'
-      Hint = 'Texture mapping'
-      ImageIndex = 78
-      OnExecute = ToolAnyExecute
-    end
     object ViewLayerStack: TAction
       Category = 'View'
       Caption = 'Layers'
@@ -8239,13 +8168,6 @@ object FMain: TFMain
       OnUpdate = ImageFlattenUpdate
       ShortCut = 24646
     end
-    object ToolLayerMapping: TAction
-      Category = 'Tool'
-      Hint = 'Layer perspective'
-      ImageIndex = 97
-      OnExecute = ToolAnyExecute
-      OnUpdate = ToolLayerMappingUpdate
-    end
     object FileReload: TAction
       Category = 'File'
       Caption = 'Reload'
@@ -8479,50 +8401,11 @@ object FMain: TFMain
       Caption = 'Noise filter...'
       OnExecute = FilterAnyExecute
     end
-    object ToolChangeDocking: TAction
-      Category = 'Tool'
-      Hint = 'Change docking'
-      ImageIndex = 111
-      OnExecute = ToolChangeDockingExecute
-    end
-    object ToolBrush: TAction
-      Category = 'Tool'
-      Hint = 'Brush'
-      ImageIndex = 112
-      OnExecute = ToolAnyExecute
-    end
-    object BrushCreateGeometric: TAction
-      Category = 'Tool'
-      Hint = 'Create geometric brush'
-      ImageIndex = 113
-      OnExecute = BrushCreateGeometricExecute
-      OnUpdate = BrushCreateGeometricUpdate
-    end
-    object BrushLoadFromFile: TAction
-      Category = 'Tool'
-      Hint = 'Load brush from file...'
-      ImageIndex = 1
-      OnExecute = BrushLoadFromFileExecute
-      OnUpdate = BrushLoadFromFileUpdate
-    end
-    object BrushRemoveCurrent: TAction
-      Category = 'Tool'
-      Hint = 'Remove current brush'
-      ImageIndex = 39
-      OnExecute = BrushRemoveCurrentExecute
-      OnUpdate = BrushRemoveCurrentUpdate
-    end
     object FilterRain: TAction
       Category = 'Filter'
       Caption = 'Rain...'
       OnExecute = FilterAnyExecute
     end
-    object ToolClone: TAction
-      Category = 'Tool'
-      Hint = 'Clone tool'
-      ImageIndex = 118
-      OnExecute = ToolAnyExecute
-    end
     object ViewStatusBar: TAction
       Category = 'View'
       Caption = 'Status bar'
@@ -8541,14 +8424,6 @@ object FMain: TFMain
       OnExecute = FileUseImageBrowserExecute
       OnUpdate = FileUseImageBrowserUpdate
     end
-    object ToolHotSpot: TAction
-      Category = 'Tool'
-      Caption = 'Hot spot'
-      Hint = 'Choose hot spot of a cursor'
-      ImageIndex = 120
-      OnExecute = ToolAnyExecute
-      OnUpdate = ToolHotSpotUpdate
-    end
     object FileChooseEntry: TAction
       Category = 'File'
       Caption = 'Choose entry...'
@@ -8630,6 +8505,170 @@ object FMain: TFMain
       Caption = 'Wave diplacement...'
       OnExecute = FilterAnyExecute
     end
+    object ToolHand: TAction
+      Category = 'Tool'
+      Caption = 'Hand'
+      Hint = 'Move and scroll picture'
+      ImageIndex = 15
+      OnExecute = ToolAnyExecute
+    end
+    object ToolHotSpot: TAction
+      Category = 'Tool'
+      Caption = 'Hot spot'
+      Hint = 'Choose hot spot of a cursor'
+      ImageIndex = 120
+      OnExecute = ToolAnyExecute
+      OnUpdate = ToolHotSpotUpdate
+    end
+    object ToolColorPicker: TAction
+      Category = 'Tool'
+      Hint = 'Color picker'
+      ImageIndex = 17
+      OnExecute = ToolAnyExecute
+    end
+    object ToolPen: TAction
+      Category = 'Tool'
+      Caption = 'Pen'
+      Hint = 'Simple pen'
+      ImageIndex = 16
+      OnExecute = ToolAnyExecute
+    end
+    object ToolBrush: TAction
+      Category = 'Tool'
+      Hint = 'Brush'
+      ImageIndex = 112
+      OnExecute = ToolAnyExecute
+    end
+    object ToolEraser: TAction
+      Category = 'Tool'
+      Hint = 'Eraser'
+      ImageIndex = 18
+      OnExecute = ToolAnyExecute
+    end
+    object ToolFloodfill: TAction
+      Category = 'Tool'
+      Hint = 'Floodfill'
+      ImageIndex = 23
+      OnExecute = ToolAnyExecute
+    end
+    object ToolClone: TAction
+      Category = 'Tool'
+      Hint = 'Clone tool'
+      ImageIndex = 118
+      OnExecute = ToolAnyExecute
+    end
+    object ToolEditShape: TAction
+      Category = 'Tool'
+      Hint = 'Edit shape'
+      ImageIndex = 125
+      Visible = False
+    end
+    object ToolRect: TAction
+      Category = 'Tool'
+      Hint = 'Rectangle'
+      ImageIndex = 19
+      OnExecute = ToolAnyExecute
+    end
+    object ToolEllipse: TAction
+      Category = 'Tool'
+      Hint = 'Ellipse'
+      ImageIndex = 20
+      OnExecute = ToolAnyExecute
+    end
+    object ToolPolygon: TAction
+      Category = 'Tool'
+      Caption = 'Polygon'
+      Hint = 'Polygon or polyline'
+      ImageIndex = 21
+      OnExecute = ToolAnyExecute
+    end
+    object ToolSpline: TAction
+      Category = 'Tool'
+      Caption = 'Curve'
+      Hint = 'Spline'
+      ImageIndex = 22
+      OnExecute = ToolAnyExecute
+    end
+    object ToolGradient: TAction
+      Category = 'Tool'
+      Caption = 'Gradient'
+      Hint = 'Render gradient'
+      ImageIndex = 24
+      OnExecute = ToolAnyExecute
+    end
+    object ToolPhong: TAction
+      Category = 'Tool'
+      Hint = 'Shaded shape'
+      ImageIndex = 70
+      OnExecute = ToolAnyExecute
+    end
+    object ToolText: TAction
+      Category = 'Tool'
+      Hint = 'Text'
+      ImageIndex = 60
+      OnExecute = ToolAnyExecute
+    end
+    object ToolLoadTexture: TAction
+      Category = 'Tool'
+      Hint = 'Load texture...'
+      ImageIndex = 1
+      OnExecute = ToolLoadTextureExecute
+    end
+    object ToolNoTexture: TAction
+      Category = 'Tool'
+      Enabled = False
+      Hint = 'No texture'
+      ImageIndex = 39
+      OnExecute = ToolNoTextureExecute
+      OnUpdate = ToolNoTextureUpdate
+    end
+    object ToolDeformation: TAction
+      Category = 'Tool'
+      Caption = 'Deformation'
+      Hint = 'Deformation grid'
+      ImageIndex = 57
+      OnExecute = ToolAnyExecute
+    end
+    object ToolTextureMapping: TAction
+      Category = 'Tool'
+      Hint = 'Texture mapping'
+      ImageIndex = 78
+      OnExecute = ToolAnyExecute
+    end
+    object ToolLayerMapping: TAction
+      Category = 'Tool'
+      Hint = 'Layer perspective'
+      ImageIndex = 97
+      OnExecute = ToolAnyExecute
+      OnUpdate = ToolLayerMappingUpdate
+    end
+    object ToolChangeDocking: TAction
+      Category = 'Tool'
+      Hint = 'Change docking'
+      ImageIndex = 111
+      OnExecute = ToolChangeDockingExecute
+    end
+    object BrushCreateGeometric: TAction
+      Category = 'Tool'
+      Hint = 'Create geometric brush'
+      ImageIndex = 113
+      OnExecute = BrushCreateGeometricExecute
+      OnUpdate = BrushCreateGeometricUpdate
+    end
+    object BrushLoadFromFile: TAction
+      Category = 'Tool'
+      Hint = 'Load brush from file...'
+      ImageIndex = 1
+      OnExecute = BrushLoadFromFileExecute
+      OnUpdate = BrushLoadFromFileUpdate
+    end
+    object BrushRemoveCurrent: TAction
+      Category = 'Tool'
+      Hint = 'Remove current brush'
+      ImageIndex = 39
+      OnExecute = BrushRemoveCurrentExecute
+      OnUpdate = BrushRemoveCurrentUpdate
+    end
   end
   object ColorDialog1: TColorDialog
     Title = 'Choose color'
@@ -27074,191 +27113,191 @@ object FMain: TFMain
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000002A2A000A2A2A000A2A2A000A2A2A00202A2A00202A2A
-      00202A2A00202A2A00202A2A00202A2A00202A2A000A2A2A000A2A2A000A0000
-      0000000000000000000000000000000000002A2A000A2A2A000A2A2A000A2A2A
-      00202A2A00202A2A00202A2A00202A2A000A2A2A000A2A2A000A000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000002A2A00482A2A00482A2A00882A2A00DF2A2A00DF2A2A
-      00DF2A2A00DF2A2A00DF2A2A00DF2A2A00DF2A2A00882A2A00482A2A00480000
-      0000000000000000000000000000000000002A2A00482A2A00482A2A00882A2A
-      00DF2A2A00DF2A2A00DF2A2A00DF2A2A00882A2A00482A2A0048000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00002A2A000A2A2A00482A2A00522A2A00682A2A00E92A2A00FF2A2A00FF2A2A
-      00FF2A2A00FF2A2A00FF2A2A00FF2A2A00FF2A2A00BE2A2A00522A2A00522A2A
-      003300000000000000002A2A000A2A2A00482A2A00522A2A00682A2A00E92A2A
-      00FF2A2A00FF2A2A00FF2A2A00FF2A2A00BE2A2A00522A2A00522A2A00330000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00002A2A000A2A2A00482A2A00682A2A00FF2A2A00FF3D3308FF3D3308FF2A2A
-      00FF3D3308FF2A2A00FF3D3308FF3D3308FF2A2A00FF2A2A00FF2A2A00682A2A
-      003300000000000000002A2A000A2A2A00482A2A00682A2A00FF2A2A00FF3D33
-      08FF3D3308FF3D3308FF3D3308FF2A2A00FF2A2A00FF2A2A00682A2A00330000
+      000000000000000000000000000000000000000000005DB15E345DB15E4B5DB1
+      5EA55DB15EBE5DB15ED25DB15EBE5DB15EA55DB15E4B5DB15E34000000000000
+      0000000000000000000000000000000000005DB15E345DB15E4B5DB15EA55DB1
+      5EBE5DB15ED25DB15EBE5DB15EA55DB15E4B5DB15E3400000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000005DB15E345DB15EA55DB15EF55DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EF85DB15EBE5DB15E340000
+      00000000000000000000000000005DB15E345DB15EA55DB15EF55DB15EFF5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EEF5DB15EA55DB15E34000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000005DB15E7E5DB15EF85DB15EFF5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFD5DB15EA50000
+      00000000000000000000000000005DB15E4B5DB15EF55DB15EFF5DB15EFF5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EEF5DB15E4B000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000005DB15E345DB15EDE5DB15EFF5DB15EFF7C84
+      55FF897251FF897251FF897251FF827C53FF5DB15EFF5DB15EFF5DB15EF55DB1
+      5E4B0000000000000000000000005DB15EBE5DB15EFF5DB15EFF817D53FF8972
+      51FF897251FF897251FF7C8555FF5DB15EFF5DB15EFF5DB15EA5000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000005DB15E4B5DB15EFD5DB15EFF5DB15EFF995B
+      4CFF9F534BFF9F534BFF9F534BFF9E554BFF6B9E5AFF5DB15EFF5DB15EFF5DB1
+      5EA50000000000000000000000005DB15ED25DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF5DB15EFF5DB15ED2000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000005DB15ED25DB15EFF5DB15EFF7A8755FF9F53
+      4BFF9F534BFF9F534BFF9F534BFF9F534BFF857952FF5DB15EFF5DB15EFF5DB1
+      5EE95DB15E3400000000000000005DB15EE95DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF5DB15EFF5DB15EDE000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000005DB15E345DB15EF85DB15EFF5DB15EFF8F6A4FFF9F53
+      4BFF9F534BFF9F534BFF9F534BFF9F534BFF985D4DFF5DB15EFF5DB15EFF5DB1
+      5EFD5DB15E4B00000000000000005DB15EE95DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF5DB15EFF5DB15EFB5DB15EDE5DB1
+      5EDE5DB15EDE5DB15EBE5DB15E7E5DB15E340000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000005DB15EA55DB15EFF5DB15EFF699F5AFF9E554BFF9F53
+      4BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF778C56FF5DB15EFF5DB1
+      5EFF5DB15ED200000000000000005DB15EE95DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFE5DB15EEF5DB15EA55DB15E34000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000005DB15E345DB15EE95DB15EFF5DB15EFF847A53FF9F534BFF9F53
+      4BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF8E6B50FF5DB15EFF5DB1
+      5EFF5DB15EF85DB15E34000000005DB15EE95DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFD5DB15ED25DB15E340000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000005DB15E4B5DB15EFD5DB15EFF5DB15EFF96604DFF9F534BFF9F53
+      4BFF9F534BFF92664FFF9F534BFF9F534BFF9F534BFF9D564BFF68A15BFF5DB1
+      5EFF5DB15EFF5DB15EA5000000005DB15EE95DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF6F9859FF877552FF95624EFF9562
+      4EFF90684FFF837B53FF66A45BFF5DB15EFF5DB15EFF5DB15EFE5DB15ED25DB1
+      5E34000000000000000000000000000000000000000000000000000000000000
+      0000000000005DB15EBE5DB15EFF5DB15EFF749157FF9F534BFF9F534BFF9F53
+      4BFF9E554BFF6B9D5AFF9D564CFF9F534BFF9F534BFF9F534BFF847A53FF5DB1
+      5EFF5DB15EFF5DB15EE95DB15E345DB15EE95DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF8C6E50FF847953FF9E544BFF9F534BFF9F534BFF9F53
+      4BFF9F534BFF9F534BFF9B594CFF7A8855FF5DB15EFF5DB15EFF5DB15EFD5DB1
+      5EA5000000000000000000000000000000000000000000000000000000000000
+      00005DB15E345DB15EF55DB15EFF5DB15EFF8B6F51FF9F534BFF9F534BFF9F53
+      4BFF92664FFF5DB15EFF8E6C50FF9F534BFF9F534BFF9F534BFF96604DFF5DB1
+      5EFF5DB15EFF5DB15EFD5DB15E4B5DB15EE95DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF9B594CFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
+      4BFF9F534BFF9F534BFF9F534BFF9E544BFF7A8855FF5DB15EFF5DB15EFF5DB1
+      5EEF5DB15E340000000000000000000000000000000000000000000000000000
+      00005DB15E7E5DB15EFF5DB15EFF64A75CFF9C584CFF9F534BFF9F534BFF9F53
+      4BFF807F54FF5DB15EFF7B8655FF9F534BFF9F534BFF9F534BFF9F534BFF758F
+      57FF5DB15EFF5DB15EFF5DB15EBE5DB15EEF5DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF9F534BFF9F534BFF9B594CFF8B6F51FF897251FF985D
+      4DFF9F534BFF9F534BFF9F534BFF9F534BFF9B594CFF66A45BFF5DB15EFF5DB1
+      5EFE5DB15E7E0000000000000000000000000000000000000000000000005DB1
+      5E345DB15EDE5DB15EFF5DB15EFF7E8154FF9F534BFF9F534BFF9F534BFF9D55
+      4BFF68A15BFF5DB15EFF62AA5CFF9A5A4CFF9F534BFF9F534BFF9F534BFF8D6D
+      50FF5DB15EFF5DB15EFF5DB15EF55DB15EF55DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF9F534BFF93644EFF66A45BFF5DB15EFF5DB15EFF5DB1
+      5EFF8D6D50FF9F534BFF9F534BFF9F534BFF9F534BFF847953FF5DB15EFF5DB1
+      5EFF5DB15ED20000000000000000000000000000000000000000000000005DB1
+      5E4B5DB15EFA5DB15EFF5DB15EFF92654EFF9F534BFF9F534BFF9F534BFF9069
+      4FFF5DB15EFF5DB15EFF5DB15EFF8C6F50FF9F534BFF9F534BFF9F534BFF9D56
+      4CFF64A75CFF5DB15EFF5DB15EFF5DB15EFA5DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF9E554BFF6C9C5AFF5DB15EFF5DB15EFF5DB15EFF5DB1
+      5EFF62AA5CFF995B4CFF9F534BFF9F534BFF9F534BFF93644EFF5DB15EFF5DB1
+      5EFF5DB15EE90000000000000000000000000000000000000000000000005DB1
+      5EA55DB15EFF5DB15EFF6E9859FF9E544BFF9F534BFF9F534BFF9F534BFF7D83
+      55FF5DB15EFF5DB15EFF5DB15EFF778C56FF9F534BFF9F534BFF9F534BFF9F53
+      4BFF817D53FF5DB15EFF5DB15EFF5DB15EFE5DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF93644EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
+      5EFF5DB15EFF8C6F50FF9F534BFF9F534BFF9F534BFF9C584CFF5DB15EFF5DB1
+      5EFF5DB15EF500000000000000000000000000000000000000005DB15E345DB1
+      5EE95DB15EFF5DB15EFF877552FF9F534BFF9F534BFF9F534BFF9D564BFF64A7
+      5CFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF995C4DFF9F534BFF9F534BFF9F53
+      4BFF95614EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF8B6F51FF5DB15EFF5DB15EFF5DB15EF55DB15EEF5DB1
+      5EFF5DB15EFF837B53FF9F534BFF9F534BFF9F534BFF9F544BFF62AA5CFF5DB1
+      5EFF5DB15EFA5DB15E34000000000000000000000000000000005DB15E4B5DB1
+      5EFD5DB15EFF5DB15EFF995B4DFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
+      4BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
+      4BFF9F534BFF729358FF5DB15EFF5DB15EFF5DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF897251FF5DB15EFF5DB15EFF5DB15EE95DB15ED25DB1
+      5EFF5DB15EFF817E54FF9F534BFF9F534BFF9F534BFF9F534BFF69A05AFF5DB1
+      5EFF5DB15EFB5DB15E34000000000000000000000000000000005DB15ED25DB1
+      5EFF5DB15EFF798A56FF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
+      4BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
+      4BFF9F534BFF8B6F51FF5DB15EFF5DB15EFF5DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF5DB15EFF5DB15EF55DB15EE95DB1
+      5EFF5DB15EFF827C53FF9F534BFF9F534BFF9F534BFF9F544BFF62AA5CFF5DB1
+      5EFF5DB15EFA5DB15E340000000000000000000000005DB15E345DB15EF85DB1
+      5EFF5DB15EFF8F6A50FF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
+      4BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
+      4BFF9F534BFF9C584CFF64A75CFF5DB15EFF5DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF93644EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
+      5EFF5DB15EFF887351FF9F534BFF9F534BFF9F534BFF9C584CFF5DB15EFF5DB1
+      5EFF5DB15EF5000000000000000000000000000000005DB15EA55DB15EFF5DB1
+      5EFF68A15BFF9D564BFF9F534BFF9F534BFF9F534BFF9A5B4CFF95624EFF9562
+      4EFF95624EFF95624EFF95624EFF95624EFF95624EFF985D4DFF9F534BFF9F53
+      4BFF9F534BFF9F534BFF7F8154FF5DB15EFF5DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF9E554BFF699F5AFF5DB15EFF5DB15EFF5DB15EFF5DB1
+      5EFF5DB15EFF96604DFF9F534BFF9F534BFF9F534BFF94634EFF5DB15EFF5DB1
+      5EFF5DB15EE90000000000000000000000005DB15E345DB15EE95DB15EFF5DB1
+      5EFF827C53FF9F534BFF9F534BFF9F534BFF9F534BFF798A56FF5DB15EFF5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF6B9E5AFF9E544BFF9F53
+      4BFF9F534BFF9F534BFF94634EFF5DB15EFF5DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF9F534BFF91674FFF5DB15EFF5DB15EFF5DB15EFF5DB1
+      5EFF807F54FF9F534BFF9F534BFF9F534BFF9F534BFF857952FF5DB15EFF5DB1
+      5EFF5DB15ED20000000000000000000000005DB15E4B5DB15EFB5DB15EFF5DB1
+      5EFF95614EFF9F534BFF9F534BFF9F534BFF9A5A4CFF5DB15EFF5DB15EFF5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF92664FFF9F53
+      4BFF9F534BFF9F534BFF9F544BFF709658FF5DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF9F534BFF9F534BFF95624EFF7F8054FF7A8855FF8C6F
+      50FF9E544BFF9F534BFF9F534BFF9F534BFF9C584CFF699F5AFF5DB15EFF5DB1
+      5EFF5DB15E7E0000000000000000000000005DB15EA55DB15EFF5DB15EFF7293
+      58FF9F534BFF9F534BFF9F534BFF9F534BFF8C6F50FF5DB15EFF5DB15EFF5DB1
+      5EFE5DB15EEF5DB15EEF5DB15EEF5DB15EFD5DB15EFF5DB15EFF7F8154FF9F53
+      4BFF9F534BFF9F534BFF9F534BFF897251FF5DB15EFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF995B4CFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
+      4BFF9F534BFF9F534BFF9F534BFF9F534BFF7E8154FF5DB15EFF5DB15EFF5DB1
+      5EEF5DB15E4B0000000000000000000000005DB15EBE5DB15EFF5DB15EFF8B70
+      51FF9F534BFF9F534BFF9F534BFF9F534BFF778C56FF5DB15EFF5DB15EFF5DB1
+      5EBE0000000000000000000000005DB15E7E5DB15EFE5DB15EFF64A75CFF9D56
+      4CFF9F534BFF9F534BFF9F534BFF9B594CFF62AA5CFF5DB15EFF93644EFF9F53
+      4BFF9F534BFF9F534BFF7C8455FF92664FFF9F534BFF9F534BFF9F534BFF9F53
+      4BFF9F534BFF9F534BFF9E544BFF827D53FF5DB15EFF5DB15EFF5DB15EFD5DB1
+      5EA5000000000000000000000000000000005DB15EBE5DB15EFF5DB15EFF9068
+      4FFF95624EFF95624EFF95624EFF91674FFF5DB15EFF5DB15EFF5DB15EFA5DB1
+      5E4B0000000000000000000000005DB15E345DB15EEF5DB15EFF5DB15EFF8874
+      52FF95624EFF95624EFF95624EFF95624EFF758E57FF5DB15EFF8B7051FF9562
+      4EFF95624EFF95624EFF758E57FF5DB15EFF808054FF92654EFF9E544BFF9F53
+      4BFF9B594CFF8F6A4FFF719458FF5DB15EFF5DB15EFF5DB15EFF5DB15ED25DB1
+      5E34000000000000000000000000000000005DB15E7E5DB15EF85DB15EFF5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15ED25DB1
+      5E34000000000000000000000000000000005DB15EA55DB15EFD5DB15EFF5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EDE5DB15E4B0000
+      0000000000000000000000000000000000005DB15E345DB15EBE5DB15EFA5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFD5DB15ED25DB15E4B0000
+      0000000000000000000000000000000000005DB15E345DB15EBE5DB15EFA5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
+      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EF85DB15EBE5DB15E34000000000000
+      000000000000000000000000000000000000000000005DB15E345DB15E7E5DB1
+      5EBE5DB15EDE5DB15EE95DB15EDE5DB15EBE5DB15E7E5DB15E34000000000000
+      000000000000000000000000000000000000000000005DB15E345DB15E7E5DB1
+      5EBE5DB15EDE5DB15EE95DB15EE95DB15EDE5DB15EBE5DB15EBE5DB15ED25DB1
+      5EDE5DB15EDE5DB15ED25DB15EBE5DB15EBE5DB15ED25DB15EDE5DB15EEF5DB1
+      5EEF5DB15EE95DB15ED25DB15EA55DB15E4B5DB15E3400000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00002A2A000A2A2A00882A2A00E92A2A00FF2A2A00FFB36C39FFC67541FFB36C
-      39FFB36C39FFB36C39FFC67541FFB36C39FF2A2A00FF2A2A00FF2A2A00E92A2A
-      007400000000000000002A2A000A2A2A00882A2A00E92A2A00FF2A2A00FFB36C
-      39FFB36C39FFB36C39FFB36C39FF2A2A00FF2A2A00FF2A2A00E92A2A00740000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00002A2A00202A2A00DF2A2A00FF3D3308FFB36C39FFC67541FFC67541FFC675
-      41FFC67541FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF2A2A
-      009F00000000000000002A2A00202A2A00DF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF2A2A009F0000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000002A2A
-      00092A2A00A52A2A00FF302D02FF8F5B2AFFC67541FFC67541FFC67541FFC675
-      41FFC67541FFC67541FFC67541FFC67541FFC67541FF8F5B2AFF302D02FF2A2A
-      00FF2A2A00A52A2A00092A2A00A52A2A00FF2A2A00FF3D3308FFC67541FFC675
-      41FFC67541FFC67541FFC67541FFC67541FF2A2A00FF2A2A00FF2A2A00FF2A2A
-      00DC2A2A00172A2A00092A2A00092A2A00090000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000002A2A
-      00412A2A004A2A2A00A5523D11FF584013FFB86E3BFFC67541FFC67541FFC675
-      41FFC67541FFC67541FFC67541FFC67541FF9D6130FF584013FF523D11FF2A2A
-      00A52A2A004A2A2A00412A2A004A2A2A00E82A2A00FF2A2A00FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF2A2A00E42A2A
-      00B82A2A00A12A2A006A2A2A00412A2A00410000000000000000000000000000
-      000000000000000000000000000000000000000000002A2A00092A2A00412A2A
-      004A39310660563F12E8584013FF664719FFB86E3BFFC67541FFC67541FFC675
-      41FFC67541FFC67541FFC67541FFC67541FF9D6130FF584013FF584013FF513D
-      10BB2A2A004A2A2A004A2A2A00602A2A00E82A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF2A2A00E42A2A
-      00B82A2A00B82A2A008F2A2A004A2A2A004A2A2A002E00000000000000000000
-      000000000000000000000000000000000000000000002A2A00092A2A00412A2A
-      005036300578553F12EE5B4214FF744E1FFFBC703DFFC67541FFC67541FFB86E
-      3BFF9D6130FFB86E3BFFC67541FFC67541FFA46533FF624517FF5B4214FF4F3C
-      0FC62A2A005B2A2A00502A2A00782A2A00EE2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FFC67541FFC67541FF3D3308FF2A2A00FF3B32
-      07D23D3308C12A2A00B83630057A3931065F2A2A004A2A2A004A2A2A00090000
-      000000000000000000000000000000000000000000002A2A00092A2A00522A2A
-      0072352F0489604417EE714C1EFF7E5323FFBC703DFFC67541FFB86E3BFF8154
-      24FF584013FF815424FFB86E3BFFC67541FFA76634FF714C1EFF714C1EFF5B42
-      14CC2A2A00722A2A00722A2A00892A2A00EE2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FFC67541FFC67541FFB36C39FF9D6130FF9B60
-      2FFF905B2BF66F4B1DEF5A4114F1584013DC2A2A004A2A2A004A2A2A00410000
-      000000000000000000000000000000000000000000002A2A000F2A2A00692A2A
-      00783B3207896F4C1DEE744E1FFF7E5323FFBC703DFFC67541FF9D6130FF5840
-      13FF584013FF664719FFB86E3BFFC67541FFA76634FF744E1FFF744E1FFF6446
-      18CC2A2A00782A2A00782A2A00892A2A00EE2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FFC67541FFC67541FFC67541FFB66D3AFF9B60
-      2FFF9B602FFF835525FA5A4114F15A4114F1533D11B22A2A004A2A2A004A2A2A
-      002E00000000000000000000000000000000000000002A2A000F2A2A00692A2A
-      0089363005CC744E1FFF7E5323FFC67541FFC67541FFC67541FF9D6130FF5840
-      13FF47380CFF584013FFB86E3BFFC67541FFC67541FFC67541FF7E5323FF5C42
-      15EE2A2A00AA2A2A00892A2A00CC2A2A00FF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FFC67541FFC67541FF8C5929FFC67541FFC675
-      41FFA06331FF9B602FFF9B602FFF634518F25A4114F12A2A00732A2A00582A2A
-      002E00000000000000000000000000000000000000002A2A000F2A2A009C2A2A
-      00EE2A2A00FF8A5828FFBC703DFFC67541FFC67541FFC67541FFC67541FF8F5B
-      2AFF2A2A00FF8F5B2AFFC67541FFC67541FFC67541FFC67541FFBC703DFF774F
-      20FF2A2A00EE2A2A00EE2A2A00FF2A2A00FF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FFC67541FFC67541FF2A2A00FFC67541FFC675
-      41FFC1723FFF9B602FFF9B602FFF935C2CFD674719E12A2A00B82A2A00AA2A2A
-      005800000000000000000000000000000000000000002A2A00202A2A00DF2A2A
-      00FF3D3308FFB36C39FFC67541FFC67541FFC67541FFC67541FF8C5929FF2A2A
-      00FF2A2A00FF3D3308FFB36C39FFC67541FFC67541FFC67541FFC67541FF8C59
-      29FF2A2A00FF2A2A00FF2A2A00FF2A2A00FF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF3D3308FFB36C
-      39FFC67541FFB66D3AFF9B602FFF9B602FFF795021E42A2A00B82A2A00B82A2A
-      0073000000000000000000000000000000002A2A00092A2A00A52A2A00FF302D
-      02FF8F5B2AFFC67541FFC67541FFC67541FFC67541FFC67541FF8C5929FF2A2A
-      00FF2A2A00FF3D3308FFB36C39FFC67541FFC67541FFC67541FFC67541FFC675
-      41FF8F5B2AFF302D02FF2A2A00FF2A2A00FF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF3D3308FFB36C
-      39FFC67541FFC67541FFC67541FFA06331FF734D1EF62A2A00D22A2A00C12A2A
-      00730000000000000000000000002A2A001C2A2A00412A2A004A2A2A00A5523D
-      11FF584013FFB86E3BFFC67541FFC67541FFC67541FFC67541FF8C5929FF2A2A
-      00FF2A2A00FF3D3308FFB36C39FFC67541FFC67541FFC67541FFC67541FF9D61
-      30FF584013FF523D11FF2A2A00FF2A2A00FF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF3D3308FFB36C
-      39FFC67541FFC67541FFC67541FFC1723FFF815424FF2A2A00F62A2A00F62A2A
-      008E0000000000000000000000002A2A00412A2A004A39310660563F12E85840
-      13FF664719FFB86E3BFFC67541FFC67541FFC67541FFC67541FF8C5929FF2A2A
-      00FF2A2A00FF3D3308FFB36C39FFC67541FFC67541FFC67541FFC67541FF9D61
-      30FF584013FF584013FF47380CFF2A2A00FF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF3D3308FFB36C
-      39FFC67541FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF2A2A
-      009F0000000000000000000000002A2A00412A2A005036300578553F12EE5B42
-      14FF744E1FFFBC703DFFC67541FFC67541FFC67541FFC67541FFC67541FFC675
-      41FF3D3308FFC67541FFC67541FFC67541FFC67541FFC67541FFC67541FFA465
-      33FF624517FF5B4214FF584013FF2A2A00FF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF3D3308FFB36C
-      39FFC67541FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF2A2A
-      009F0000000000000000000000002A2A00522A2A0072352F0489604417EE714C
-      1EFF7E5323FFBC703DFFC67541FFC67541FFC67541FFC67541FFC67541FFC675
-      41FFB36C39FFC67541FFC67541FFC67541FFC67541FFC67541FFC67541FFA766
-      34FF714C1EFF714C1EFF513D10FF2A2A00FF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF3D3308FFB36C
-      39FFC67541FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF2A2A
-      009F0000000000000000000000002A2A00692A2A00783B3207896F4C1DEE744E
-      1FFF7E5323FFBC703DFFC67541FFC67541FFC67541FFC67541FFC67541FFC675
-      41FFC67541FFC67541FFC67541FFC67541FFC67541FFC67541FFC67541FFA766
-      34FF744E1FFF744E1FFF584113FF2A2A00FF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF3D3308FFB36C
-      39FFC67541FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF2A2A
-      009F0000000000000000000000002A2A00692A2A0089363005CC744E1FFF7E53
-      23FFC67541FFC67541FFC67541FFC67541FFC67541FF9D6130FF9D6130FFC675
-      41FF8C5929FFC67541FF9D6130FF9D6130FFC67541FFC67541FFC67541FFC675
-      41FFC67541FF7E5323FF744E1FFF2A2A00FF2A2A00FF3D3308FFC67541FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF3D3308FFB36C
-      39FFC67541FFC67541FFC67541FFB66D3AFF764E20FF2A2A00F62A2A00E42A2A
-      007C0000000000000000000000002A2A009C2A2A00EE2A2A00FF8A5828FFBC70
-      3DFFC67541FFC67541FFC67541FFC67541FFC67541FF584013FF584013FF8F5B
-      2AFF2A2A00FF8F5B2AFF584013FF584013FFC67541FFC67541FFC67541FFC675
-      41FFC67541FFBC703DFF774F20FF2A2A00FF2A2A00FF2A2A00FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF3D3308FFB36C
-      39FFC67541FFC67541FFC67541FF9B602FFF734D1EF62A2A00D22A2A00B82A2A
-      00730000000000000000000000002A2A00DF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF9D6130FF584013FF584013FF47380CFF2A2A
-      00FF2A2A00FF302D02FF523D11FF584013FF664719FFB86E3BFFC67541FFC675
-      41FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF3D3308FFB36C
-      39FFC67541FFB66D3AFF9B602FFF9B602FFF795021E42A2A00B82A2A00B82A2A
-      00730000000000000000000000002A2A00DF2A2A00FF2A2A00FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF9D6130FF584013FF47380CFF2A2A00FF2A2A
-      00FF2A2A00B42A2A00FF2A2A00FF47380CFF584013FFB86E3BFFC67541FFC675
-      41FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF2A2A00FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FFC67541FFC67541FF3D3308FFC67541FFC675
-      41FFB66D3AFF9B602FFF9B602FFF835525FA543E12DD2A2A00B82A2A009D2A2A
-      004F0000000000000000000000002A2A00DF2A2A00FF3D3308FFC67541FFC675
-      41FFC67541FFC67541FFC67541FFC67541FF8F5B2AFF2A2A00FF2A2A00FF2A2A
-      00FF2A2A00362A2A00FF2A2A00FF2A2A00FF8F5B2AFFC67541FFC67541FFC675
-      41FFC67541FFC67541FFC67541FF2A2A00FF2A2A00FF3D3308FFC67541FFC675
-      41FFC67541FFC67541FFC67541FFC67541FFC67541FFB36C39FFC67541FFC675
-      41FF9B602FFF9B602FFF9B602FFF5A4114F15A4114F12A2A008B2A2A00702A2A
-      00460000000000000000000000002A2A00DF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF2A2A00B42A2A
-      00362A2A00362A2A004F2A2A00E62A2A00FF3D3308FFB36C39FFC67541FFC675
-      41FFC67541FFC67541FF8C5929FF2A2A00FF2A2A00FF3D3308FFB36C39FFC675
-      41FFC67541FFC67541FFC67541FFC67541FFC67541FFC67541FFB66D3AFF9B60
-      2FFF9B602FFF835525FA5A4114F15A4114F1503C10C02A2A00702A2A00702A2A
-      00460000000000000000000000002A2A00882A2A00BE2A2A00FF2A2A00FF8C59
-      29FF8C5929FF8C5929FF8C5929FF2A2A00FF2A2A00FF2A2A00B42A2A00362A2A
-      00362A2A00222A2A00362A2A00362A2A00B42A2A00FF2A2A00FF8C5929FF8C59
-      29FF8C5929FF8C5929FF2A2A00FF2A2A00FF2A2A00BE2A2A00FF2A2A00FF8C59
-      29FF8C5929FFC67541FF8C5929FF8C5929FF8C5929FF8C5929FFC67541FF734D
-      1EF6795021E4543E12DD5A4114F1503C10C02A2A00702A2A00702A2A00460000
-      00000000000000000000000000002A2A00482A2A00522A2A00FF2A2A00FF2A2A
-      00FF2A2A00FF2A2A00FF2A2A00FF2A2A00FF2A2A00FF2A2A00362A2A00362A2A
-      0036000000002A2A00362A2A00362A2A00362A2A00FF2A2A00FF2A2A00FF2A2A
-      00FF2A2A00FF2A2A00FF2A2A00FF2A2A00FF2A2A00522A2A00FF2A2A00FF2A2A
-      00FF2A2A00FF2A2A00FF2A2A00FF2A2A00FF2A2A00FF2A2A00FF2A2A00F62A2A
-      00B82A2A00B82A2A00B82A2A008B2A2A00702A2A00702A2A0070000000000000
-      00000000000000000000000000002A2A00482A2A00522A2A00682A2A00E92A2A
-      00FF2A2A00FF2A2A00FF2A2A00FF2A2A00B42A2A00362A2A00362A2A00220000
-      0000000000002A2A00072A2A002F2A2A00362A2A004F2A2A00E62A2A00FF2A2A
-      00FF2A2A00FF2A2A00FF2A2A00BE2A2A00522A2A00522A2A00682A2A00E92A2A
-      00FF2A2A00FF2A2A00FF2A2A00FF2A2A00FF2A2A00FF2A2A00FF2A2A00E42A2A
-      00B82A2A00B82A2A009D2A2A00702A2A00702A2A004600000000000000000000
-      00000000000000000000000000002A2A001F2A2A00332A2A00332A2A00742A2A
-      009F2A2A009F2A2A009F2A2A009F2A2A003B2A2A00222A2A0022000000000000
-      00000000000000000000000000002A2A00222A2A00222A2A006D2A2A009F2A2A
-      009F2A2A009F2A2A009F2A2A00492A2A00332A2A00332A2A00332A2A00742A2A
-      009F2A2A009F2A2A009F2A2A009F2A2A009F2A2A009F2A2A009F2A2A007C2A2A
-      00732A2A00732A2A004F2A2A00462A2A00460000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -44881,287 +44920,287 @@ object FMain: TFMain
       A2FF2E98A2FF2E98A2FF2E98A2FF607745FF607745FF607745FF607745FF6077
       45FF607745FF607745FF607745FF607745FF607745FF607745FF607745FFA2A3
       73FFA2A373FFA2A373FFA2A373FFA2A373FFA2A373FFA2A373FFA2A373FFA2A3
-      73FFA2A373FFA5A675FFABAC7990000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000005DB15E345DB15E4B5DB1
-      5EA55DB15EBE5DB15ED25DB15EBE5DB15EA55DB15E4B5DB15E34000000000000
-      0000000000000000000000000000000000005DB15E345DB15E4B5DB15EA55DB1
-      5EBE5DB15ED25DB15EBE5DB15EA55DB15E4B5DB15E3400000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000005DB15E345DB15EA55DB15EF55DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EF85DB15EBE5DB15E340000
-      00000000000000000000000000005DB15E345DB15EA55DB15EF55DB15EFF5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EEF5DB15EA55DB15E34000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000005DB15E7E5DB15EF85DB15EFF5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFD5DB15EA50000
-      00000000000000000000000000005DB15E4B5DB15EF55DB15EFF5DB15EFF5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EEF5DB15E4B000000000000
+      73FFA2A373FFA5A675FFABAC7990000000760000009A0000009A0000009A0000
+      009A0000009A0000009A0000009A0000009A0000009A0000009A0000009A0000
+      009A0000009A0000009A0000009A0000009A0000009A0000009A0000009A0000
+      009A0000009A0000009A0000009A0000009A0000009A0000009A0000009A0000
+      009A0000009A0000009A0000009A000000760000000100000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A334B51B4476870CD476870CD4768
+      70CD476870CD476870CD476870CD476870CD476870CD476870CD476870CD4768
+      70CD476870CD476870CD476870CD476870CD476870CD476870CD476870CD4768
+      70CD476870CD476870CD476870CD476870CD476870CD476870CD476870CD4768
+      70CD476870CD476870CD334B51B40000009A0000001A00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF5D8994FF5D89
+      94FF5D8994FF5D8994FF5D8994FF5D8994FF5D8994FF5D8994FF5D8994FF5D89
+      94FF5D8994FF5D8994FF5D8994FF5D8994FF5D8994FF5D8994FF5D8994FF5D89
+      94FF5D8994FF5D8994FF5D8994FF5D8994FF5D8994FF5D8994FF5D8994FF5D89
+      94FF5D8994FF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF8CCEDEFF96DD
+      EEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DD
+      EEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DD
+      EEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DD
+      EEFF8CCEDEFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF84C3D2FF1C292CFF2A3E42FF91D5E6FFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF426269FF000000FF000000FF182426FF91D5E6FFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF3B575DFF000000FF000000FF000000FF192527FF91D6
+      E7FFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF3B575DFF000000FF000000FF000000FF000000FF1925
+      28FF91D6E7FFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF3A565CFF000000FF000000FF000000FF000000FF0000
+      00FF192528FF92D7E8FFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF3A565CFF000000FF000000FF808080FF161616FF0000
+      00FF000000FF1A2629FF92D7E8FFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF39555BFF000000FF000000FFC3C3C3FFC8C8C8FF1616
+      16FF000000FF000000FF1B272AFF93D8E9FFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF39555BFF000000FF000000FFC3C3C3FFFFFFFFFFC8C8
+      C8FF131313FF000000FF000000FF1B282BFF94DAEBFFA1EDFFFFA1EDFFFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF39545AFF000000FF000000FFC4C4C4FFFFFFFFFFFFFF
+      FFFFC7C7C7FF131313FF000000FF000000FF1B282BFF94DAEBFFA1EDFFFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF39545AFF000000FF000000FFC4C4C4FFFFFFFFFFFFFF
+      FFFFFFFFFFFFC6C6C6FF131313FF000000FF000000FF1C292CFF94DAEBFFA1ED
+      FFFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF385359FF000000FF000000FFC4C4C4FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFC6C6C6FF131313FF000000FF000000FF1C2A2DFF95DB
+      ECFF95DCECFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF385359FF000000FF000000FFC4C4C4FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFC5C5C5FF131313FF000000FF000000FF1D2B
+      2EFF8ACCDBFF5D8994FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF385359FF000000FF000000FFC4C4C4FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC4C4C4FF0F0F0FFF000000FF0000
+      00FF1B282BFF567F89FF476870CD0000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF95DCECFFA1ED
+      FFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1EDFFFFA1ED
+      FFFFA1EDFFFFA1EDFFFF375258FF000000FF000000FFC5C5C5FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC3C3C3FF0F0F0FFF0000
+      00FF000000FF11191BFF415F66D10000009A0000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF8CCEDEFF96DD
+      EEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DDEEFF96DD
+      EEFF96DDEEFF96DDEEFF344C52FF000000FF000000FFC5C5C5FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC2C2C2FF0F0F
+      0FFF000000FF000000FF0B1112F6000000A10000001F00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A476870CD5D8994FF5D8994FF5D89
+      94FF5D8994FF5D8994FF5D8994FF5D8994FF5D8994FF5D8994FF5D8994FF5D89
+      94FF5D8994FF5D8994FF1F2F32FF000000FF000000FFC6C6C6FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC1C1
+      C1FF0F0F0FFF000000FF000000FF000000EC0000002D00000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000009A334B51B4476870CD476870CD4768
+      70CD476870CD476870CD476870CD476870CD476870CD476870CD476870CD4768
+      70CD476870CD476870CD151F21EE000000FF000000FFC6C6C6FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFC1C1C1FF0F0F0FFF000000FF000000FF000000D200000010000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000005DB15E345DB15EDE5DB15EFF5DB15EFF7C84
-      55FF897251FF897251FF897251FF827C53FF5DB15EFF5DB15EFF5DB15EF55DB1
-      5E4B0000000000000000000000005DB15EBE5DB15EFF5DB15EFF817D53FF8972
-      51FF897251FF897251FF7C8555FF5DB15EFF5DB15EFF5DB15EA5000000000000
+      0000000000000000000000000000000000760000009A0000009A0000009A0000
+      009A0000009A0000009A0000009A0000009A0000009A0000009A0000009A0000
+      009A0000009A0000009A000000DD000000FF000000FFC6C6C6FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFC0C0C0FF0F0F0FFF000000FF000000FF000000CC0000000F0000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000001000000190000001D0000001D0000
+      001D0000001D0000001D0000001D0000001D0000001D0000001D0000001D0000
+      001D0000001D0000001D000000B2000000FF000000FFC6C6C6FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFBFBFBFFF0F0F0FFF000000FF000000FF000000CB0000
+      000F000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000005DB15E4B5DB15EFD5DB15EFF5DB15EFF995B
-      4CFF9F534BFF9F534BFF9F534BFF9E554BFF6B9E5AFF5DB15EFF5DB15EFF5DB1
-      5EA50000000000000000000000005DB15ED25DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF5DB15EFF5DB15ED2000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000A8000000FF000000FFC6C6C6FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFBEBEBEFF0F0F0FFF000000FF000000FF0000
+      00CA000000100000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000005DB15ED25DB15EFF5DB15EFF7A8755FF9F53
-      4BFF9F534BFF9F534BFF9F534BFF9F534BFF857952FF5DB15EFF5DB15EFF5DB1
-      5EE95DB15E3400000000000000005DB15EE95DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF5DB15EFF5DB15EDE000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000A9000000FF000000FFC7C7C7FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBDBDBDFF0A0A0AFF000000FF0000
+      00FF000000C90000000900000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000005DB15E345DB15EF85DB15EFF5DB15EFF8F6A4FFF9F53
-      4BFF9F534BFF9F534BFF9F534BFF9F534BFF985D4DFF5DB15EFF5DB15EFF5DB1
-      5EFD5DB15E4B00000000000000005DB15EE95DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF5DB15EFF5DB15EFB5DB15EDE5DB1
-      5EDE5DB15EDE5DB15EBE5DB15E7E5DB15E340000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000005DB15EA55DB15EFF5DB15EFF699F5AFF9E554BFF9F53
-      4BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF778C56FF5DB15EFF5DB1
-      5EFF5DB15ED200000000000000005DB15EE95DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFE5DB15EEF5DB15EA55DB15E34000000000000
+      00000000000000000000000000A9000000FF000000FFC7C7C7FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD9D9D9FF4B4B4BFF000000FF0000
+      00FF000000FF0000006000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000005DB15E345DB15EE95DB15EFF5DB15EFF847A53FF9F534BFF9F53
-      4BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF8E6B50FF5DB15EFF5DB1
-      5EFF5DB15EF85DB15E34000000005DB15EE95DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFD5DB15ED25DB15E340000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000005DB15E4B5DB15EFD5DB15EFF5DB15EFF96604DFF9F534BFF9F53
-      4BFF9F534BFF92664FFF9F534BFF9F534BFF9F534BFF9D564BFF68A15BFF5DB1
-      5EFF5DB15EFF5DB15EA5000000005DB15EE95DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF6F9859FF877552FF95624EFF9562
-      4EFF90684FFF837B53FF66A45BFF5DB15EFF5DB15EFF5DB15EFE5DB15ED25DB1
-      5E34000000000000000000000000000000000000000000000000000000000000
-      0000000000005DB15EBE5DB15EFF5DB15EFF749157FF9F534BFF9F534BFF9F53
-      4BFF9E554BFF6B9D5AFF9D564CFF9F534BFF9F534BFF9F534BFF847A53FF5DB1
-      5EFF5DB15EFF5DB15EE95DB15E345DB15EE95DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF8C6E50FF847953FF9E544BFF9F534BFF9F534BFF9F53
-      4BFF9F534BFF9F534BFF9B594CFF7A8855FF5DB15EFF5DB15EFF5DB15EFD5DB1
-      5EA5000000000000000000000000000000000000000000000000000000000000
-      00005DB15E345DB15EF55DB15EFF5DB15EFF8B6F51FF9F534BFF9F534BFF9F53
-      4BFF92664FFF5DB15EFF8E6C50FF9F534BFF9F534BFF9F534BFF96604DFF5DB1
-      5EFF5DB15EFF5DB15EFD5DB15E4B5DB15EE95DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF9B594CFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
-      4BFF9F534BFF9F534BFF9F534BFF9E544BFF7A8855FF5DB15EFF5DB15EFF5DB1
-      5EEF5DB15E340000000000000000000000000000000000000000000000000000
-      00005DB15E7E5DB15EFF5DB15EFF64A75CFF9C584CFF9F534BFF9F534BFF9F53
-      4BFF807F54FF5DB15EFF7B8655FF9F534BFF9F534BFF9F534BFF9F534BFF758F
-      57FF5DB15EFF5DB15EFF5DB15EBE5DB15EEF5DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF9F534BFF9F534BFF9B594CFF8B6F51FF897251FF985D
-      4DFF9F534BFF9F534BFF9F534BFF9F534BFF9B594CFF66A45BFF5DB15EFF5DB1
-      5EFE5DB15E7E0000000000000000000000000000000000000000000000005DB1
-      5E345DB15EDE5DB15EFF5DB15EFF7E8154FF9F534BFF9F534BFF9F534BFF9D55
-      4BFF68A15BFF5DB15EFF62AA5CFF9A5A4CFF9F534BFF9F534BFF9F534BFF8D6D
-      50FF5DB15EFF5DB15EFF5DB15EF55DB15EF55DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF9F534BFF93644EFF66A45BFF5DB15EFF5DB15EFF5DB1
-      5EFF8D6D50FF9F534BFF9F534BFF9F534BFF9F534BFF847953FF5DB15EFF5DB1
-      5EFF5DB15ED20000000000000000000000000000000000000000000000005DB1
-      5E4B5DB15EFA5DB15EFF5DB15EFF92654EFF9F534BFF9F534BFF9F534BFF9069
-      4FFF5DB15EFF5DB15EFF5DB15EFF8C6F50FF9F534BFF9F534BFF9F534BFF9D56
-      4CFF64A75CFF5DB15EFF5DB15EFF5DB15EFA5DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF9E554BFF6C9C5AFF5DB15EFF5DB15EFF5DB15EFF5DB1
-      5EFF62AA5CFF995B4CFF9F534BFF9F534BFF9F534BFF93644EFF5DB15EFF5DB1
-      5EFF5DB15EE90000000000000000000000000000000000000000000000005DB1
-      5EA55DB15EFF5DB15EFF6E9859FF9E544BFF9F534BFF9F534BFF9F534BFF7D83
-      55FF5DB15EFF5DB15EFF5DB15EFF778C56FF9F534BFF9F534BFF9F534BFF9F53
-      4BFF817D53FF5DB15EFF5DB15EFF5DB15EFE5DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF93644EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
-      5EFF5DB15EFF8C6F50FF9F534BFF9F534BFF9F534BFF9C584CFF5DB15EFF5DB1
-      5EFF5DB15EF500000000000000000000000000000000000000005DB15E345DB1
-      5EE95DB15EFF5DB15EFF877552FF9F534BFF9F534BFF9F534BFF9D564BFF64A7
-      5CFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF995C4DFF9F534BFF9F534BFF9F53
-      4BFF95614EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF8B6F51FF5DB15EFF5DB15EFF5DB15EF55DB15EEF5DB1
-      5EFF5DB15EFF837B53FF9F534BFF9F534BFF9F534BFF9F544BFF62AA5CFF5DB1
-      5EFF5DB15EFA5DB15E34000000000000000000000000000000005DB15E4B5DB1
-      5EFD5DB15EFF5DB15EFF995B4DFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
-      4BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
-      4BFF9F534BFF729358FF5DB15EFF5DB15EFF5DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF897251FF5DB15EFF5DB15EFF5DB15EE95DB15ED25DB1
-      5EFF5DB15EFF817E54FF9F534BFF9F534BFF9F534BFF9F534BFF69A05AFF5DB1
-      5EFF5DB15EFB5DB15E34000000000000000000000000000000005DB15ED25DB1
-      5EFF5DB15EFF798A56FF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
-      4BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
-      4BFF9F534BFF8B6F51FF5DB15EFF5DB15EFF5DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF8C6E50FF5DB15EFF5DB15EFF5DB15EF55DB15EE95DB1
-      5EFF5DB15EFF827C53FF9F534BFF9F534BFF9F534BFF9F544BFF62AA5CFF5DB1
-      5EFF5DB15EFA5DB15E340000000000000000000000005DB15E345DB15EF85DB1
-      5EFF5DB15EFF8F6A50FF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
-      4BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
-      4BFF9F534BFF9C584CFF64A75CFF5DB15EFF5DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF93644EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
-      5EFF5DB15EFF887351FF9F534BFF9F534BFF9F534BFF9C584CFF5DB15EFF5DB1
-      5EFF5DB15EF5000000000000000000000000000000005DB15EA55DB15EFF5DB1
-      5EFF68A15BFF9D564BFF9F534BFF9F534BFF9F534BFF9A5B4CFF95624EFF9562
-      4EFF95624EFF95624EFF95624EFF95624EFF95624EFF985D4DFF9F534BFF9F53
-      4BFF9F534BFF9F534BFF7F8154FF5DB15EFF5DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF9E554BFF699F5AFF5DB15EFF5DB15EFF5DB15EFF5DB1
-      5EFF5DB15EFF96604DFF9F534BFF9F534BFF9F534BFF94634EFF5DB15EFF5DB1
-      5EFF5DB15EE90000000000000000000000005DB15E345DB15EE95DB15EFF5DB1
-      5EFF827C53FF9F534BFF9F534BFF9F534BFF9F534BFF798A56FF5DB15EFF5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF6B9E5AFF9E544BFF9F53
-      4BFF9F534BFF9F534BFF94634EFF5DB15EFF5DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF9F534BFF91674FFF5DB15EFF5DB15EFF5DB15EFF5DB1
-      5EFF807F54FF9F534BFF9F534BFF9F534BFF9F534BFF857952FF5DB15EFF5DB1
-      5EFF5DB15ED20000000000000000000000005DB15E4B5DB15EFB5DB15EFF5DB1
-      5EFF95614EFF9F534BFF9F534BFF9F534BFF9A5A4CFF5DB15EFF5DB15EFF5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF92664FFF9F53
-      4BFF9F534BFF9F534BFF9F544BFF709658FF5DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF9F534BFF9F534BFF95624EFF7F8054FF7A8855FF8C6F
-      50FF9E544BFF9F534BFF9F534BFF9F534BFF9C584CFF699F5AFF5DB15EFF5DB1
-      5EFF5DB15E7E0000000000000000000000005DB15EA55DB15EFF5DB15EFF7293
-      58FF9F534BFF9F534BFF9F534BFF9F534BFF8C6F50FF5DB15EFF5DB15EFF5DB1
-      5EFE5DB15EEF5DB15EEF5DB15EEF5DB15EFD5DB15EFF5DB15EFF7F8154FF9F53
-      4BFF9F534BFF9F534BFF9F534BFF897251FF5DB15EFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF995B4CFF9F534BFF9F534BFF9F534BFF9F534BFF9F53
-      4BFF9F534BFF9F534BFF9F534BFF9F534BFF7E8154FF5DB15EFF5DB15EFF5DB1
-      5EEF5DB15E4B0000000000000000000000005DB15EBE5DB15EFF5DB15EFF8B70
-      51FF9F534BFF9F534BFF9F534BFF9F534BFF778C56FF5DB15EFF5DB15EFF5DB1
-      5EBE0000000000000000000000005DB15E7E5DB15EFE5DB15EFF64A75CFF9D56
-      4CFF9F534BFF9F534BFF9F534BFF9B594CFF62AA5CFF5DB15EFF93644EFF9F53
-      4BFF9F534BFF9F534BFF7C8455FF92664FFF9F534BFF9F534BFF9F534BFF9F53
-      4BFF9F534BFF9F534BFF9E544BFF827D53FF5DB15EFF5DB15EFF5DB15EFD5DB1
-      5EA5000000000000000000000000000000005DB15EBE5DB15EFF5DB15EFF9068
-      4FFF95624EFF95624EFF95624EFF91674FFF5DB15EFF5DB15EFF5DB15EFA5DB1
-      5E4B0000000000000000000000005DB15E345DB15EEF5DB15EFF5DB15EFF8874
-      52FF95624EFF95624EFF95624EFF95624EFF758E57FF5DB15EFF8B7051FF9562
-      4EFF95624EFF95624EFF758E57FF5DB15EFF808054FF92654EFF9E544BFF9F53
-      4BFF9B594CFF8F6A4FFF719458FF5DB15EFF5DB15EFF5DB15EFF5DB15ED25DB1
-      5E34000000000000000000000000000000005DB15E7E5DB15EF85DB15EFF5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15ED25DB1
-      5E34000000000000000000000000000000005DB15EA55DB15EFD5DB15EFF5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EDE5DB15E4B0000
-      0000000000000000000000000000000000005DB15E345DB15EBE5DB15EFA5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFD5DB15ED25DB15E4B0000
-      0000000000000000000000000000000000005DB15E345DB15EBE5DB15EFA5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB15EFF5DB1
-      5EFF5DB15EFF5DB15EFF5DB15EFF5DB15EF85DB15EBE5DB15E34000000000000
-      000000000000000000000000000000000000000000005DB15E345DB15E7E5DB1
-      5EBE5DB15EDE5DB15EE95DB15EDE5DB15EBE5DB15E7E5DB15E34000000000000
-      000000000000000000000000000000000000000000005DB15E345DB15E7E5DB1
-      5EBE5DB15EDE5DB15EE95DB15EE95DB15EDE5DB15EBE5DB15EBE5DB15ED25DB1
-      5EDE5DB15EDE5DB15ED25DB15EBE5DB15EBE5DB15ED25DB15EDE5DB15EEF5DB1
-      5EEF5DB15EE95DB15ED25DB15EA55DB15E4B5DB15E3400000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000AA000000FF000000FFC8C8C8FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFD3D3D3FF6E6E6EFF000000FF000000FF000000FF0000
+      00FF000000F70000003400000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000AA000000FF000000FFC8C8C8FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFE
+      FEFFCCCCCCFF646464FF000000FF000000FF000000FF000000FF000000FC0000
+      00A70000002C0000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000AB000000FF000000FFC8C8C8FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCFCFCFF6E6E
+      6EFF000000FF000000FF000000FF000000FF000000FA0000009D000000260000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000AB000000FF000000FFC8C8C8FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE4E4E4FF0000
+      00FF000000FF000000FF000000F6000000940000001E00000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000AB000000FF000000FFC8C8C8FFFFFFFFFFFFFF
+      FFFFF9F9F9FFC1C1C1FF868686FFC3C3C3FFFFFFFFFFFFFFFFFFFCFCFCFF4C4C
+      4CFF000000FF000000FF00000089000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000AC000000FF000000FFC9C9C9FFE8E8E8FF9D9D
+      9DFF343434FF000000FF000000FF0F0F0FFFE4E4E4FFFFFFFFFFFFFFFFFFC4C4
+      C4FF000000FF000000FF000000F3000000170000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000AC000000FF000000FF4C4C4CFF0A0A0AFF0000
+      00FF000000FF000000FF000000FF000000FF8F8F8FFFFFFFFFFFFFFFFFFFFEFE
+      FEFF5D5D5DFF000000FF000000FF000000940000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000AD000000FF000000FF000000FF000000FF0000
+      00FF000000FF000000E2000000FF000000FF1C1C1CFFEFEFEFFFFFFFFFFFFFFF
+      FFFFCFCFCFFF000000FF000000FF000000F90000002200000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000A8000000FF000000FF000000FF000000FC0000
+      00B10000004800000002000000C5000000FF000000FFA3A3A3FFFFFFFFFFFFFF
+      FFFFFFFFFFFF6E6E6EFF000000FF000000FF000000A500000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000004B000000F6000000E8000000840000001E0000
+      0000000000000000000000000051000000FF000000FF323232FFF8F8F8FFFFFF
+      FFFFFFFFFFFFDBDBDBFF000000FF000000FF000000FD00000030000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000070000000000000000000000000000
+      0000000000000000000000000002000000DA000000FF000000FFB6B6B6FFFFFF
+      FFFFFFFFFFFFFFFFFFFF7E7E7EFF000000FF000000FF000000B6000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000069000000FF000000FF4B4B4BFFFDFD
+      FDFFFFFFFFFFFFFFFFFFE0E0E0FF000000FF000000FF000000FF0000003D0000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000009000000EB000000FF000000FFC7C7
+      C7FFFBFBFBFFBCBCBCFF484848FF000000FF000000FF000000FF000000810000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000081000000FF000000FF4F4F
+      4FFF484848FF000000FF000000FF000000FF000000FF000000E60000002B0000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000016000000F6000000FF0000
+      00FF000000FF000000FF000000FF000000EA000000750000000B000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000098000000FF0000
+      00FF000000FF000000EA000000750000000B0000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000001A000000D30000
+      00E0000000750000000B00000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000

lazpaint/lazpaintmainform.pas

@@ -28,6 +28,7 @@ type
   { TFMain }
 
   TFMain = class(TForm)
+    ToolEditShape: TAction;
     ComboBox_ArrowStart: TBCComboBox;
     ComboBox_ArrowEnd: TBCComboBox;
     ComboBox_BrushSelect: TBCComboBox;
@@ -3311,6 +3312,7 @@ var
     image.SetSavedFlag(BPP, frameIndex);
     ToolManager.ToolOpen;
     ZoomFitIfTooBig;
+    ToolHotSpotUpdate(nil);
     result := true;
   end;
   procedure ImportNewPicture;

lazpaint/maintoolbar.inc

@@ -1294,7 +1294,7 @@ end;
 
 procedure TFMain.ToolHotSpotUpdate(Sender: TObject);
 begin
-  ToolHotSpot.Visible := UTF8CompareText(ExtractFileExt(Image.currentFilenameUTF8),'.cur')=0;
+  ToolHotSpot.Visible := Image.IsCursor;
 end;
 
 procedure TFMain.Tool_LinearGradientClick(Sender: TObject);

lazpaint/release/bin/i18n/lazpaint.ar.po

@@ -155,6 +155,13 @@ msgid "Redo"
 msgstr "إعادة"
 
 #: tfmain.editselectall.caption
+msgctxt "tfmain.editselectall.caption"
+msgid "Select all"
+msgstr "تحديد الكل"
+
+#: tfmain.editselectall.hint
+#, fuzzy
+msgctxt "tfmain.editselectall.hint"
 msgid "Select all"
 msgstr "تحديد الكل"
 
@@ -1028,6 +1035,10 @@ msgstr "تشويه"
 msgid "Deformation grid"
 msgstr "تشويه الشبكة"
 
+#: tfmain.tooleditshape.hint
+msgid "Edit shape"
+msgstr ""
+
 #: tfmain.toolellipse.hint
 msgctxt "TFMAIN.TOOLELLIPSE.HINT"
 msgid "Ellipse"

lazpaint/release/bin/i18n/lazpaint.cs.po

@@ -151,6 +151,13 @@ msgid "Redo"
 msgstr "Provést znova"
 
 #: tfmain.editselectall.caption
+msgctxt "tfmain.editselectall.caption"
+msgid "Select all"
+msgstr "Vybrat vše"
+
+#: tfmain.editselectall.hint
+#, fuzzy
+msgctxt "tfmain.editselectall.hint"
 msgid "Select all"
 msgstr "Vybrat vše"
 
@@ -1025,6 +1032,10 @@ msgstr "Zakřivení"
 msgid "Deformation grid"
 msgstr "Mřížka zakřivení"
 
+#: tfmain.tooleditshape.hint
+msgid "Edit shape"
+msgstr ""
+
 #: tfmain.toolellipse.hint
 msgctxt "TFMAIN.TOOLELLIPSE.HINT"
 msgid "Ellipse"

lazpaint/release/bin/i18n/lazpaint.de.po

@@ -166,6 +166,13 @@ msgid "Redo"
 msgstr "Rückgängig"
 
 #: tfmain.editselectall.caption
+msgctxt "tfmain.editselectall.caption"
+msgid "Select all"
+msgstr "Alles auswählen"
+
+#: tfmain.editselectall.hint
+#, fuzzy
+msgctxt "tfmain.editselectall.hint"
 msgid "Select all"
 msgstr "Alles auswählen"
 
@@ -1040,6 +1047,10 @@ msgstr "Verformung"
 msgid "Deformation grid"
 msgstr "Verformungsgitter"
 
+#: tfmain.tooleditshape.hint
+msgid "Edit shape"
+msgstr ""
+
 #: tfmain.toolellipse.hint
 msgctxt "TFMAIN.TOOLELLIPSE.HINT"
 msgid "Ellipse"

lazpaint/release/bin/i18n/lazpaint.es.po

@@ -149,6 +149,13 @@ msgid "Redo"
 msgstr "Rehacer"
 
 #: tfmain.editselectall.caption
+msgctxt "tfmain.editselectall.caption"
+msgid "Select all"
+msgstr "Seleccionar todo"
+
+#: tfmain.editselectall.hint
+#, fuzzy
+msgctxt "tfmain.editselectall.hint"
 msgid "Select all"
 msgstr "Seleccionar todo"
 
@@ -1022,6 +1029,10 @@ msgstr "Deformación"
 msgid "Deformation grid"
 msgstr "Grilla de deformación"
 
+#: tfmain.tooleditshape.hint
+msgid "Edit shape"
+msgstr "Editar forma"
+
 #: tfmain.toolellipse.hint
 msgctxt "TFMAIN.TOOLELLIPSE.HINT"
 msgid "Ellipse"

lazpaint/release/bin/i18n/lazpaint.fi.po

@@ -140,6 +140,13 @@ msgid "Redo"
 msgstr "Palauta"
 
 #: tfmain.editselectall.caption
+msgctxt "tfmain.editselectall.caption"
+msgid "Select all"
+msgstr "Valitse kaikki"
+
+#: tfmain.editselectall.hint
+#, fuzzy
+msgctxt "tfmain.editselectall.hint"
 msgid "Select all"
 msgstr "Valitse kaikki"
 
@@ -1015,6 +1022,10 @@ msgstr "Muodonmuutos"
 msgid "Deformation grid"
 msgstr "Muodonmuutosruudukko"
 
+#: tfmain.tooleditshape.hint
+msgid "Edit shape"
+msgstr ""
+
 #: tfmain.toolellipse.hint
 msgctxt "TFMAIN.TOOLELLIPSE.HINT"
 msgid "Ellipse"

lazpaint/release/bin/i18n/lazpaint.fr.po

@@ -155,6 +155,13 @@ msgid "Redo"
 msgstr "Refaire"
 
 #: tfmain.editselectall.caption
+msgctxt "tfmain.editselectall.caption"
+msgid "Select all"
+msgstr "Tout sélectionner"
+
+#: tfmain.editselectall.hint
+#, fuzzy
+msgctxt "tfmain.editselectall.hint"
 msgid "Select all"
 msgstr "Tout sélectionner"
 
@@ -1029,6 +1036,10 @@ msgstr "Déformation"
 msgid "Deformation grid"
 msgstr "Grille de déformation"
 
+#: tfmain.tooleditshape.hint
+msgid "Edit shape"
+msgstr "Modifier la forme"
+
 #: tfmain.toolellipse.hint
 msgctxt "TFMAIN.TOOLELLIPSE.HINT"
 msgid "Ellipse"

lazpaint/release/bin/i18n/lazpaint.ja.po

@@ -155,6 +155,13 @@ msgid "Redo"
 msgstr "リドゥ"
 
 #: tfmain.editselectall.caption
+msgctxt "tfmain.editselectall.caption"
+msgid "Select all"
+msgstr "全選択"
+
+#: tfmain.editselectall.hint
+#, fuzzy
+msgctxt "tfmain.editselectall.hint"
 msgid "Select all"
 msgstr "全選択"
 
@@ -1028,6 +1035,10 @@ msgstr "グリッド変形"
 msgid "Deformation grid"
 msgstr "グリッドを変形させる"
 
+#: tfmain.tooleditshape.hint
+msgid "Edit shape"
+msgstr ""
+
 #: tfmain.toolellipse.hint
 msgctxt "TFMAIN.TOOLELLIPSE.HINT"
 msgid "Ellipse"

lazpaint/release/bin/i18n/lazpaint.lv.po

@@ -153,6 +153,13 @@ msgid "Redo"
 msgstr "Pārdarīt"
 
 #: tfmain.editselectall.caption
+msgctxt "tfmain.editselectall.caption"
+msgid "Select all"
+msgstr "Iezīmēt visu"
+
+#: tfmain.editselectall.hint
+#, fuzzy
+msgctxt "tfmain.editselectall.hint"
 msgid "Select all"
 msgstr "Iezīmēt visu"
 
@@ -1025,6 +1032,10 @@ msgstr "Staipīšana"
 msgid "Deformation grid"
 msgstr "Staipīšanas režģis"
 
+#: tfmain.tooleditshape.hint
+msgid "Edit shape"
+msgstr ""
+
 #: tfmain.toolellipse.hint
 msgctxt "TFMAIN.TOOLELLIPSE.HINT"
 msgid "Ellipse"

lazpaint/release/bin/i18n/lazpaint.nl.po

@@ -175,6 +175,13 @@ msgid "Redo"
 msgstr "Opnieuw uitvoeren"
 
 #: tfmain.editselectall.caption
+msgctxt "tfmain.editselectall.caption"
+msgid "Select all"
+msgstr "Alles selecteren"
+
+#: tfmain.editselectall.hint
+#, fuzzy
+msgctxt "tfmain.editselectall.hint"
 msgid "Select all"
 msgstr "Alles selecteren"
 
@@ -1050,6 +1057,10 @@ msgstr "Vervorming"
 msgid "Deformation grid"
 msgstr "Vervormingsraster"
 
+#: tfmain.tooleditshape.hint
+msgid "Edit shape"
+msgstr ""
+
 #: tfmain.toolellipse.hint
 msgctxt "TFMAIN.TOOLELLIPSE.HINT"
 msgid "Ellipse"

lazpaint/release/bin/i18n/lazpaint.po

@@ -139,6 +139,12 @@ msgid "Redo"
 msgstr ""
 
 #: tfmain.editselectall.caption
+msgctxt "tfmain.editselectall.caption"
+msgid "Select all"
+msgstr ""
+
+#: tfmain.editselectall.hint
+msgctxt "tfmain.editselectall.hint"
 msgid "Select all"
 msgstr ""
 
@@ -1010,6 +1016,10 @@ msgstr ""
 msgid "Deformation grid"
 msgstr ""
 
+#: tfmain.tooleditshape.hint
+msgid "Edit shape"
+msgstr ""
+
 #: tfmain.toolellipse.hint
 msgctxt "TFMAIN.TOOLELLIPSE.HINT"
 msgid "Ellipse"

lazpaint/release/bin/i18n/lazpaint.pt_BR.po

@@ -159,6 +159,13 @@ msgid "Redo"
 msgstr "Refazer"
 
 #: tfmain.editselectall.caption
+msgctxt "tfmain.editselectall.caption"
+msgid "Select all"
+msgstr "Selecionar tudo"
+
+#: tfmain.editselectall.hint
+#, fuzzy
+msgctxt "tfmain.editselectall.hint"
 msgid "Select all"
 msgstr "Selecionar tudo"
 
@@ -1030,6 +1037,10 @@ msgstr "Distorção"
 msgid "Deformation grid"
 msgstr "Grade de distorção"
 
+#: tfmain.tooleditshape.hint
+msgid "Edit shape"
+msgstr ""
+
 #: tfmain.toolellipse.hint
 msgctxt "TFMAIN.TOOLELLIPSE.HINT"
 msgid "Ellipse"

lazpaint/release/bin/i18n/lazpaint.ru.po

@@ -155,6 +155,13 @@ msgid "Redo"
 msgstr "Переделать"
 
 #: tfmain.editselectall.caption
+msgctxt "tfmain.editselectall.caption"
+msgid "Select all"
+msgstr "Выбрать все"
+
+#: tfmain.editselectall.hint
+#, fuzzy
+msgctxt "tfmain.editselectall.hint"
 msgid "Select all"
 msgstr "Выбрать все"
 
@@ -1028,6 +1035,10 @@ msgstr "Деформация"
 msgid "Deformation grid"
 msgstr "Деформация сетки"
 
+#: tfmain.tooleditshape.hint
+msgid "Edit shape"
+msgstr ""
+
 #: tfmain.toolellipse.hint
 msgctxt "TFMAIN.TOOLELLIPSE.HINT"
 msgid "Ellipse"

lazpaint/release/bin/i18n/lazpaint.sv.po

@@ -139,6 +139,13 @@ msgid "Redo"
 msgstr "Gör om"
 
 #: tfmain.editselectall.caption
+msgctxt "tfmain.editselectall.caption"
+msgid "Select all"
+msgstr "Välj allt"
+
+#: tfmain.editselectall.hint
+#, fuzzy
+msgctxt "tfmain.editselectall.hint"
 msgid "Select all"
 msgstr "Välj allt"
 
@@ -1012,6 +1019,10 @@ msgstr "Förvrängning"
 msgid "Deformation grid"
 msgstr "Förvrängningsnät"
 
+#: tfmain.tooleditshape.hint
+msgid "Edit shape"
+msgstr ""
+
 #: tfmain.toolellipse.hint
 msgctxt "TFMAIN.TOOLELLIPSE.HINT"
 msgid "Ellipse"

lazpaint/tools/utool.pas

@@ -8,8 +8,9 @@ uses
   Classes, SysUtils, Graphics, BGRABitmap, BGRABitmapTypes, uimage,
   UImageType, ULayerAction, LCLType, Controls, UBrushType, UConfig;
 
-type TPaintToolType = (ptHand,ptHotSpot, ptMoveLayer,ptRotateLayer,ptZoomLayer, ptPen, ptBrush, ptClone, ptColorPicker, ptEraser,
-                   ptRect, ptEllipse, ptPolygon, ptSpline,
+type TPaintToolType = (ptHand,ptHotSpot, ptMoveLayer,ptRotateLayer,ptZoomLayer,
+                   ptPen, ptBrush, ptClone, ptColorPicker, ptEraser,
+                   ptEditShape, ptRect, ptEllipse, ptPolygon, ptSpline,
                    ptFloodFill, ptGradient, ptPhong,
                    ptSelectPen, ptSelectRect, ptSelectEllipse, ptSelectPoly, ptSelectSpline,
                    ptMoveSelection, ptRotateSelection, ptMagicWand, ptDeformation, ptTextureMapping, ptLayerMapping,
@@ -18,7 +19,7 @@ type TPaintToolType = (ptHand,ptHotSpot, ptMoveLayer,ptRotateLayer,ptZoomLayer,
 const
   PaintToolTypeStr : array[TPaintToolType] of string = ('Hand','HotSpot', 'MoveLayer','RotateLayer','ZoomLayer',
                    'Pen', 'Brush', 'Clone', 'ColorPicker', 'Eraser',
-                   'Rect', 'Ellipse', 'Polygon', 'Spline',
+                   'EditShape', 'Rect', 'Ellipse', 'Polygon', 'Spline',
                    'FloodFill', 'Gradient', 'Phong',
                    'SelectPen', 'SelectRect', 'SelectEllipse', 'SelectPoly', 'SelectSpline',
                    'MoveSelection', 'RotateSelection', 'MagicWand', 'Deformation', 'TextureMapping', 'LayerMapping',

lazpaint/umenu.pas

@@ -361,7 +361,8 @@ begin
     else
       curTool := succ(curTool);
 
-    if FToolsShortcuts[curTool] = AShortCut then
+    if (FToolsShortcuts[curTool] = AShortCut) and not
+       ((curTool = ptHotSpot) and not FInstance.Image.IsCursor) then
     begin
       ATool := curTool;
       AShortCut:= '';
@@ -387,7 +388,7 @@ begin
   AddMenus('MenuFilter', 'MenuRadialBlur,FilterBlurMotion,FilterBlurCustom,FilterPixelate,-,FilterSharpen,FilterSmooth,FilterNoise,FilterMedian,FilterClearType,FilterClearTypeInverse,FilterFunction,-,FilterContour,FilterEmboss,FilterPhong,-,FilterSphere,FilterTwirl,FilterWaveDisplacement,FilterCylinder');
   AddMenus('MenuRadialBlur',  'FilterBlurBox,FilterBlurFast,FilterBlurRadial,FilterBlurCorona,FilterBlurDisk');
   AddMenus('MenuColors', 'ColorCurves,ColorPosterize,ColorColorize,ColorShiftColors,FilterComplementaryColor,ColorIntensity,-,ColorLightness,FilterNegative,FilterLinearNegative,FilterNormalize,FilterGrayscale');
-  AddMenus('MenuTool',   'ToolHand,ToolHotSpot,ToolColorPicker,-,ToolPen,ToolBrush,ToolEraser,ToolFloodFill,ToolClone,-,ToolRect,ToolEllipse,ToolPolygon,ToolSpline,ToolGradient,ToolPhong,ToolText,-,ToolDeformation,ToolTextureMapping');
+  AddMenus('MenuTool',   'ToolHand,ToolHotSpot,ToolColorPicker,-,ToolPen,ToolBrush,ToolEraser,ToolFloodFill,ToolClone,-,ToolEditShape,ToolRect,ToolEllipse,ToolPolygon,ToolSpline,ToolGradient,ToolPhong,ToolText,-,ToolDeformation,ToolTextureMapping');
   AddMenus('MenuRender', 'RenderPerlinNoise,RenderCyclicPerlinNoise,-,RenderWater,RenderCustomWater,RenderSnowPrint,RenderWood,RenderWoodVertical,RenderMetalFloor,RenderPlastik,RenderStone,RenderRoundStone,RenderMarble,RenderCamouflage,-,RenderClouds,FilterRain');
   AddMenus('MenuHelp',   'HelpIndex,-,HelpAbout');
   for i := 0 to high(FMainMenus) do
@@ -513,6 +514,7 @@ begin
   ActionShortcut('ToolBrush','B');
   ActionShortcut('ToolColorPicker','I');
   ActionShortcut('ToolEraser','E');
+  ActionShortcut('ToolEditShape','J');
   ActionShortcut('ToolRect','U');
   ActionShortcut('ToolEllipse','U');
   ActionShortcut('ToolPolygon','D');