TurboPower_ipro: Fix IpHtmlPanel ignoring linebreak between <p> nodes within a <td> node. Improvements in rendering distance between paragraphs.

git-svn-id: trunk@58817 -

components/turbopower_ipro/ipfilebroker.pas

@@ -81,7 +81,6 @@ type
   public
     constructor Create(AOwner : TComponent); override;
     destructor Destroy; override;
-
     function DoGetHtmlStream(const URL : string; PostData : TIpFormDataEntity) : TStream; override;
     function DoCheckURL(const URL : string; var ContentType : string) : Boolean; override;
     procedure DoLeave(Html : TIpHtml); override;

components/turbopower_ipro/iphtml.pas

@@ -96,7 +96,7 @@ const
   MAXINTS = 4096; {buffer size - this should be way more than needed}
   TINTARRGROWFACTOR = 64;
   DEFAULT_PRINTMARGIN = 0.5; {inches}
-  FONTSIZESVALUSARRAY : array[0..6] of integer = (8,10,12,14,18,24,36);
+  FONTSIZESVALUESARRAY : array[0..6] of integer = (8,10,12,14,18,24,36);
   MAXWORDS = 65536;
 
   ZOOM_TO_FIT = 0;
@@ -299,6 +299,7 @@ type
     WordRect2 : TRect;
     Props : TIpHtmlProps;
     Owner : TIpHtmlNode;
+    LFHeight : Integer;  // Height of LineFeed elements
     {$IFDEF IP_LAZARUS}
     IsSelected: boolean;
     {$ENDIF}
@@ -649,6 +650,8 @@ type
     property Size : TIpHtmlHeaderSize read FSize write FSize;
   end;
 
+  { TIpHtmlNodeP }
+
   TIpHtmlNodeP = class(TIpHtmlNodeInline)
   private
     FAlign : TIpHtmlAlign;
@@ -2039,6 +2042,7 @@ type
     procedure EnsureClosure(const EndToken: TIpHtmlToken; const EndTokens: TIpHtmlTokenSet);
     function NewElement(EType : TElementType; Own: TIpHtmlNode) : PIpHtmlElement;
     function BuildStandardEntry(EType: TElementType): PIpHtmlElement;
+    function BuildLinefeedEntry(EType: TElementType; AHeight: Integer): PIpHtmlElement;
     function ParseDir: TIpHtmlDirection;
     procedure ParseSPAN(Parent: TIpHtmlNode; const EndTokens: TIpHtmlTokenSet);
     procedure ParseQ(Parent: TIpHtmlNode; const EndTokens: TIpHtmlTokenSet);
@@ -3908,21 +3912,22 @@ end;
 procedure TIpHtmlBaseLayouter.RemoveDuplicateLFs;
 var
   i: Integer;
+  elem: PIpHtmlElement;
+  prevelem: PIpHtmlElement;
 begin
   i := pred(FElementQueue.Count);
-  while i >= 0 do begin
+  while i > 0 do begin
+    elem := PIpHtmlElement(FElementQueue[i]);
+    prevelem := PIpHtmlElement(FElementQueue[i-1]);
     case PIpHtmlElement(FElementQueue[i])^.ElementType of
       etSoftLF:
-        if (i > 0) and (PIpHtmlElement(FElementQueue[i-1])^.ElementType in [etSoftLF, etHardLF])
-          then FElementQueue.Delete(i);
-      {
-      etHardLF:
-        if (i > 0) and (PIpHtmlElement(FElementQueue[i-1])^.ElementType in [etSoftLF, etHardLF])
-        then begin
-          FElementQueue.Delete(i-1);
-          dec(i);
+        if (prevelem.ElementType in [etSoftLF, etHardLF]) then begin
+          prevelem.LFHeight := MaxI2(prevelem.LFHeight, elem.LFHeight);
+          FElementQueue.Delete(i);
         end;
-        }
+      etHardLF:
+        if (prevelem.ElementType in [etSoftLF, etHardLF]) then
+          prevelem.LFHeight := MaxI2(prevelem.LFHeight, elem.LFHeight);
     end;
     dec(i);
   end;
@@ -8712,6 +8717,14 @@ begin
   SetWordRect(Result, Rect(0, 0, 0, 0));
 end;
 
+function TIpHtml.BuildLineFeedEntry(EType: TElementType;
+  AHeight: Integer): PIpHtmlElement;
+begin
+  if not (EType in [etHardLF, etSoftLF]) then
+    raise Exception.Create('BuildLinefeedEntry can only be called with parameter etSoftLF or dtHardLF');
+  Result := BuildStandardEntry(EType);
+  Result.LFHeight := AHeight;
+end;
 procedure TIpHtml.MakeVisible(const R: TRect{$IFDEF IP_LAZARUS}; ShowAtTop: Boolean = True{$ENDIF});
 begin
   if assigned(FOnScroll) then
@@ -9212,7 +9225,7 @@ begin
     Props.FontName := FirstString(Face);
   case Size.SizeType of
   hrsAbsolute :
-    Props.FontSize := FONTSIZESVALUSARRAY[Size.Value-1];
+    Props.FontSize := FONTSIZESVALUESARRAY[Size.Value-1];
   hrsRelative :
     begin
       TmpSize := Props.BaseFontSize + Size.Value;
@@ -9222,7 +9235,7 @@ begin
       if TmpSize > 7 then
         Props.FontSize := 36
       else
-        Props.FontSize := FONTSIZESVALUSARRAY[TmpSize-1];
+        Props.FontSize := FONTSIZESVALUESARRAY[TmpSize-1];
     end;
   end;
   if Color <> -1 then
@@ -9624,22 +9637,41 @@ begin
   inherited SetProps(Props);
 end;
 
+function GetMargin(AMargin: TIpHtmlElemMargin; ADefault: Integer): Integer;
+begin
+  if AMargin.Style = hemsPx then
+    Result := round(AMargin.Size)
+  else
+    Result := ADefault;
+end;
+
 procedure TIpHtmlNodeP.Enqueue;
+var
+  elem: PIpHtmlElement;
+  hf, h: Integer;
 begin
+  hf := Props.FontSize;
   if FChildren.Count > 0 then begin
-    if not ((FParentNode is TIpHtmlNodeLI) or (FParentNode is TIpHtmlNodeTD)) then
+    if not (FParentNode is TIpHtmlNodeLI) then
     begin
-      EnqueueElement(Owner.SoftLF);
-      EnqueueElement(Owner.HardLF);
+      if FParentNode is TIpHtmlNodeTD then h := 0 else h := hf div 2;
+      // FIXME: above line is a workaround for LHelp to display the code tables
+      // correctly
+      h := GetMargin(Props.ElemMarginTop, h);
+      elem := Owner.BuildLinefeedEntry(etSoftLF, h);
+      EnqueueElement(elem);
     end;
   end;
-
   inherited Enqueue;
-
   if FChildren.Count > 0 then begin
-    if not (FParentNode is TIpHtmlNodeTD) then begin
-      EnqueueElement(Owner.SoftLF);
-      EnqueueElement(Owner.HardLF);
+    if not (FParentNode is TIpHtmlNodeLI) then
+    begin
+      if FParentNode is TIpHtmlNodeTD then h := 0 else h := hf div 2;
+      // FIXME: above line is a workaround for LHelp to display the code tables
+      // correctly
+      h := GetMargin(Props.ElemMarginBottom, h);
+      elem := Owner.BuildLinefeedEntry(etSoftLF, h);
+      EnqueueElement(elem);
     end;
   end;
 end;
@@ -9784,7 +9816,7 @@ procedure TIpHtmlNodeHeader.SetProps(const RenderProps: TIpHtmlProps);
 begin
   Props.Assign(RenderProps);
   Props.DelayCache:=True;
-  Props.FontSize := FONTSIZESVALUSARRAY[abs(Size-6)];
+  Props.FontSize := FONTSIZESVALUESARRAY[abs(Size-6)];
   Props.FontStyle := [fsBold];
   Props.Alignment := Align;
   Props.DelayCache:=False;
@@ -9792,13 +9824,22 @@ begin
 end;
 
 procedure TIpHtmlNodeHeader.Enqueue;
+var
+  elem: PIpHtmlElement;
+  hf: Integer;
+  h: Integer;
 begin
-  if FChildren.Count > 0 then
-    EnqueueElement(Owner.HardLF);
+  hf := Props.FontSize;
+  if FChildren.Count > 0 then begin
+    h := GetMargin(Props.ElemMarginTop, hf div 2);
+    elem := Owner.BuildLinefeedEntry(etHardLF, h);
+    EnqueueElement(elem);
+  end;
   inherited Enqueue;
   if FChildren.Count > 0 then begin
-    EnqueueElement(Owner.SoftLF);
-//    EnqueueElement(Owner.HardLF);    // Remove large spacing after header line
+    h := GetMargin(Props.ElemMarginBottom, hf div 4);
+    elem := Owner.BuildLinefeedEntry(etHardLF, h);
+    EnqueueElement(elem);
   end;
 end;
 
@@ -10611,12 +10652,11 @@ begin
   end;
 }
   EnqueueElement(Owner.SoftLF);
-  EnqueueElement(Owner.HardLF);
 
   EnqueueElement(Element);
 
   EnqueueElement(Owner.SoftLF);
-  EnqueueElement(Owner.hardLF);  // LFs needed otherwise next element is too close
+//  EnqueueElement(Owner.HardLF);  // LFs needed otherwise next element is too close
 {
   case Align of
   hiaTop,
@@ -11567,7 +11607,7 @@ procedure TIpHtmlNodeBASEFONT.ApplyProps(
   const RenderProps: TIpHtmlProps);
 begin
   Props.Assign(RenderProps);
-  Props.FontSize := FONTSIZESVALUSARRAY[Size-1];
+  Props.FontSize := FONTSIZESVALUESARRAY[Size-1];
   Props.BaseFontSize := Size;
 end;
 

components/turbopower_ipro/iphtmlblocklayout.pas

@@ -806,6 +806,7 @@ var
   Prefor : Boolean;
   CurElem : PIpHtmlElement;
   wi: PWordInfo;
+  lfh: Integer;
 
   procedure InitInner;
   begin
@@ -831,6 +832,7 @@ var
     FBaseOffset := 0;
     FSoftBreak := False;
     FHyphenSpace := 0;
+    lfh := 0;
   end;
 
   procedure ContinueRow;
@@ -935,12 +937,20 @@ begin
               Break;
           etSoftLF :
             if not DoQueueElemSoftLF(WW) then
+            begin
+              if CurElem.LFHeight > 0 then
+                lfh := CurElem.LFHeight;
               Break;
+            end;
           etHardLF :
             if not DoQueueElemHardLF then
+            begin
+              if CurElem.LFHeight > 0 then
+                lfh := CurElem.LFHeight;
             //  raise EIpHtmlException.Create('TIpNodeBlockLayouter.LayoutQueue: FIgnoreHardLF is True after all.')
             //else
               Break;
+            end;
           etClearLeft, etClearRight, etClearBoth :
             if not DoQueueElemClear(CurElem) then
               Break;
@@ -977,7 +987,7 @@ begin
       OutputQueueLine;
       if (not FExpBreak) and (FTextWidth=0) and (FVRemainL=0) and (FVRemainR=0) then
         break;
-      Inc(YYY, FMaxAscent + FMaxDescent);
+      Inc(YYY, FMaxAscent + FMaxDescent + lfh);
 
       // Calculate VRemainL and VRemainR
       FVRemainL := CalcVRemain(FVRemainL, FLIdent);

examples/gridexamples/merged_cells/mainform.lfm

@@ -5,7 +5,7 @@ object Form1: TForm1
   Width = 650
   Caption = 'Form1'
   OnCreate = FormCreate
-  LCLVersion = '1.7'
+  LCLVersion = '1.8.4.0'
   object ImageList1: TImageList
     left = 58
     top = 45

examples/gridexamples/merged_cells/mainform.pas

@@ -132,6 +132,7 @@ end;
 procedure TForm1.MergeCellsHandler(Sender: TObject; ACol, ARow: Integer;
   var ALeft, ATop, ARight, ABottom: Integer);
 begin
+  (*
   // Define a merged block which is a single row heigh
   if (ACol in [1..2]) and (ARow = 1) then begin
     ALeft := 1;
@@ -149,10 +150,11 @@ begin
     ALeft := 1;
     ARight := 2;
   end else
+  *)
   // Define a merged block in the row headers (for the vertical text)
   if (ACol = 0) and (ARow in [2..5]) then begin
     ATop := 2;
-    ABottom := 5;
+    ABottom := 5;    (*
   end else
   // Merge the next two cells adjacent to cell with text 'Image'
   if (ACol > 1) and (Grid.Cells[ACol-1, ARow] = 'Image') then begin
@@ -161,7 +163,7 @@ begin
   end else
   if (ACol > 2) and (Grid.Cells[ACol-2, ARow] = 'Image') then begin
     ALeft := ACol - 1;
-    ARight := ALeft + 1;
+    ARight := ALeft + 1;    *)
   end;
 end;
 

examples/gridexamples/merged_cells/mergedcells_project.lpi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="11"/>
+    <Version Value="10"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
@@ -16,10 +16,9 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <FormatVersion Value="2"/>
-      <Modes Count="1">
-        <Mode0 Name="default"/>
-      </Modes>
+      <local>
+        <FormatVersion Value="1"/>
+      </local>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>

tools/lazdatadesktop/dicteditor.pp

@@ -71,7 +71,6 @@ Type
     FDomainsNode : TTreeNode;
 {$endif}
     Function AddNewItemPopup(ObjectType: TEditObjectType; AImageIndex : Integer) : TMenuItem;
-    procedure CreateGUI;
     procedure DoDoubleClick(Sender: TObject);
     procedure DoNewObject(Sender: TObject);
     procedure DoDeleteObject(Sender: TObject);
@@ -112,6 +111,7 @@ Type
     Constructor Create(AOwner : TComponent); override;
     Destructor Destroy; override;
     // General methods.
+    procedure CreateGUI;
     Procedure ShowDictionary;
     Procedure LoadFromFile(AFileName : String);
     Procedure SaveToFile(AFileName : String);
@@ -351,7 +351,7 @@ constructor TDataDictEditor.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
   FDD:=TFPDataDictionary.Create;
-  CreateGUI;
+  //CreateGUI;
 end;
 
 Procedure TDataDictEditor.CreateGUI;

tools/lazdatadesktop/frmmain.lfm

@@ -5,7 +5,7 @@ object MainForm: TMainForm
   Width = 666
   ActiveControl = PCRecent
   Caption = 'Lazarus Database Desktop'
-  ClientHeight = 464
+  ClientHeight = 460
   ClientWidth = 666
   Menu = MainMenu1
   OnClose = FormClose
@@ -15,7 +15,7 @@ object MainForm: TMainForm
   OnShow = FormShow
   Position = poScreenCenter
   SessionProperties = 'Height;Left;Top;Width;WindowState'
-  LCLVersion = '1.7'
+  LCLVersion = '1.9.0.0'
   object TBMain: TToolBar
     Left = 0
     Height = 26
@@ -48,85 +48,81 @@ object MainForm: TMainForm
       Left = 73
       Height = 24
       Top = 2
-      Width = 10
       Style = tbsSeparator
     end
     object TBNewTable: TToolButton
-      Left = 115
+      Left = 113
       Top = 2
       Action = ANewTable
     end
     object TBNewField: TToolButton
-      Left = 139
+      Left = 137
       Top = 2
       Action = ANewField
     end
     object ToolButton2: TToolButton
-      Left = 259
+      Left = 257
       Height = 24
       Top = 2
-      Width = 10
       Style = tbsSeparator
     end
     object TBDeleteTable: TToolButton
-      Left = 269
+      Left = 265
       Top = 2
       Action = ADeleteObject
     end
     object ToolButton3: TToolButton
-      Left = 293
+      Left = 289
       Height = 24
       Top = 2
-      Width = 10
       Style = tbsSeparator
     end
     object TBGenerateSQL: TToolButton
-      Left = 303
+      Left = 297
       Top = 2
       Action = AGenerateSQL
     end
     object TBAddIndex: TToolButton
-      Left = 187
+      Left = 185
       Top = 2
       Action = ANewIndex
     end
     object ToolButton5: TToolButton
-      Left = 327
+      Left = 321
       Top = 2
       Action = ACreateCode
     end
     object TBAddSequence: TToolButton
-      Left = 211
+      Left = 209
       Top = 2
       Action = AAddSequence
     end
     object ToolButton4: TToolButton
-      Left = 235
+      Left = 233
       Top = 2
       Action = AAddDomain
     end
     object ToolButton6: TToolButton
-      Left = 163
+      Left = 161
       Top = 2
       Action = AAddForeignKey
     end
     object ToolButton7: TToolButton
-      Left = 107
+      Left = 105
       Height = 24
       Top = 2
-      Width = 8
       Caption = 'ToolButton7'
       Style = tbsSeparator
     end
     object ToolButton8: TToolButton
-      Left = 83
+      Left = 81
       Top = 2
       Action = ANewConnection
     end
   end
   object PCRecent: TPageControl
     Left = 0
-    Height = 418
+    Height = 414
     Top = 26
     Width = 458
     ActivePage = TSAll
@@ -209,16 +205,15 @@ object MainForm: TMainForm
     end
     object TSAll: TTabSheet
       Caption = 'Connections/Dictionaries'
-      ClientHeight = 380
+      ClientHeight = 386
       ClientWidth = 450
       ImageIndex = 17
       object TVAll: TTreeView
         Left = 0
-        Height = 380
+        Height = 386
         Top = 0
         Width = 450
         Align = alClient
-        DefaultItemHeight = 16
         Images = ILMain
         PopupMenu = PMAll
         ReadOnly = True
@@ -231,7 +226,7 @@ object MainForm: TMainForm
   object PStatus: TPanel
     Left = 0
     Height = 20
-    Top = 444
+    Top = 440
     Width = 666
     Align = alBottom
     BevelOuter = bvNone
@@ -260,7 +255,7 @@ object MainForm: TMainForm
   end
   object PCItems: TPageControl
     Left = 466
-    Height = 418
+    Height = 414
     Top = 26
     Width = 200
     Align = alRight
@@ -269,7 +264,7 @@ object MainForm: TMainForm
   end
   object SRecent: TSplitter
     Left = 458
-    Height = 418
+    Height = 414
     Top = 26
     Width = 8
     Align = alRight
@@ -283,120 +278,12 @@ object MainForm: TMainForm
       Caption = '&File'
       object MenuItem1: TMenuItem
         Action = ANew
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000000000008080
-          80FF808080FF808080FF808080FF808080FF808080FF808080FF808080FF8080
-          80FF808080FF808080FF808080FF000000000000000000000000000000FF0000
-          00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
-          00FF000000FF000000FF808080FF0000000000000000000000000F0F0FFFFFFF
-          FFFFC0C0C0FFC0C0C0FFC0C0C0FFC0C0C0FFC0C0C0FFC0C0C0FFC0C0C0FFC0C0
-          C0FFC0C0C0FF000000FF808080FF000000000000000000000000000000FFFFFF
-          FFFFD1D1D1FFD1D1D1FFD1D1D1FFD1D1D1FFD1D1D1FFD1D1D1FFD1D1D1FFD1D1
-          D1FFC0C0C0FF000000FF808080FF000000000000000000000000000000FFFFFF
-          FFFFD1D1D1FFD1D1D1FFD1D1D1FFD1D1D1FFD1D1D1FFD1D1D1FFD1D1D1FFD1D1
-          D1FFC0C0C0FF000000FF808080FF000000000000000000000000000000FFFFFF
-          FFFFD1D1D1FFDFDFDFFFD1D1D1FFDFDFDFFFD1D1D1FFDFDFDFFFD1D1D1FFDFDF
-          DFFFC0C0C0FF000000FF808080FF000000000000000000000000000000FFFFFF
-          FFFFDFDFDFFFD1D1D1FFDFDFDFFFD1D1D1FFDFDFDFFFD1D1D1FFDFDFDFFFD1D1
-          D1FFC0C0C0FF000000FF808080FF000000000000000000000000000000FFFFFF
-          FFFFDFDFDFFFDFDFDFFFDFDFDFFFDFDFDFFFDFDFDFFFDFDFDFFFDFDFDFFFDFDF
-          DFFFC0C0C0FF000000FF808080FF000000000000000000000000000000FFFFFF
-          FFFFDFDFDFFFF0F0F0FFDFDFDFFFF0F0F0FFDFDFDFFFF0F0F0FFDFDFDFFFF0F0
-          F0FFC0C0C0FF000000FF808080FF000000000000000000000000000000FFFFFF
-          FFFFF0F0F0FFDFDFDFFFF0F0F0FFDFDFDFFFF0F0F0FFDFDFDFFFF0F0F0FFDFDF
-          DFFFC0C0C0FF000000FF808080FF000000000000000000000000000000FFFFFF
-          FFFFF0F0F0FFF0F0F0FFF0F0F0FFF0F0F0FFF0F0F0FFF0F0F0FFF0F0F0FFF0F0
-          F0FFC0C0C0FF000000FF808080FF000000000000000000000000000000FFFFFF
-          FFFFF0F0F0FFFFFFFFFFF0F0F0FFFFFFFFFFF0F0F0FF000000FF000000FF0000
-          00FF000000FF000000FF00000000000000000000000000000000000000FFFFFF
-          FFFFFFFFFFFFF0F0F0FFFFFFFFFFF0F0F0FFFFFFFFFF000000FFFFFFFFFFFFFF
-          FFFF000000FF0000000000000000000000000000000000000000000000FFFFFF
-          FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFF0000
-          00FF000000000000000000000000000000000000000000000000000000FFFFFF
-          FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FF000000FF0000
-          0000000000000000000000000000000000000000000000000000000000FF0000
-          00FF000000FF000000FF000000FF000000FF000000FF000000FF000000000000
-          0000000000000000000000000000000000000000000000000000
-        }
       end
       object MIOpen: TMenuItem
         Action = AOpen
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000232323FF4A4A
-          4AFF494A4AFF4B4C4CFF4C4C4CFF4B4C4CFF4A4B4BFF484949FF464646FF4343
-          43FF404141FF333434FF1E1F1FFF0000000000000000000000001B334EFFBDBD
-          BDFFA5A6A6FFA8AAAAFFABADADFFACAEAEFFAAABABFFA6A7A7FFA0A1A1FF999A
-          9AFF929494FF8B8D8DFF484949FF0000000000000000000000001B334EFF5053
-          56FFCECECEFFBCBEBEFFC2C4C4FFC5C6C6FFC2C3C3FFBEBFBFFFB5B6B6FFADAE
-          AEFFA4A5A5FF9D9E9EFF6E6F6FFF121212FF00000000000000001B334EFF1830
-          49FFCDCDCDFFC9CACAFFD4D5D5FFD4D5D5FFD0D2D2FFCBCCCCFFC1C2C2FFB8B9
-          B9FFAEAFAFFFA1A2A2FF949595FF484949FF00000000000000001B334EFF447D
-          B7FF4E5153FFDADADAFFDADBDBFFE0E1E1FFDCDDDDFFD5D6D6FFCACBCBFFC0C1
-          C1FFB5B6B6FFA8A9A9FF9FA0A0FF676868FF212222FF000000001B334EFF82C2
-          FEFF19314AFFDBDBDBFFDEDFDFFFE7E8E8FFE4E6E6FFDEDFDFFFD1D2D2FFC6C7
-          C7FFB9BABAFFACADADFF9FA0A0FF939494FF484949FF000000001B334EFF82C2
-          FEFF4E86C4FF4C4F52FFF5F5F5FFF5F5F5FFECECECFFE4E4E4FFDCDCDCFFD4D4
-          D4FFCBCBCBFFC4C4C4FFBCBCBCFFB5B5B5FFB3B3B3FF303030FF1B334EFF8AC8
-          FEFF82C2FEFF1B334EFF4D5053FF4D5053FF4F5255FF575A5CFF4E5154FF4E51
-          54FF505356FF505356FF4E5154FF000000FF000000FF000000FF1B334EFF9AD3
-          FEFF87C5FDFF82C2FEFF62ACF8FF62ACF8FF62ACF8FF62ACF8FF62ACF8FF62AC
-          F8FF62ACF8FF62ACF8FF000000FF0000000000000000000000001B334EFF66A5
-          E5FF9AD3FEFF85C5FEFF66A5E5FF1B334EFF1B334EFF1B334EFF1B334EFF1B33
-          4EFF1B334EFF1B334EFF00000000000000000000000000000000000000001B33
-          4EFF1B334EFF1B334EFF1B334EFF000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000FF000000FF000000FF000000FF0000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          000000000000000000FF000000FF000000FF0000000000000000000000000000
-          00000000000000000000000000FF000000000000000000000000000000000000
-          0000000000FF000000FF000000FF000000FF0000000000000000000000000000
-          0000000000000000000000000000000000FF000000FF00000000000000FF0000
-          00FF000000FF000000FF00000000000000FF0000000000000000000000000000
-          000000000000000000000000000000000000000000FF000000FF000000FF0000
-          00FF000000000000000000000000000000000000000000000000
-        }
       end
       object MISave: TMenuItem
         Action = ASave
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000010101FF816B
-          56FFBD8E5EFFB88A5DFFC0C0C0FFDFDFDFFF553F2AFF8E6A47FFB8B8B8FFB8B8
-          B8FFB4B4B4FF9F9F9FFF4A3724FF936E4AFF886644FFB88A5DFF010101FFFFD9
-          B4FFC59462FFB88A5DFFB8B8B8FFC1C1C1FF5D462FFF886644FFC1C1C1FFB8B8
-          B8FFB8B8B8FFB3B3B3FF493724FF916D49FF886644FFB88A5DFF010101FFFFD9
-          B4FFCC9966FFC09060FFB8B8B8FFB8B8B8FF503B27FF614A31FFE7E7E7FFCBCB
-          CBFFB8B8B8FFAAAAAAFF4D3A26FF95704BFF856343FFB88A5DFF010101FFFFD9
-          B4FFCC9966FFCB9865FFBCA48EFFB8B8B8FFB8B8B8FFC2C2C2FFDFDFDFFFE7E7
-          E7FFCCCCCCFF7D7872FF5F472FFF876544FFB88A5DFFB88A5DFF010101FFFFD9
-          B4FFCC9966FFCC9966FFC89664FFB98B5DFFB88A5DFFB88A5DFFB88A5DFFB88A
-          5DFFB88A5DFFB7895CFFB5875BFFB88A5DFFB88A5DFFB88A5DFF010101FFFFD9
-          B4FFCC9966FFF8F1EBFFFFFFFFFFF5F5F5FFE7E7E7FFE7E7E7FFE7E7E7FFE7E7
-          E7FFE7E7E7FFE7E7E7FFE7E7E7FFE7E7E7FFD7CABBFFB88A5DFF010101FFFFD9
-          B4FFCC9966FFFFFFFFFFFFFFFFFFFFFFFFFFEFEFEFFFE7E7E7FFE7E7E7FFE7E7
-          E7FFE7E7E7FFE7E7E7FFE7E7E7FFE7E7E7FFE7E7E7FFB88A5DFF010101FFFFD9
-          B4FFCC9966FFFFFFFFFFCCCCCCFFCCCCCCFFCCCCCCFFC8C8C8FFC0C0C0FFB8B8
-          B8FFB8B8B8FFB8B8B8FFB8B8B8FFB8B8B8FFE7E7E7FFB88A5DFF010101FFFFD9
-          B4FFCC9966FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCFC
-          FCFFF2F2F2FFE7E7E7FFE7E7E7FFE7E7E7FFE7E7E7FFB88A5DFF010101FFFFD9
-          B4FFCC9966FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-          FFFFFFFFFFFFF9F9F9FFEBEBEBFFE7E7E7FFE7E7E7FFB88A5DFF010101FFFFD9
-          B4FFCC9966FFFFFFFFFFCCCCCCFFCCCCCCFFCCCCCCFFCCCCCCFFCCCCCCFFCCCC
-          CCFFCCCCCCFFCCCCCCFFCACACAFFBDBDBDFFE7E7E7FFB88A5DFF010101FFFFD9
-          B4FFCC9966FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-          FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7F7F7FFC09060FF010101FFFFD9
-          B4FFCC9966FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-          FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCC9966FF010101FFFFE1
-          C5FFCC9966FF7683CCFF6273C9FF6172C9FF6170C9FF6170C9FF6170C9FF6170
-          C9FF6170C9FF6473C9FF6070C8FF6474CCFF737FCCFFCC9966FF010101FFFFF9
-          F6FFFFD5ABFF9CA6DEFFABB3E1FFABB2E0FFAAB2E0FFAAB2E0FFAAB2E0FFAAB2
-          E0FFAAB2E0FFA3ACDDFF99A2DAFF9CA5DBFF8A95D6FFFFCC99FF000000000101
-          01FF010101FF010101FF010101FF010101FF010101FF010101FF010101FF0101
-          01FF010101FF010101FF010101FF010101FF010101FF010101FF
-        }
       end
       object MISaveAs: TMenuItem
         Action = ASaveAs
@@ -415,42 +302,6 @@ object MainForm: TMainForm
       end
       object MIExit: TMenuItem
         Action = AExit
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF001D63
-          9B0019609800145D9500105A92FF0D5890FF135C92FF0C578FFF999999FF7171
-          71FF545454FF515151FF4F4F4FFF4C4C4CFF4A4A4AFF474747FF454545FF2567
-          9DFF3274A8FF3D7CAFFF4784B5FF4E8ABAFF3E7EADFF0C578FFFFFFFFF00FFFF
-          FF00585858FFA2A2A2FFA2A2A2FFA3A3A3FFA4A4A4FFA4A4A4FFA5A5A5FF2F6F
-          A5FF78ABD2FF78ABD3FF73A7D1FF69A0CDFF407FAEFF0F5991FFFFFFFF00FFFF
-          FF005C5C5CFFA1A1A1FF3C7340FFA0A1A1FFA3A3A3FFA3A3A3FFA4A4A4FF3674
-          AAFF7DAFD4FF5B9AC9FF5495C7FF5896C8FF4180AEFF135C94FFFFFFFF00FFFF
-          FF00606060FFA0A0A0FF3D7641FF367139FFA2A2A2FFA2A2A2FFA3A3A3FF3D79
-          B0FF82B3D7FF629FCCFF5A9AC9FF5E9BCAFF4381AFFF196098FF37823EFF347E
-          3BFF317937FF2E7534FF499150FF468F4CFF39733DFFA1A1A1FFA2A2A2FF457E
-          B4FF88B7D9FF67A3CFFF619ECCFF639FCCFF4583B1FF1F649CFF3B8742FF89CB
-          92FF84C88DFF80C688FF7BC383FF77C17FFF478F4DFF3B743FFFA1A1A1FF4C84
-          BAFF8DBBDBFF6EA8D1FF66A6D1FF5FB4DFFF4785B1FF2569A1FF3E8B46FF8FCE
-          99FF7DC687FF78C381FF73C07CFF74C07CFF79C281FF49904FFF547F57FF5489
-          BFFF94BFDDFF75ADD4FF63B8E1FF4BD4FFFF428BB8FF2C6EA6FF41904AFF94D2
-          9FFF91D09AFF8DCD96FF89CB92FF84C88DFF519858FF417C46FF9F9F9FFF5A8E
-          C4FF98C3E0FF7CB3D7FF74AFD6FF5EC4EDFF4B88B3FF3473ABFF44944DFF4291
-          4BFF3F8D48FF3D8945FF5DA465FF5AA061FF45834BFF9E9E9EFF9E9E9EFF6092
-          C9FF9EC7E2FF83B8DAFF7DB4D7FF7EB3D7FF4F89B4FF3B79B1FFFFFFFF00FFFF
-          FF00777777FF9A9A9AFF3D8A45FF498A4FFF9C9C9CFF9D9D9DFF9D9D9DFF6696
-          CCFFA2CBE3FF89BDDCFF83B9DAFF84B9DAFF518BB5FF437EB6FFFFFFFF00FFFF
-          FF007A7A7AFF999999FF529159FF999A99FF9B9B9BFF9C9C9CFF9C9C9CFF6C9A
-          D0FFA7CEE5FF8FC1DFFF89BDDCFF8BBDDCFF538DB6FF4B84BCFFFFFFFF00FFFF
-          FF007D7D7DFF999999FF999999FF9A9A9AFF9A9A9AFF9B9B9BFF9B9B9BFF6F9D
-          D3FFAAD1E7FFABD1E7FF98C7E1FF91C2DEFF568FB7FF5289C1FFFFFFFF00FFFF
-          FF00808080FF7E7E7EFF7C7C7CFF7A7A7AFF777777FF757575FF727272FF719E
-          D4FF6F9ED6FF87B2DCFFABD3E8FFA9D0E6FF5890B8FF598EC6FFFFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00709ED6FF6D9CD4FF85B1DAFF5A91B9FF6093CBFFFFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-          FF00FFFFFF00FFFFFF00FFFFFF006D9CD4FF6A9AD2FF6697CFFF
-        }
       end
     end
     object MenuItem2: TMenuItem
@@ -476,360 +327,36 @@ object MainForm: TMainForm
       end
       object MINewTable: TMenuItem
         Action = ANewTable
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          000000000000000000000000000000000000000000000000000000000000CECE
-          CEFFC3C3C3FF8E8E8EFFE0E0E0FFE0E0E0FFE0E0E0FFE0E0E0FFE0E0E0FFE0E0
-          E0FFE0E0E0FFE0E0E0FFE0E0E0FFE0E0E0FFD0D0D0FF0000000000000000DEDE
-          DEFFD3D3D3FF9A9A9AFFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2
-          F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFE0E0E0FF0000000000000000A2A2
-          A2FF9A9A9AFF9A9A9AFFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2
-          F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFE0E0E0FF0000000000000000DEDE
-          DEFFD3D3D3FF9A9A9AFFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2
-          F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFE0E0E0FF0000000000000000DEDE
-          DEFFD3D3D3FF9A9A9AFFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2
-          F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFE0E0E0FF0000000000000000A2A2
-          A2FF9A9A9AFF9A9A9AFFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2
-          F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFE0E0E0FF0000000000000000DEDE
-          DEFFD3D3D3FF9A9A9AFFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2
-          F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFE0E0E0FF0000000000000000DEDE
-          DEFFD3D3D3FF9A9A9AFFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2
-          F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFE0E0E0FF0000000000000000A2A2
-          A2FF9A9A9AFF9A9A9AFFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2
-          F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFE0E0E0FF0000000000000000DEDE
-          DEFFD3D3D3FF9A9A9AFFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2
-          F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFE0E0E0FF0000000000000000DEDE
-          DEFFD3D3D3FF9A9A9AFFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2
-          F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FFE0E0E0FF0000000000000000A2A2
-          A2FF9A9A9AFF9A9A9AFF9A9A9AFF9A9A9AFF9A9A9AFF9A9A9AFF9A9A9AFF9A9A
-          9AFF9A9A9AFF9A9A9AFF9A9A9AFF9A9A9AFF8E8E8EFF0000000000000000DEDE
-          DEFFD3D3D3FF9A9A9AFFD3D3D3FFD3D3D3FF9A9A9AFFD3D3D3FFD3D3D3FF9A9A
-          9AFFD3D3D3FFD3D3D3FF9A9A9AFFD3D3D3FFC3C3C3FF0000000000000000DEDE
-          DEFFDEDEDEFFA2A2A2FFDEDEDEFFDEDEDEFFA2A2A2FFDEDEDEFFDEDEDEFFA2A2
-          A2FFDEDEDEFFDEDEDEFFA2A2A2FFDEDEDEFFCECECEFF00000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000
-        }
       end
       object MINewField: TMenuItem
         Action = ANewField
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000F0FBFF00F0FB
-          FF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FB
-          FF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FB
-          FF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00006000FF006000FF0060
-          00FF000000FFF0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FB
-          FF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00006000FF006000FF008000FF0060
-          00FF000000FF004000FFF0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FB
-          FF00F0FBFF00F0FBFF00F0FBFF00006000FF008000FF008000FF00A000FF00A0
-          00FF006000FF006000FF000000FFF0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FB
-          FF00F0FBFF00F0FBFF00008000FF008000FF00A000FF00A000FF00C000FF00A0
-          00FF008000FF006000FF006000FF000000FFF0FBFF00F0FBFF00F0FBFF00F0FB
-          FF00F0FBFF00F0FBFF00000000FF008000FF00A000FF00C000FF80E040FF00C0
-          00FF00A000FF008000FF006000FF000000FFF0FBFF00F0FBFF00F0FBFF00F0FB
-          FF00F0FBFF00F0FBFF0000FFFFFF00A000FF00C000FF80E040FF00FF00FF00A0
-          00FF00A000FF00A000FF008000FF006000FFF0FBFF00F0FBFF00F0FBFF000000
-          00FFF0FBFF00F0FBFF00000000FF00C000FF80E040FF000000FF80E040FF80E0
-          40FF00A000FF00A000FF00A000FF008000FFF0FBFF00F0FBFF00F0FBFF0000FF
-          FFFF000000FFF0FBFF0000FFFFFF00A000FF000000FF00FFFFFF80E040FF80E0
-          40FF80E040FF80E040FF00A000FF00A000FFF0FBFF00F0FBFF00F0FBFF00F0FB
-          FF0000FFFFFF000000FF000000FF000000FF00FFFFFF80E040FF80E040FF80E0
-          40FF80E040FF80E040FF80E040FF40E000FFF0FBFF00F0FBFF00F0FBFF000000
-          00FFF0FBFF0000FFFFFF00FFFFFF00FFFFFF40E000FF000000FF000000FF0000
-          00FF40E020FF80E020FF80E020FFF0FBFF00F0FBFF00F0FBFF00F0FBFF0000FF
-          FFFFF0FBFF0000FFFFFF00FFFFFF00FFFFFF80E020FF00FFFFFF00FFFFFF00FF
-          FFFF00FF00FF40E020FFF0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FB
-          FF00000000FF00FFFFFF00FFFFFF00FFFFFF000000FFF0FBFF0080E020FF80E0
-          20FFF0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF000000
-          00FF00FFFFFFF0FBFF00000000FFF0FBFF0000FFFFFF000000FFF0FBFF00F0FB
-          FF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF0000FF
-          FFFFF0FBFF00F0FBFF0000FFFFFFF0FBFF00F0FBFF0000FFFFFFF0FBFF00F0FB
-          FF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FB
-          FF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FB
-          FF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00F0FBFF00
-        }
       end
       object MenuItem4: TMenuItem
         Action = ANewIndex
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000000000000000
-          00FF000000FF000000FF000000FF000000FF000000FF000000FF000000000000
-          000000000000000000FF000000FF000000FF000000FF000000FF000000000000
-          0000000000FFE3ECE4FF77A37DFF77A37DFF77A37DFF000000FF000000000000
-          000000000000000000FF000000FF000000FF0000000000000000000000000000
-          000000000000000000FFAFC9B3FF77A37DFF77A37DFF000000FF000000000000
-          00000000000000000000000000FF000000FF000000FF00000000000000000000
-          0000000000FF77A37DFF77A37DFFAFC9B3FF77A37DFF000000FF000000000000
-          0000000000000000000000000000000000FF000000FF000000FF000000000000
-          00FF77A37DFF77A37DFF77A37DFF000000FFE3ECE4FF000000FF000000000000
-          000000000000000000FF000000FF000000FF000000FF000000FF000000FFCFDE
-          D1FF77A37DFF77A37DFF000000FF00000000000000FF000000FF000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          00FFCFDED1FF000000FF000000000000000000000000000000FF000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000FF0000000000000000000000000000000000000000000000000000
-          000000000000000000FF00000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          00FF000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          00000000000000000000000000000000000000000000000000006C4E31FF6C4E
-          31FF000000006C4E31FF6C4E31FF0000000000000000000000FF000000000000
-          00000000000000000000000000000000000000000000000000006C4E31FF6C4E
-          31FF000000006C4E31FF6C4E31FF000000000000000000000000000000000000
-          00000000000000000000000000000000000000000000000000006C4E31FF6C4E
-          31FF6C4E31FF6C4E31FF6C4E31FF000000000000000000000000000000000000
-          00000000000000000000000000000000000000000000000000006C4E31FF6C4E
-          31FF000000006C4E31FF6C4E31FF000000000000000000000000000000000000
-          00000000000000000000000000000000000000000000000000006C4E31006C4E
-          31FF6C4E31FF6C4E31FF6C4E3100000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000
-        }
       end
       object MenuItem7: TMenuItem
         Action = AAddForeignKey
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          000000000000000000000000000000000000000000FF000000FF000000FF0000
-          00FF000000FF000000FF000000FF000000FF0000000000000000000000000000
-          0000000000000000000000000000000000FFC2C2C2FFBCBCBCFFBCBCBCFFBBBB
-          BBFFBBBBBBFFBBBBBBFFBBBBBBFFA0A0A0FF000000FF00000000000000000000
-          0000000000000000000000000000000000FFFDFDFDFFE8E8E8FFE8E8E8FFE8E8
-          E8FFE8E8E8FFE8E8E8FFE8E8E8FFC0C0C0FF000000FF00000000000000FF0000
-          00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF8E8E
-          8EFFEAEAEAFFEAEAEAFFEAEAEAFFC1C1C1FF000000FF00000000000000FFE0E0
-          E0FFD1D1D1FFD1D1D1FFD1D1D1FFD1D1D1FF000000FFBBBBBBFFA0A0A0FF2828
-          28FFEEEEEEFFEEEEEEFFEBEBEBFFC3C3C3FF000000FF00000000000000FFFFFF
-          FFFF000000FFEFEFEFFF000000FFD1D1D1FF000000FFE8E8E8FFC0C0C0FF0000
-          00FFEEEEEEFFEEEEEEFFECECECFFC4C4C4FF000000FF00000000000000FFFFFF
-          FFFFEFEFEFFF000000FF000000FFD1D1D1FF000000FFEAEAEAFFC1C1C1FF0000
-          00FFEFEFEFFFEEEEEEFFEEEEEEFFC5C5C5FF000000FF00000000000000FFFFFF
-          FFFF000000FF000000FF000000FFD1D1D1FF000000FFEBEBEBFFC3C3C3FF0000
-          00FFE2E2E2FF858585FF494B4BFF161616FF000000FF00000000000000FFFFFF
-          FFFFFFFFFFFFFFFFFFFFFFFFFFFFE0E0E0FF000000FFECECECFFC4C4C4FF0000
-          00FFADADADFF767676FF5D5D5DFF404040FF000000FF00000000000000FF0000
-          00FF000000FF000000FF000000FF000000FFB1B1B1FFEEEEEEFFC5C5C5FF0000
-          00FFC3C3C3FFFBFBFBFFA8A8A8FF000000FF0000000000000000000000FFFEFE
-          FEFFF1F1F1FFF1F1F1FFF0F0F0FFE2E2E2FF858585FF494B4BFF161616FF0000
-          00FFE0E0E0FFC1C1C1FF000000FF000000000000000000000000000000FFFEFE
-          FEFFF1F1F1FFF1F1F1FFF1F1F1FFADADADFF767676FF5D5D5DFF404040FF0000
-          00FF000000FF000000FF00000000000000000000000000000000000000FFFEFE
-          FEFFF1F1F1FFF1F1F1FFF1F1F1FFC3C3C3FFFBFBFBFFA8A8A8FF000000FF0000
-          0000000000000000000000000000000000000000000000000000000000FFFEFE
-          FEFFFEFEFEFFFEFEFEFFFDFDFDFFE0E0E0FFC1C1C1FF000000FF000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          00FF000000FF000000FF000000FF000000FF000000FF00000000000000000000
-          0000000000000000000000000000000000000000000000000000
-        }
       end
       object MenuItem5: TMenuItem
         Action = AAddDomain
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000FAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFD4D4D4FF9F9F
-          9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F
-          9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFFD4D4D4FF9F9F9FFFF2F2
-          F2FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-          FFFFFFFFFFFF000000FFB1B1B1FF000000FFFFFFFFFF9F9F9FFF9F9F9FFFEFEF
-          EFFF000000FFFCFCFCFFFCFCFCFF000000FFFCFCFCFF000000FF000000FF0000
-          00FF9E9E9EFFFCFCFCFF000000FFFCFCFCFFFCFCFCFF9F9F9FFF9F9F9FFFEBEB
-          EBFF000000FF000000FF000000FF000000FFF8F8F8FF000000FFF8F8F8FFC2C2
-          C2FF000000FFF8F8F8FF000000FFF8F8F8FFF8F8F8FF9F9F9FFF9F9F9FFFE9E9
-          E9FF000000FFF6F6F6FFF6F6F6FF000000FFF6F6F6FF000000FF000000FF0000
-          00FF919191FFF6F6F6FF000000FFF6F6F6FFF6F6F6FF9F9F9FFF9F9F9FFFE6E6
-          E6FF000000FFF3F3F3FFF3F3F3FF000000FFF3F3F3FF000000FFF3F3F3FFCACA
-          CAFF000000FFF3F3F3FF000000FFF3F3F3FFF3F3F3FF9F9F9FFF9F9F9FFFE2E2
-          E2FF5D5D5DFF000000FF000000FF5D5D5DFFEFEFEFFF000000FF000000FF0000
-          00FF959595FFEFEFEFFF000000FFEFEFEFFFEFEFEFFF9F9F9FFF9F9F9FFFD4D4
-          D4FFE0E0E0FFE0E0E0FFE0E0E0FFE0E0E0FFE0E0E0FFE0E0E0FFE0E0E0FFE0E0
-          E0FFE0E0E0FF000000FFBBBBBBFF000000FFE0E0E0FF9F9F9FFFD4D4D4FF9F9F
-          9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F
-          9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFF9F9F9FFFD4D4D4FFFAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA
-          FAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFF
-        }
       end
       object MenuItem6: TMenuItem
         Action = AAddSequence
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000FF0000
-          00FF000000FF000000FF000000FF00000000000000FF00000000000000FF0000
-          0000000000FF000000FF000000FF000000FF0000000000000000000000000000
-          00FF000000FF0000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000FF0000000000000000000000000000
-          00FF000000FF0000000000000000000000000000000000000000000000000000
-          000000000000000000FF000000FF000000FF000000FF00000000000000000000
-          00FF000000FF0000000000000000000000000000000000000000000000000000
-          0000000000FF000000FF00000000000000FF000000FF00000000000000000000
-          00FF000000FF0000000000000000000000000000000000000000000000000000
-          0000000000FF000000FF00000000000000FF000000FF00000000000000000000
-          00FF000000FF0000000000000000000000000000000000000000000000000000
-          0000000000FF000000FF00000000000000FF000000FF00000000000000FF0000
-          00FF000000FF0000000000000000000000000000000000000000000000000000
-          000000000000000000FF000000FF000000FF0000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000
-        }
       end
       object MIDDSep2: TMenuItem
         Caption = '-'
       end
       object MIDeleteTable: TMenuItem
         Action = ADeleteObject
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000000000000000
-          0000000000000000000006060600060606FF000000FF0F0F0FFF050505FF0000
-          00FF000000FF0606060000000000000000000000000000000000000000000000
-          000006060600060606FF060606FF3A4142FF7B8F8FFF6C7A7AFF3C4444FF5E6C
-          6CFF2C3535FF292E2EFF000000FF060606000000000000000000000000000000
-          0000212727FF3D4343FF868E8EFF555E5EFFD0DADAFF99ABACFF525D5DFF8494
-          94FF404D4DFF535D5DFF222828FF1D2323FF0000000000000000000000000000
-          0000242B2BFF757E7EFFD1D8D8FF808D8DFFD3DDDDFF99ABACFF525D5DFF93A0
-          A0FF404D4DFF6B7878FF384444FF222828FF0000000000000000000000000000
-          0000252C2CFFA3ADADFFD3DADAFF818E8FFFD4DDDDFF99ABACFF525D5DFF93A0
-          A0FF404D4DFF6C7979FF425050FF222929FF0000000000000000000000000000
-          0000252C2CFFA3ADADFFD2D9D9FF7F8B8BFFCED5D6FF7B8888FF4F5758FF8793
-          93FF3D4A4AFF6B7878FF425050FF222929FF0000000000000000000000000000
-          0000242B2BFF99A4A5FFAEB6B7FF677071FF92A1A1FF637374FF354040FF5B69
-          69FF2F3939FF5F6969FF343F3FFF202626FF0000000000000000000000000000
-          0000232A2AFF95A0A0FF404D4DFF303636FF262A2AFF2A2F2FFF0D0F0FFF090B
-          0BFF0D1010FF383E3EFF2B3434FF1F2424FF0000000000000000000000000000
-          00001B1F1FFF303434FF44494BFF626768FF666F70FF646B6BFF5D6C6EFF4B57
-          58FF313939FF151617FF161A1AFF191E1FFF0000000000000000000000000000
-          00FF465152FF657173FF919D9FFFC8E1E4FFCFE5E9FFCBE0E2FFCBD1D1FF7F8D
-          8EFF647576FF586768FF384243FF222829FF000000FF00000000000000000000
-          00FF75898AFFD2EDF1FFE9F8FBFFEDF5F9FFEEF7F8FFECF7F8FFE6F3F5FFD9EA
-          ECFFCBDDDEFF899B9DFF546263FF4A5758FF000000FF00000000000000000000
-          00FFD3E4E8FFE9F1F4FFE4F1F2FFDAE9EAFFD2E2E5FFBED2D5FFA7C1C3FF94AD
-          AFFFA4BEC0FFACC4C6FF9CB6B8FF667779FF000000FF00000000000000002B2B
-          2BFFBCD1D3FFC4DADCFFCFE0E2FFA2B7B9FF5B6264FF363839FF333C3CFF5360
-          61FF83989AFF9BB5B7FF98B2B3FF8BA2A4FF000000FF00000000000000000606
-          0600101010FFA5C0C2FFA5BFC1FF67797AFF404748FF252727FF2E3536FF7285
-          87FF889EA0FF8AA1A3FF8CA3A5FF000000FF0606060000000000000000000000
-          000006060600000000FF000000FF718385FFD8EDF0FFE9F1F2FFE4EDEEFFBAC6
-          C7FF465253FF000000FF000000FF060606000000000000000000000000000000
-          00000000000006060600060606000E0E0EFF424242FF4A4A4AFF3E3E3EFF2C2C
-          2CFF000000FF0606060006060600000000000000000000000000
-        }
       end
       object MIDDSep3: TMenuItem
         Caption = '-'
       end
       object MIGenerateSQL: TMenuItem
         Action = AGenerateSQL
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000F0FBFF008080
-          80FF808080FF808080FF808080FF808080FFA4A0A0FFA4A0A0FFA4A0A0FFA4A0
-          A0FFA4A0A0FFA4A0A0FFA4A0A0FFA4A0A0FFF0FBFF000000FFFFF0FBFF008080
-          80FFF0FBFF00808080FFF0FBFF00808080FFF0FBFF00A4A0A0FFF0FBFF00A4A0
-          A0FFF0FBFF00A4A0A0FFF0FBFF00A4A0A0FFF0FBFF000000FFFFF0FBFF000000
-          00FFF0FBFF00000000FFF0FBFF00000000FFF0FBFF00000000FFF0FBFF000000
-          00FFF0FBFF00000000FFF0FBFF00000000FFF0FBFF000000FFFF0000FFFF8060
-          00FFC0C040FFC0C040FFC0C040FFC0C040FFC0C060FFC0C060FFC0C060FFC0C0
-          60FF806020FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFF8060
-          00FFFFFF00FF000000FF000000FF000000FF000000FFC0C040FFC0C040FF80A0
-          40FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFF8060
-          00FFFFFF00FF000000FFC0C0C0FF000000FFFFFF00FFFFFF00FF80A040FF4000
-          00FF400000FF800040FF800040FF800040FF800040FFFFFFFFFF0000FFFF8060
-          00FFFFFF00FF000000FF000000FFFFFF00FFFFFF00FF806020FFFFFFFFFFFFFF
-          FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFF8060
-          00FFFFFF00FF000000FFFFFF00FFFFFF00FF80A040FF400000FF400000FF4000
-          00FF800040FF800040FF800040FF800040FF800040FFFFFFFFFF0000FFFF8060
-          00FFFFFF00FFFFFF00FFFFFF00FF806000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-          FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFF8060
-          00FFFFFF00FFFFFF00FF808000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-          FFFFC06020FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFF8060
-          00FFFFFF00FF808000FFC04000FFC06020FFFFFFFFFFFFFFFFFFC04000FFC040
-          00FFC04000FFFFFFFFFFC04000FFC04000FFC04000FFFFFFFFFF0000FFFF8060
-          00FF808020FFC0C0C0FFC0A060FFC04000FFC0C0C0FFC04000FFC0A060FFC060
-          20FFC04000FFC0C0C0FFC04000FFC0A060FFFFFFFFFFFFFFFFFF0000FFFF8060
-          00FFC0C0C0FFC06020FFC04000FFC06020FFFFFFFFFFC04000FFFFFFFFFFFFFF
-          FFFFC04000FFFFFFFFFFC04000FFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFF0000
-          FFFFC0C0C0FFC04000FFC0A060FFC0C0C0FFC0DCC0FFC04000FFC0DCC0FFC0DC
-          C0FFC04000FFFFFFFFFFC04000FFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFF0000
-          FFFFC0C0C0FFC06020FFC04000FFC04000FFFFFFFFFFC0A060FFC04000FFC040
-          00FFC0A060FFFFFFFFFFC04000FFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFF0000
-          FFFFC0C0C0FFC0C0C0FFC0C0C0FFC0C0C0FFC0DCC0FFC0DCC0FFC0DCC0FFC0DC
-          C0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-        }
       end
       object MICreateCode: TMenuItem
         Action = ACreateCode
-        Bitmap.Data = {
-          36040000424D3604000000000000360000002800000010000000100000000100
-          2000000000000004000064000000640000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000000000000000000000000000000000000000000000000000000000
-          0000000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
-          00FF000000FF000000FF000000FF000000FF0000000000000000000000FFBEBE
-          BEFFEFEFEFFFF0F0F0FFF1F1F1FFF3F3F3FFF4F4F4FFF5F5F5FFF6F6F6FFF7F7
-          F7FFF9F9F9FFFAFAFAFFFBFBFBFFFCFCFCFFC1C1C1FF00000000000000FFF9F9
-          F9FFEEEEEEFFEFEFEFFFF0F0F0FFF1F1F1FFF3F3F3FFF4F4F4FFF5F5F5FFF6F6
-          F6FFF7F7F7FFF9F9F9FFFAFAFAFFFBFBFBFFFCFCFCFF000000FF000000FFF9F9
-          F9FFEDEDEDFF727272FF737373FF737373FF747474FF757575FF757575FFF5F5
-          F5FFF6F6F6FFF7F7F7FFF9F9F9FFFAFAFAFFFBFBFBFF000000FF000000FFF8F8
-          F8FFEAEAEAFFEBEBEBFFEDEDEDFFEEEEEEFFEFEFEFFFF0F0F0FFF1F1F1FFF3F3
-          F3FFF4F4F4FFF5F5F5FFF6F6F6FFF7F7F7FFF9F9F9FF000000FF000000FFF7F7
-          F7FFE9E9E9FF707070FF717171FF727272FF727272FFEFEFEFFFF0F0F0FFF1F1
-          F1FFF3F3F3FFF4F4F4FFF5F5F5FFF6F6F6FFF7F7F7FF000000FF000000FFF7F7
-          F7FFE8E8E8FFE9E9E9FFEAEAEAFFEBEBEBFFEDEDEDFFEEEEEEFFEFEFEFFFF0F0
-          F0FFF1F1F1FFF3F3F3FFF4F4F4FFF5F5F5FFF6F6F6FF000000FF000000FFF6F6
-          F6FFE7E7E7FF6F6F6FFF707070FF707070FF717171FF727272FF727272FF7373
-          73FF737373FFF1F1F1FFF3F3F3FFF4F4F4FFF5F5F5FF000000FF000000FFF6F6
-          F6FFE5E5E5FFE7E7E7FFE8E8E8FFE9E9E9FFEAEAEAFFEBEBEBFFEDEDEDFFEEEE
-          EEFFEFEFEFFFF0F0F0FFF1F1F1FFF3F3F3FFF4F4F4FF000000FF000000FFF6F6
-          F6FFE4E4E4FF6E6E6EFF6F6F6FFF6F6F6FFF707070FF707070FFEBEBEBFFEDED
-          EDFFEEEEEEFFEFEFEFFFF0F0F0FFF1F1F1FFF3F3F3FF000000FF000000FFF6F6
-          F6FFE3E3E3FFE4E4E4FFE5E5E5FFE7E7E7FFE8E8E8FFE9E9E9FFEAEAEAFFEBEB
-          EBFFEDEDEDFFEEEEEEFFEFEFEFFFF0F0F0FFF1F1F1FF000000FF000000FFF5F5
-          F5FFE2E2E2FF6D6D6DFF6D6D6DFF6E6E6EFF6F6F6FFF6F6F6FFF707070FFEAEA
-          EAFFEBEBEBFFEDEDEDFFEEEEEEFFEFEFEFFFF0F0F0FF000000FF000000FFF5F5
-          F5FFE1E1E1FFE2E2E2FFE3E3E3FFE4E4E4FFE5E5E5FFE7E7E7FFE8E8E8FFE9E9
-          E9FFEAEAEAFFEBEBEBFFEDEDEDFFEEEEEEFFEFEFEFFF000000FF00000000BFBF
-          BFFFF5F5F5FFF5F5F5FFF6F6F6FFF6F6F6FFF6F6F6FFF6F6F6FFF7F7F7FFF7F7
-          F7FFF8F8F8FFF8F8F8FFF9F9F9FFF9F9F9FFB9B9B9FF00000000000000000000
-          00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
-          00FF000000FF000000FF000000FF000000FF0000000000000000
-        }
       end
     end
     object MIConnection: TMenuItem
@@ -1721,42 +1248,6 @@ object MainForm: TMainForm
     end
     object PMINewConnection: TMenuItem
       Action = ANewConnection
-      Bitmap.Data = {
-        36040000424D3604000000000000360000002800000010000000100000000100
-        2000000000000004000064000000640000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000FF0000
-        00FF000000FF000000FF000000FF000000000000000000000000000000000000
-        00000000000000000000000000000000000000000000080808FF525252FF5252
-        52FF5E5E5EFF545454FF4C4C4CFF181818FF0000000000000000000000000000
-        0000000000FF000000FF000000FF000000FF000000FF404040FF737373FF9595
-        95FF9D9D9DFF888888FF6A6A6AFF595959FF000000FF00000000000000000808
-        08FF525252FF525252FF5E5E5EFF545454FF4C4C4CFF1B1B1BFF5E5E5EFF6E6E
-        6EFF6D6D6DFF696969FF666666FF535353FF000000FF00000000000000FF7373
-        73FF7E7E7EFF959595FF9D9D9DFF888888FF6A6A6AFF595959FF000000FF8D8D
-        8DFF8D8D8DFF8A8A8AFF616161FF656565FF000000FF00000000000000FF7F7F
-        7FFF9E9E9EFF6E6E6EFF6D6D6DFF696969FF666666FF535353FF000000FFA8A8
-        A8FFAFAFAFFFA6A6A6FF858585FF565656FF000000FF00000000000000FFA7A7
-        A7FF777777FF8D8D8DFF8D8D8DFF88898AFF606363FF636768FF010506FF8A8D
-        8DFF828384FF8C8C8CFF939393FF6E6E6EFF000000FF00000000000000FF9999
-        99FFADADADFFA8A8A8FFADAFB0FFA0A9ABFF829499FF5F777CFF1F373CFF8B9D
-        A2FF858E90FF7F8081FF797979FF727272FF000000FF00000000000000FFB4B4
-        B4FFA3A3A3FF8B8C8CFF838B8DFF86A2A9FF8ABBC9FF81B9C7FF649CAAFF8ABB
-        C9FF86A2A9FF838B8DFF7D7E7EFF727272FF000000FF00000000000000FFB7B7
-        B7FF989898FF8F9192FF84979CFF82B3C1FFA6D9E6FFCFECF5FFCCEBF3FFA7DB
-        E9FF93C3D1FF94A6ABFF545657FF1D1D1DFF000000FF00000000000000FF9898
-        98FFB4B4B4FF929596FF879EA4FF8DC3D2FFCDE9F1FFF6FAFBFFF6FAFBFFCCE8
-        F0FF6DA4B4FF2F484FFF212627FF000000000000000000000000202020003737
-        37FF7D7D7DFF8F9293FF9DB4BAFF93C7D8FFCCE8EFFFF6FAFBFFF6FAFBFFCFEC
-        F4FF91DAEEFF7BD2EC0071C6E200000000000000000000000000000000000E0E
-        0E00222222FF16191AFF1A2E34FF598B9BFFA2D5E5FFD0EEF6FFD1EFF7FFAAE2
-        F2FF84D4EBFF7DD3EB006DB6DA00000000000000000000000000000000000000
-        0000000000007FFFFF0079D2E8007CD0E90084D4EDFF88D2E7FF88D2E7FF84D4
-        EDFF7CD0E90079D2E8007FFFFF00000000000000000000000000
-      }
     end
     object PMIDeleteConnection: TMenuItem
       Action = ADeleteConnection
@@ -1772,42 +1263,6 @@ object MainForm: TMainForm
     end
     object PMINewDataDict: TMenuItem
       Action = ANew
-      Bitmap.Data = {
-        36040000424D3604000000000000360000002800000010000000100000000100
-        2000000000000004000064000000640000000000000000000000FFFFFF00BB6A
-        3400BA6530FFBB6631FFBA6630FFBA6630FFBA6630FFBA6530FFBA652FFFB965
-        2EFFB9652EFFB9642EFFB9642EFFB7622CFFB7622E00FFFFFF00FFFFFF00BC69
-        33FFF8F1EAFFF7ECDFFFF6EBDEFFF6EADEFFF6EADCFFF6EADCFFFAF3EBFFFAF3
-        EBFFFAF2EAFFFCF7F3FFFCF8F4FFFEFEFDFFB7602AFFFFFFFF00FFFFFF00BF71
-        38FFF5EBDFFFFDBF68FFFCBD67FFFBBE65FFFCBE64FFFCBE64FFFCBD62FFFBBD
-        63FFFBBC61FFFCBE60FFFCBC62FFFDFBF8FFB9642DFFFFFFFF00FFFFFF00C178
-        3CFFF7EDE3FFFDC26EFFFFD8A0FFFFD79EFFFFD69BFFFFD798FFFFD696FFFFD6
-        95FFFFD594FFFFD493FFFBBE65FFFBF7F4FFBB6731FFFFFFFF00FFFFFF00C47C
-        40FFF7F0E6FFF8B455FFF7B456FFF7B554FFF8B453FFF8B253FFF7B352FFF7B3
-        52FFF7B251FFF7B24FFFF7B24FFFFCF9F5FFBF6F36FFFFFFFF00FFFFFF00C580
-        42FFF8F1E8FFFEE5D5FFFDE5D3FFFDE5D3FFFCE5D3FFFCE5D3FFFCE4D1FFFCE2
-        CEFFFCE2CCFFFBE0C9FFFBE1C8FFFDFAF7FFC1763BFFFFFFFF00FFFFFF00C582
-        45FFF8F2EBFFFEE7D6FFFDE7D6FFFDE7D6FFFDE7D6FFFDE6D5FFFDE5D3FFFCE4
-        D1FFFCE2CDFFFBE1CBFFFBE1C9FFFBF7F2FFC57C3FFFFFFFFF00FFFFFF00C684
-        47FFF9F3ECFFFEE8D6FFFEE8D7FFFDE7D6FFFDE7D6FFFDE7D5FFFDE5D3FFFBE4
-        D0FFFBE3CCFFFADFC7FFFADFC6FFFAF2EAFFC68042FFFFFFFF00FFFFFF00C688
-        49FFF9F4EDFFFEE8D8FFFEE8D8FFFEE8D7FFFEE7D6FFFDE5D3FFFCE4D1FFFBE1
-        CCFFFAE0C7FFF9DDC3FFF8DCC2FFFAF4EDFFC68245FFFFFFFF00FFFFFF00C688
-        4AFFF9F4EFFFFEE7D7FFFDE7D6FFFDE7D5FFFDE6D4FFFCE6D2FFFBE1CCFFFADF
-        C7FFF8DCC2FFF6DABDFFF6D8BBFFFAF4EFFFC68346FFFFFFFF00FFFFFF00C689
-        4BFFF9F4F0FFFCE6D3FFFCE6D4FFFDE7D3FFFCE4D1FFFBE3CDFFFAE0C8FFF8DC
-        C2FFF5D6BBFFF3D4B5FFF1D2B3FFF8F4F0FFC48246FFFFFFFF00FFFFFF00C689
-        4BFFF9F5F1FFFCE3CFFFFBE4D0FFFCE4CFFFFCE3CDFFFAE1CAFFF9DDC4FFF6D9
-        BCFFF4E9DFFFF7F2ECFFFBF7F3FFF5EFE9FFC27E45FFFFFFFF00FFFFFF00C689
-        4CFFF9F5F1FFFCE3CDFFFBE3CEFFFBE3CDFFFBE2CBFFF9E0C8FFF8DCC2FFF5D6
-        BAFFFDFBF8FFFCE6CDFFFAE5C9FFE2B684FFBF7942FFFFFFFF00FFFFFF00C588
-        4BFFFAF6F2FFFAE0C7FFFBE1C9FFFBE2C9FFFBE0C8FFF9DFC5FFF8DBC1FFF4D6
-        B8FFFFFBF8FFF6D8B4FFE1B07DFFDB9264FFB46B3E00FFFFFF00FFFFFF00C485
-        49FFF7F2ECFFF8F4EEFFF8F4EDFFF8F3EDFFF8F3EDFFF8F3EDFFF8F2ECFFF7F2
-        ECFFF2E6D7FFE2B27DFFDB9465FFB3683B00FFFFFF00FFFFFF00FFFFFF00C17D
-        4400C88B4DFFC88C4FFFC88C4FFFC88C4FFFC88C4FFFC88D4FFFC98C4FFFC78B
-        4FFFC5894BFFC4763BFFB3683C00FFFFFF00FFFFFF00FFFFFF00
-      }
       OnClick = ANewExecute
     end
     object MenuItem8: TMenuItem
@@ -1825,42 +1280,6 @@ object MainForm: TMainForm
     end
     object PMINewConnectionA: TMenuItem
       Action = ANewConnection
-      Bitmap.Data = {
-        36040000424D3604000000000000360000002800000010000000100000000100
-        2000000000000004000064000000640000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000000000
-        0000000000000000000000000000000000000000000000000000000000FF0000
-        00FF000000FF000000FF000000FF000000000000000000000000000000000000
-        00000000000000000000000000000000000000000000080808FF525252FF5252
-        52FF5E5E5EFF545454FF4C4C4CFF181818FF0000000000000000000000000000
-        0000000000FF000000FF000000FF000000FF000000FF404040FF737373FF9595
-        95FF9D9D9DFF888888FF6A6A6AFF595959FF000000FF00000000000000000808
-        08FF525252FF525252FF5E5E5EFF545454FF4C4C4CFF1B1B1BFF5E5E5EFF6E6E
-        6EFF6D6D6DFF696969FF666666FF535353FF000000FF00000000000000FF7373
-        73FF7E7E7EFF959595FF9D9D9DFF888888FF6A6A6AFF595959FF000000FF8D8D
-        8DFF8D8D8DFF8A8A8AFF616161FF656565FF000000FF00000000000000FF7F7F
-        7FFF9E9E9EFF6E6E6EFF6D6D6DFF696969FF666666FF535353FF000000FFA8A8
-        A8FFAFAFAFFFA6A6A6FF858585FF565656FF000000FF00000000000000FFA7A7
-        A7FF777777FF8D8D8DFF8D8D8DFF88898AFF606363FF636768FF010506FF8A8D
-        8DFF828384FF8C8C8CFF939393FF6E6E6EFF000000FF00000000000000FF9999
-        99FFADADADFFA8A8A8FFADAFB0FFA0A9ABFF829499FF5F777CFF1F373CFF8B9D
-        A2FF858E90FF7F8081FF797979FF727272FF000000FF00000000000000FFB4B4
-        B4FFA3A3A3FF8B8C8CFF838B8DFF86A2A9FF8ABBC9FF81B9C7FF649CAAFF8ABB
-        C9FF86A2A9FF838B8DFF7D7E7EFF727272FF000000FF00000000000000FFB7B7
-        B7FF989898FF8F9192FF84979CFF82B3C1FFA6D9E6FFCFECF5FFCCEBF3FFA7DB
-        E9FF93C3D1FF94A6ABFF545657FF1D1D1DFF000000FF00000000000000FF9898
-        98FFB4B4B4FF929596FF879EA4FF8DC3D2FFCDE9F1FFF6FAFBFFF6FAFBFFCCE8
-        F0FF6DA4B4FF2F484FFF212627FF000000000000000000000000202020003737
-        37FF7D7D7DFF8F9293FF9DB4BAFF93C7D8FFCCE8EFFFF6FAFBFFF6FAFBFFCFEC
-        F4FF91DAEEFF7BD2EC0071C6E200000000000000000000000000000000000E0E
-        0E00222222FF16191AFF1A2E34FF598B9BFFA2D5E5FFD0EEF6FFD1EFF7FFAAE2
-        F2FF84D4EBFF7DD3EB006DB6DA00000000000000000000000000000000000000
-        0000000000007FFFFF0079D2E8007CD0E90084D4EDFF88D2E7FF88D2E7FF84D4
-        EDFF7CD0E90079D2E8007FFFFF00000000000000000000000000
-      }
     end
     object PMIDeleteConnectionA: TMenuItem
       Action = ADeleteConnection
@@ -1873,42 +1292,6 @@ object MainForm: TMainForm
     end
     object PMINewDataDictA: TMenuItem
       Action = ANew
-      Bitmap.Data = {
-        36040000424D3604000000000000360000002800000010000000100000000100
-        2000000000000004000064000000640000000000000000000000FFFFFF00BB6A
-        3400BA6530FFBB6631FFBA6630FFBA6630FFBA6630FFBA6530FFBA652FFFB965
-        2EFFB9652EFFB9642EFFB9642EFFB7622CFFB7622E00FFFFFF00FFFFFF00BC69
-        33FFF8F1EAFFF7ECDFFFF6EBDEFFF6EADEFFF6EADCFFF6EADCFFFAF3EBFFFAF3
-        EBFFFAF2EAFFFCF7F3FFFCF8F4FFFEFEFDFFB7602AFFFFFFFF00FFFFFF00BF71
-        38FFF5EBDFFFFDBF68FFFCBD67FFFBBE65FFFCBE64FFFCBE64FFFCBD62FFFBBD
-        63FFFBBC61FFFCBE60FFFCBC62FFFDFBF8FFB9642DFFFFFFFF00FFFFFF00C178
-        3CFFF7EDE3FFFDC26EFFFFD8A0FFFFD79EFFFFD69BFFFFD798FFFFD696FFFFD6
-        95FFFFD594FFFFD493FFFBBE65FFFBF7F4FFBB6731FFFFFFFF00FFFFFF00C47C
-        40FFF7F0E6FFF8B455FFF7B456FFF7B554FFF8B453FFF8B253FFF7B352FFF7B3
-        52FFF7B251FFF7B24FFFF7B24FFFFCF9F5FFBF6F36FFFFFFFF00FFFFFF00C580
-        42FFF8F1E8FFFEE5D5FFFDE5D3FFFDE5D3FFFCE5D3FFFCE5D3FFFCE4D1FFFCE2
-        CEFFFCE2CCFFFBE0C9FFFBE1C8FFFDFAF7FFC1763BFFFFFFFF00FFFFFF00C582
-        45FFF8F2EBFFFEE7D6FFFDE7D6FFFDE7D6FFFDE7D6FFFDE6D5FFFDE5D3FFFCE4
-        D1FFFCE2CDFFFBE1CBFFFBE1C9FFFBF7F2FFC57C3FFFFFFFFF00FFFFFF00C684
-        47FFF9F3ECFFFEE8D6FFFEE8D7FFFDE7D6FFFDE7D6FFFDE7D5FFFDE5D3FFFBE4
-        D0FFFBE3CCFFFADFC7FFFADFC6FFFAF2EAFFC68042FFFFFFFF00FFFFFF00C688
-        49FFF9F4EDFFFEE8D8FFFEE8D8FFFEE8D7FFFEE7D6FFFDE5D3FFFCE4D1FFFBE1
-        CCFFFAE0C7FFF9DDC3FFF8DCC2FFFAF4EDFFC68245FFFFFFFF00FFFFFF00C688
-        4AFFF9F4EFFFFEE7D7FFFDE7D6FFFDE7D5FFFDE6D4FFFCE6D2FFFBE1CCFFFADF
-        C7FFF8DCC2FFF6DABDFFF6D8BBFFFAF4EFFFC68346FFFFFFFF00FFFFFF00C689
-        4BFFF9F4F0FFFCE6D3FFFCE6D4FFFDE7D3FFFCE4D1FFFBE3CDFFFAE0C8FFF8DC
-        C2FFF5D6BBFFF3D4B5FFF1D2B3FFF8F4F0FFC48246FFFFFFFF00FFFFFF00C689
-        4BFFF9F5F1FFFCE3CFFFFBE4D0FFFCE4CFFFFCE3CDFFFAE1CAFFF9DDC4FFF6D9
-        BCFFF4E9DFFFF7F2ECFFFBF7F3FFF5EFE9FFC27E45FFFFFFFF00FFFFFF00C689
-        4CFFF9F5F1FFFCE3CDFFFBE3CEFFFBE3CDFFFBE2CBFFF9E0C8FFF8DCC2FFF5D6
-        BAFFFDFBF8FFFCE6CDFFFAE5C9FFE2B684FFBF7942FFFFFFFF00FFFFFF00C588
-        4BFFFAF6F2FFFAE0C7FFFBE1C9FFFBE2C9FFFBE0C8FFF9DFC5FFF8DBC1FFF4D6
-        B8FFFFFBF8FFF6D8B4FFE1B07DFFDB9264FFB46B3E00FFFFFF00FFFFFF00C485
-        49FFF7F2ECFFF8F4EEFFF8F4EDFFF8F3EDFFF8F3EDFFF8F3EDFFF8F2ECFFF7F2
-        ECFFF2E6D7FFE2B27DFFDB9465FFB3683B00FFFFFF00FFFFFF00FFFFFF00C17D
-        4400C88B4DFFC88C4FFFC88C4FFFC88C4FFFC88C4FFFC88D4FFFC98C4FFFC78B
-        4FFFC5894BFFC4763BFFB3683C00FFFFFF00FFFFFF00FFFFFF00
-      }
     end
     object PMIDeleteDataDictA: TMenuItem
       Action = ADeleteRecentDataDict

tools/lazdatadesktop/frmmain.pp

@@ -1440,6 +1440,7 @@ begin
   Result.ImageIndex:=15;
   PCDD.ActivePage:=Result;
   Result.DataDictionary.OnProgress:=@DoDDEprogress;
+  Result.CreateGUI;
 end;
 
 { ---------------------------------------------------------------------

tools/lazdatadesktop/lazdatadesktop.lpi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="11"/>
     <General>
       <Flags>
         <SaveOnlyProjectUnits Value="True"/>
@@ -27,9 +27,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="8">
       <Item1>