From f133fe2679e0476bbc52304c3f537684bf39b1ea Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Fri, 27 Apr 2007 07:30:36 +0000
Subject: [PATCH] Evaluate/Modify dialog: - saving/loading dialog position and
 sized - saving/loading history - added button images - small controls
 repositioning

git-svn-id: trunk@11009 -
---
 .gitattributes               |   3 +
 .gitignore                   |   2 +
 debugger/evaluatedlg.lfm     | 151 ++++++++++++++++++++++++-----
 debugger/evaluatedlg.lrs     | 183 +++++++++++++++++++++++++++++------
 debugger/evaluatedlg.pp      |  19 +++-
 images/debugger/evaluate.bmp | Bin 0 -> 822 bytes
 images/debugger/inspect.bmp  | Bin 0 -> 822 bytes
 images/debugger/modify.bmp   | Bin 0 -> 822 bytes
 8 files changed, 303 insertions(+), 55 deletions(-)
 create mode 100644 images/debugger/evaluate.bmp
 create mode 100644 images/debugger/inspect.bmp
 create mode 100644 images/debugger/modify.bmp

diff --git a/.gitattributes b/.gitattributes
index a768ce9456..56c1bcf8cb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2006,6 +2006,9 @@ images/components/txmlconfig.xpm svneol=native#text/plain
 images/components/txmlpropstorage.xpm -text svneol=native#image/x-xpixmap
 images/components/unregisteredcomponent.xpm -text svneol=native#image/x-xpixmap
 images/components_images.lrs svneol=native#text/pascal
+images/debugger/evaluate.bmp -text svneol=unset#image/bmp
+images/debugger/inspect.bmp -text svneol=unset#image/bmp
+images/debugger/modify.bmp -text svneol=unset#image/bmp
 images/designer/anchorbottombottom.xpm -text svneol=native#image/x-xpixmap
 images/designer/anchorcenterhorizontal.xpm -text svneol=native#image/x-xpixmap
 images/designer/anchorcentervertical.xpm -text svneol=native#image/x-xpixmap
diff --git a/.gitignore b/.gitignore
index bbe6929741..8ddefa29c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -352,6 +352,8 @@ images/codetoolsdefines/*.bak
 images/codetoolsdefines/units
 images/components/*.bak
 images/components/units
+images/debugger/*.bak
+images/debugger/units
 images/designer/*.bak
 images/designer/units
 images/menu/*.bak
diff --git a/debugger/evaluatedlg.lfm b/debugger/evaluatedlg.lfm
index 3e3d54dedc..4d23a7aa34 100644
--- a/debugger/evaluatedlg.lfm
+++ b/debugger/evaluatedlg.lfm
@@ -1,86 +1,94 @@
 inherited EvaluateDlg: TEvaluateDlg
   Left = 351
-  Height = 296
+  Height = 290
   Top = 136
   Width = 400
   HorzScrollBar.Page = 399
-  VertScrollBar.Page = 295
+  VertScrollBar.Page = 289
   ActiveControl = ToolBar1
   BorderStyle = bsSizeToolWin
   Caption = 'Evaluate/Modify'
   KeyPreview = True
+  OnClose = FormClose
   OnKeyDown = FormKeyDown
   object Label1: TLabel
     Left = 8
-    Height = 14
-    Top = 56
-    Width = 57
+    Height = 17
+    Top = 44
+    Width = 60
     Caption = '&Expression:'
     Color = clNone
     ParentColor = False
   end
   object Label2: TLabel
     Left = 8
-    Height = 14
-    Top = 104
-    Width = 35
+    Height = 17
+    Top = 92
+    Width = 36
     Caption = '&Result:'
     Color = clNone
     ParentColor = False
   end
   object lblNewValue: TLabel
     Left = 8
-    Height = 14
-    Top = 247
-    Width = 55
+    Height = 17
+    Top = 245
+    Width = 59
     Anchors = [akLeft, akBottom]
     Caption = '&New value:'
     Color = clNone
     ParentColor = False
   end
   object ToolBar1: TToolBar
-    Height = 54
+    Height = 44
     Width = 400
     AutoSize = True
-    ButtonHeight = 50
-    ButtonWidth = 75
+    ButtonHeight = 40
+    ButtonWidth = 50
     Caption = 'ToolBar1'
     EdgeBorders = [ebTop, ebBottom]
     Flat = True
+    Images = ImageList1
+    Indent = 2
     ShowCaptions = True
     TabOrder = 0
     TabStop = True
     object tbInspect: TToolButton
-      Left = 226
+      Left = 166
       Top = 2
       Caption = '&Inspect'
       Enabled = False
+      ImageIndex = 3
     end
     object tbWatch: TToolButton
-      Left = 151
+      Left = 116
       Top = 2
+      AllowAllUp = True
       Caption = '&Watch'
       Enabled = False
+      ImageIndex = 2
       OnClick = tbWatchClick
     end
     object tbModify: TToolButton
-      Left = 76
+      Left = 62
       Top = 2
       Caption = '&Modify'
       Enabled = False
+      ImageIndex = 1
     end
     object tbEvaluate: TToolButton
-      Left = 1
+      Left = 2
       Top = 2
       Caption = 'E&valuate'
       Enabled = False
+      ImageIndex = 0
       OnClick = tbEvaluateClick
     end
   end
   object cmbExpression: TComboBox
     Left = 8
     Height = 21
-    Top = 72
+    Top = 60
     Width = 384
     Anchors = [akTop, akLeft, akRight]
     AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@@ -91,8 +99,8 @@ inherited EvaluateDlg: TEvaluateDlg
   end
   object txtResult: TMemo
     Left = 8
-    Height = 124
-    Top = 120
+    Height = 131
+    Top = 108
     Width = 384
     Anchors = [akTop, akLeft, akRight, akBottom]
     ScrollBars = ssAutoVertical
@@ -101,7 +109,7 @@ inherited EvaluateDlg: TEvaluateDlg
   object cmbNewValue: TComboBox
     Left = 8
     Height = 21
-    Top = 268
+    Top = 262
     Width = 384
     Anchors = [akLeft, akRight, akBottom]
     AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@@ -110,6 +118,103 @@ inherited EvaluateDlg: TEvaluateDlg
   end
   object ImageList1: TImageList
     left = 16
-    top = 352
+    top = 263
+    Bitmap = {
+      6C6904000000100000001000000036030000424D360300000000000036000000
+      2800000010000000100000000100180000000000000300000000000000000000
+      0000000000000000FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
+      FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF0000
+      2A00002A00002A00002A00002A00002A00002A00002A00002A00002A00002A55
+      3F2A00002AFF00FFFF00FFFF4000FF4000FF4000FF4000FF4000FF4000FF4000
+      FF4000FF4000FF4000FF4000FF4000FF4000FF400000002AFF00FFFF4000FF8F
+      6A55DFFF00CCFFFF805555DFFF00CCFFFF602B55DFFF00CCFFFF501555DFFF00
+      CCFFFF400000002AFF00FFFF4000FF9E7DAAEEFF55DFFFFF8055AAEEFF55DFFF
+      FF7040AAEEFF55DFFFFF5015AAEEFF55DFFFFF400000002AFF00FFFF4000FF9F
+      80FF9F80FF8F6AFF8F6AFF8055FF8055FF7040FF7040FF602BFF602BFF5015FF
+      4000FF400000002AFF00FFFF4000FF9F805555FF0000FFFF8F6A55DFFF00CCFF
+      FF805555DFFF00CCFFFF602B55DFFF00CCFFFF400000002AFF00FFFF4000FFAF
+      95AAAAFF5555FFFF9E7DAAEEFF55DFFFFF8055AAEEFF55DFFFFF7040AAEEFF55
+      DFFFFF400000002AFF00FFFF4000FFAF95FFAF95FF9F80FF9F80FF9F80FF8F6A
+      FF8F6AFF8055FF8055FF7040FF7040FF4000FF400000002AFF00FFFF4000B6B4
+      B4A09E9EA09E9EA09E9EA09E9EA09E9EA09E9EA09E9EA09E9EA09E9EA09E9EA0
+      9E9EFF400000002AFF00FFFF4000B6B4B480FF0080FF007AF4007AF40075EA00
+      75EA0070DF0070DF006AD50065CA00A09E9EFF400000002AFF00FFFF4000B6B4
+      B485FF0B80FF0080FF007AF4007AF40075EA0075EA0070DF0070DF006AD500A0
+      9E9EFF400000002AFF00FFFF4000B6B4B485FF0B85FF0B80FF0080FF007AF400
+      7AF40075EA0075EA0070DF0070DF00A09E9EFF400000002AFF00FFFF4000B6B4
+      B4B6B4B4B6B4B4B6B4B4B6B4B4B6B4B4B6B4B4B6B4B4B6B4B4B6B4B4B6B4B4B6
+      B4B4FF400000002AFF00FFFF00FFFF4000FF4000FF4000FF4000FF4000FF4000
+      FF4000FF4000FF4000FF4000FF4000FF4000FF4000FF00FFFF00FFFF00FFFF00
+      FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
+      00FFFF00FFFF00FF36030000424D360300000000000036000000280000001000
+      0000100000000100180000000000000300000000000000000000000000000000
+      0000FF00FF00002A00002A00002A00002A00002A00002A00002A00002A00002A
+      00002A00002A553F2A00002AFF00FFFF00FFFF4000FF4000FF4000FF4000FF40
+      00FF4000FF4000FF4000FF4000FF4000FF4000FF4000FF4000FF400000002AFF
+      00FFFF4000FF8F6A55DFFF00CCFFFF805555DFFF00CCFFFF602B55DFFF00CCFF
+      FF501555DFFF00CCFFFF400000002AFF00FFFF4000FF9E7DAAEEFF55DFFFFF80
+      55AAEEFF55DFFFFF7040AAEEFF55DFFFFF5015AAEEFF55DFFFFF400000002AFF
+      00FFFF4000FF9F80FF9F80FF8F6AFF8F6AFF8055FF8055FF7040FF7040FF602B
+      FF602BFF5015FF4000FF400000002AFF00FFFF4000FF9F805555FF0000FFFF8F
+      6A55DFFF00CCFFFF805555DFFF00CCFFFF602B55DFFF00CCFFFF400000002AFF
+      00FFFF4000FFAF95AAAAFF5555FFFF9E7DAAEEFF52555852555852555885E2FA
+      FF7040AAEEFF55DFFFFF400000002AFF00FFFF4000FFAF95FFAF95FF9F80FF9F
+      80FF9F80525558FFFFFF92BECD525558F18763FF7040FF4000FF400000002AFF
+      00FFFF4000B6B4B4A09E9EA09E9EA09E9EA09E9E525558BADBEF91CFE392BECD
+      525558EAEAEAA09E9EFF400000002AFF00FFFF4000B6B4B480FF0080FF007AF4
+      007AF400CAF1A392BECDBADBEF91CFE392BECD525558EAEAEAFF400000002AFF
+      00FFFF4000B6B4B485FF0B80FF0080FF007AF4007AF400CAF1A392BECDBADBEF
+      91CFE392BECD525558F1876300002AFF00FFFF4000B6B4B485FF0B85FF0B80FF
+      0080FF007AF4007AF400CAF1A392BECDBADBEF91CFE392BECD5255580B0B75FF
+      00FFFF4000B6B4B4B6B4B4B6B4B4B6B4B4B6B4B4B6B4B4B6B4B4B6B4B4EAEAEA
+      92BECDBADBEF91CFE392BECD8D9CC7E6ECEEFF00FFFF4000FF4000FF4000FF40
+      00FF4000FF4000FF4000FF4000FF4000F1876392BECDBADBEF8D9CC78D9CC7E6
+      ECEEFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
+      FF00FFE6ECEE8D9CC7AAB5D5AAB5D5E6ECEEFF00FFFF00FFFF00FFFF00FFFF00
+      FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFE6ECEE8D9CC78D9CC7E6
+      ECEE080200002F2A2058504D202A2F0D0A7374617469632063686172202A2077
+      6174636865735F78706D5B5D203D207B0D0A22313620313620382031222C0D0A
+      22200963204E6F6E65222C0D0A222E09632023363636364343222C0D0A222B09
+      632023443544354546222C0D0A224009632023464646464646222C0D0A222309
+      632023453145314531222C0D0A222409632023433843384338222C0D0A222509
+      632023343434343434222C0D0A222609632023303030303030222C0D0A222020
+      2020202020202020202020202020222C0D0A2220262626262626262626262626
+      262020222C0D0A2220262E2E2E2E2E2E2E2E2E2E2E254020222C0D0A22202623
+      23232323404040404023254020222C0D0A222026242326402640402626402425
+      4020222C0D0A2220262340232640404040404023254020222C0D0A2220262423
+      264026404026264024254020222C0D0A222026234040404040404040402B2540
+      20222C0D0A2220262440404040404040402324254020222C0D0A222026234026
+      402640402626402B254020222C0D0A2220262440402640404023402324254020
+      222C0D0A222026234040264040232626402B254020222C0D0A22202624232423
+      242B242B242B24254020222C0D0A222026252525252525252525252525402022
+      2C0D0A2220204040404040404040404040404020222C0D0A2220202020202020
+      202020202020202020227D3B0D0A36030000424D360300000000000036000000
+      2800000010000000100000000100180000000000000300000000000000000000
+      0000000000000000FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
+      FF00FFFF00FFFF00FFF7F3F2BADBEFBADBEFF7F3F2FF00FFFF00FFFF00FFFF00
+      FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFF7F3F2BADBEF50B4EFB1
+      DDF8BADBEFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
+      FF00FFF7F3F2BADBEF50B4EFB1DDF8BADBEFFF00FFFF00FFFF00FFFF00FFFF00
+      FFFF00FFFF00FFFF00FFFF00FFFF00FFF7F3F2BADBEF50B4EFB1DDF8BADBEFFF
+      00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFF7F3F2
+      BADBEF50B4EFB1DDF8BADBEFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
+      FFF7F3F2E6DDD9DDD1CCE6DDD9BADBEF50B4EFB1DDF8BADBEFFF00FFFF00FFFF
+      00FFFF00FFFF00FFFF00FFF7F3F2E6DDD9DDD1CCFFCAAAFFCAAAFFCAAADDD1CC
+      DDD1CCBADBEFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFDDD1CCFFCF
+      B5FFCFB5FFCFB5FFCFB5FFCFB5FFCFB5FFCAAAE6DDD9FF00FFFF00FFFF00FFFF
+      00FFFF00FFFF00FFF7F3F2DDD1CCFFD6BFFFD6BFFFD6BFFFD6BFFFD6BFFFCFB5
+      FFCAAADDD1CCF7F3F2FF00FFFF00FFFF00FFFF00FFFF00FFE6DDD9FFDDCAFFDD
+      CAFFDDCAFFDDCAFFDDCAFFD6BFFFCFB5FFCAAAFFCAAAE6DDD9FF00FFFF00FFFF
+      00FFFF00FFFF00FFDDD1CCFFEBDFFFEBDFFFEBDFFFEBDFFFDDCAFFD6BFFFCFB5
+      FFCAAAFFCAAADDD1CCFF00FFFF00FFFF00FFFF00FFFF00FFE6DDD9FFEBDFFFF2
+      EAFFF2EAFFEBDFFFDDCAFFD6BFFFCFB5FFCAAAFFCAAAE6DDD9FF00FFFF00FFFF
+      00FFFF00FFFF00FFF7F3F2DDD1CCFFF2EAFFF2EAFFEBDFFFDDCAFFD6BFFFCFB5
+      FFCAAADDD1CCF7F3F2FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFE6DDD9FFEB
+      DFFFEBDFFFEBDFFFDDCAFFD6BFFFCFB5FFCAAADDD1CCFF00FFFF00FFFF00FFFF
+      00FFFF00FFFF00FFFF00FFF7F3F2DDD1CCDDD1CCFFDDCAFFDDCAFFD6BFDDD1CC
+      E6DDD9F7F3F2FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
+      FFF7F3F2E6DDD9DDD1CCE6DDD9F7F3F2FF00FFFF00FFFF00FFFF00FFFF00FFFF
+      00FFFF00FFFF00FF
+    }
   end
 end
diff --git a/debugger/evaluatedlg.lrs b/debugger/evaluatedlg.lrs
index 0f11885535..f560260b2a 100644
--- a/debugger/evaluatedlg.lrs
+++ b/debugger/evaluatedlg.lrs
@@ -1,35 +1,156 @@
-{ Dit is een automatisch aangemaakt lazarus broncode bestand }
+{ Это - файл ресурсов, автоматически созданный lazarus }
 
 LazarusResources.Add('TEvaluateDlg','FORMDATA',[
-  'TPF0'#241#12'TEvaluateDlg'#11'EvaluateDlg'#4'Left'#3'_'#1#6'Height'#3'('#1#3
+  'TPF0'#241#12'TEvaluateDlg'#11'EvaluateDlg'#4'Left'#3'_'#1#6'Height'#3'"'#1#3
   +'Top'#3#136#0#5'Width'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'VertScrollB'
-  +'ar.Page'#3''''#1#13'ActiveControl'#7#8'ToolBar1'#11'BorderStyle'#7#13'bsSiz'
-  +'eToolWin'#7'Caption'#6#15'Evaluate/Modify'#10'KeyPreview'#9#9'OnKeyDown'#7
-  +#11'FormKeyDown'#0#6'TLabel'#6'Label1'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'8'
-  +#5'Width'#2'9'#7'Caption'#6#12'&Expression:'#5'Color'#7#6'clNone'#11'ParentC'
-  +'olor'#8#0#0#6'TLabel'#6'Label2'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'h'#5'Wi'
-  +'dth'#2'#'#7'Caption'#6#8'&Result:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0
-  +#0#6'TLabel'#11'lblNewValue'#4'Left'#2#8#6'Height'#2#14#3'Top'#3#247#0#5'Wid'
-  +'th'#2'7'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#11'&New value:'
-  +#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#8'TToolBar'#8'ToolBar1'#6'Height'
-  +#2'6'#5'Width'#3#144#1#8'AutoSize'#9#12'ButtonHeight'#2'2'#11'ButtonWidth'#2
-  +'K'#7'Caption'#6#8'ToolBar1'#11'EdgeBorders'#11#5'ebTop'#8'ebBottom'#0#4'Fla'
-  +'t'#9#12'ShowCaptions'#9#8'TabOrder'#2#0#7'TabStop'#9#0#11'TToolButton'#9'tb'
-  +'Inspect'#4'Left'#3#226#0#3'Top'#2#2#7'Caption'#6#8'&Inspect'#7'Enabled'#8#0
-  +#0#11'TToolButton'#7'tbWatch'#4'Left'#3#151#0#3'Top'#2#2#7'Caption'#6#6'&Wat'
-  +'ch'#7'Enabled'#8#7'OnClick'#7#12'tbWatchClick'#0#0#11'TToolButton'#8'tbModi'
-  +'fy'#4'Left'#2'L'#3'Top'#2#2#7'Caption'#6#7'&Modify'#7'Enabled'#8#0#0#11'TTo'
-  +'olButton'#10'tbEvaluate'#4'Left'#2#1#3'Top'#2#2#7'Caption'#6#9'E&valuate'#7
-  +'Enabled'#8#7'OnClick'#7#15'tbEvaluateClick'#0#0#0#9'TComboBox'#13'cmbExpres'
-  +'sion'#4'Left'#2#8#6'Height'#2#21#3'Top'#2'H'#5'Width'#3#128#1#7'Anchors'#11
-  +#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineCo'
-  +'mplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'OnChange'#7#19'cmbExp'
-  +'ressionChange'#9'OnKeyDown'#7#20'cmbExpressionKeyDown'#8'TabOrder'#2#2#0#0#5
-  +'TMemo'#9'txtResult'#4'Left'#2#8#6'Height'#2'|'#3'Top'#2'x'#5'Width'#3#128#1
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#10'ScrollBars'#7
-  +#14'ssAutoVertical'#8'TabOrder'#2#1#0#0#9'TComboBox'#11'cmbNewValue'#4'Left'
-  +#2#8#6'Height'#2#21#3'Top'#3#12#1#5'Width'#3#128#1#7'Anchors'#11#6'akLeft'#7
-  +'akRight'#8'akBottom'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20
-  +'cbactSearchAscending'#0#9'MaxLength'#2#0#8'TabOrder'#2#3#0#0#10'TImageList'
-  +#10'ImageList1'#4'left'#2#16#3'top'#3'`'#1#0#0#0
+  +'ar.Page'#3'!'#1#13'ActiveControl'#7#8'ToolBar1'#11'BorderStyle'#7#13'bsSize'
+  +'ToolWin'#7'Caption'#6#15'Evaluate/Modify'#10'KeyPreview'#9#7'OnClose'#7#9'F'
+  +'ormClose'#9'OnKeyDown'#7#11'FormKeyDown'#0#6'TLabel'#6'Label1'#4'Left'#2#8#6
+  +'Height'#2#17#3'Top'#2','#5'Width'#2'<'#7'Caption'#6#12'&Expression:'#5'Colo'
+  +'r'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#4'Left'#2#8#6'Heig'
+  +'ht'#2#17#3'Top'#2'\'#5'Width'#2'$'#7'Caption'#6#8'&Result:'#5'Color'#7#6'cl'
+  +'None'#11'ParentColor'#8#0#0#6'TLabel'#11'lblNewValue'#4'Left'#2#8#6'Height'
+  +#2#17#3'Top'#3#245#0#5'Width'#2';'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'C'
+  +'aption'#6#11'&New value:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#8'TToo'
+  +'lBar'#8'ToolBar1'#6'Height'#2','#5'Width'#3#144#1#8'AutoSize'#9#12'ButtonHe'
+  +'ight'#2'('#11'ButtonWidth'#2'2'#7'Caption'#6#8'ToolBar1'#11'EdgeBorders'#11
+  +#5'ebTop'#8'ebBottom'#0#4'Flat'#9#6'Images'#7#10'ImageList1'#6'Indent'#2#2#12
+  +'ShowCaptions'#9#8'TabOrder'#2#0#7'TabStop'#9#0#11'TToolButton'#9'tbInspect'
+  +#4'Left'#3#166#0#3'Top'#2#2#7'Caption'#6#8'&Inspect'#7'Enabled'#8#10'ImageIn'
+  +'dex'#2#3#0#0#11'TToolButton'#7'tbWatch'#4'Left'#2't'#3'Top'#2#2#10'AllowAll'
+  +'Up'#9#7'Caption'#6#6'&Watch'#7'Enabled'#8#10'ImageIndex'#2#2#7'OnClick'#7#12
+  +'tbWatchClick'#0#0#11'TToolButton'#8'tbModify'#4'Left'#2'>'#3'Top'#2#2#7'Cap'
+  +'tion'#6#7'&Modify'#7'Enabled'#8#10'ImageIndex'#2#1#0#0#11'TToolButton'#10't'
+  +'bEvaluate'#4'Left'#2#2#3'Top'#2#2#7'Caption'#6#9'E&valuate'#7'Enabled'#8#10
+  +'ImageIndex'#2#0#7'OnClick'#7#15'tbEvaluateClick'#0#0#0#9'TComboBox'#13'cmbE'
+  +'xpression'#4'Left'#2#8#6'Height'#2#21#3'Top'#2'<'#5'Width'#3#128#1#7'Anchor'
+  +'s'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOf'
+  +'LineComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'OnChange'#7#19
+  +'cmbExpressionChange'#9'OnKeyDown'#7#20'cmbExpressionKeyDown'#8'TabOrder'#2#2
+  +#0#0#5'TMemo'#9'txtResult'#4'Left'#2#8#6'Height'#3#131#0#3'Top'#2'l'#5'Width'
+  +#3#128#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#10'Scroll'
+  +'Bars'#7#14'ssAutoVertical'#8'TabOrder'#2#1#0#0#9'TComboBox'#11'cmbNewValue'
+  +#4'Left'#2#8#6'Height'#2#21#3'Top'#3#6#1#5'Width'#3#128#1#7'Anchors'#11#6'ak'
+  +'Left'#7'akRight'#8'akBottom'#0#16'AutoCompleteText'#11#22'cbactEndOfLineCom'
+  +'plete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'TabOrder'#2#3#0#0#10'T'
+  +'ImageList'#10'ImageList1'#4'left'#2#16#3'top'#3#7#1#6'Bitmap'#10#200#11#0#0
+  +'li'#4#0#0#0#16#0#0#0#16#0#0#0'6'#3#0#0'BM6'#3#0#0#0#0#0#0'6'#0#0#0'('#0#0#0
+  +#16#0#0#0#16#0#0#0#1#0#24#0#0#0#0#0#0#3#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0
+  +#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255
+  +#255#0#255#255#0#255#255#0#255#0#0'*'#0#0'*'#0#0'*'#0#0'*'#0#0'*'#0#0'*'#0#0
+  +'*'#0#0'*'#0#0'*'#0#0'*'#0#0'*U?*'#0#0'*'#255#0#255#255#0#255#255'@'#0#255'@'
+  +#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0
+  +#255'@'#0#255'@'#0#255'@'#0#255'@'#0#0#0'*'#255#0#255#255'@'#0#255#143'jU'
+  +#223#255#0#204#255#255#128'UU'#223#255#0#204#255#255'`+U'#223#255#0#204#255
+  +#255'P'#21'U'#223#255#0#204#255#255'@'#0#0#0'*'#255#0#255#255'@'#0#255#158'}'
+  +#170#238#255'U'#223#255#255#128'U'#170#238#255'U'#223#255#255'p@'#170#238#255
+  +'U'#223#255#255'P'#21#170#238#255'U'#223#255#255'@'#0#0#0'*'#255#0#255#255'@'
+  +#0#255#159#128#255#159#128#255#143'j'#255#143'j'#255#128'U'#255#128'U'#255'p'
+  +'@'#255'p@'#255'`+'#255'`+'#255'P'#21#255'@'#0#255'@'#0#0#0'*'#255#0#255#255
+  +'@'#0#255#159#128'UU'#255#0#0#255#255#143'jU'#223#255#0#204#255#255#128'UU'
+  +#223#255#0#204#255#255'`+U'#223#255#0#204#255#255'@'#0#0#0'*'#255#0#255#255
+  +'@'#0#255#175#149#170#170#255'UU'#255#255#158'}'#170#238#255'U'#223#255#255
+  +#128'U'#170#238#255'U'#223#255#255'p@'#170#238#255'U'#223#255#255'@'#0#0#0'*'
+  +#255#0#255#255'@'#0#255#175#149#255#175#149#255#159#128#255#159#128#255#159
+  +#128#255#143'j'#255#143'j'#255#128'U'#255#128'U'#255'p@'#255'p@'#255'@'#0#255
+  +'@'#0#0#0'*'#255#0#255#255'@'#0#182#180#180#160#158#158#160#158#158#160#158
+  +#158#160#158#158#160#158#158#160#158#158#160#158#158#160#158#158#160#158#158
+  +#160#158#158#160#158#158#255'@'#0#0#0'*'#255#0#255#255'@'#0#182#180#180#128
+  +#255#0#128#255#0'z'#244#0'z'#244#0'u'#234#0'u'#234#0'p'#223#0'p'#223#0'j'#213
+  +#0'e'#202#0#160#158#158#255'@'#0#0#0'*'#255#0#255#255'@'#0#182#180#180#133
+  +#255#11#128#255#0#128#255#0'z'#244#0'z'#244#0'u'#234#0'u'#234#0'p'#223#0'p'
+  +#223#0'j'#213#0#160#158#158#255'@'#0#0#0'*'#255#0#255#255'@'#0#182#180#180
+  +#133#255#11#133#255#11#128#255#0#128#255#0'z'#244#0'z'#244#0'u'#234#0'u'#234
+  +#0'p'#223#0'p'#223#0#160#158#158#255'@'#0#0#0'*'#255#0#255#255'@'#0#182#180
+  +#180#182#180#180#182#180#180#182#180#180#182#180#180#182#180#180#182#180#180
+  +#182#180#180#182#180#180#182#180#180#182#180#180#182#180#180#255'@'#0#0#0'*'
+  ,#255#0#255#255#0#255#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0
+  +#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255#0#255#255
+  +#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255
+  +#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0
+  +#255'6'#3#0#0'BM6'#3#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#16#0#0#0#16#0#0#0#1#0#24#0
+  +#0#0#0#0#0#3#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#255#0#0'*'#0#0'*'#0#0
+  +'*'#0#0'*'#0#0'*'#0#0'*'#0#0'*'#0#0'*'#0#0'*'#0#0'*'#0#0'*U?*'#0#0'*'#255#0
+  +#255#255#0#255#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0
+  +#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#0#0'*'#255#0
+  +#255#255'@'#0#255#143'jU'#223#255#0#204#255#255#128'UU'#223#255#0#204#255#255
+  +'`+U'#223#255#0#204#255#255'P'#21'U'#223#255#0#204#255#255'@'#0#0#0'*'#255#0
+  +#255#255'@'#0#255#158'}'#170#238#255'U'#223#255#255#128'U'#170#238#255'U'#223
+  +#255#255'p@'#170#238#255'U'#223#255#255'P'#21#170#238#255'U'#223#255#255'@'#0
+  +#0#0'*'#255#0#255#255'@'#0#255#159#128#255#159#128#255#143'j'#255#143'j'#255
+  +#128'U'#255#128'U'#255'p@'#255'p@'#255'`+'#255'`+'#255'P'#21#255'@'#0#255'@'
+  +#0#0#0'*'#255#0#255#255'@'#0#255#159#128'UU'#255#0#0#255#255#143'jU'#223#255
+  +#0#204#255#255#128'UU'#223#255#0#204#255#255'`+U'#223#255#0#204#255#255'@'#0
+  +#0#0'*'#255#0#255#255'@'#0#255#175#149#170#170#255'UU'#255#255#158'}'#170#238
+  +#255'RUXRUXRUX'#133#226#250#255'p@'#170#238#255'U'#223#255#255'@'#0#0#0'*'
+  +#255#0#255#255'@'#0#255#175#149#255#175#149#255#159#128#255#159#128#255#159
+  +#128'RUX'#255#255#255#146#190#205'RUX'#241#135'c'#255'p@'#255'@'#0#255'@'#0#0
+  +#0'*'#255#0#255#255'@'#0#182#180#180#160#158#158#160#158#158#160#158#158#160
+  +#158#158'RUX'#186#219#239#145#207#227#146#190#205'RUX'#234#234#234#160#158
+  +#158#255'@'#0#0#0'*'#255#0#255#255'@'#0#182#180#180#128#255#0#128#255#0'z'
+  +#244#0'z'#244#0#202#241#163#146#190#205#186#219#239#145#207#227#146#190#205
+  +'RUX'#234#234#234#255'@'#0#0#0'*'#255#0#255#255'@'#0#182#180#180#133#255#11
+  +#128#255#0#128#255#0'z'#244#0'z'#244#0#202#241#163#146#190#205#186#219#239
+  +#145#207#227#146#190#205'RUX'#241#135'c'#0#0'*'#255#0#255#255'@'#0#182#180
+  +#180#133#255#11#133#255#11#128#255#0#128#255#0'z'#244#0'z'#244#0#202#241#163
+  +#146#190#205#186#219#239#145#207#227#146#190#205'RUX'#11#11'u'#255#0#255#255
+  +'@'#0#182#180#180#182#180#180#182#180#180#182#180#180#182#180#180#182#180#180
+  +#182#180#180#182#180#180#234#234#234#146#190#205#186#219#239#145#207#227#146
+  +#190#205#141#156#199#230#236#238#255#0#255#255'@'#0#255'@'#0#255'@'#0#255'@'
+  +#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#255'@'#0#241#135'c'#146#190#205#186
+  +#219#239#141#156#199#141#156#199#230#236#238#255#0#255#255#0#255#255#0#255
+  +#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0
+  +#255#230#236#238#141#156#199#170#181#213#170#181#213#230#236#238#255#0#255
+  +#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0
+  +#255#255#0#255#255#0#255#255#0#255#230#236#238#141#156#199#141#156#199#230
+  +#236#238#8#2#0#0'/* XPM */'#13#10'static char * watches_xpm[] = {'#13#10'"16'
+  +' 16 8 1",'#13#10'" '#9'c None",'#13#10'".'#9'c #6666CC",'#13#10'"+'#9'c #D5'
+  +'D5EF",'#13#10'"@'#9'c #FFFFFF",'#13#10'"#'#9'c #E1E1E1",'#13#10'"$'#9'c #C8'
+  +'C8C8",'#13#10'"%'#9'c #444444",'#13#10'"&'#9'c #000000",'#13#10'"          '
+  +'      ",'#13#10'" &&&&&&&&&&&&&  ",'#13#10'" &...........%@ ",'#13#10'" &##'
+  +'###@@@@@#%@ ",'#13#10'" &$#&@&@@&&@$%@ ",'#13#10'" &#@#&@@@@@@#%@ ",'#13#10
+  +'" &$#&@&@@&&@$%@ ",'#13#10'" &#@@@@@@@@@+%@ ",'#13#10'" &$@@@@@@@@#$%@ ",'
+  +#13#10'" &#@&@&@@&&@+%@ ",'#13#10'" &$@@&@@@#@#$%@ ",'#13#10'" &#@@&@@#&&@+%'
+  +'@ ",'#13#10'" &$#$#$+$+$+$%@ ",'#13#10'" &%%%%%%%%%%%%@ ",'#13#10'"  @@@@@@'
+  +'@@@@@@@ ",'#13#10'"                "};'#13#10'6'#3#0#0'BM6'#3#0#0#0#0#0#0'6'
+  +#0#0#0'('#0#0#0#16#0#0#0#16#0#0#0#1#0#24#0#0#0#0#0#0#3#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255
+  +#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#247#243#242#186#219#239
+  +#186#219#239#247#243#242#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255
+  +#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#247#243#242#186
+  +#219#239'P'#180#239#177#221#248#186#219#239#255#0#255#255#0#255#255#0#255#255
+  +#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#247#243
+  +#242#186#219#239'P'#180#239#177#221#248#186#219#239#255#0#255#255#0#255#255#0
+  +#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255
+  +#247#243#242#186#219#239'P'#180#239#177#221#248#186#219#239#255#0#255#255#0
+  +#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255
+  +#255#0#255#247#243#242#186#219#239'P'#180#239#177#221#248#186#219#239#255#0
+  +#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#247#243#242
+  +#230#221#217#221#209#204#230#221#217#186#219#239'P'#180#239#177#221#248#186
+  +#219#239#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#247#243
+  ,#242#230#221#217#221#209#204#255#202#170#255#202#170#255#202#170#221#209#204
+  +#221#209#204#186#219#239#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255
+  +#255#0#255#255#0#255#221#209#204#255#207#181#255#207#181#255#207#181#255#207
+  +#181#255#207#181#255#207#181#255#202#170#230#221#217#255#0#255#255#0#255#255
+  +#0#255#255#0#255#255#0#255#255#0#255#247#243#242#221#209#204#255#214#191#255
+  +#214#191#255#214#191#255#214#191#255#214#191#255#207#181#255#202#170#221#209
+  +#204#247#243#242#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#230#221
+  +#217#255#221#202#255#221#202#255#221#202#255#221#202#255#221#202#255#214#191
+  +#255#207#181#255#202#170#255#202#170#230#221#217#255#0#255#255#0#255#255#0
+  +#255#255#0#255#255#0#255#221#209#204#255#235#223#255#235#223#255#235#223#255
+  +#235#223#255#221#202#255#214#191#255#207#181#255#202#170#255#202#170#221#209
+  +#204#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#230#221#217#255#235
+  +#223#255#242#234#255#242#234#255#235#223#255#221#202#255#214#191#255#207#181
+  +#255#202#170#255#202#170#230#221#217#255#0#255#255#0#255#255#0#255#255#0#255
+  +#255#0#255#247#243#242#221#209#204#255#242#234#255#242#234#255#235#223#255
+  +#221#202#255#214#191#255#207#181#255#202#170#221#209#204#247#243#242#255#0
+  +#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#230#221#217#255#235
+  +#223#255#235#223#255#235#223#255#221#202#255#214#191#255#207#181#255#202#170
+  +#221#209#204#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#255
+  +#0#255#247#243#242#221#209#204#221#209#204#255#221#202#255#221#202#255#214
+  +#191#221#209#204#230#221#217#247#243#242#255#0#255#255#0#255#255#0#255#255#0
+  +#255#255#0#255#255#0#255#255#0#255#255#0#255#255#0#255#247#243#242#230#221
+  +#217#221#209#204#230#221#217#247#243#242#255#0#255#255#0#255#255#0#255#255#0
+  +#255#255#0#255#255#0#255#255#0#255#255#0#255#0#0#0
 ]);
diff --git a/debugger/evaluatedlg.pp b/debugger/evaluatedlg.pp
index f39afe5717..1e5b747a35 100644
--- a/debugger/evaluatedlg.pp
+++ b/debugger/evaluatedlg.pp
@@ -38,7 +38,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, LCLType, Forms, Controls, Graphics, Dialogs,
-  ComCtrls, StdCtrls, DebuggerDlg, BaseDebugManager;
+  ComCtrls, StdCtrls, DebuggerDlg, BaseDebugManager, IDEWindowIntf, InputHistory;
 
 type
 
@@ -57,6 +57,7 @@ type
     tbWatch: TToolButton;
     tbModify: TToolButton;
     tbEvaluate: TToolButton;
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormShow(Sender: TObject);
     procedure cmbExpressionChange(Sender: TObject);
@@ -70,6 +71,7 @@ type
     procedure SetFindText(const NewFindText: string);
 
   public
+    constructor Create(TheOwner: TComponent); override;
     property FindText: string read GetFindText write SetFindText;
 
   end;
@@ -78,6 +80,14 @@ implementation
 
 { TEvaluateDlg }
 
+constructor TEvaluateDlg.Create(TheOwner:TComponent);
+begin
+  inherited Create(TheOwner);
+
+  IDEDialogLayoutList.ApplyLayout(Self, 400, 290);
+  cmbExpression.Items.Assign(InputHistories.HistoryLists.GetList(ClassName, True));
+end;
+
 procedure TEvaluateDlg.cmbExpressionChange(Sender: TObject);
 var
   HasExpression: Boolean;
@@ -115,6 +125,13 @@ begin
 end;
 
 
+procedure TEvaluateDlg.FormClose(Sender: TObject;
+  var CloseAction: TCloseAction);
+begin
+  IDEDialogLayoutList.SaveLayout(Self);
+  InputHistories.HistoryLists.GetList(ClassName, True).Assign(cmbExpression.Items);
+end;
+
 procedure TEvaluateDlg.FormShow(Sender: TObject);
 begin
   cmbExpression.SetFocus;
diff --git a/images/debugger/evaluate.bmp b/images/debugger/evaluate.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..5a90ae172943f9ae7e62426ff5b24be714fb692d
GIT binary patch
literal 822
zcmbV~Ef2y#42DaP7|arW0%3lZ1y3?_eg-o&gCQX~gPxk*&@(d&KZ0P<^9U5aw6}(h
zuj6BRuIX-XySJB{&AmRD$D=r=HI&tZk=Y0N-n=vs0sjDCVn<C`Af0`{?~oD_Cy}ZV
z4v1Pw61tKEjwC)!V17aRY+am@_DL^E>`M|jl63XCMk0wAt(e$nLYE1g#&Fv|Cm#rO
zRu*I3{$*MeNF_F7_j)W-w)D=JIl!BrT~%$f%npsv)oTP|bzzn#Ca#(22#Y;Xs|WoC
a2bPkTdP~W(o<^|K`k`Yt<A097U*;=9OqtjK

literal 0
HcmV?d00001

diff --git a/images/debugger/inspect.bmp b/images/debugger/inspect.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..4c9c4ebdbaa0560c36ba8ea0bfbe51ee181c5cb6
GIT binary patch
literal 822
zcmc(dKMKMy6viW7z|kXkf*!zK@SNQQU0k{cL0k$V!OcO3LLGFAzw`x7ni@yTmyqWB
z^Ik&ci(;(0uV9`rCVq_6wA)vnmmis}vUxo2?e^3F7I`JCh?nbTWu92_`u~clelbUL
z*fG;;rsucP>QaCUd^;eN-EaEPC56%pA>8TfDgt(0vJcy{xDcZw;O+ES(h@HGcK!fw
zpm%Ki09*q4_UgbQ)~ETt{~`Tg|CIA3q^lr5ZAN;N5{{LF*A;6*(#r|Y0*mIS@&(nJ
BO921?

literal 0
HcmV?d00001

diff --git a/images/debugger/modify.bmp b/images/debugger/modify.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..3f5d3f0bb50e3c6d394bc894f9c4c25cd7aeccf8
GIT binary patch
literal 822
zcma))u}i~16vm%8X6X{}PY}CzHMk2wIB+a<>(s?XDBMz<q$qTgq~MmNOYPv`S`bSo
zCx?Q9Ly$_r$>sT7-lIKAn;O15UhaP1yD#BRPHX#AJT=UR7!@6RbWp65?#qkJOiXlC
zE_3VvkWLZ(Q)&U<ZJHU=3$ry^)T>&=p%xM16i0wh+S#134ql5^q(vNR;q$3wsM~b1
z#;FxK)vHc%D1le~Q{=!`b6GII|Dcy;42uLiGv}ht`!7z}kY~_iNK&O1Ff-piO;9YZ
z8ZKDz50`mH!(l&3mIC(p_I)$`5KErt*n-99EfaM4<Mh0^2f1ch<2xLbTM*3e4}Pa5
x2rlG4Apb@oxgYHMZv6Q*FTX;FAr`<ZUM}9289hN}53i8+-$LpICKikI{{wAhu*d)a

literal 0
HcmV?d00001