From fbc5ba49f3f2cabe8e998ce62830e9fa9509ea49 Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Thu, 22 Jan 2009 08:04:20 +0000
Subject: [PATCH] ide: improve anchoring of character map, change combo style
 to prevent editing of text

git-svn-id: trunk@18387 -
---
 ide/charactermapdlg.lfm | 76 +++++++++++++++++++++++----------------
 ide/charactermapdlg.lrs | 78 +++++++++++++++++++++++------------------
 2 files changed, 90 insertions(+), 64 deletions(-)

diff --git a/ide/charactermapdlg.lfm b/ide/charactermapdlg.lfm
index 76be1f4804..fd75cffffe 100644
--- a/ide/charactermapdlg.lfm
+++ b/ide/charactermapdlg.lfm
@@ -15,11 +15,12 @@ object CharacterMapDialog: TCharacterMapDialog
   LCLVersion = '0.9.27'
   object ButtonPanel: TButtonPanel
     Left = 6
-    Height = 48
-    Top = 378
+    Height = 30
+    Top = 396
     Width = 472
     TabOrder = 0
     ShowButtons = [pbClose, pbHelp]
+    ShowBevel = False
   end
   object PageControl1: TPageControl
     AnchorSideLeft.Control = Owner
@@ -28,7 +29,7 @@ object CharacterMapDialog: TCharacterMapDialog
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = ButtonPanel
     Left = 6
-    Height = 366
+    Height = 384
     Top = 6
     Width = 472
     ActivePage = TabSheet1
@@ -38,28 +39,34 @@ object CharacterMapDialog: TCharacterMapDialog
     TabOrder = 1
     object TabSheet1: TTabSheet
       Caption = 'ANSI'
-      ClientHeight = 336
-      ClientWidth = 468
+      ClientHeight = 358
+      ClientWidth = 464
       object CharInfoLabel: TLabel
-        AnchorSideLeft.Control = Owner
+        AnchorSideLeft.Control = TabSheet1
         AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Control = TabSheet1
+        AnchorSideRight.Side = asrBottom
+        AnchorSideBottom.Control = TabSheet1
+        AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 17
-        Top = 313
-        Width = 456
-        Align = alBottom
-        Anchors = [akLeft, akBottom]
+        Height = 14
+        Top = 338
+        Width = 452
+        Anchors = [akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'CharInfoLabel'
         ParentColor = False
       end
       object StringGrid1: TStringGrid
+        AnchorSideLeft.Control = TabSheet1
+        AnchorSideTop.Control = TabSheet1
+        AnchorSideRight.Control = TabSheet1
         AnchorSideRight.Side = asrBottom
-        AnchorSideBottom.Side = asrBottom
+        AnchorSideBottom.Control = CharInfoLabel
         Left = 0
-        Height = 288
+        Height = 332
         Top = 0
-        Width = 468
+        Width = 464
         Anchors = [akTop, akLeft, akRight, akBottom]
         ColCount = 17
         DefaultColWidth = 16
@@ -72,29 +79,33 @@ object CharacterMapDialog: TCharacterMapDialog
     end
     object TabSheet2: TTabSheet
       Caption = 'Unicode'
-      ClientHeight = 336
-      ClientWidth = 468
+      ClientHeight = 358
+      ClientWidth = 464
       object UnicodeCharInfoLabel: TLabel
         AnchorSideLeft.Control = Owner
-        AnchorSideTop.Side = asrBottom
+        AnchorSideTop.Control = cbUniRange
+        AnchorSideTop.Side = asrCenter
         Left = 6
-        Height = 17
-        Top = 313
-        Width = 126
-        Anchors = [akLeft, akBottom]
+        Height = 14
+        Top = 334
+        Width = 107
         BorderSpacing.Around = 6
         Caption = 'UnicodeCharInfoLabel'
         ParentColor = False
       end
       object StringGrid2: TStringGrid
+        AnchorSideLeft.Control = TabSheet2
+        AnchorSideTop.Control = TabSheet2
+        AnchorSideRight.Control = TabSheet2
+        AnchorSideRight.Side = asrBottom
+        AnchorSideBottom.Control = cbUniRange
         Left = 0
-        Height = 288
+        Height = 325
         Top = 0
-        Width = 468
+        Width = 464
         Anchors = [akTop, akLeft, akRight, akBottom]
         ColCount = 16
-        DefaultColWidth = 26
-        DefaultRowHeight = 26
+        DefaultColWidth = 16
         Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goSmoothScroll]
         RowCount = 15
         TabOrder = 0
@@ -102,17 +113,22 @@ object CharacterMapDialog: TCharacterMapDialog
         OnMouseMove = StringGrid2MouseMove
       end
       object cbUniRange: TComboBox
-        Left = 253
-        Height = 24
-        Top = 305
+        AnchorSideRight.Control = TabSheet2
+        AnchorSideRight.Side = asrBottom
+        AnchorSideBottom.Control = TabSheet2
+        AnchorSideBottom.Side = asrBottom
+        Left = 246
+        Height = 21
+        Top = 331
         Width = 212
         Anchors = [akRight, akBottom]
         AutoComplete = False
-        ItemHeight = 0
+        BorderSpacing.Around = 6
+        ItemHeight = 13
         ItemWidth = 0
         OnSelect = cbUniRangeSelect
+        Style = csDropDownList
         TabOrder = 1
-        Text = 'cbUniRange'
       end
     end
   end
diff --git a/ide/charactermapdlg.lrs b/ide/charactermapdlg.lrs
index 24e408b4a2..54507faae8 100644
--- a/ide/charactermapdlg.lrs
+++ b/ide/charactermapdlg.lrs
@@ -7,38 +7,48 @@ LazarusResources.Add('TCharacterMapDialog','FORMDATA',[
   +#3#228#1#9'FormStyle'#7#11'fsStayOnTop'#10'KeyPreview'#9#8'OnCreate'#7#10'Fo'
   +'rmCreate'#6'OnShow'#7#8'FormShow'#8'Position'#7#14'poScreenCenter'#10'LCLVe'
   +'rsion'#6#6'0.9.27'#0#12'TButtonPanel'#11'ButtonPanel'#4'Left'#2#6#6'Height'
-  +#2'0'#3'Top'#3'z'#1#5'Width'#3#216#1#8'TabOrder'#2#0#11'ShowButtons'#11#7'pb'
-  +'Close'#6'pbHelp'#0#0#0#12'TPageControl'#12'PageControl1'#22'AnchorSideLeft.'
-  +'Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight'
-  +'.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideB'
-  +'ottom.Control'#7#11'ButtonPanel'#4'Left'#2#6#6'Height'#3'n'#1#3'Top'#2#6#5
-  +'Width'#3#216#1#10'ActivePage'#7#9'TabSheet1'#7'Anchors'#11#5'akTop'#6'akLef'
-  +'t'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#8'TabIndex'#2#0#8
-  +'TabOrder'#2#1#0#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#4'ANSI'#12'ClientHei'
-  +'ght'#3'P'#1#11'ClientWidth'#3#212#1#0#6'TLabel'#13'CharInfoLabel'#22'Anchor'
-  +'SideLeft.Control'#7#5'Owner'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
-  +#6#6'Height'#2#17#3'Top'#3'9'#1#5'Width'#3#200#1#5'Align'#7#8'alBottom'#7'An'
-  +'chors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#13'CharInfoLabel'#11'ParentColor'#8#0#0#11'TStringGrid'#11'StringGrid1'#20
-  +'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBotto'
-  +'m'#4'Left'#2#0#6'Height'#3' '#1#3'Top'#2#0#5'Width'#3#212#1#7'Anchors'#11#5
-  +'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'ColCount'#2#17#15'DefaultColWid'
-  +'th'#2#16#7'Options'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLin'
-  +'e'#10'goHorzLine'#14'goSmoothScroll'#0#8'RowCount'#2#15#8'TabOrder'#2#0#11
-  +'OnMouseDown'#7#20'StringGrid1MouseDown'#11'OnMouseMove'#7#20'StringGrid1Mou'
-  +'seMove'#0#0#0#9'TTabSheet'#9'TabSheet2'#7'Caption'#6#7'Unicode'#12'ClientHe'
-  +'ight'#3'P'#1#11'ClientWidth'#3#212#1#0#6'TLabel'#20'UnicodeCharInfoLabel'#22
-  +'AnchorSideLeft.Control'#7#5'Owner'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
-  +'Left'#2#6#6'Height'#2#17#3'Top'#3'9'#1#5'Width'#2'~'#7'Anchors'#11#6'akLeft'
-  +#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#20'UnicodeCharInfoL'
-  +'abel'#11'ParentColor'#8#0#0#11'TStringGrid'#11'StringGrid2'#4'Left'#2#0#6'H'
-  +'eight'#3' '#1#3'Top'#2#0#5'Width'#3#212#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#8'akBottom'#0#8'ColCount'#2#16#15'DefaultColWidth'#2#26#16'Default'
-  +'RowHeight'#2#26#7'Options'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'go'
-  +'VertLine'#10'goHorzLine'#14'goSmoothScroll'#0#8'RowCount'#2#15#8'TabOrder'#2
-  +#0#11'OnMouseDown'#7#20'StringGrid2MouseDown'#11'OnMouseMove'#7#20'StringGri'
-  +'d2MouseMove'#0#0#9'TComboBox'#10'cbUniRange'#4'Left'#3#253#0#6'Height'#2#24
-  +#3'Top'#3'1'#1#5'Width'#3#212#0#7'Anchors'#11#7'akRight'#8'akBottom'#0#12'Au'
-  +'toComplete'#8#10'ItemHeight'#2#0#9'ItemWidth'#2#0#8'OnSelect'#7#16'cbUniRan'
-  +'geSelect'#8'TabOrder'#2#1#4'Text'#6#10'cbUniRange'#0#0#0#0#0
+  +#2#30#3'Top'#3#140#1#5'Width'#3#216#1#8'TabOrder'#2#0#11'ShowButtons'#11#7'p'
+  +'bClose'#6'pbHelp'#0#9'ShowBevel'#8#0#0#12'TPageControl'#12'PageControl1'#22
+  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23
+  +'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#24'AnchorSideBottom.Control'#7#11'ButtonPanel'#4'Left'#2#6#6'Height'#3#128#1
+  +#3'Top'#2#6#5'Width'#3#216#1#10'ActivePage'#7#9'TabSheet1'#7'Anchors'#11#5'a'
+  +'kTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#8'Tab'
+  +'Index'#2#0#8'TabOrder'#2#1#0#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#4'ANSI'
+  +#12'ClientHeight'#3'f'#1#11'ClientWidth'#3#208#1#0#6'TLabel'#13'CharInfoLabe'
+  +'l'#22'AnchorSideLeft.Control'#7#9'TabSheet1'#18'AnchorSideTop.Side'#7#9'asr'
+  +'Bottom'#23'AnchorSideRight.Control'#7#9'TabSheet1'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#9'TabSheet1'#21'AnchorSideBot'
+  +'tom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#14#3'Top'#3'R'#1#5'Width'#3
+  +#196#1#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Aro'
+  +'und'#2#6#7'Caption'#6#13'CharInfoLabel'#11'ParentColor'#8#0#0#11'TStringGri'
+  +'d'#11'StringGrid1'#22'AnchorSideLeft.Control'#7#9'TabSheet1'#21'AnchorSideT'
+  +'op.Control'#7#9'TabSheet1'#23'AnchorSideRight.Control'#7#9'TabSheet1'#20'An'
+  +'chorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#13'CharIn'
+  +'foLabel'#4'Left'#2#0#6'Height'#3'L'#1#3'Top'#2#0#5'Width'#3#208#1#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'ColCount'#2#17#15'DefaultC'
+  +'olWidth'#2#16#7'Options'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVe'
+  +'rtLine'#10'goHorzLine'#14'goSmoothScroll'#0#8'RowCount'#2#15#8'TabOrder'#2#0
+  +#11'OnMouseDown'#7#20'StringGrid1MouseDown'#11'OnMouseMove'#7#20'StringGrid1'
+  +'MouseMove'#0#0#0#9'TTabSheet'#9'TabSheet2'#7'Caption'#6#7'Unicode'#12'Clien'
+  +'tHeight'#3'f'#1#11'ClientWidth'#3#208#1#0#6'TLabel'#20'UnicodeCharInfoLabel'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#10'cbUniR'
+  +'ange'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'To'
+  +'p'#3'N'#1#5'Width'#2'k'#20'BorderSpacing.Around'#2#6#7'Caption'#6#20'Unicod'
+  +'eCharInfoLabel'#11'ParentColor'#8#0#0#11'TStringGrid'#11'StringGrid2'#22'An'
+  +'chorSideLeft.Control'#7#9'TabSheet2'#21'AnchorSideTop.Control'#7#9'TabSheet'
+  +'2'#23'AnchorSideRight.Control'#7#9'TabSheet2'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#24'AnchorSideBottom.Control'#7#10'cbUniRange'#4'Left'#2#0#6'Heig'
+  +'ht'#3'E'#1#3'Top'#2#0#5'Width'#3#208#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'a'
+  +'kRight'#8'akBottom'#0#8'ColCount'#2#16#15'DefaultColWidth'#2#16#7'Options'
+  +#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLine'#14
+  +'goSmoothScroll'#0#8'RowCount'#2#15#8'TabOrder'#2#0#11'OnMouseDown'#7#20'Str'
+  +'ingGrid2MouseDown'#11'OnMouseMove'#7#20'StringGrid2MouseMove'#0#0#9'TComboB'
+  +'ox'#10'cbUniRange'#23'AnchorSideRight.Control'#7#9'TabSheet2'#20'AnchorSide'
+  +'Right.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#9'TabSheet2'#21'A'
+  +'nchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#246#0#6'Height'#2#21#3'Top'#3
+  +'K'#1#5'Width'#3#212#0#7'Anchors'#11#7'akRight'#8'akBottom'#0#12'AutoComplet'
+  +'e'#8#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#13#9'ItemWidth'#2#0#8'On'
+  +'Select'#7#16'cbUniRangeSelect'#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#1
+  +#0#0#0#0#0
 ]);