IDE: New text/layout for option to enable/disable Anchordocking and DockedFormEdit (initial setup dialog)

components/anchordocking/anchordockstr.pas

@@ -89,15 +89,21 @@ resourcestring
   adrsFloatingWindowsOnTopHint = 'Show floating windows on top of main form';
   adrsFlatHeadersButtons = 'Flat header buttons';
   adrsFlatHeadersButtonsHint = 'Flat buttons in headers of docked controls';
-  setupMultiWindowIDEDisplayIndi = 'Multi Window IDE: Display individual separate Windows'
-    +' in the IDE';
-  setupSingleWindowIDEDisplayASi = 'Single Window IDE: Display a single Window holding '
-    +'all parts of the IDE (Docked)';
-  setupSingleWindowModeAllowsYou = 'Single Window mode allows you to undock individual '
-    +'Windows and have several group of Windows. The IDE will show additional "Dock-Handles" in '
-    +'each Window, which will allow you to change layout, but also require additional space.';
-  SDisable = 'Disabled (requires restart)';
   SIDELayout = 'IDE Layout';
+  setupMultiWindowIDEClassic = 'Classic IDE (Multi-Window):';
+  setupMultiWindowIDESeperateWindows = 'There are separate windows for each part of ' +
+    'the IDE (Editor, Components, Debug,...). ' +
+    'They can all be individually moved around on the screen.';
+  setupMultiWindowIDEModern = 'Modern IDE (Single-Window):';
+  setupMultiWindowIDESingleWindow = 'The IDE consists out of a single Window. ' +
+    'Different parts of the IDE are shown in panels of that Window. Some can be reached ' +
+    'through a tabbed interface.';
+  setupMultiWindowIDEInfo = 'The "modern" single Window mode still allows you to undock ' +
+    'individual Windows and have several groups of Windows. The IDE will show additional "Dock-Handles" ' +
+    'in each Window, which will allow you to change layout, but also require additional space.';
+  setupMultiWindowIDEOption = 'You can change this in the IDE options under: "Anchordocking"';
+  SDisable = 'Disabled (requires restart)';
+  SSingleMultiWindow = 'Single/Multi Window';
 
 implementation
 

components/anchordocking/design/anchordockdsgninitialsetupframe.lfm

@@ -3,66 +3,106 @@ object AnchorDockSetupFrame: TAnchorDockSetupFrame
   Height = 240
   Top = 0
   Width = 320
-  ChildSizing.LeftRightSpacing = 5
+  ChildSizing.LeftRightSpacing = 2
-  ChildSizing.TopBottomSpacing = 5
+  ChildSizing.TopBottomSpacing = 2
-  ChildSizing.HorizontalSpacing = 2
+  ChildSizing.ControlsPerLine = 1
-  ChildSizing.VerticalSpacing = 5
-  ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
-  ChildSizing.ShrinkHorizontal = crsHomogenousChildResize
-  ChildSizing.Layout = cclLeftToRightThenTopToBottom
-  ChildSizing.ControlsPerLine = 2
   ClientHeight = 240
   ClientWidth = 320
   TabOrder = 0
-  DesignLeft = 342
+  DesignLeft = 366
-  DesignTop = 289
+  DesignTop = 286
   object rbMulti: TRadioButton
-    Left = 5
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 2
     Height = 17
-    Top = 5
+    Top = 2
-    Width = 25
+    Width = 316
-    Constraints.MaxWidth = 25
+    Anchors = [akTop, akLeft, akRight]
+    Font.Style = [fsBold]
+    ParentFont = False
     TabOrder = 0
     OnChange = rbMultiChange
   end
   object lbMulti: TLabel
-    Left = 32
+    AnchorSideLeft.Control = Owner
-    Height = 17
+    AnchorSideTop.Control = rbMulti
-    Top = 5
+    AnchorSideTop.Side = asrBottom
-    Width = 283
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 20
+    Height = 15
+    Top = 19
+    Width = 298
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 20
     Caption = 'lbMulti'
     WordWrap = True
     OnClick = lbMultiClick
   end
   object rbSingle: TRadioButton
-    Left = 5
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = lbMulti
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 2
     Height = 17
-    Top = 27
+    Top = 34
-    Width = 25
+    Width = 316
+    Anchors = [akTop, akLeft, akRight]
+    Font.Style = [fsBold]
+    ParentFont = False
     TabOrder = 1
     OnChange = rbMultiChange
   end
   object lbSingle: TLabel
-    Left = 32
+    AnchorSideLeft.Control = Owner
-    Height = 17
+    AnchorSideTop.Control = rbSingle
-    Top = 27
+    AnchorSideTop.Side = asrBottom
-    Width = 283
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 20
+    Height = 15
+    Top = 51
+    Width = 298
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 20
     Caption = 'lbSingle'
     WordWrap = True
     OnClick = lbSingleClick
   end
-  object Label1: TLabel
-    Left = 5
-    Height = 15
-    Top = 49
-    Width = 25
-  end
   object lbInfo: TLabel
-    Left = 32
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = lbSingle
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 2
     Height = 15
-    Top = 49
+    Top = 72
-    Width = 283
+    Width = 316
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 6
     Caption = 'lbInfo'
     WordWrap = True
   end
+  object lbInfo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = lbInfo
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 2
+    Height = 15
+    Top = 88
+    Width = 316
+    Alignment = taCenter
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 1
+    Caption = 'lbInfo1'
+    WordWrap = True
+  end
 end

components/anchordocking/design/anchordockdsgninitialsetupframe.pas

@@ -15,8 +15,8 @@ type
   { TAnchorDockSetupFrame }
 
   TAnchorDockSetupFrame = class(TFrame)
-    Label1: TLabel;
     lbInfo: TLabel;
+    lbInfo1: TLabel;
     lbMulti: TLabel;
     lbSingle: TLabel;
     rbMulti: TRadioButton;
@@ -83,9 +83,12 @@ end;
 
 procedure TAnchorDockSetupFrame.Init;
 begin
-  lbMulti.Caption := setupMultiWindowIDEDisplayIndi;
+  rbMulti.Caption := setupMultiWindowIDEClassic;
-  lbSingle.Caption := setupSingleWindowIDEDisplayASi;
+  lbMulti.Caption := setupMultiWindowIDESeperateWindows;
-  lbInfo.Caption := setupSingleWindowModeAllowsYou;
+  rbSingle.Caption := setupMultiWindowIDEModern;
+  lbSingle.Caption := setupMultiWindowIDESingleWindow;
+  lbInfo.Caption := setupMultiWindowIDEInfo;
+  lbInfo1.Caption := setupMultiWindowIDEOption;
 end;
 
 { TAnchorDockDsgnSetup }
@@ -129,7 +132,7 @@ end;
 
 function TAnchorDockDsgnSetup.Caption: String;
 begin
-  Result := 'Single/Multi Window';
+  Result := SSingleMultiWindow;
 end;
 
 function TAnchorDockDsgnSetup.SortOrder: Integer;

components/anchordocking/languages/anchordockstr.cs.po

@@ -304,19 +304,35 @@ msgstr "Uvolnit"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/anchordocking/languages/anchordockstr.de.po

@@ -299,19 +299,35 @@ msgstr ""
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/anchordocking/languages/anchordockstr.es.po

@@ -299,19 +299,35 @@ msgstr "Desacoplar"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/anchordocking/languages/anchordockstr.fr.po

@@ -301,19 +301,35 @@ msgstr "Désamarrer"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/anchordocking/languages/anchordockstr.hu.po

@@ -301,19 +301,35 @@ msgstr "Rögzítés feloldása"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/anchordocking/languages/anchordockstr.it.po

@@ -303,19 +303,35 @@ msgstr "Libera"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/anchordocking/languages/anchordockstr.lt.po

@@ -303,19 +303,35 @@ msgstr "Naikinti pritvirtinimą"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/anchordocking/languages/anchordockstr.pl.po

@@ -302,19 +302,35 @@ msgstr "Oddokuj"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/anchordocking/languages/anchordockstr.pot

@@ -291,19 +291,35 @@ msgstr ""
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/anchordocking/languages/anchordockstr.pt_BR.po

@@ -301,19 +301,35 @@ msgstr "Desancorar"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/anchordocking/languages/anchordockstr.ru.po

@@ -301,19 +301,35 @@ msgstr "Расстыковать"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/anchordocking/languages/anchordockstr.tr.po

@@ -303,19 +303,35 @@ msgstr "Yuvadan ayır"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/anchordocking/languages/anchordockstr.uk.po

@@ -304,19 +304,35 @@ msgstr "Відстикувати"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/anchordocking/languages/anchordockstr.zh_CN.po

@@ -302,19 +302,35 @@ msgstr "取消停靠"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: anchordockstr.setupmultiwindowidedisplayindi
+#: anchordockstr.setupmultiwindowideclassic
-msgid "Multi Window IDE: Display individual separate Windows in the IDE"
+msgid "Classic IDE (Multi-Window):"
 msgstr ""
 
-#: anchordockstr.setupsinglewindowidedisplayasi
+#: anchordockstr.setupmultiwindowideinfo
-msgid "Single Window IDE: Display a single Window holding all parts of the IDE (Docked)"
+msgid "The \"modern\" single Window mode still allows you to undock individual Windows and have several groups of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
 msgstr ""
 
-#: anchordockstr.setupsinglewindowmodeallowsyou
+#: anchordockstr.setupmultiwindowidemodern
-msgid "Single Window mode allows you to undock individual Windows and have several group of Windows. The IDE will show additional \"Dock-Handles\" in each Window, which will allow you to change layout, but also require additional space."
+msgid "Modern IDE (Single-Window):"
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Anchordocking\""
+msgstr ""
+
+#: anchordockstr.setupmultiwindowideseperatewindows
+msgid "There are separate windows for each part of the IDE (Editor, Components, Debug,...). They can all be individually moved around on the screen."
+msgstr ""
+
+#: anchordockstr.setupmultiwindowidesinglewindow
+msgid "The IDE consists out of a single Window. Different parts of the IDE are shown in panels of that Window. Some can be reached through a tabbed interface."
 msgstr ""
 
 #: anchordockstr.sidelayout
 msgid "IDE Layout"
 msgstr ""
 
+#: anchordockstr.ssinglemultiwindow
+msgid "Single/Multi Window"
+msgstr ""
+

components/dockedformeditor/dockedforminitialsetupframe.lfm

@@ -3,66 +3,105 @@ object DockedFormEditSetupFrame: TDockedFormEditSetupFrame
   Height = 240
   Top = 0
   Width = 320
-  ChildSizing.LeftRightSpacing = 5
+  ChildSizing.LeftRightSpacing = 2
-  ChildSizing.TopBottomSpacing = 5
+  ChildSizing.TopBottomSpacing = 2
-  ChildSizing.HorizontalSpacing = 2
-  ChildSizing.VerticalSpacing = 5
-  ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
-  ChildSizing.ShrinkHorizontal = crsHomogenousChildResize
-  ChildSizing.Layout = cclLeftToRightThenTopToBottom
-  ChildSizing.ControlsPerLine = 2
   ClientHeight = 240
   ClientWidth = 320
   TabOrder = 0
   DesignLeft = 348
   DesignTop = 3
   object rbFloat: TRadioButton
-    Left = 5
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 2
     Height = 17
-    Top = 5
+    Top = 2
-    Width = 25
+    Width = 316
-    Constraints.MaxWidth = 25
+    Anchors = [akTop, akLeft, akRight]
+    Font.Style = [fsBold]
+    ParentFont = False
     TabOrder = 0
     OnChange = rbDockedChange
   end
   object lbFloat: TLabel
-    Left = 32
+    AnchorSideLeft.Control = Owner
-    Height = 17
+    AnchorSideTop.Control = rbFloat
-    Top = 5
+    AnchorSideTop.Side = asrBottom
-    Width = 283
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 20
+    Height = 15
+    Top = 19
+    Width = 298
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 20
     Caption = 'lbFloat'
     WordWrap = True
     OnClick = lbFloatClick
   end
   object rbDocked: TRadioButton
-    Left = 5
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = lbFloat
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 2
     Height = 17
-    Top = 27
+    Top = 34
-    Width = 25
+    Width = 316
+    Anchors = [akTop, akLeft, akRight]
+    Font.Style = [fsBold]
+    ParentFont = False
     TabOrder = 1
     OnChange = rbDockedChange
   end
   object lbDocked: TLabel
-    Left = 32
+    AnchorSideLeft.Control = Owner
-    Height = 17
+    AnchorSideTop.Control = rbDocked
-    Top = 27
+    AnchorSideTop.Side = asrBottom
-    Width = 283
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 20
+    Height = 15
+    Top = 51
+    Width = 298
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 20
     Caption = 'lbDocked'
     WordWrap = True
     OnClick = lbDockedClick
   end
-  object Label1: TLabel
-    Left = 5
-    Height = 15
-    Top = 49
-    Width = 25
-  end
   object lbInfo: TLabel
-    Left = 32
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = lbDocked
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 2
     Height = 15
-    Top = 49
+    Top = 72
-    Width = 283
+    Width = 316
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 6
     Caption = 'lbInfo'
     WordWrap = True
   end
+  object lbInfo1: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = lbInfo
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 2
+    Height = 15
+    Top = 88
+    Width = 316
+    Alignment = taCenter
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 1
+    Caption = 'lbInfo1'
+    WordWrap = True
+  end
 end

components/dockedformeditor/dockedforminitialsetupframe.pas

@@ -15,8 +15,8 @@ type
   { TDockedFormEditSetupFrame }
 
   TDockedFormEditSetupFrame = class(TFrame)
-    Label1: TLabel;
     lbInfo: TLabel;
+    lbInfo1: TLabel;
     lbFloat: TLabel;
     lbDocked: TLabel;
     rbFloat: TRadioButton;
@@ -82,9 +82,12 @@ end;
 
 procedure TDockedFormEditSetupFrame.Init;
 begin
-  lbFloat.Caption := setupDisplayTheFormEditorDesig;
+  rbFloat.Caption := setupDesignerClassic;
-  lbDocked.Caption := setupDisplayDockTheFormEditorA;
+  lbFloat.Caption := setupDesignerFloat;
-  lbInfo.Caption := setupWithTheDockedDesignerYouW;
+  rbDocked.Caption := setupDesignerModern;
+  lbDocked.Caption := setupDesignerDocked;
+  lbInfo.Caption := setupDesignerInfo;
+  lbInfo1.Caption := setupMultiWindowIDEOption;
 end;
 
 { TDockedFormEditSetup }
@@ -127,7 +130,7 @@ end;
 
 function TDockedFormEditSetup.Caption: String;
 begin
-  Result := 'Embed form editor';
+  Result := SFormEditor;
 end;
 
 function TDockedFormEditSetup.SortOrder: Integer;

components/dockedformeditor/dockedstrconsts.pas

@@ -54,15 +54,18 @@ resourceString
   STabPositionRight           = 'Right';
 
   SArgumentOutOfRange         = 'Argument out of range.';
-  setupDisplayTheFormEditorDesig = 'Display the form editor (Designer) as a separate '
+  setupDesignerClassic = 'Classic Form Editor (floating):';
-    +'floating form.';
+  setupDesignerFloat = 'The form editor shows the edited form as a normal window.';
-  setupDisplayDockTheFormEditorA = 'Display/Dock the form editor as part of the source-'
+  setupDesignerModern = 'Modern Form Editor (docked/tabbed):';
-    +'editors.';
+  setupDesignerDocked = 'The form editor is part of the IDE''s source editor (tabbed interface).';
-  setupWithTheDockedDesignerYouW = 'With the docked designer you will have a tab to '
+  setupDesignerInfo = 'The "classic" designer can be positioned on your screen independent of ' +
-    +'toggle the source and the design view. You can open a 2nd source-edit window to see both at'
+    'other parts of the IDE. The "modern" docked designer will be embedded into the ' +
-    +' the same time.';
+    'source-edit window, and you will have a tab to toggle between source and form. ' +
+    'You can open a 2nd source-edit window to see both at the same time.';
+  setupMultiWindowIDEOption = 'You can change this in the IDE options under: "Docked Form Editor"';
   SDisableRequiresRestart = 'Disabled (requires restart)';
   SIDELayout = 'IDE Layout';
+  SFormEditor = 'Form editor / Designer';
 
 const
   STabPosition: array [Low(TTabPosition)..High(TTabPosition)] of String = (

components/dockedformeditor/languages/dockedstrconsts.fr.po

@@ -123,16 +123,28 @@ msgstr "Détacher le côté du contrôle"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaydocktheformeditora
+#: dockedstrconsts.setupdesignerclassic
-msgid "Display/Dock the form editor as part of the source-editors."
+msgid "Classic Form Editor (floating):"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaytheformeditordesig
+#: dockedstrconsts.setupdesignerdocked
-msgid "Display the form editor (Designer) as a separate floating form."
+msgid "The form editor is part of the IDE's source editor (tabbed interface)."
 msgstr ""
 
-#: dockedstrconsts.setupwiththedockeddesigneryouw
+#: dockedstrconsts.setupdesignerfloat
-msgid "With the docked designer you will have a tab to toggle the source and the design view. You can open a 2nd source-edit window to see both at the same time."
+msgid "The form editor shows the edited form as a normal window."
+msgstr ""
+
+#: dockedstrconsts.setupdesignerinfo
+msgid "The \"classic\" designer can be positioned on your screen independent of other parts of the IDE. The \"modern\" docked designer will be embedded into the source-edit window, and you will have a tab to toggle between source and form. You can open a 2nd source-edit window to see both at the same time."
+msgstr ""
+
+#: dockedstrconsts.setupdesignermodern
+msgid "Modern Form Editor (docked/tabbed):"
+msgstr ""
+
+#: dockedstrconsts.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Docked Form Editor\""
 msgstr ""
 
 #: dockedstrconsts.sforcerefreshingcaption
@@ -143,6 +155,10 @@ msgstr "Forcer le rafraîchissement lors du redimensionnement"
 msgid "Force refreshing form when user is sizing it"
 msgstr "Forcer l'actualisation de la fiche lorsque l'utilisateur la dimensionne"
 
+#: dockedstrconsts.sformeditor
+msgid "Form editor / Designer"
+msgstr ""
+
 #: dockedstrconsts.sidelayout
 msgid "IDE Layout"
 msgstr ""

components/dockedformeditor/languages/dockedstrconsts.hu.po

@@ -125,16 +125,28 @@ msgstr ""
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaydocktheformeditora
+#: dockedstrconsts.setupdesignerclassic
-msgid "Display/Dock the form editor as part of the source-editors."
+msgid "Classic Form Editor (floating):"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaytheformeditordesig
+#: dockedstrconsts.setupdesignerdocked
-msgid "Display the form editor (Designer) as a separate floating form."
+msgid "The form editor is part of the IDE's source editor (tabbed interface)."
 msgstr ""
 
-#: dockedstrconsts.setupwiththedockeddesigneryouw
+#: dockedstrconsts.setupdesignerfloat
-msgid "With the docked designer you will have a tab to toggle the source and the design view. You can open a 2nd source-edit window to see both at the same time."
+msgid "The form editor shows the edited form as a normal window."
+msgstr ""
+
+#: dockedstrconsts.setupdesignerinfo
+msgid "The \"classic\" designer can be positioned on your screen independent of other parts of the IDE. The \"modern\" docked designer will be embedded into the source-edit window, and you will have a tab to toggle between source and form. You can open a 2nd source-edit window to see both at the same time."
+msgstr ""
+
+#: dockedstrconsts.setupdesignermodern
+msgid "Modern Form Editor (docked/tabbed):"
+msgstr ""
+
+#: dockedstrconsts.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Docked Form Editor\""
 msgstr ""
 
 #: dockedstrconsts.sforcerefreshingcaption
@@ -145,6 +157,10 @@ msgstr ""
 msgid "Force refreshing form when user is sizing it"
 msgstr ""
 
+#: dockedstrconsts.sformeditor
+msgid "Form editor / Designer"
+msgstr ""
+
 #: dockedstrconsts.sidelayout
 msgid "IDE Layout"
 msgstr ""

components/dockedformeditor/languages/dockedstrconsts.lt.po

@@ -126,16 +126,28 @@ msgstr ""
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaydocktheformeditora
+#: dockedstrconsts.setupdesignerclassic
-msgid "Display/Dock the form editor as part of the source-editors."
+msgid "Classic Form Editor (floating):"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaytheformeditordesig
+#: dockedstrconsts.setupdesignerdocked
-msgid "Display the form editor (Designer) as a separate floating form."
+msgid "The form editor is part of the IDE's source editor (tabbed interface)."
 msgstr ""
 
-#: dockedstrconsts.setupwiththedockeddesigneryouw
+#: dockedstrconsts.setupdesignerfloat
-msgid "With the docked designer you will have a tab to toggle the source and the design view. You can open a 2nd source-edit window to see both at the same time."
+msgid "The form editor shows the edited form as a normal window."
+msgstr ""
+
+#: dockedstrconsts.setupdesignerinfo
+msgid "The \"classic\" designer can be positioned on your screen independent of other parts of the IDE. The \"modern\" docked designer will be embedded into the source-edit window, and you will have a tab to toggle between source and form. You can open a 2nd source-edit window to see both at the same time."
+msgstr ""
+
+#: dockedstrconsts.setupdesignermodern
+msgid "Modern Form Editor (docked/tabbed):"
+msgstr ""
+
+#: dockedstrconsts.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Docked Form Editor\""
 msgstr ""
 
 #: dockedstrconsts.sforcerefreshingcaption
@@ -146,6 +158,10 @@ msgstr ""
 msgid "Force refreshing form when user is sizing it"
 msgstr ""
 
+#: dockedstrconsts.sformeditor
+msgid "Form editor / Designer"
+msgstr ""
+
 #: dockedstrconsts.sidelayout
 msgid "IDE Layout"
 msgstr ""

components/dockedformeditor/languages/dockedstrconsts.pot

@@ -112,16 +112,28 @@ msgstr ""
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaydocktheformeditora
+#: dockedstrconsts.setupdesignerclassic
-msgid "Display/Dock the form editor as part of the source-editors."
+msgid "Classic Form Editor (floating):"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaytheformeditordesig
+#: dockedstrconsts.setupdesignerdocked
-msgid "Display the form editor (Designer) as a separate floating form."
+msgid "The form editor is part of the IDE's source editor (tabbed interface)."
 msgstr ""
 
-#: dockedstrconsts.setupwiththedockeddesigneryouw
+#: dockedstrconsts.setupdesignerfloat
-msgid "With the docked designer you will have a tab to toggle the source and the design view. You can open a 2nd source-edit window to see both at the same time."
+msgid "The form editor shows the edited form as a normal window."
+msgstr ""
+
+#: dockedstrconsts.setupdesignerinfo
+msgid "The \"classic\" designer can be positioned on your screen independent of other parts of the IDE. The \"modern\" docked designer will be embedded into the source-edit window, and you will have a tab to toggle between source and form. You can open a 2nd source-edit window to see both at the same time."
+msgstr ""
+
+#: dockedstrconsts.setupdesignermodern
+msgid "Modern Form Editor (docked/tabbed):"
+msgstr ""
+
+#: dockedstrconsts.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Docked Form Editor\""
 msgstr ""
 
 #: dockedstrconsts.sforcerefreshingcaption
@@ -132,6 +144,10 @@ msgstr ""
 msgid "Force refreshing form when user is sizing it"
 msgstr ""
 
+#: dockedstrconsts.sformeditor
+msgid "Form editor / Designer"
+msgstr ""
+
 #: dockedstrconsts.sidelayout
 msgid "IDE Layout"
 msgstr ""

components/dockedformeditor/languages/dockedstrconsts.pt_BR.po

@@ -122,16 +122,28 @@ msgstr "Desanexar lado do controle"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaydocktheformeditora
+#: dockedstrconsts.setupdesignerclassic
-msgid "Display/Dock the form editor as part of the source-editors."
+msgid "Classic Form Editor (floating):"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaytheformeditordesig
+#: dockedstrconsts.setupdesignerdocked
-msgid "Display the form editor (Designer) as a separate floating form."
+msgid "The form editor is part of the IDE's source editor (tabbed interface)."
 msgstr ""
 
-#: dockedstrconsts.setupwiththedockeddesigneryouw
+#: dockedstrconsts.setupdesignerfloat
-msgid "With the docked designer you will have a tab to toggle the source and the design view. You can open a 2nd source-edit window to see both at the same time."
+msgid "The form editor shows the edited form as a normal window."
+msgstr ""
+
+#: dockedstrconsts.setupdesignerinfo
+msgid "The \"classic\" designer can be positioned on your screen independent of other parts of the IDE. The \"modern\" docked designer will be embedded into the source-edit window, and you will have a tab to toggle between source and form. You can open a 2nd source-edit window to see both at the same time."
+msgstr ""
+
+#: dockedstrconsts.setupdesignermodern
+msgid "Modern Form Editor (docked/tabbed):"
+msgstr ""
+
+#: dockedstrconsts.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Docked Form Editor\""
 msgstr ""
 
 #: dockedstrconsts.sforcerefreshingcaption
@@ -142,6 +154,10 @@ msgstr "Forçar atualização ao redimensionar"
 msgid "Force refreshing form when user is sizing it"
 msgstr "Forçar atualização do formulário quando o usuário o estiver redimensionando"
 
+#: dockedstrconsts.sformeditor
+msgid "Form editor / Designer"
+msgstr ""
+
 #: dockedstrconsts.sidelayout
 msgid "IDE Layout"
 msgstr ""

components/dockedformeditor/languages/dockedstrconsts.ru.po

@@ -122,16 +122,28 @@ msgstr "Отвязать сторону компонента"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaydocktheformeditora
+#: dockedstrconsts.setupdesignerclassic
-msgid "Display/Dock the form editor as part of the source-editors."
+msgid "Classic Form Editor (floating):"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaytheformeditordesig
+#: dockedstrconsts.setupdesignerdocked
-msgid "Display the form editor (Designer) as a separate floating form."
+msgid "The form editor is part of the IDE's source editor (tabbed interface)."
 msgstr ""
 
-#: dockedstrconsts.setupwiththedockeddesigneryouw
+#: dockedstrconsts.setupdesignerfloat
-msgid "With the docked designer you will have a tab to toggle the source and the design view. You can open a 2nd source-edit window to see both at the same time."
+msgid "The form editor shows the edited form as a normal window."
+msgstr ""
+
+#: dockedstrconsts.setupdesignerinfo
+msgid "The \"classic\" designer can be positioned on your screen independent of other parts of the IDE. The \"modern\" docked designer will be embedded into the source-edit window, and you will have a tab to toggle between source and form. You can open a 2nd source-edit window to see both at the same time."
+msgstr ""
+
+#: dockedstrconsts.setupdesignermodern
+msgid "Modern Form Editor (docked/tabbed):"
+msgstr ""
+
+#: dockedstrconsts.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Docked Form Editor\""
 msgstr ""
 
 #: dockedstrconsts.sforcerefreshingcaption
@@ -142,6 +154,10 @@ msgstr "Принудительно обновлять при изменении
 msgid "Force refreshing form when user is sizing it"
 msgstr "Принудительно обновлять форму при изменении её размера"
 
+#: dockedstrconsts.sformeditor
+msgid "Form editor / Designer"
+msgstr ""
+
 #: dockedstrconsts.sidelayout
 msgid "IDE Layout"
 msgstr ""

components/dockedformeditor/languages/dockedstrconsts.tr.po

@@ -122,16 +122,28 @@ msgstr "Kontrol Tarafını Ayırın"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaydocktheformeditora
+#: dockedstrconsts.setupdesignerclassic
-msgid "Display/Dock the form editor as part of the source-editors."
+msgid "Classic Form Editor (floating):"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaytheformeditordesig
+#: dockedstrconsts.setupdesignerdocked
-msgid "Display the form editor (Designer) as a separate floating form."
+msgid "The form editor is part of the IDE's source editor (tabbed interface)."
 msgstr ""
 
-#: dockedstrconsts.setupwiththedockeddesigneryouw
+#: dockedstrconsts.setupdesignerfloat
-msgid "With the docked designer you will have a tab to toggle the source and the design view. You can open a 2nd source-edit window to see both at the same time."
+msgid "The form editor shows the edited form as a normal window."
+msgstr ""
+
+#: dockedstrconsts.setupdesignerinfo
+msgid "The \"classic\" designer can be positioned on your screen independent of other parts of the IDE. The \"modern\" docked designer will be embedded into the source-edit window, and you will have a tab to toggle between source and form. You can open a 2nd source-edit window to see both at the same time."
+msgstr ""
+
+#: dockedstrconsts.setupdesignermodern
+msgid "Modern Form Editor (docked/tabbed):"
+msgstr ""
+
+#: dockedstrconsts.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Docked Form Editor\""
 msgstr ""
 
 #: dockedstrconsts.sforcerefreshingcaption
@@ -142,6 +154,10 @@ msgstr "İndirme ve çıkartma için her zaman zorla"
 msgid "Force refreshing form when user is sizing it"
 msgstr "Kullanıcı boyutlandırırken formu yenilemeye zorla"
 
+#: dockedstrconsts.sformeditor
+msgid "Form editor / Designer"
+msgstr ""
+
 #: dockedstrconsts.sidelayout
 msgid "IDE Layout"
 msgstr ""

components/dockedformeditor/languages/dockedstrconsts.uk.po

@@ -124,16 +124,28 @@ msgstr "Від'єднати бік елемента керування"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaydocktheformeditora
+#: dockedstrconsts.setupdesignerclassic
-msgid "Display/Dock the form editor as part of the source-editors."
+msgid "Classic Form Editor (floating):"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaytheformeditordesig
+#: dockedstrconsts.setupdesignerdocked
-msgid "Display the form editor (Designer) as a separate floating form."
+msgid "The form editor is part of the IDE's source editor (tabbed interface)."
 msgstr ""
 
-#: dockedstrconsts.setupwiththedockeddesigneryouw
+#: dockedstrconsts.setupdesignerfloat
-msgid "With the docked designer you will have a tab to toggle the source and the design view. You can open a 2nd source-edit window to see both at the same time."
+msgid "The form editor shows the edited form as a normal window."
+msgstr ""
+
+#: dockedstrconsts.setupdesignerinfo
+msgid "The \"classic\" designer can be positioned on your screen independent of other parts of the IDE. The \"modern\" docked designer will be embedded into the source-edit window, and you will have a tab to toggle between source and form. You can open a 2nd source-edit window to see both at the same time."
+msgstr ""
+
+#: dockedstrconsts.setupdesignermodern
+msgid "Modern Form Editor (docked/tabbed):"
+msgstr ""
+
+#: dockedstrconsts.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Docked Form Editor\""
 msgstr ""
 
 #: dockedstrconsts.sforcerefreshingcaption
@@ -144,6 +156,10 @@ msgstr "Примусове оновлення при зміні розміру"
 msgid "Force refreshing form when user is sizing it"
 msgstr "Примусове оновлення форми, коли користувач змінює її розміри"
 
+#: dockedstrconsts.sformeditor
+msgid "Form editor / Designer"
+msgstr ""
+
 #: dockedstrconsts.sidelayout
 msgid "IDE Layout"
 msgstr ""

components/dockedformeditor/languages/dockedstrconsts.zh_CN.po

@@ -123,16 +123,28 @@ msgstr "分离控制面板"
 msgid "Disabled (requires restart)"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaydocktheformeditora
+#: dockedstrconsts.setupdesignerclassic
-msgid "Display/Dock the form editor as part of the source-editors."
+msgid "Classic Form Editor (floating):"
 msgstr ""
 
-#: dockedstrconsts.setupdisplaytheformeditordesig
+#: dockedstrconsts.setupdesignerdocked
-msgid "Display the form editor (Designer) as a separate floating form."
+msgid "The form editor is part of the IDE's source editor (tabbed interface)."
 msgstr ""
 
-#: dockedstrconsts.setupwiththedockeddesigneryouw
+#: dockedstrconsts.setupdesignerfloat
-msgid "With the docked designer you will have a tab to toggle the source and the design view. You can open a 2nd source-edit window to see both at the same time."
+msgid "The form editor shows the edited form as a normal window."
+msgstr ""
+
+#: dockedstrconsts.setupdesignerinfo
+msgid "The \"classic\" designer can be positioned on your screen independent of other parts of the IDE. The \"modern\" docked designer will be embedded into the source-edit window, and you will have a tab to toggle between source and form. You can open a 2nd source-edit window to see both at the same time."
+msgstr ""
+
+#: dockedstrconsts.setupdesignermodern
+msgid "Modern Form Editor (docked/tabbed):"
+msgstr ""
+
+#: dockedstrconsts.setupmultiwindowideoption
+msgid "You can change this in the IDE options under: \"Docked Form Editor\""
 msgstr ""
 
 #: dockedstrconsts.sforcerefreshingcaption
@@ -143,6 +155,10 @@ msgstr "强制刷新大小"
 msgid "Force refreshing form when user is sizing it"
 msgstr "用户调整大小时强制刷新窗体"
 
+#: dockedstrconsts.sformeditor
+msgid "Form editor / Designer"
+msgstr ""
+
 #: dockedstrconsts.sidelayout
 msgid "IDE Layout"
 msgstr ""

ide/initialsetupdlgs.lfm

@@ -1,12 +1,12 @@
 object InitialSetupDialog: TInitialSetupDialog
   AnchorSideBottom.Side = asrBottom
   Left = 298
-  Height = 450
+  Height = 520
   Top = 241
-  Width = 620
+  Width = 640
   Caption = 'InitialSetupDialog'
-  ClientHeight = 450
+  ClientHeight = 520
-  ClientWidth = 620
+  ClientWidth = 640
   Position = poScreenCenter
   LCLVersion = '3.99.0.0'
   OnCreate = FormCreate
@@ -18,7 +18,7 @@ object InitialSetupDialog: TInitialSetupDialog
     AnchorSideRight.Control = Splitter1
     AnchorSideBottom.Control = BtnPanel
     Left = 6
-    Height = 351
+    Height = 421
     Top = 54
     Width = 159
     Anchors = [akTop, akLeft, akRight, akBottom]
@@ -40,7 +40,7 @@ object InitialSetupDialog: TInitialSetupDialog
     AnchorSideBottom.Control = PropertiesTreeView
     AnchorSideBottom.Side = asrBottom
     Left = 165
-    Height = 351
+    Height = 421
     Top = 54
     Width = 5
     Align = alNone
@@ -49,18 +49,18 @@ object InitialSetupDialog: TInitialSetupDialog
   object BtnPanel: TPanel
     Left = 10
     Height = 25
-    Top = 415
+    Top = 485
-    Width = 600
+    Width = 620
     Align = alBottom
     AutoSize = True
     BorderSpacing.Around = 10
     BevelOuter = bvNone
     ClientHeight = 25
-    ClientWidth = 600
+    ClientWidth = 620
     ParentFont = False
     TabOrder = 2
     object StartIDEBitBtn: TBitBtn
-      Left = 500
+      Left = 520
       Height = 25
       Top = 0
       Width = 100
@@ -82,9 +82,9 @@ object InitialSetupDialog: TInitialSetupDialog
     AnchorSideBottom.Control = Splitter1
     AnchorSideBottom.Side = asrBottom
     Left = 170
-    Height = 351
+    Height = 421
     Top = 54
-    Width = 444
+    Width = 464
     ActivePage = DebuggerTabSheet
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Right = 6
@@ -99,14 +99,14 @@ object InitialSetupDialog: TInitialSetupDialog
       ChildSizing.TopBottomSpacing = 6
       ChildSizing.HorizontalSpacing = 6
       ChildSizing.VerticalSpacing = 6
-      ClientHeight = 323
+      ClientHeight = 393
-      ClientWidth = 436
+      ClientWidth = 456
       ParentFont = False
       object LazDirLabel: TLabel
         Left = 6
         Height = 15
         Top = 6
-        Width = 424
+        Width = 444
         Align = alTop
         Caption = 'LazDirLabel'
         ParentColor = False
@@ -122,7 +122,7 @@ object InitialSetupDialog: TInitialSetupDialog
         Left = 6
         Height = 23
         Top = 27
-        Width = 424
+        Width = 444
         Anchors = [akTop, akLeft, akRight]
         ItemHeight = 15
         ParentFont = False
@@ -134,9 +134,9 @@ object InitialSetupDialog: TInitialSetupDialog
         AnchorSideTop.Control = LazDirBrowseButton
         AnchorSideTop.Side = asrBottom
         Left = 6
-        Height = 230
+        Height = 300
         Top = 87
-        Width = 424
+        Width = 444
         Align = alBottom
         Anchors = [akTop, akLeft, akRight, akBottom]
         Lines.Strings = (
@@ -172,14 +172,14 @@ object InitialSetupDialog: TInitialSetupDialog
       ChildSizing.TopBottomSpacing = 6
       ChildSizing.HorizontalSpacing = 6
       ChildSizing.VerticalSpacing = 6
-      ClientHeight = 323
+      ClientHeight = 393
-      ClientWidth = 436
+      ClientWidth = 456
       ParentFont = False
       object CompilerLabel: TLabel
         Left = 6
         Height = 15
         Top = 6
-        Width = 424
+        Width = 444
         Align = alTop
         Caption = 'CompilerLabel'
         ParentColor = False
@@ -195,7 +195,7 @@ object InitialSetupDialog: TInitialSetupDialog
         Left = 6
         Height = 23
         Top = 27
-        Width = 424
+        Width = 444
         Anchors = [akTop, akLeft, akRight]
         ItemHeight = 15
         ParentFont = False
@@ -226,9 +226,9 @@ object InitialSetupDialog: TInitialSetupDialog
         AnchorSideBottom.Control = CompilerTabSheet
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 230
+        Height = 300
         Top = 87
-        Width = 424
+        Width = 444
         Anchors = [akTop, akLeft, akRight, akBottom]
         Lines.Strings = (
           'CompilerMemo'
@@ -247,14 +247,14 @@ object InitialSetupDialog: TInitialSetupDialog
       ChildSizing.TopBottomSpacing = 6
       ChildSizing.HorizontalSpacing = 6
       ChildSizing.VerticalSpacing = 6
-      ClientHeight = 323
+      ClientHeight = 393
-      ClientWidth = 436
+      ClientWidth = 456
       ParentFont = False
       object FPCSrcDirLabel: TLabel
         Left = 6
         Height = 15
         Top = 6
-        Width = 424
+        Width = 444
         Align = alTop
         Caption = 'FPCSrcDirLabel'
         ParentColor = False
@@ -265,7 +265,7 @@ object InitialSetupDialog: TInitialSetupDialog
         Left = 6
         Height = 23
         Top = 27
-        Width = 424
+        Width = 444
         Align = alTop
         ItemHeight = 15
         ParentFont = False
@@ -291,9 +291,9 @@ object InitialSetupDialog: TInitialSetupDialog
         AnchorSideTop.Control = FPCSrcDirBrowseButton
         AnchorSideTop.Side = asrBottom
         Left = 6
-        Height = 230
+        Height = 300
         Top = 87
-        Width = 424
+        Width = 444
         Align = alBottom
         Anchors = [akTop, akLeft, akRight, akBottom]
         Lines.Strings = (
@@ -353,14 +353,14 @@ object InitialSetupDialog: TInitialSetupDialog
     end
     object MakeExeTabSheet: TTabSheet
       Caption = 'MakeExeTabSheet'
-      ClientHeight = 323
+      ClientHeight = 393
-      ClientWidth = 436
+      ClientWidth = 456
       ParentFont = False
       object MakeExeComboBox: TComboBox
         Left = 6
         Height = 23
         Top = 27
-        Width = 424
+        Width = 444
         Align = alTop
         BorderSpacing.Around = 6
         ItemHeight = 15
@@ -373,7 +373,7 @@ object InitialSetupDialog: TInitialSetupDialog
         Left = 6
         Height = 15
         Top = 6
-        Width = 424
+        Width = 444
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'MakeExeLabel'
@@ -400,9 +400,9 @@ object InitialSetupDialog: TInitialSetupDialog
         AnchorSideTop.Control = MakeExeBrowseButton
         AnchorSideTop.Side = asrBottom
         Left = 6
-        Height = 230
+        Height = 300
         Top = 87
-        Width = 424
+        Width = 444
         Align = alBottom
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
@@ -423,14 +423,14 @@ object InitialSetupDialog: TInitialSetupDialog
     end
     object FppkgTabSheet: TTabSheet
       Caption = 'FppkgTabSheet'
-      ClientHeight = 323
+      ClientHeight = 393
-      ClientWidth = 436
+      ClientWidth = 456
       ParentFont = False
       object FppkgComboBox: TComboBox
         Left = 6
         Height = 23
         Top = 6
-        Width = 424
+        Width = 444
         Align = alTop
         BorderSpacing.Around = 6
         ItemHeight = 15
@@ -443,7 +443,7 @@ object InitialSetupDialog: TInitialSetupDialog
         Left = 6
         Height = 15
         Top = 35
-        Width = 424
+        Width = 444
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'FppkgLabel'
@@ -470,9 +470,9 @@ object InitialSetupDialog: TInitialSetupDialog
         AnchorSideTop.Control = FppkgWriteConfigButton
         AnchorSideTop.Side = asrBottom
         Left = 6
-        Height = 230
+        Height = 300
         Top = 87
-        Width = 424
+        Width = 444
         Align = alBottom
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
@@ -490,7 +490,7 @@ object InitialSetupDialog: TInitialSetupDialog
         AnchorSideLeft.Control = DebuggerTabSheet
         AnchorSideTop.Control = FppkgLabel
         AnchorSideTop.Side = asrBottom
-        Left = 271
+        Left = 291
         Height = 25
         Top = 56
         Width = 159
@@ -509,7 +509,7 @@ object InitialSetupDialog: TInitialSetupDialog
     Left = 0
     Height = 48
     Top = 0
-    Width = 620
+    Width = 640
     Align = alTop
     ParentFont = False
     OnPaint = WelcomePaintBoxPaint

ide/initialsetupdlgs.pas

@@ -519,6 +519,7 @@ begin
         if ScrollBox.ControlCount > 1 then begin
           NewDiv.AnchorSide[akTop].Side := asrBottom;
           NewDiv.AnchorSide[akTop].Control := ScrollBox.Controls[ScrollBox.ControlCount - 2];
+          NewDiv.BorderSpacing.Top := 10;
         end
         else begin
           NewDiv.AnchorSide[akTop].Side := asrTop;