IdeDebugger: Settings for array-navigation-bar (via DisplayFormat) / fix inherited DisplayFormat for "multiline"/indent.

2025-08-07 10:16:09 +02:00 · 2024-08-25 00:27:04 +02:00 · 2024-08-25 00:27:04 +02:00 · e5ec3afe04
commit e5ec3afe04
parent 048d3d6686
39 changed files with 1111 additions and 128 deletions
--- a/components/ideintf/idedebuggerwatchvalueintf.pas
+++ b/components/ideintf/idedebuggerwatchvalueintf.pas
@ -151,13 +151,18 @@ type
    class operator = (a,b: TWatchDisplayFormatPointer): boolean;
  end;

-  { TWatchDisplayFormatMultiline }
-
  TWatchDisplayFormatMultiline = packed record
    UseInherited:          boolean;
    MaxMultiLineDepth:     integer; // Deeper than this will not be line-wrapped
    class operator = (a,b: TWatchDisplayFormatMultiline): boolean;
  end;
+  TWatchDisplayFormatArrayNav = packed record
+    UseInherited:          boolean;
+    PageSize:              Integer;
+    EnforceBounds:         boolean;
+    AutoHideNavBar:        boolean;
+    class operator = (a,b: TWatchDisplayFormatArrayNav): boolean;
+  end;

  { TWatchDisplayFormat }

@ -171,7 +176,8 @@ type
    Float:   TWatchDisplayFormatFloat;
    Struct:  TWatchDisplayFormatStruct;
    Pointer: TWatchDisplayFormatPointer;
-    MultiLine: TWatchDisplayFormatMultiline;
+    MultiLine:   TWatchDisplayFormatMultiline;
+    ArrayNavBar: TWatchDisplayFormatArrayNav;

    MemDump: boolean;

@ -248,6 +254,11 @@ const
    MultiLine: (UseInherited:     True;
                MaxMultiLineDepth: 3;
               );
+    ArrayNavBar: (UseInherited:   True;
+                  PageSize:       10;
+                  EnforceBounds:  True;
+                  AutoHideNavBar: True;
+                 );
    MemDump:       False;
  );

@ -511,6 +522,7 @@ begin
    'Ptr: '+dbgs(df.Pointer.UseInherited)+' '+dbgs(df.Pointer.DerefFormat) + LineEnding+
    'Addr: '+dbgs(df.Pointer.Address.UseInherited)+' '+dbgs(df.Pointer.Address.TypeFormat)+' '+dbgs(df.Pointer.Address.BaseFormat)+' '+dbgs(df.Pointer.Address.Signed)+' '+dbgs(df.Struct.Address.NoLeadZero) + LineEnding+
    'Indent: '+dbgs(df.MultiLine.UseInherited)+' '+dbgs(df.MultiLine.MaxMultiLineDepth) + LineEnding+
+    'ArrayNav: '+dbgs(df.ArrayNavBar.UseInherited)+' '+dbgs(df.ArrayNavBar.PageSize)+' '+dbgs(df.ArrayNavBar.EnforceBounds)+' '+dbgs(df.ArrayNavBar.AutoHideNavBar) + LineEnding+
    'Dmp: '+dbgs(df.MemDump);
 end;

@ -657,20 +669,32 @@ begin
    (a.MaxMultiLineDepth     = b.MaxMultiLineDepth);
 end;

+{ TWatchDisplayFormatArrayNav }
+
+class operator TWatchDisplayFormatArrayNav. = (a, b: TWatchDisplayFormatArrayNav): boolean;
+begin
+  Result :=
+    (a.UseInherited          = b.UseInherited) and
+    (a.PageSize              = b.PageSize) and
+    (a.EnforceBounds         = b.EnforceBounds) and
+    (a.AutoHideNavBar        = b.AutoHideNavBar);
+end;
+
 class operator TWatchDisplayFormat. = (a, b: TWatchDisplayFormat): boolean;
 begin
  Result :=
-    (a.Num       = b.Num) and
-    (a.Num2      = b.Num2) and
-    (a.Enum      = b.Enum) and
-    (a.EnumVal   = b.EnumVal) and
-    (a.Bool      = b.Bool) and
-    (a.Char      = b.Char) and
-    (a.Float     = b.Float) and
-    (a.Struct    = b.Struct) and
-    (a.Pointer   = b.Pointer) and
-    (a.MultiLine = b.MultiLine) and
-    (a.MemDump   = b.MemDump);
+    (a.Num         = b.Num) and
+    (a.Num2        = b.Num2) and
+    (a.Enum        = b.Enum) and
+    (a.EnumVal     = b.EnumVal) and
+    (a.Bool        = b.Bool) and
+    (a.Char        = b.Char) and
+    (a.Float       = b.Float) and
+    (a.Struct      = b.Struct) and
+    (a.Pointer     = b.Pointer) and
+    (a.MultiLine   = b.MultiLine) and
+    (a.ArrayNavBar = b.ArrayNavBar) and
+    (a.MemDump     = b.MemDump);
 end;

 function TWatchDisplayFormat.HasOverrides: boolean;
@ -680,7 +704,7 @@ begin
                Float.UseInherited and
                Struct.UseInherited and Struct.Address.UseInherited and
                Pointer.UseInherited and Pointer.Address.UseInherited and
-                MultiLine.UseInherited
+                MultiLine.UseInherited and ArrayNavBar.UseInherited
               );
 end;

@ -697,7 +721,8 @@ begin
  Struct.Address.UseInherited  := False;
  Pointer.UseInherited         := False;
  Pointer.Address.UseInherited := False;
-  MultiLine.UseInherited := False;
+  MultiLine.UseInherited       := False;
+  ArrayNavBar.UseInherited     := False;
 end;

 procedure TWatchDisplayFormat.CopyInheritedFrom(AnOther: TWatchDisplayFormat);
@ -718,6 +743,7 @@ begin
  if Pointer.UseInherited         then Pointer         := AnOther.Pointer;
  if not a.UseInherited           then Pointer.Address := a;
  if MultiLine.UseInherited       then MultiLine       := AnOther.MultiLine;
+  if ArrayNavBar.UseInherited     then ArrayNavBar     := AnOther.ArrayNavBar;
 end;

 end.
--- a/ide/packages/idedebugger/arraynavigationframe.lfm
+++ b/ide/packages/idedebugger/arraynavigationframe.lfm
@ -218,4 +218,20 @@ object ArrayNavigationBar: TArrayNavigationBar
    Flat = True
    OnClick = btnHideClick
  end
+  object cbAutoHide: TCheckBox
+    AnchorSideLeft.Control = btnHide
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = Owner
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 394
+    Height = 24
+    Top = 0
+    Width = 82
+    Anchors = [akTop, akLeft, akBottom]
+    BorderSpacing.Left = 6
+    Caption = 'cbAutoHide'
+    TabOrder = 3
+    OnChange = cbAutoHideChange
+  end
 end
--- a/ide/packages/idedebugger/arraynavigationframe.pas
+++ b/ide/packages/idedebugger/arraynavigationframe.pas
@ -6,7 +6,8 @@ interface

 uses
  Classes, SysUtils, Math, Forms, Controls, Buttons, StdCtrls, LCLType, ExtCtrls, SpinEx,
-  LazNumEdit, IDEImagesIntf, laz.VirtualTrees, IdeDebuggerStringConstants, DebuggerTreeView;
+  LazNumEdit, IDEImagesIntf, IdeDebuggerWatchValueIntf, laz.VirtualTrees,
+  IdeDebuggerStringConstants, DebuggerTreeView, Debugger, IdeDebuggerWatchResPrinter;

 type

@ -25,6 +26,7 @@ type
    btnArrayStart: TSpeedButton;
    btnHide: TSpeedButton;
    cbEnforceBound: TCheckBox;
+    cbAutoHide: TCheckBox;
    Label1: TLabel;
    edArrayPageSize: TLazIntegerEdit;
    edArrayStart: TLazIntegerEdit;
@ -32,12 +34,16 @@ type
    procedure BtnChangePageClicked(Sender: TObject);
    procedure BtnChangeSizeClicked(Sender: TObject);
    procedure btnHideClick(Sender: TObject);
+    procedure cbAutoHideChange(Sender: TObject);
    procedure cbEnforceBoundChange(Sender: TObject);
    procedure edArrayPageSizeEditingDone(Sender: TObject);
    procedure edArrayPageSizeKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
    procedure edArrayStartEditingDone(Sender: TObject);
    procedure edArrayStartKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
  private
+    FArrayNavConfig: IArrayNavSettings;
+    FDisplayFormatResolver: TDisplayFormatResolver;
+    FState: (anNew, anBoundsAllowHide, anBoundsNeedNav);
    FHardLimits: Boolean;
    FHighBound: int64;
    FLowBound: int64;
@ -75,6 +81,7 @@ type
    procedure HideNavBar;
    procedure ShowNavBar;
    procedure UpdateCollapsedExpanded;
+    procedure UpdateForNewBounds;
    property  NavBarVisible: boolean read FNavBarVisible;
    property LowBound: int64 read FLowBound write SetLowBound;
    property HighBound: int64 read FHighBound write SetHighBound;
@ -86,6 +93,8 @@ type
    property LimitedPageSize: int64 read GetLimitedPageSize;

    property OwnerData: pointer read FOwnerData write FOwnerData;
+    property DisplayFormatResolver: TDisplayFormatResolver read FDisplayFormatResolver write FDisplayFormatResolver;
+    property ArrayNavConfig: IArrayNavSettings read FArrayNavConfig write FArrayNavConfig;
  published
    property OnIndexChanged: TArrayNavChangeEvent read FOnIndexChanged write FOnIndexChanged;
    property OnPageSize: TArrayNavChangeEvent read FOnPageSize write FOnPageSize;
@ -160,9 +169,29 @@ begin
  HideNavBar;
 end;

+procedure TArrayNavigationBar.cbAutoHideChange(Sender: TObject);
+var
+  df: TWatchDisplayFormat;
+  opts: TWatchDisplayFormatArrayNav;
+begin
+  if (OwnerData <> nil) and (FArrayNavConfig <> nil) then begin
+    df := FArrayNavConfig.GetDisplayFormat;
+    if FDisplayFormatResolver <> nil then
+      opts := FDisplayFormatResolver.ResolveArrayNavBar(df)
+    else
+      opts := df.ArrayNavBar;
+
+    opts.UseInherited := False;
+    opts.AutoHideNavBar := cbAutoHide.Checked;
+    opts.EnforceBounds := cbEnforceBound.Checked;
+    FArrayNavConfig.SetArrayNavOpts(opts);
+  end;
+end;
+
 procedure TArrayNavigationBar.cbEnforceBoundChange(Sender: TObject);
 begin
  UpdateBoundsInfo;
+  cbAutoHideChange(nil);
 end;

 procedure TArrayNavigationBar.edArrayPageSizeEditingDone(Sender: TObject);
@ -372,6 +401,59 @@ begin
  end;
 end;

+procedure TArrayNavigationBar.UpdateForNewBounds;
+
+  function AllowAutoHide: boolean;
+  begin
+    Result := (FLowBound = edArrayStart.Value) and
+              (FHighBound - FLowBound + 1 <= edArrayPageSize.Value);
+  end;
+
+var
+  df: TWatchDisplayFormat;
+  opts: TWatchDisplayFormatArrayNav;
+begin
+  if (OwnerData = nil) then
+    exit;
+
+  case FState of
+    anNew: begin
+        if FArrayNavConfig <> nil then
+          df := FArrayNavConfig.GetDisplayFormat
+        else
+          df := DefaultWatchDisplayFormat;
+        if FDisplayFormatResolver <> nil then
+          opts := FDisplayFormatResolver.ResolveArrayNavBar(df)
+        else
+          opts := df.ArrayNavBar;
+
+        edArrayPageSize.Value := opts.PageSize;
+        cbEnforceBound.Checked := opts.EnforceBounds;
+        cbAutoHide.Checked := opts.AutoHideNavBar;
+
+        if cbAutoHide.Checked then begin
+          if AllowAutoHide then
+            HideNavBar
+          else
+            ShowNavBar;
+        end;
+      end;
+    anBoundsAllowHide: begin
+        if cbAutoHide.Checked and not AllowAutoHide then
+          ShowNavBar;
+      end;
+    anBoundsNeedNav: begin
+        if cbAutoHide.Checked and AllowAutoHide then
+          HideNavBar;
+      end;
+  end;
+
+  if AllowAutoHide then
+    FState := anBoundsAllowHide
+  else
+    FState := anBoundsNeedNav;
+end;
+
 procedure TArrayNavigationBar.SetShowBoundInfo(AValue: Boolean);
 begin
  if FShowBoundInfo = AValue then Exit;
@ -446,8 +528,17 @@ begin
  else
    cbEnforceBound.BorderSpacing.Top := 0;

+  if (cbAutoHide.Left+cbAutoHide.Width + Left < 1) or
+     (cbAutoHide.Left+ Left > Parent.ClientWidth - 1) or
+     (cbAutoHide.Top+Top > Parent.ClientHeight + FTree.Header.Height - 1) or
+     (not Visible)
+  then
+    cbAutoHide.BorderSpacing.Top := 1
+  else
+    cbAutoHide.BorderSpacing.Top := 0;
+
  if FNavBarVisible then begin
-    Constraints.MinWidth := Max(Max(cbEnforceBound.Left + btnHide.Width + btnHide.Width,
+    Constraints.MinWidth := Max(Max(cbAutoHide.Left + cbAutoHide.Width,
                                    FTree.RangeX
                                   ), FTree.ClientWidth);
  end;
--- a/ide/packages/idedebugger/dbgtreeviewwatchdata.pas
+++ b/ide/packages/idedebugger/dbgtreeviewwatchdata.pas
@ -5,10 +5,10 @@ unit DbgTreeViewWatchData;
 interface

 uses
-  Classes, SysUtils, Math, IdeDebuggerBase, DebuggerTreeView,
-  IdeDebuggerWatchResult, ArrayNavigationFrame, BaseDebugManager,
-  laz.VirtualTrees, DbgIntfDebuggerBase, IdeDebuggerWatchValueIntf, Controls,
-  LazDebuggerIntf, LazDebuggerIntfBaseTypes;
+  Classes, SysUtils, Math, IdeDebuggerBase, DebuggerTreeView, IdeDebuggerWatchResult,
+  ArrayNavigationFrame, BaseDebugManager, IdeDebuggerWatchResPrinter, Debugger, laz.VirtualTrees,
+  DbgIntfDebuggerBase, IdeDebuggerWatchValueIntf, Controls, LazDebuggerIntf,
+  LazDebuggerIntfBaseTypes;

 type

@ -25,6 +25,7 @@ type
  TDbgTreeViewWatchDataMgr = class
  private
    FCancelUpdate: Boolean;
+    FDisplayFormatResolver: TDisplayFormatResolver;
    FTreeView: TDbgTreeView;
    FExpandingWatchAbleResult: TObject;

@ -64,6 +65,7 @@ type
      AFields: TTreeViewDataToTextFields;
      AnOpts: TTreeViewDataToTextOptions): String;

+    property DisplayFormatResolver: TDisplayFormatResolver read FDisplayFormatResolver write FDisplayFormatResolver;
    property CancelUpdate: Boolean read FCancelUpdate write FCancelUpdate;
    property TreeView: TDbgTreeView read FTreeView;
  end;
@ -193,6 +195,7 @@ var
  Nav: TArrayNavigationBar;
  Offs, KeepCnt, KeepBelow: Int64;
  ForceIdx: Boolean;
+  intfArrayNav: IArrayNavSettings;
 begin
  ChildCount := 0;
  ResData := AWatchAbleResult.ResultData;
@ -238,6 +241,10 @@ begin
  end;
  FTreeView.NodeControlVisible[AVNode] := True;
  Nav.OwnerData := AWatchAble;
+  Nav.DisplayFormatResolver := FDisplayFormatResolver;
+  AWatchAble.GetInterface(IArrayNavSettings, intfArrayNav);
+  Nav.ArrayNavConfig := intfArrayNav;
+  Nav.UpdateForNewBounds;
  ChildCount := Nav.LimitedPageSize;

  if ChildCount > 0 then begin
--- a/ide/packages/idedebugger/debugger.pp
+++ b/ide/packages/idedebugger/debugger.pp
@ -32,6 +32,7 @@
 unit Debugger;

 {$mode objfpc}{$H+}
+{$Interfaces CORBA}

 {$IFDEF linux} {$DEFINE DBG_ENABLE_TERMINAL} {$ENDIF}

@ -495,6 +496,14 @@ type

 type

+  { IArrayNavSettings }
+
+  IArrayNavSettings = interface ['{37109E8D-F7EA-4B09-9B95-1DD3770A45F0}']
+    function  GetDisplayFormat: TWatchDisplayFormat;
+    procedure SetArrayNavOpts(const AValue: TWatchDisplayFormatArrayNav);
+  end;
+
+
  TWatchesEvent =
       procedure(const ASender: TIdeWatches; const AWatch: TIdeWatch) of object;

@ -588,7 +597,7 @@ type

  { TIdeWatch }

-  TIdeWatch = class(TWatch, IWatchAbleDataIntf, IFreeNotifyingIntf)
+  TIdeWatch = class(TWatch, IWatchAbleDataIntf, IArrayNavSettings, IFreeNotifyingIntf)
  private
    FChildWatches: TIdeWatches;
    FDisplayName: String;
@ -605,6 +614,8 @@ type
    procedure SetDisplayName(AValue: String); reintroduce;
    function GetEnabled: Boolean;
    function GetExpression: String;
+  // IArrayNavSettings
+    procedure SetArrayNavOpts(const AValue: TWatchDisplayFormatArrayNav);
  protected
    procedure InitChildWatches;
    function CreateChildWatches: TIdeWatches; virtual;
@ -930,7 +941,7 @@ type

  { TIdeLocalsValue }

-  TIdeLocalsValue = class(TLocalsValue, IWatchAbleResultIntf, IWatchAbleDataIntf, IFreeNotifyingIntf)
+  TIdeLocalsValue = class(TLocalsValue, IWatchAbleResultIntf, IWatchAbleDataIntf, IArrayNavSettings, IFreeNotifyingIntf)
  private
    FSubLocals: TSubLocals;
    FDisplayName: String;
@ -949,6 +960,8 @@ type
    function GetChildrenByNameAsArrayEntry(AName: Int64; DerefCount: Integer): TObject;
    function GetChildrenByNameAsField(AName, AClassName: String; DerefCount: Integer): TObject;

+  // IArrayNavSettings
+    procedure SetArrayNavOpts(const AValue: TWatchDisplayFormatArrayNav);
  protected
    function FindParentValue: TIdeLocalsValue; virtual;
    function MaybeCopyResultForChild: boolean;
@ -6812,6 +6825,13 @@ begin
  Result := inherited Expression;
 end;

+procedure TIdeWatch.SetArrayNavOpts(const AValue: TWatchDisplayFormatArrayNav);
+begin
+  if FParentWatch = nil then
+    FDisplayFormat.ArrayNavBar := AValue;
+  // else ignore
+end;
+
 procedure TIdeWatch.SetParentWatch(AValue: TIdeWatch);
 begin
  if FParentWatch = AValue then Exit;
@ -7523,6 +7543,11 @@ begin
  Result := GetSubLocal(StringOfChar('^', DerefCount) + AName, Expr);
 end;

+procedure TIdeLocalsValue.SetArrayNavOpts(const AValue: TWatchDisplayFormatArrayNav);
+begin
+  // ignore
+end;
+
 function TIdeLocalsValue.FindParentValue: TIdeLocalsValue;
 begin
  Result := nil;
--- a/ide/packages/idedebugger/frames/displayformatconfigframe.lfm
+++ b/ide/packages/idedebugger/frames/displayformatconfigframe.lfm
@ -2688,18 +2688,171 @@ object DisplayFormatFrame: TDisplayFormatFrame
      end
    end
  end
-  object PanelMemDump: TPanel
+  object PanelArrayNavBar: TPanel
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = PanelIndent
    AnchorSideTop.Side = asrBottom
    AnchorSideRight.Control = Owner
    AnchorSideRight.Side = asrBottom
    Left = 0
-    Height = 34
+    Height = 26
    Top = 498
    Width = 592
    Anchors = [akTop, akLeft, akRight]
    AutoSize = True
+    BorderSpacing.Bottom = 4
+    BevelOuter = bvNone
+    ChildSizing.EnlargeHorizontal = crsScaleChilds
+    ChildSizing.ShrinkHorizontal = crsScaleChilds
+    ChildSizing.Layout = cclLeftToRightThenTopToBottom
+    ChildSizing.ControlsPerLine = 2
+    ClientHeight = 26
+    ClientWidth = 592
+    TabOrder = 11
+    object Spacer19: TLabel
+      Left = 0
+      Height = 1
+      Top = 0
+      Width = 107
+      BorderSpacing.Right = 4
+      Caption = '  '
+      Constraints.MaxHeight = 1
+    end
+    object Spacer20: TLabel
+      Left = 111
+      Height = 1
+      Top = 0
+      Width = 481
+      Caption = '         '
+      Constraints.MaxHeight = 1
+    end
+    object DividerBevelArrayNavBar: TDividerBevel
+      Left = 0
+      Height = 1
+      Top = 0
+      Width = 592
+      Align = alTop
+      AutoSize = False
+      BevelWidth = 1
+      BorderSpacing.Bottom = 2
+      CaptionSpacing = 5
+      Font.Height = 2
+      Font.Style = [fsBold]
+      LeftIndent = 30
+      ParentFont = False
+      Style = gsHorLines
+    end
+    object cbOverrideArrayNavBar: TCheckBox
+      AnchorSideLeft.Control = Spacer19
+      AnchorSideTop.Control = DividerBevelArrayNavBar
+      AnchorSideTop.Side = asrBottom
+      Left = 0
+      Height = 17
+      Top = 3
+      Width = 18
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 0
+      OnChange = OverrideCheckChanged
+    end
+    object lbOverrideArrayNavBar: TLabel
+      AnchorSideLeft.Control = cbOverrideArrayNavBar
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = cbOverrideArrayNavBar
+      AnchorSideRight.Control = Spacer19
+      AnchorSideRight.Side = asrBottom
+      Left = 18
+      Height = 15
+      Top = 3
+      Width = 89
+      Anchors = [akTop, akLeft, akRight]
+      Caption = 'lbOverrideArrayNavBar'
+      Font.Style = [fsBold]
+      ParentFont = False
+      WordWrap = True
+      OnClick = CheckLabelClicked
+    end
+    object PanelArrayNavBarOpts: TPanel
+      AnchorSideLeft.Control = Spacer20
+      AnchorSideTop.Control = DividerBevelArrayNavBar
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = Spacer20
+      AnchorSideRight.Side = asrBottom
+      Left = 111
+      Height = 23
+      Top = 3
+      Width = 481
+      Anchors = [akTop, akLeft, akRight]
+      AutoSize = True
+      BevelOuter = bvNone
+      ChildSizing.EnlargeHorizontal = crsSameSize
+      ChildSizing.ShrinkHorizontal = crsSameSize
+      ChildSizing.Layout = cclLeftToRightThenTopToBottom
+      ChildSizing.ControlsPerLine = 3
+      ClientHeight = 23
+      ClientWidth = 481
+      TabOrder = 1
+      object cbArrayNavAutoHide: TCheckBox
+        Left = 0
+        Height = 19
+        Top = 0
+        Width = 160
+        Caption = 'cbArrayNavAutoHide'
+        TabOrder = 0
+        OnChange = cbArrayNavEnforceBoundsChange
+      end
+      object cbArrayNavEnforceBounds: TCheckBox
+        Left = 160
+        Height = 19
+        Top = 0
+        Width = 161
+        Caption = 'cbArrayNavEnforceBounds'
+        TabOrder = 1
+        OnChange = cbArrayNavEnforceBoundsChange
+      end
+      object lbPageSize: TLabel
+        Left = 321
+        Height = 15
+        Top = 2
+        Width = 56
+        BorderSpacing.CellAlignHorizontal = ccaLeftTop
+        BorderSpacing.CellAlignVertical = ccaCenter
+        Caption = 'lbPageSize'
+      end
+      object SpinPageSize: TSpinEdit
+        AnchorSideLeft.Control = lbPageSize
+        AnchorSideLeft.Side = asrBottom
+        AnchorSideRight.Side = asrBottom
+        Left = 380
+        Height = 23
+        Top = 0
+        Width = 90
+        Alignment = taRightJustify
+        Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Left = 3
+        BorderSpacing.Right = 5
+        BorderSpacing.CellAlignHorizontal = ccaRightBottom
+        Constraints.MaxWidth = 90
+        MaxValue = 5000
+        MinValue = 1
+        TabOrder = 2
+        Value = 10
+        OnChange = FormatSpinChanged
+      end
+    end
+  end
+  object PanelMemDump: TPanel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = PanelArrayNavBar
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 0
+    Height = 34
+    Top = 528
+    Width = 592
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
    BorderSpacing.Bottom = 1
    BevelOuter = bvNone
    ClientHeight = 34
--- a/ide/packages/idedebugger/frames/displayformatconfigframe.pas
+++ b/ide/packages/idedebugger/frames/displayformatconfigframe.pas
@ -49,6 +49,7 @@ type
    cbEnumValSign: TCheckBox;
    cbMemDump: TCheckBox;
    cbOverrideEnumVal: TCheckBox;
+    cbOverrideArrayNavBar: TCheckBox;
    cbOverrideNum2Base: TCheckBox;
    cbOverridePointerDeref: TCheckBox;
    cbOverrideAddressFormat: TCheckBox;
@ -63,6 +64,8 @@ type
    cbEnumSign: TCheckBox;
    cbStructAddrTyped: TCheckBox;
    cbPointerAddrTyped: TCheckBox;
+    cbArrayNavAutoHide: TCheckBox;
+    cbArrayNavEnforceBounds: TCheckBox;
    DigitSpacer3: TLabel;
    DigitSpacer4: TLabel;
    DividerBevelEnumVal: TDividerBevel;
@ -74,10 +77,13 @@ type
    DividerBevelEnum: TDividerBevel;
    DividerBevelFloat: TDividerBevel;
    DividerBevelPointerDeref1: TDividerBevel;
+    DividerBevelArrayNavBar: TDividerBevel;
    DividerBevelStruct: TDividerBevel;
    Label1: TLabel;
+    lbPageSize: TLabel;
    lbMaxWrapLvl: TLabel;
    lbOverrideIndent: TLabel;
+    lbOverrideArrayNavBar: TLabel;
    lbStructAddrTypedFiller: TLabel;
    Label3: TLabel;
    lbEnumValBaseSpace: TLabel;
@ -110,6 +116,8 @@ type
    PanelNum2SepGroup: TPanel;
    PanelIndent: TPanel;
    PanelIndentMax: TPanel;
+    PanelArrayNavBar: TPanel;
+    PanelArrayNavBarOpts: TPanel;
    rbClear: TRadioButton;
    rbClear1: TRadioButton;
    rbClear10: TRadioButton;
@ -222,7 +230,9 @@ type
    Spacer16: TLabel;
    Spacer17: TLabel;
    Spacer18: TLabel;
+    Spacer19: TLabel;
    Spacer2: TLabel;
+    Spacer20: TLabel;
    Spacer3: TLabel;
    Spacer4: TLabel;
    Spacer5: TLabel;
@ -230,6 +240,7 @@ type
    Spacer7: TLabel;
    Spacer8: TLabel;
    Spacer9: TLabel;
+    SpinPageSize: TSpinEdit;
    SpinIndentMaxWrap: TSpinEdit;
    SpinFloatDigits: TSpinEdit;
    SpinDigits: TSpinEdit;
@ -255,6 +266,7 @@ type
    tbFloat: TSpeedButton;
    ToolButton5: TToolButton;
    procedure cbAddrNoLeadZeroChange(Sender: TObject);
+    procedure cbArrayNavEnforceBoundsChange(Sender: TObject);
    procedure cbMemDumpChange(Sender: TObject);
    procedure cbNum2VisibleCheckedChange(Sender: TObject);
    procedure CheckLabelClicked(Sender: TObject);
@ -277,6 +289,7 @@ type
    FAllowMultiTabs: boolean;
    FHighlightModifiedTabs: boolean;
    FShowAll: boolean;
+    FShowArrayNavBarOpts: boolean;
    FShowCurrent: boolean;

    FDisplayFormatCount: integer;
@ -303,6 +316,7 @@ type
    procedure SetDisplayFormats(AIndex: integer; AValue: TWatchDisplayFormat);
    procedure SetHighlightModifiedTabs(AValue: boolean);
    procedure SetShowAll(AValue: boolean);
+    procedure SetShowArrayNavBarOpts(AValue: boolean);
    procedure SetShowCurrent(AValue: boolean);
    procedure SetShowExtraSettings(AValue: boolean);
    procedure SetShowMemDump(AValue: boolean);
@ -343,6 +357,7 @@ type
    property ShowMemDump: boolean read FShowMemDump write SetShowMemDump;
    property ShowMultiRadio: boolean read FShowMultiRadio write SetShowMultiRadio;
    property ShowOverrideChecks: boolean read FShowOverrideChecks write SetShowOverrideChecks;
+    property ShowArrayNavBarOpts: boolean read FShowArrayNavBarOpts write SetShowArrayNavBarOpts;
    // ShowExtraSettings: Show PanelEnumVal  (project and global opts)
    property ShowExtraSettings: boolean read FShowExtraSettings write SetShowExtraSettings;
    property ShowFullAddressInMulti: boolean read FShowFullAddressInMulti write FShowFullAddressInMulti;
@ -535,6 +550,16 @@ begin
  UpdateDisplay;
 end;

+procedure TDisplayFormatFrame.cbArrayNavEnforceBoundsChange(Sender: TObject);
+begin
+  if FUpdatingDisplay > 0 then
+    exit;
+  TControl(Sender).Tag := 0;
+  EnableParentOverride(TControl(Sender));
+  UpdateFormat;
+  UpdateDisplay;
+end;
+
 procedure TDisplayFormatFrame.cbNum2VisibleCheckedChange(Sender: TObject);
 begin
  if FUpdatingDisplay > 0 then
@ -636,6 +661,7 @@ begin
  TControl(Sender).Tag := 0;
  EnableParentOverride(TControl(Sender), True);
  UpdateFormat;
+  UpdateDisplay;
 end;

 procedure TDisplayFormatFrame.OverrideCheckChanged(Sender: TObject);
@ -915,6 +941,12 @@ begin
  ToolButton4.Visible := FShowCurrent;
 end;

+procedure TDisplayFormatFrame.SetShowArrayNavBarOpts(AValue: boolean);
+begin
+  if FShowArrayNavBarOpts = AValue then Exit;
+  FShowArrayNavBarOpts := AValue;
+end;
+
 procedure TDisplayFormatFrame.SetShowCurrent(AValue: boolean);
 begin
  if FShowCurrent = AValue then Exit;
@ -955,6 +987,7 @@ begin
  cbOverridePointerDeref.Visible  := FShowOverrideChecks;
  cbOverrideAddressFormat.Visible := FShowOverrideChecks;
  cbOverrideIndent.Visible        := FShowOverrideChecks;
+  cbOverrideArrayNavBar.Visible   := FShowOverrideChecks;
 end;

 procedure TDisplayFormatFrame.ClearRadios(APanel: TWinControl; ARecursive: Boolean;
@ -1122,6 +1155,7 @@ begin
  PanelPointer.Visible       := tbPointer.Down;
  PanelAddressFormat.Visible := (tbPointer.Down or tbStruct.Down) and (not CheckAddrFormatVis);
  PanelIndent.Visible        := tbIndent.Down;
+  PanelArrayNavBar.Visible   := tbIndent.Down and FShowArrayNavBarOpts;

  lbStructAddrTypedFiller.Visible := CheckAddrFormatVis;
  cbStructAddrTyped.Visible       := CheckAddrFormatVis;
@ -1268,6 +1302,8 @@ begin
    end;
    if FButtonStates[bsIndent] then begin
      BoolFromCBState(cbOverrideIndent.State, FDisplayFormat[i].MultiLine.UseInherited);
+      if FShowArrayNavBarOpts then
+        BoolFromCBState(cbOverrideArrayNavBar.State, FDisplayFormat[i].ArrayNavBar.UseInherited);
    end;
  end;
 end;
@ -1478,6 +1514,13 @@ begin
    if FButtonStates[bsIndent] then begin
      if (SpinIndentMaxWrap.Tag = 0) then
        FDisplayFormat[i].MultiLine.MaxMultiLineDepth := SpinIndentMaxWrap.Value;
+
+      if FShowArrayNavBarOpts then begin
+        BoolFromCB(cbArrayNavAutoHide, FDisplayFormat[i].ArrayNavBar.AutoHideNavBar, False);
+        BoolFromCB(cbArrayNavEnforceBounds, FDisplayFormat[i].ArrayNavBar.EnforceBounds, False);
+        if (SpinPageSize.Tag = 0) then
+          FDisplayFormat[i].ArrayNavBar.PageSize := SpinPageSize.Value;
+      end;
    end;

    BoolFromCBState(cbMemDump.State, FDisplayFormat[i].MemDump, False);
@ -1499,7 +1542,7 @@ end;
 procedure TDisplayFormatFrame.UpdateDisplay;
 var
  InherhitNum, InherhitNum2, InherhitEnum, InherhitEnumVal, InherhitFloat,
-  InherhitStruct, InherhitPtr, InherhitAddress, InherhitIndent: TBoolSet;
+  InherhitStruct, InherhitPtr, InherhitAddress, InherhitIndent, InherhitArrayNav: TBoolSet;

  FormatNumBase:       TValueDisplayFormats;
  FormatNumSign:       TValueDisplayFormats;
@ -1537,6 +1580,10 @@ var

  FormatIndentMaxWrap: integer;

+  FormatArrayNavAutoHide:    TBoolSet;
+  FormatArrayNavForceBounds: TBoolSet;
+  FormatPageSize:     integer;
+
  FormatIsMemDump: TBoolSet;

  i: Integer;
@ -1563,6 +1610,7 @@ begin
    InherhitPtr     := [];
    InherhitAddress := [];
    InherhitIndent  := [];
+    InherhitArrayNav:= [];

    FormatNumBase       := [];
    FormatNumSign       := [];
@ -1598,6 +1646,10 @@ begin
    FormatAddressSign   := [];
    FormatAddressLead   := [];

+    FormatArrayNavAutoHide    := [];
+    FormatArrayNavForceBounds := [];
+    FormatPageSize:= INT_UNK;
+
    FormatIndentMaxWrap := INT_UNK;

    FormatIsMemDump := [];
@ -1699,6 +1751,11 @@ begin
      if FButtonStates[bsIndent] then begin
        include(InherhitIndent,  FDisplayFormat[i].MultiLine.UseInherited);
        UpdateIntSetting(FormatIndentMaxWrap, FDisplayFormat[i].MultiLine.MaxMultiLineDepth);
+
+        include(InherhitArrayNav,  FDisplayFormat[i].ArrayNavBar.UseInherited);
+        include(FormatArrayNavAutoHide,    FDisplayFormat[i].ArrayNavBar.AutoHideNavBar);
+        include(FormatArrayNavForceBounds, FDisplayFormat[i].ArrayNavBar.EnforceBounds);
+        UpdateIntSetting(FormatPageSize, FDisplayFormat[i].ArrayNavBar.PageSize);
      end;
    end;

@ -1712,6 +1769,7 @@ begin
      cbOverridePointerDeref.State  := BoolsetToCBState(InherhitPtr);
      cbOverrideAddressFormat.State := BoolsetToCBState(InherhitAddress);
      cbOverrideIndent.State        := BoolsetToCBState(InherhitIndent);
+      cbOverrideArrayNavBar.State   := BoolsetToCBState(InherhitArrayNav);
    end
    else begin
      InherhitNum     := [False];
@ -1723,6 +1781,7 @@ begin
      InherhitPtr     := [False];
      InherhitAddress := [False];
      InherhitIndent  := [False];
+      InherhitArrayNav:= [False];
    end;


@ -1837,12 +1896,23 @@ begin
    end;

    if InherhitIndent = [True] then begin
-      SetSpinEditToInherit(SpinIndentMaxWrap)
+      SetSpinEditToInherit(SpinIndentMaxWrap);
    end
    else begin
      IntToSpinEdit(SpinIndentMaxWrap, FormatIndentMaxWrap);
    end;

+    if InherhitArrayNav = [True] then begin
+      cbArrayNavAutoHide.State := cbGrayed;
+      cbArrayNavEnforceBounds.State := cbGrayed;
+      SetSpinEditToInherit(SpinPageSize)
+    end
+    else begin
+      cbArrayNavAutoHide.State := BoolsetToCBState(FormatArrayNavAutoHide, False);
+      cbArrayNavEnforceBounds.State := BoolsetToCBState(FormatArrayNavForceBounds, False);
+      IntToSpinEdit(SpinPageSize, FormatPageSize);
+    end;
+
    UpdateNumDigitPanel;
    UpdateNum2Visibility;
    UpdateNum2DigitPanel;
@ -1858,6 +1928,7 @@ begin
    FormatSpinChanged(Spin2Digits);
    FormatSpinChanged(SpinFloatDigits);
    FormatSpinChanged(SpinIndentMaxWrap);
+    FormatSpinChanged(SpinPageSize);

    dec(FUpdatingDisplay);
  end;
@ -1982,7 +2053,7 @@ begin
  tbFloat.Caption   := DispFormatDlgBtnFloat;
  tbStruct.Caption  := DispFormatDlgBtnStruct;
  tbPointer.Caption := DispFormatDlgBtnPointer;
-  tbIndent.Caption := DispFormatDlgBtnIndent;
+  tbIndent.Caption  := DispFormatDlgBtnOptions;


  lbOverrideNumBase.Caption       := DispFormatDlgBtnNumber;
@ -2076,9 +2147,13 @@ begin
  cbStructAddrTyped.Caption  := DispFormatPointerAddressTyped;
  cbPointerAddrTyped.Caption := DispFormatPointerAddressTyped;

-  lbOverrideIndent.Caption := DispFormatDlgBtnIndent;
+  lbOverrideIndent.Caption := DispFormatDlgIndent;
  lbMaxWrapLvl.Caption     := DispFormatIndentMaxWrap;

+  lbOverrideArrayNavBar.Caption   := DispFormatDlgArrayNav;
+  cbArrayNavAutoHide.Caption      := DispFormatArrayNavAutoHide;
+  cbArrayNavEnforceBounds.Caption := DispFormatArrayNavEnforceBounds;
+  lbPageSize.Caption              := DispFormatArrayNavPageSize;

  DividerBevelMemDump.Caption       := '';
  cbMemDump.Caption             := DispFormatCategoryMemDump;
--- a/ide/packages/idedebugger/frames/displayformatdefaultsconfigframe.pas
+++ b/ide/packages/idedebugger/frames/displayformatdefaultsconfigframe.pas
@ -62,6 +62,7 @@ begin
  btnLocals.Down  := False;
  btnInspect.Down := False;
  btnEvalMod.Down := False;
+  DisplayFormatFrame1.ShowArrayNavBarOpts := True;
  lblChangingDescr.Caption := DispFormatOptChangingDescrAll;
  SaveButtonStates;
  ApplyConfigs;
@ -80,6 +81,7 @@ begin
    btnInspect.Down := Sender = btnInspect;
    btnEvalMod.Down := Sender = btnEvalMod;
  end;
+  DisplayFormatFrame1.ShowArrayNavBarOpts := btnWatches.Down or btnLocals.Down or btnGlobal.Down;
  lblChangingDescr.Caption := DispFormatOptChangingDescrSome;
  SaveButtonStates;
  ApplyConfigs;
@ -167,6 +169,7 @@ begin
  DisplayFormatFrame1.ShowMemDump := False;
  DisplayFormatFrame1.SelectDefaultButton;
  DisplayFormatFrame1.ShowExtraSettings := True;
+  DisplayFormatFrame1.ShowArrayNavBarOpts := True;
  DisplayFormatFrame1.ShowFullAddressInMulti := True;
  DisplayFormatFrame1.ShowOverrideChecks := FShowOverrideChecks;

--- a/ide/packages/idedebugger/frames/watchinspecttoolbar.pas
+++ b/ide/packages/idedebugger/frames/watchinspecttoolbar.pas
@ -316,7 +316,7 @@ begin
     (FCurrentWatchValue.ResultData <> nil)
  then
    r := FCurrentWatchValue.ResultData.ValueKind;
-  d := TWatchPropertyDlg.Create(Self.Owner, FDisplayFormat, r, FAllowMemDump);
+  d := TWatchPropertyDlg.Create(Self.Owner, FDisplayFormat, r, FAllowMemDump, False);
  if d.ShowModal = mrOK then begin
    FDisplayFormat := d.DisplayFormat;
    // DoDisplaySettingsUpdated;
--- a/ide/packages/idedebugger/idedebuggerdisplayformats.pas
+++ b/ide/packages/idedebugger/idedebuggerdisplayformats.pas
@ -173,6 +173,10 @@ begin
   ADisplayFormat.Pointer.Address.NoLeadZero := AConfig.GetValue(APath + 'PointerLeadZero', DefaultWatchDisplayFormat.Pointer.Address.NoLeadZero);
  ADisplayFormat.MultiLine.UseInherited := AConfig.GetValue(APath + 'MultiLineInherit', DefaultWatchDisplayFormat.MultiLine.UseInherited);
   ADisplayFormat.MultiLine.MaxMultiLineDepth := AConfig.GetValue(APath + 'MultiLineMaxWrapDepth', DefaultWatchDisplayFormat.MultiLine.MaxMultiLineDepth);
+  ADisplayFormat.ArrayNavBar.UseInherited := AConfig.GetValue(APath + 'ArrayNavBarInherit', DefaultWatchDisplayFormat.ArrayNavBar.UseInherited);
+   ADisplayFormat.ArrayNavBar.PageSize       := AConfig.GetValue(APath + 'ArrayNavBarPageSize', DefaultWatchDisplayFormat.ArrayNavBar.PageSize);
+   ADisplayFormat.ArrayNavBar.EnforceBounds  := AConfig.GetValue(APath + 'ArrayNavBarEnforceBounds', DefaultWatchDisplayFormat.ArrayNavBar.EnforceBounds);
+   ADisplayFormat.ArrayNavBar.AutoHideNavBar := AConfig.GetValue(APath + 'ArrayNavBarAutoHideNavBar', DefaultWatchDisplayFormat.ArrayNavBar.AutoHideNavBar);
  ADisplayFormat.MemDump := AConfig.GetValue(APath + 'IsMemDump', DefaultWatchDisplayFormat.MemDump);
 end;

@ -234,6 +238,10 @@ begin
   AConfig.SetDeleteValue(APath + 'PointerLeadZero',   ADisplayFormat.Pointer.Address.NoLeadZero,   DefaultWatchDisplayFormat.Pointer.Address.NoLeadZero);
  AConfig.SetDeleteValue(APath + 'MultiLineInherit',   ADisplayFormat.MultiLine.UseInherited,       DefaultWatchDisplayFormat.MultiLine.UseInherited);
   AConfig.SetDeleteValue(APath + 'MultiLineMaxWrapDepth',ADisplayFormat.MultiLine.MaxMultiLineDepth, DefaultWatchDisplayFormat.MultiLine.MaxMultiLineDepth);
+  AConfig.SetDeleteValue(APath + 'ArrayNavBarInherit',   ADisplayFormat.ArrayNavBar.UseInherited,       DefaultWatchDisplayFormat.ArrayNavBar.UseInherited);
+   AConfig.SetDeleteValue(APath + 'ArrayNavBarPageSize',ADisplayFormat.ArrayNavBar.PageSize, DefaultWatchDisplayFormat.ArrayNavBar.PageSize);
+   AConfig.SetDeleteValue(APath + 'ArrayNavBarEnforceBounds',ADisplayFormat.ArrayNavBar.EnforceBounds, DefaultWatchDisplayFormat.ArrayNavBar.EnforceBounds);
+   AConfig.SetDeleteValue(APath + 'ArrayNavBarAutoHideNavBar',ADisplayFormat.ArrayNavBar.AutoHideNavBar, DefaultWatchDisplayFormat.ArrayNavBar.AutoHideNavBar);
  AConfig.SetDeleteValue(APath + 'IsMemDump',          ADisplayFormat.MemDump, False);
 end;

--- a/ide/packages/idedebugger/idedebuggerstringconstants.pas
+++ b/ide/packages/idedebugger/idedebuggerstringconstants.pas
@ -431,7 +431,7 @@ resourcestring
  DispFormatDlgBtnStruct    = 'Structure';
  DispFormatDlgBtnPointer   = 'Pointer';
  DispFormatDlgBtnAdrFormat = 'Address';
-  DispFormatDlgBtnIndent    = 'Multiline';
+  DispFormatDlgBtnOptions   = 'Options';

  DispFormatDlgCaptionShowChar = '(Show Char)';
  DispFormatDlgCaptionAddress  = '(Address)';
@ -492,7 +492,12 @@ resourcestring
  DispFormatPointerDerefOff      = 'No deref data';
  DispFormatPointerDerefOn       = 'Show deref data';
  DispFormatPointerDerefOnly     = 'Only deref data';
+  DispFormatDlgIndent            = 'Multiline';
  DispFormatIndentMaxWrap        = 'Max multiline level';
+  DispFormatDlgArrayNav          = 'Array Navigation';
+  DispFormatArrayNavAutoHide     = 'Auto-hide';
+  DispFormatArrayNavEnforceBounds= 'Enforce bounds';
+  DispFormatArrayNavPageSize     = 'Page-size';
  DispFormatCategoryData         = 'Value';
  DispFormatCategoryMemDump      = 'Memory dump';

--- a/ide/packages/idedebugger/idedebuggervalueformatterdisplayformat.pas
+++ b/ide/packages/idedebugger/idedebuggervalueformatterdisplayformat.pas
@ -100,6 +100,7 @@ begin
  DisplayFormatFrame1.ShowAll := True;
  DisplayFormatFrame1.AllowMultiTabs := True;
  DisplayFormatFrame1.ShowExtraSettings := False;
+  DisplayFormatFrame1.ShowArrayNavBarOpts := True;
  DisplayFormatFrame1.ShowMemDump := False;
  DisplayFormatFrame1.ShowOverrideChecks := True;

--- a/ide/packages/idedebugger/idedebuggerwatchresprinter.pas
+++ b/ide/packages/idedebugger/idedebuggerwatchresprinter.pas
@ -50,6 +50,8 @@ type
    function ResolveDispFormat(const ADispFormat: TWatchDisplayFormat;
      const AResValue: TWatchResultData
    ): TResolvedDisplayFormat;
+    function ResolveMultiLine(const ADispFormat: TWatchDisplayFormat): TWatchDisplayFormatMultiline;
+    function ResolveArrayNavBar(const ADispFormat: TWatchDisplayFormat): TWatchDisplayFormatArrayNav;
    // Resolving from FallBackFormats[n] to FallBackFormats[0]
    // [0] must be the IDE global format, and will be used regardless of UseInherited
    property FallBackFormats: TWatchDisplayFormatList read FFallBackFormats;
@ -391,6 +393,36 @@ begin
  end;
 end;

+function TDisplayFormatResolver.ResolveMultiLine(const ADispFormat: TWatchDisplayFormat
+  ): TWatchDisplayFormatMultiline;
+var
+  i: Integer;
+begin
+  Result := ADispFormat.MultiLine;
+  i := FFallBackFormats.Count-1;
+  while (Result.UseInherited) and (i > 0) do begin
+    Result := FFallBackFormats[i].MultiLine;
+    dec(i);
+  end;
+  if (Result.UseInherited) then
+    Result := DefaultWatchDisplayFormat.MultiLine;
+end;
+
+function TDisplayFormatResolver.ResolveArrayNavBar(const ADispFormat: TWatchDisplayFormat
+  ): TWatchDisplayFormatArrayNav;
+var
+  i: Integer;
+begin
+  Result := ADispFormat.ArrayNavBar;
+  i := FFallBackFormats.Count-1;
+  while (Result.UseInherited) and (i > 0) do begin
+    Result := FFallBackFormats[i].ArrayNavBar;
+    dec(i);
+  end;
+  if (Result.UseInherited) then
+    Result := DefaultWatchDisplayFormat.ArrayNavBar;
+end;
+
 { TWatchResultPrinter }

 procedure TWatchResultPrinter.StoreSetting(var AStorage: TWatchResStoredSettings);
@ -556,6 +588,7 @@ var
  i: Integer;
  sep, tn: String;
  SepHasBreak, SepUsed, OldHasLineBreak: Boolean;
+  MultiLine: TWatchDisplayFormatMultiline;
 begin
  if (AResValue.ArrayType = datDynArray) then begin
    tn := AResValue.TypeName;
@ -579,7 +612,8 @@ begin
  sep := ', ';
  SepHasBreak := False;
  SepUsed := False;
-  if (rpfMultiLine in FFormatFlags) and (FIndentLvl < ADispFormat.MultiLine.MaxMultiLineDepth ) then begin
+  MultiLine := FDisplayFormatResolver.ResolveMultiLine(ADispFormat);
+  if (rpfMultiLine in FFormatFlags) and (FIndentLvl < MultiLine.MaxMultiLineDepth ) then begin
    sep := ',' + FLineSeparator;
    SepHasBreak := True;
    if (rpfIndent in FFormatFlags) then begin
@ -635,6 +669,7 @@ var
  FldOwner: TWatchResultData;
  vis, sep, tn, Header, we: String;
  InclVisSect, SepUsed, OldHasLineBreak: Boolean;
+  MultiLine: TWatchDisplayFormatMultiline;
 begin
  Resolved := DisplayFormatResolver.ResolveDispFormat(ADispFormat, AResValue);
  Result := '';
@ -668,7 +703,8 @@ begin

  sep := '';
  SepUsed := False;
-  if (rpfMultiLine in FFormatFlags) and (FIndentLvl < ADispFormat.MultiLine.MaxMultiLineDepth ) then begin
+  MultiLine := FDisplayFormatResolver.ResolveMultiLine(ADispFormat);
+  if (rpfMultiLine in FFormatFlags) and (FIndentLvl < MultiLine.MaxMultiLineDepth ) then begin
    sep := FLineSeparator;
    if (rpfIndent in FFormatFlags) then begin
      sep := sep + FIndentString;
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.af_ZA.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.af_ZA.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -42,6 +43,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
 msgid "Binary"
@ -104,6 +118,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -140,10 +158,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -156,6 +170,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -194,6 +212,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 msgctxt "idedebuggerstringconstants.dispformatenumname"
 msgid "Name"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.ar.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.ar.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -43,6 +44,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
 msgid "Binary"
@ -105,6 +119,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -141,10 +159,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -157,6 +171,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -195,6 +213,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 msgctxt "idedebuggerstringconstants.dispformatenumname"
 msgid "Name"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.ca.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.ca.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -42,6 +43,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -107,6 +121,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -143,10 +161,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -159,6 +173,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -197,6 +215,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.cs.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.cs.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -43,6 +44,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -110,6 +124,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -147,10 +165,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -163,6 +177,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -201,6 +219,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.de.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.de.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -43,6 +44,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -109,6 +123,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -146,10 +164,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -162,6 +176,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -200,6 +218,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.es.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.es.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -43,6 +44,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -110,6 +124,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -147,10 +165,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -163,6 +177,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -201,6 +219,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.fi.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.fi.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -43,6 +44,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -110,6 +124,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -147,10 +165,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -163,6 +177,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -201,6 +219,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.fr.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.fr.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -43,6 +44,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -110,6 +124,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -147,10 +165,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -163,6 +177,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -201,6 +219,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.he.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.he.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -42,6 +43,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -108,6 +122,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -145,10 +163,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -161,6 +175,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -199,6 +217,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.hu.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.hu.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -43,6 +44,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -110,6 +124,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -147,10 +165,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -163,6 +177,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -201,6 +219,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.id.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.id.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -42,6 +43,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -107,6 +121,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -143,10 +161,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -159,6 +173,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -197,6 +215,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.it.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.it.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -43,6 +44,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -110,6 +124,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -147,10 +165,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -163,6 +177,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -201,6 +219,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.ja.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.ja.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -43,6 +44,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -110,6 +124,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -147,10 +165,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -163,6 +177,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -201,6 +219,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.lt.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.lt.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -43,6 +44,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -110,6 +124,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -147,10 +165,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -163,6 +177,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -201,6 +219,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.nl.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.nl.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -42,6 +43,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -107,6 +121,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -143,10 +161,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -159,6 +173,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -197,6 +215,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.pl.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.pl.po
@ -6,6 +6,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -43,6 +44,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -109,6 +123,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -146,10 +164,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -162,6 +176,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -200,6 +218,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.pot
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.pot
@ -2,6 +2,7 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -39,6 +40,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
 msgid "Binary"
@ -101,6 +115,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -137,10 +155,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -153,6 +167,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -191,6 +209,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 msgctxt "idedebuggerstringconstants.dispformatenumname"
 msgid "Name"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.pt_BR.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.pt_BR.po
@ -13,6 +13,7 @@ msgstr ""
 "Language: pt_BR\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -50,6 +51,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -117,6 +131,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -154,10 +172,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -170,6 +184,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -208,6 +226,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.ru.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.ru.po
@ -12,6 +12,7 @@ msgstr ""
 "X-Generator: Poedit 2.3.1\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr "Соблюдать границы"

@ -49,6 +50,20 @@ msgstr "Преобразование значения простого типа
 msgid "Do not ask again"
 msgstr "Больше не спрашивать"

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+#, fuzzy
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr "Соблюдать границы"
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
 msgid "Binary"
@ -111,6 +126,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr "Числовое значение"

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr "Адрес"
@ -147,10 +166,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr "Вещественный"

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr "Многострочный"
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr "Показывать значение во вторичном формате"
@ -163,6 +178,10 @@ msgstr "Число"
 msgid "Number (2nd)"
 msgstr "Число (вторичный)"

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -201,6 +220,12 @@ msgstr "(Знаковый)"
 msgid "(Typed)"
 msgstr "(Типизированный)"

+#: idedebuggerstringconstants.dispformatdlgindent
+#, fuzzy
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr "Многострочный"
+
 #: idedebuggerstringconstants.dispformatenumname
 msgctxt "idedebuggerstringconstants.dispformatenumname"
 msgid "Name"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.sk.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.sk.po
@ -13,6 +13,7 @@ msgstr ""
 "X-Generator: Poedit 2.2.3\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -49,6 +50,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -115,6 +129,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -152,10 +170,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -168,6 +182,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -206,6 +224,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.tr.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.tr.po
@ -13,6 +13,7 @@ msgstr ""
 "X-Generator: Poedit 3.2\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -49,6 +50,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -116,6 +130,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -153,10 +171,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -169,6 +183,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -207,6 +225,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.uk.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.uk.po
@ -14,6 +14,7 @@ msgstr ""
 "X-Generator: Lokalize 21.12.3\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -51,6 +52,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -118,6 +132,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -155,10 +173,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -171,6 +185,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -209,6 +227,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/languages/idedebuggerstringconstants.zh_CN.po
+++ b/ide/packages/idedebugger/languages/idedebuggerstringconstants.zh_CN.po
@ -13,6 +13,7 @@ msgstr ""
 "X-Generator: Poedit 3.3.2\n"

 #: idedebuggerstringconstants.arrnavenforcebounds
+msgctxt "idedebuggerstringconstants.arrnavenforcebounds"
 msgid "Enforce bounds"
 msgstr ""

@ -50,6 +51,19 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""

+#: idedebuggerstringconstants.dispformatarraynavautohide
+msgid "Auto-hide"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavenforcebounds
+msgctxt "idedebuggerstringconstants.dispformatarraynavenforcebounds"
+msgid "Enforce bounds"
+msgstr ""
+
+#: idedebuggerstringconstants.dispformatarraynavpagesize
+msgid "Page-size"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatbasebin
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatbasebin"
@ -117,6 +131,10 @@ msgctxt "idedebuggerstringconstants.dispformatcharord"
 msgid "Ordinal"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgarraynav
+msgid "Array Navigation"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnadrformat
 msgid "Address"
 msgstr ""
@ -154,10 +172,6 @@ msgctxt "idedebuggerstringconstants.dispformatdlgbtnfloat"
 msgid "Float"
 msgstr ""

-#: idedebuggerstringconstants.dispformatdlgbtnindent
-msgid "Multiline"
-msgstr ""
-
 #: idedebuggerstringconstants.dispformatdlgbtnnum2visible
 msgid "Show value in a second format"
 msgstr ""
@ -170,6 +184,10 @@ msgstr ""
 msgid "Number (2nd)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgbtnoptions
+msgid "Options"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatdlgbtnord
 msgctxt "idedebuggerstringconstants.dispformatdlgbtnord"
 msgid "Ordinal"
@ -208,6 +226,11 @@ msgstr ""
 msgid "(Typed)"
 msgstr ""

+#: idedebuggerstringconstants.dispformatdlgindent
+msgctxt "idedebuggerstringconstants.dispformatdlgindent"
+msgid "Multiline"
+msgstr ""
+
 #: idedebuggerstringconstants.dispformatenumname
 #, fuzzy
 msgctxt "idedebuggerstringconstants.dispformatenumname"
--- a/ide/packages/idedebugger/localsdlg.pp
+++ b/ide/packages/idedebugger/localsdlg.pp
@ -338,6 +338,8 @@ begin
  FWatchPrinter.FormatFlags := [rpfClearMultiLine];
  FLocolsTreeMgr := TDbgTreeViewLocalsValueMgr.Create(vtLocals);
  FLocolsTreeMgr.FLocalsDlg := Self;
+  FLocolsTreeMgr.DisplayFormatResolver := FWatchPrinter.DisplayFormatResolver;
+
  ToolBar1.Images := IDEImages.Images_16;
  vtLocals.LazImages := IDEImages.Images_16;

--- a/ide/packages/idedebugger/watchesdlg.pp
+++ b/ide/packages/idedebugger/watchesdlg.pp
@ -289,6 +289,8 @@ begin
  FStateFlags := [];
  nbInspect.Visible := False;

+  FWatchTreeMgr.DisplayFormatResolver := FWatchPrinter.DisplayFormatResolver;
+
  WatchesNotification.OnAdd       := @WatchAdd;
  WatchesNotification.OnUpdate    := @WatchUpdate;
  WatchesNotification.OnRemove    := @WatchRemove;
--- a/ide/packages/idedebugger/watchpropertydlg.pp
+++ b/ide/packages/idedebugger/watchpropertydlg.pp
@ -89,7 +89,7 @@ type
    FDisplayFormat: TWatchDisplayFormat;
  public
    constructor Create(AOWner: TComponent; const AWatch: TIdeWatch; const AWatchExpression: String = ''; AResDataType: TWatchResultDataKind = rdkUnknown); overload;
-    constructor Create(AOWner: TComponent; const ADisplayFormat: TWatchDisplayFormat; AResDataType: TWatchResultDataKind; AShowMemDump: boolean = False); overload;
+    constructor Create(AOWner: TComponent; const ADisplayFormat: TWatchDisplayFormat; AResDataType: TWatchResultDataKind; AShowMemDump: boolean = False; AShowArrayNav: boolean = False); overload;
    property DisplayFormat: TWatchDisplayFormat read FDisplayFormat;
    destructor Destroy; override;
  end;
@ -196,6 +196,7 @@ begin
  ButtonPanel.HelpButton.Visible := True;
  DisplayFormatFrame1.Setup;
  DisplayFormatFrame1.BeginUdpate;
+  DisplayFormatFrame1.ShowArrayNavBarOpts := True;
  try
    if FWatch = nil
    then begin
@ -286,7 +287,7 @@ end;

 constructor TWatchPropertyDlg.Create(AOWner: TComponent;
  const ADisplayFormat: TWatchDisplayFormat; AResDataType: TWatchResultDataKind;
-  AShowMemDump: boolean);
+  AShowMemDump: boolean; AShowArrayNav: boolean);
 begin
  FMode := wpmDispFormat;
  inherited Create(AOWner);
@ -296,6 +297,7 @@ begin

  Caption:= dlgDisplayFormatDebugOptions;
  DisplayFormatFrame1.Setup;
+  DisplayFormatFrame1.ShowArrayNavBarOpts := AShowArrayNav;
  DisplayFormatFrame1.ShowMemDump := AShowMemDump;
  DisplayFormatFrame1.BeginUdpate;
  DisplayFormatFrame1.DisplayFormat := FDisplayFormat;