From fe6e112d79d6a7c1c29b05a38a22885a79710bcd Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Mon, 25 May 2009 09:10:56 +0000
Subject: [PATCH] ide: add show menu glyphs to the desktop options frame

git-svn-id: trunk@20194 -
---
 ide/environmentopts.pp         |  15 +-
 ide/frames/desktop_options.lfm | 228 +++++++++++++++++++---------
 ide/frames/desktop_options.lrs | 263 ++++++++++++++++++---------------
 ide/frames/desktop_options.pas |  54 +++++--
 ide/lazarusidestrconsts.pas    |   4 +-
 ide/main.pp                    |   2 +
 6 files changed, 360 insertions(+), 206 deletions(-)

diff --git a/ide/environmentopts.pp b/ide/environmentopts.pp
index 33b0b9b7d2..bdd50eab19 100644
--- a/ide/environmentopts.pp
+++ b/ide/environmentopts.pp
@@ -144,6 +144,7 @@ type
     FFileHasChangedOnDisk: boolean;
     FIDESpeedButtonsVisible: boolean;
     FShowButtonGlyphs: TApplicationShowGlyphs;
+    FShowMenuGlyphs: TApplicationShowGlyphs;
     FXMLCfg: TXMLConfig;
     FConfigStore: TXMLOptionsStorage;
 
@@ -459,8 +460,9 @@ type
                                            write fMsgViewDblClickJumps;
     property MsgViewFocus: boolean read fMsgViewFocus write fMsgViewFocus;
 
-    // button glyphs
+    // glyphs
     property ShowButtonGlyphs: TApplicationShowGlyphs read FShowButtonGlyphs write FShowButtonGlyphs;
+    property ShowMenuGlyphs: TApplicationShowGlyphs read FShowMenuGlyphs write FShowMenuGlyphs;
 
     // default template for each 'new item' category: Name=Path, Value=TemplateName
     property NewUnitTemplate: string read FNewUnitTemplate write FNewUnitTemplate;
@@ -654,8 +656,9 @@ begin
   fMsgViewDblClickJumps:=true;
   fMsgViewFocus:=DefaultMsgViewFocus;
 
-  // button glyphs
+  // glyphs
   FShowButtonGlyphs := sbgSystem;
+  FShowMenuGlyphs := sbgSystem;
 
   // files
   LazarusDirectory:=IDEProcs.ProgramDirectory;
@@ -971,9 +974,11 @@ begin
     fMsgViewFocus:=XMLConfig.GetValue(
       Path+'MsgViewFocus/Value',DefaultMsgViewFocus);
 
-    // button glyphs
+    // glyphs
     FShowButtonGlyphs := TApplicationShowGlyphs(XMLConfig.GetValue(Path+'ShowButtonGlyphs/Value',
       Ord(sbgSystem)));
+    FShowMenuGlyphs := TApplicationShowGlyphs(XMLConfig.GetValue(Path+'ShowMenuGlyphs/Value',
+      Ord(sbgSystem)));
 
     // recent files and directories
     FMaxRecentOpenFiles:=XMLConfig.GetValue(
@@ -1201,9 +1206,11 @@ begin
     XMLConfig.SetDeleteValue(Path+'MsgViewFocus/Value',
       fMsgViewFocus,DefaultMsgViewFocus);
 
-    // button glyphs
+    // glyphs
     XMLConfig.SetDeleteValue(Path+'ShowButtonGlyphs/Value',
       Ord(FShowButtonGlyphs), Ord(sbgSystem));
+    XMLConfig.SetDeleteValue(Path+'ShowMenuGlyphs/Value',
+      Ord(FShowMenuGlyphs), Ord(sbgSystem));
 
     // recent files and directories
     XMLConfig.SetValue(
diff --git a/ide/frames/desktop_options.lfm b/ide/frames/desktop_options.lfm
index 63b6e546c2..508bf04ddd 100644
--- a/ide/frames/desktop_options.lfm
+++ b/ide/frames/desktop_options.lfm
@@ -148,9 +148,9 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
   end
   object Bevel7: TBevel[11]
     AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = lblButtonGlyphs
+    AnchorSideTop.Control = lblGlyphs
     AnchorSideTop.Side = asrCenter
-    AnchorSideRight.Control = lblButtonGlyphs
+    AnchorSideRight.Control = lblGlyphs
     Left = 0
     Height = 3
     Top = 209
@@ -158,30 +158,30 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Right = 6
   end
-  object lblButtonGlyphs: TLabel[12]
+  object lblGlyphs: TLabel[12]
     AnchorSideTop.Control = SaveDesktopSettingsToFileButton
     AnchorSideTop.Side = asrBottom
     Left = 70
     Height = 14
     Top = 203
-    Width = 90
+    Width = 52
     BorderSpacing.Top = 6
-    Caption = 'lblButtonGlyphs'
+    Caption = 'lblGlyphs'
     Font.Style = [fsBold]
     ParentColor = False
     ParentFont = False
   end
   object Bevel8: TBevel[13]
-    AnchorSideLeft.Control = lblButtonGlyphs
+    AnchorSideLeft.Control = lblGlyphs
     AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = lblButtonGlyphs
+    AnchorSideTop.Control = lblGlyphs
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 166
+    Left = 128
     Height = 3
     Top = 209
-    Width = 431
+    Width = 469
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 6
   end
@@ -192,17 +192,17 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     AnchorSideRight.Control = lblHints
     Left = 0
     Height = 3
-    Top = 252
+    Top = 272
     Width = 64
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Right = 6
   end
   object lblHints: TLabel[15]
-    AnchorSideTop.Control = rbGlyphShowAlways
+    AnchorSideTop.Control = Panel2
     AnchorSideTop.Side = asrBottom
     Left = 70
     Height = 14
-    Top = 246
+    Top = 266
     Width = 43
     BorderSpacing.Top = 6
     Caption = 'lblHints'
@@ -219,7 +219,7 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 119
     Height = 3
-    Top = 252
+    Top = 272
     Width = 478
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 6
@@ -231,7 +231,7 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     AnchorSideRight.Control = lblMisc
     Left = 0
     Height = 3
-    Top = 312
+    Top = 332
     Width = 64
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Right = 6
@@ -241,7 +241,7 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     AnchorSideTop.Side = asrBottom
     Left = 70
     Height = 14
-    Top = 306
+    Top = 326
     Width = 39
     BorderSpacing.Top = 6
     Caption = 'lblMisc'
@@ -258,74 +258,102 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 115
     Height = 3
-    Top = 312
+    Top = 332
     Width = 482
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 6
   end
-  object CheckDiskChangesWithLoadingCheckBox: TCheckBox[20]
+  object lblButtons: TLabel[20]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Panel1
+    AnchorSideTop.Side = asrCenter
+    Left = 6
+    Height = 14
+    Top = 224
+    Width = 58
+    BorderSpacing.Left = 6
+    Caption = 'lblButtons'
+    Font.Style = [fsBold]
+    ParentColor = False
+    ParentFont = False
+  end
+  object lblMenus: TLabel[21]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Panel2
+    AnchorSideTop.Side = asrCenter
+    Left = 6
+    Height = 14
+    Top = 244
+    Width = 51
+    BorderSpacing.Left = 6
+    Caption = 'lblMenus'
+    Font.Style = [fsBold]
+    ParentColor = False
+    ParentFont = False
+  end
+  object CheckDiskChangesWithLoadingCheckBox: TCheckBox[22]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MsgViewFocusCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
     Height = 17
-    Top = 360
+    Top = 380
     Width = 221
     BorderSpacing.Left = 6
     Caption = 'CheckDiskChangesWithLoadingCheckBox'
     TabOrder = 0
   end
-  object ShowHintsForComponentPaletteCheckBox: TCheckBox[21]
+  object ShowHintsForComponentPaletteCheckBox: TCheckBox[23]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = lblHints
     AnchorSideTop.Side = asrBottom
     Left = 6
     Height = 17
-    Top = 266
+    Top = 286
     Width = 220
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'ShowHintsForComponentPaletteCheckBox'
     TabOrder = 1
   end
-  object ShowHintsForMainSpeedButtonsCheckBox: TCheckBox[22]
+  object ShowHintsForMainSpeedButtonsCheckBox: TCheckBox[24]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = ShowHintsForComponentPaletteCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
     Height = 17
-    Top = 283
+    Top = 303
     Width = 223
     BorderSpacing.Left = 6
     Caption = 'ShowHintsForMainSpeedButtonsCheckBox'
     TabOrder = 2
   end
-  object MsgViewDblClickJumpsCheckBox: TCheckBox[23]
+  object MsgViewDblClickJumpsCheckBox: TCheckBox[25]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = lblMisc
     AnchorSideTop.Side = asrBottom
     Left = 6
     Height = 17
-    Top = 326
+    Top = 346
     Width = 179
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'MsgViewDblClickJumpsCheckBox'
     TabOrder = 3
   end
-  object MsgViewFocusCheckBox: TCheckBox[24]
+  object MsgViewFocusCheckBox: TCheckBox[26]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MsgViewDblClickJumpsCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
     Height = 17
-    Top = 343
+    Top = 363
     Width = 139
     BorderSpacing.Left = 6
     Caption = 'MsgViewFocusCheckBox'
     TabOrder = 4
   end
-  object LanguageComboBox: TComboBox[25]
+  object LanguageComboBox: TComboBox[27]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = lblLanguage
     AnchorSideTop.Side = asrBottom
@@ -336,16 +364,14 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     Top = 20
     Width = 585
     Anchors = [akTop, akLeft, akRight]
-    AutoComplete = False
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     BorderSpacing.Right = 6
     ItemHeight = 13
-    ItemWidth = 0
     Style = csDropDownList
     TabOrder = 5
   end
-  object AutoSaveIntervalInSecsComboBox: TComboBox[26]
+  object AutoSaveIntervalInSecsComboBox: TComboBox[28]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = AutoSaveIntervalInSecsLabel
     AnchorSideTop.Side = asrBottom
@@ -356,7 +382,6 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     Top = 127
     Width = 585
     Anchors = [akTop, akLeft, akRight]
-    AutoComplete = False
     BorderSpacing.Around = 6
     Enabled = False
     ItemHeight = 13
@@ -366,10 +391,9 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
       '300'
       '120'
     )
-    ItemWidth = 0
     TabOrder = 6
   end
-  object AutoSaveProjectCheckBox: TCheckBox[27]
+  object AutoSaveProjectCheckBox: TCheckBox[29]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = AutoSaveEditorFilesCheckBox
     AnchorSideTop.Side = asrBottom
@@ -382,7 +406,7 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     Enabled = False
     TabOrder = 7
   end
-  object AutoSaveEditorFilesCheckBox: TCheckBox[28]
+  object AutoSaveEditorFilesCheckBox: TCheckBox[30]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = lblAutoSave
     AnchorSideTop.Side = asrBottom
@@ -396,7 +420,7 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     Enabled = False
     TabOrder = 8
   end
-  object LoadDesktopSettingsFromFileButton: TButton[29]
+  object LoadDesktopSettingsFromFileButton: TButton[31]
     AnchorSideLeft.Control = lblCenter
     AnchorSideTop.Control = lblDesktopFiles
     AnchorSideTop.Side = asrBottom
@@ -415,7 +439,7 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     OnClick = LoadDesktopSettingsFromFileButtonClick
     TabOrder = 9
   end
-  object SaveDesktopSettingsToFileButton: TButton[30]
+  object SaveDesktopSettingsToFileButton: TButton[32]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = lblDesktopFiles
     AnchorSideTop.Side = asrBottom
@@ -434,45 +458,111 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     OnClick = SaveDesktopSettingsToFileButtonClick
     TabOrder = 10
   end
-  object rbGlyphShowAlways: TRadioButton[31]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = lblButtonGlyphs
-    AnchorSideTop.Side = asrBottom
-    Left = 6
-    Height = 17
-    Top = 223
-    Width = 114
-    BorderSpacing.Left = 6
-    BorderSpacing.Top = 6
-    Caption = 'rbGlyphShowAlways'
-    TabOrder = 11
-  end
-  object rbGlyphShowNever: TRadioButton[32]
-    AnchorSideLeft.Control = lblCenter
-    AnchorSideLeft.Side = asrCenter
-    AnchorSideTop.Control = lblButtonGlyphs
-    AnchorSideTop.Side = asrBottom
-    Left = 243
-    Height = 17
-    Top = 223
-    Width = 110
-    BorderSpacing.Top = 6
-    Caption = 'rbGlyphShowNever'
-    TabOrder = 12
-  end
-  object rbGlyphShowSystem: TRadioButton[33]
-    AnchorSideTop.Control = lblButtonGlyphs
+  object Panel1: TPanel[33]
+    AnchorSideLeft.Control = lblButtons
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = lblGlyphs
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 476
+    Left = 70
     Height = 17
     Top = 223
-    Width = 115
-    Anchors = [akTop, akRight]
+    Width = 521
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
+    BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     BorderSpacing.Right = 6
-    Caption = 'rbGlyphShowSystem'
-    TabOrder = 13
+    BevelOuter = bvNone
+    ClientHeight = 17
+    ClientWidth = 521
+    TabOrder = 11
+    object rbBtnGlyphShowSystem: TRadioButton
+      AnchorSideTop.Control = Panel1
+      AnchorSideRight.Control = Panel1
+      AnchorSideRight.Side = asrBottom
+      Left = 390
+      Height = 17
+      Top = 0
+      Width = 131
+      Anchors = [akTop, akRight]
+      Caption = 'rbBtnGlyphShowSystem'
+      TabOrder = 0
+    end
+    object rbBtnGlyphShowNever: TRadioButton
+      AnchorSideLeft.Control = Panel1
+      AnchorSideLeft.Side = asrCenter
+      AnchorSideTop.Control = Panel1
+      Left = 197
+      Height = 17
+      Top = 0
+      Width = 126
+      Caption = 'rbBtnGlyphShowNever'
+      TabOrder = 1
+    end
+    object rbBtnGlyphShowAlways: TRadioButton
+      AnchorSideLeft.Control = Panel1
+      AnchorSideTop.Control = Panel1
+      Left = 0
+      Height = 17
+      Top = 0
+      Width = 130
+      Caption = 'rbBtnGlyphShowAlways'
+      TabOrder = 2
+    end
+  end
+  object Panel2: TPanel[34]
+    AnchorSideLeft.Control = Panel1
+    AnchorSideTop.Control = Panel1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 70
+    Height = 17
+    Top = 243
+    Width = 521
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
+    BorderSpacing.Top = 3
+    BorderSpacing.Right = 6
+    BevelOuter = bvNone
+    ClientHeight = 17
+    ClientWidth = 521
+    TabOrder = 12
+    object rbMenuGlyphShowSystem: TRadioButton
+      AnchorSideLeft.Control = Panel2
+      AnchorSideTop.Control = Panel2
+      AnchorSideRight.Control = Panel2
+      AnchorSideRight.Side = asrBottom
+      Left = 379
+      Height = 17
+      Top = 0
+      Width = 142
+      Anchors = [akTop, akRight]
+      Caption = 'rbMenuGlyphShowSystem'
+      TabOrder = 0
+    end
+    object rbMenuGlyphShowNever: TRadioButton
+      AnchorSideLeft.Control = Panel2
+      AnchorSideLeft.Side = asrCenter
+      AnchorSideTop.Control = Panel2
+      Left = 192
+      Height = 17
+      Top = 0
+      Width = 137
+      Caption = 'rbMenuGlyphShowNever'
+      TabOrder = 1
+    end
+    object rbMenuGlyphShowAlways: TRadioButton
+      AnchorSideLeft.Control = Panel2
+      AnchorSideTop.Control = Panel2
+      Left = 0
+      Height = 17
+      Top = 0
+      Width = 141
+      Caption = 'rbMenuGlyphShowAlways'
+      TabOrder = 2
+    end
   end
 end
diff --git a/ide/frames/desktop_options.lrs b/ide/frames/desktop_options.lrs
index f623c5976c..8837da93c8 100644
--- a/ide/frames/desktop_options.lrs
+++ b/ide/frames/desktop_options.lrs
@@ -53,122 +53,151 @@ LazarusResources.Add('TDesktopOptionsFrame','FORMDATA',[
   +'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Control'#7#5
   +'Owner'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'*'#1#6'Height'#2#14#3
   +'Top'#3#237#0#5'Width'#2#1#11'ParentColor'#8#0#0#242#2#11#6'TBevel'#6'Bevel7'
-  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#15'lblBut'
-  +'tonGlyphs'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'
-  +#7#15'lblButtonGlyphs'#4'Left'#2#0#6'Height'#2#3#3'Top'#3#209#0#5'Width'#2'@'
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#6#0
-  +#0#242#2#12#6'TLabel'#15'lblButtonGlyphs'#21'AnchorSideTop.Control'#7#31'Sav'
-  +'eDesktopSettingsToFileButton'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
-  +#2'F'#6'Height'#2#14#3'Top'#3#203#0#5'Width'#2'Z'#17'BorderSpacing.Top'#2#6#7
-  +'Caption'#6#15'lblButtonGlyphs'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'
-  +#8#10'ParentFont'#8#0#0#242#2#13#6'TBevel'#6'Bevel8'#22'AnchorSideLeft.Contr'
-  +'ol'#7#15'lblButtonGlyphs'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorS'
-  +'ideTop.Control'#7#15'lblButtonGlyphs'#18'AnchorSideTop.Side'#7#9'asrCenter'
-  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
-  ,'om'#4'Left'#3#166#0#6'Height'#2#3#3'Top'#3#209#0#5'Width'#3#175#1#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#0#0#242#2#14#6
-  +'TBevel'#6'Bevel9'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Co'
-  +'ntrol'#7#8'lblHints'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRig'
-  +'ht.Control'#7#8'lblHints'#4'Left'#2#0#6'Height'#2#3#3'Top'#3#252#0#5'Width'
-  +#2'@'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2
-  +#6#0#0#242#2#15#6'TLabel'#8'lblHints'#21'AnchorSideTop.Control'#7#17'rbGlyph'
-  +'ShowAlways'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2
-  +#14#3'Top'#3#246#0#5'Width'#2'+'#17'BorderSpacing.Top'#2#6#7'Caption'#6#8'lb'
-  +'lHints'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0
-  +#242#2#16#6'TBevel'#7'Bevel10'#22'AnchorSideLeft.Control'#7#8'lblHints'#19'A'
-  +'nchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#8'lblHints'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#9'lblGlyp'
+  +'hs'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#9'l'
+  +'blGlyphs'#4'Left'#2#0#6'Height'#2#3#3'Top'#3#209#0#5'Width'#2'@'#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#6#0#0#242#2#12
+  +#6'TLabel'#9'lblGlyphs'#21'AnchorSideTop.Control'#7#31'SaveDesktopSettingsTo'
+  +'FileButton'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2
+  +#14#3'Top'#3#203#0#5'Width'#2'4'#17'BorderSpacing.Top'#2#6#7'Caption'#6#9'lb'
+  +'lGlyphs'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0
+  +#0#242#2#13#6'TBevel'#6'Bevel8'#22'AnchorSideLeft.Control'#7#9'lblGlyphs'#19
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'lblGlyphs'
   +#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'w'#6'Height'#2#3#3'Top'#3
-  +#252#0#5'Width'#3#222#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'Bor'
-  +'derSpacing.Left'#2#6#0#0#242#2#17#6'TBevel'#7'Bevel11'#22'AnchorSideLeft.Co'
-  +'ntrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#7'lblMisc'#18'AnchorSideTop.S'
-  +'ide'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#7'lblMisc'#4'Left'#2#0#6
-  +'Height'#2#3#3'Top'#3'8'#1#5'Width'#2'@'#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#19'BorderSpacing.Right'#2#6#0#0#242#2#18#6'TLabel'#7'lblMisc'#21
-  +'AnchorSideTop.Control'#7'$ShowHintsForMainSpeedButtonsCheckBox'#18'AnchorSi'
-  +'deTop.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2#14#3'Top'#3'2'#1#5'Widt'
-  +'h'#2''''#17'BorderSpacing.Top'#2#6#7'Caption'#6#7'lblMisc'#10'Font.Style'#11
-  +#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#242#2#19#6'TBevel'#7'Bev'
-  +'el12'#22'AnchorSideLeft.Control'#7#7'lblMisc'#19'AnchorSideLeft.Side'#7#9'a'
-  +'srBottom'#21'AnchorSideTop.Control'#7#7'lblMisc'#18'AnchorSideTop.Side'#7#9
-  +'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7
-  +#9'asrBottom'#4'Left'#2's'#6'Height'#2#3#3'Top'#3'8'#1#5'Width'#3#226#1#7'An'
-  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#0#0#242
-  +#2#20#9'TCheckBox#CheckDiskChangesWithLoadingCheckBox'#22'AnchorSideLeft.Con'
-  +'trol'#7#5'Owner'#21'AnchorSideTop.Control'#7#20'MsgViewFocusCheckBox'#18'An'
-  +'chorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#17#3'Top'#3'h'#1#5
-  +'Width'#3#221#0#18'BorderSpacing.Left'#2#6#7'Caption'#6'#CheckDiskChangesWit'
-  +'hLoadingCheckBox'#8'TabOrder'#2#0#0#0#242#2#21#9'TCheckBox$ShowHintsForComp'
-  +'onentPaletteCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTo'
-  +'p.Control'#7#8'lblHints'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6
-  +'Height'#2#17#3'Top'#3#10#1#5'Width'#3#220#0#18'BorderSpacing.Left'#2#6#17'B'
-  +'orderSpacing.Top'#2#6#7'Caption'#6'$ShowHintsForComponentPaletteCheckBox'#8
-  +'TabOrder'#2#1#0#0#242#2#22#9'TCheckBox$ShowHintsForMainSpeedButtonsCheckBox'
-  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7'$ShowHint'
-  +'sForComponentPaletteCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
-  +#2#6#6'Height'#2#17#3'Top'#3#27#1#5'Width'#3#223#0#18'BorderSpacing.Left'#2#6
-  +#7'Caption'#6'$ShowHintsForMainSpeedButtonsCheckBox'#8'TabOrder'#2#2#0#0#242
-  +#2#23#9'TCheckBox'#28'MsgViewDblClickJumpsCheckBox'#22'AnchorSideLeft.Contro'
-  +'l'#7#5'Owner'#21'AnchorSideTop.Control'#7#7'lblMisc'#18'AnchorSideTop.Side'
-  +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#17#3'Top'#3'F'#1#5'Width'#3#179#0#18
-  +'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#28'MsgViewDb'
-  +'lClickJumpsCheckBox'#8'TabOrder'#2#3#0#0#242#2#24#9'TCheckBox'#20'MsgViewFo'
-  +'cusCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
-  +#7#28'MsgViewDblClickJumpsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
-  +'Left'#2#6#6'Height'#2#17#3'Top'#3'W'#1#5'Width'#3#139#0#18'BorderSpacing.Le'
-  +'ft'#2#6#7'Caption'#6#20'MsgViewFocusCheckBox'#8'TabOrder'#2#4#0#0#242#2#25#9
-  +'TComboBox'#16'LanguageComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'An'
-  +'chorSideTop.Control'#7#11'lblLanguage'#18'AnchorSideTop.Side'#7#9'asrBottom'
-  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
-  +'om'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#20#5'Width'#3'I'#2#7'Anchors'#11#5
-  +'akTop'#6'akLeft'#7'akRight'#0#12'AutoComplete'#8#18'BorderSpacing.Left'#2#6
-  +#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#10'ItemHeight'#2#13#9
-  +'ItemWidth'#2#0#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#5#0#0#242#2#26#9
-  +'TComboBox'#30'AutoSaveIntervalInSecsComboBox'#22'AnchorSideLeft.Control'#7#5
-  +'Owner'#21'AnchorSideTop.Control'#7#27'AutoSaveIntervalInSecsLabel'#18'Ancho'
-  +'rSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'Anc'
-  +'horSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2''#5
-  +'Width'#3'I'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#12'AutoComplete'
-  ,#8#20'BorderSpacing.Around'#2#6#7'Enabled'#8#10'ItemHeight'#2#13#13'Items.St'
-  +'rings'#1#6#4'1200'#6#3'600'#6#3'300'#6#3'120'#0#9'ItemWidth'#2#0#8'TabOrder'
-  +#2#6#0#0#242#2#27#9'TCheckBox'#23'AutoSaveProjectCheckBox'#22'AnchorSideLeft'
-  +'.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#27'AutoSaveEditorFilesChec'
-  +'kBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#17#3'To'
-  +'p'#2'T'#5'Width'#3#147#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#23'AutoSav'
-  +'eProjectCheckBox'#7'Enabled'#8#8'TabOrder'#2#7#0#0#242#2#28#9'TCheckBox'#27
-  +'AutoSaveEditorFilesCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Ancho'
-  +'rSideTop.Control'#7#11'lblAutoSave'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
-  +'Left'#2#6#6'Height'#2#17#3'Top'#2'C'#5'Width'#3#162#0#18'BorderSpacing.Left'
-  +#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#27'AutoSaveEditorFilesCheckBox'#7
-  +'Enabled'#8#8'TabOrder'#2#8#0#0#242#2#29#7'TButton!LoadDesktopSettingsFromFi'
-  +'leButton'#22'AnchorSideLeft.Control'#7#9'lblCenter'#21'AnchorSideTop.Contro'
-  +'l'#7#15'lblDesktopFiles'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSid'
-  +'eRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3
-  +'-'#1#6'Height'#2#23#3'Top'#3#174#0#5'Width'#3'"'#1#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#3#17'BorderSpac'
-  +'ing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6'!LoadDesktopSettingsF'
-  +'romFileButton'#7'OnClick'#7'&LoadDesktopSettingsFromFileButtonClick'#8'TabO'
-  +'rder'#2#9#0#0#242#2#30#7'TButton'#31'SaveDesktopSettingsToFileButton'#22'An'
-  +'chorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#15'lblDesktopF'
-  +'iles'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#9
-  +'lblCenter'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
-  +#23#3'Top'#3#174#0#5'Width'#3'"'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
-  +'t'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19
-  +'BorderSpacing.Right'#2#3#7'Caption'#6#31'SaveDesktopSettingsToFileButton'#7
-  +'OnClick'#7'$SaveDesktopSettingsToFileButtonClick'#8'TabOrder'#2#10#0#0#242#2
-  +#31#12'TRadioButton'#17'rbGlyphShowAlways'#22'AnchorSideLeft.Control'#7#5'Ow'
-  +'ner'#21'AnchorSideTop.Control'#7#15'lblButtonGlyphs'#18'AnchorSideTop.Side'
-  +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#17#3'Top'#3#223#0#5'Width'#2'r'#18'B'
-  +'orderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#17'rbGlyphSho'
-  +'wAlways'#8'TabOrder'#2#11#0#0#242#2' '#12'TRadioButton'#16'rbGlyphShowNever'
-  +#22'AnchorSideLeft.Control'#7#9'lblCenter'#19'AnchorSideLeft.Side'#7#9'asrCe'
-  +'nter'#21'AnchorSideTop.Control'#7#15'lblButtonGlyphs'#18'AnchorSideTop.Side'
-  +#7#9'asrBottom'#4'Left'#3#243#0#6'Height'#2#17#3'Top'#3#223#0#5'Width'#2'n'
-  +#17'BorderSpacing.Top'#2#6#7'Caption'#6#16'rbGlyphShowNever'#8'TabOrder'#2#12
-  +#0#0#242#2'!'#12'TRadioButton'#17'rbGlyphShowSystem'#21'AnchorSideTop.Contro'
-  +'l'#7#15'lblButtonGlyphs'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSid'
-  +'eRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3
-  +#220#1#6'Height'#2#17#3'Top'#3#223#0#5'Width'#2's'#7'Anchors'#11#5'akTop'#7
-  +'akRight'#0#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'
-  +#6#17'rbGlyphShowSystem'#8'TabOrder'#2#13#0#0#0
+  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#128#0#6'Height'#2#3#3'Top'
+  ,#3#209#0#5'Width'#3#213#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'B'
+  +'orderSpacing.Left'#2#6#0#0#242#2#14#6'TBevel'#6'Bevel9'#22'AnchorSideLeft.C'
+  +'ontrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#8'lblHints'#18'AnchorSideTop'
+  +'.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#8'lblHints'#4'Left'#2#0
+  +#6'Height'#2#3#3'Top'#3#16#1#5'Width'#2'@'#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#0#19'BorderSpacing.Right'#2#6#0#0#242#2#15#6'TLabel'#8'lblHints'#21
+  +'AnchorSideTop.Control'#7#6'Panel2'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  +'Left'#2'F'#6'Height'#2#14#3'Top'#3#10#1#5'Width'#2'+'#17'BorderSpacing.Top'
+  +#2#6#7'Caption'#6#8'lblHints'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8
+  +#10'ParentFont'#8#0#0#242#2#16#6'TBevel'#7'Bevel10'#22'AnchorSideLeft.Contro'
+  +'l'#7#8'lblHints'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Co'
+  +'ntrol'#7#8'lblHints'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRig'
+  +'ht.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'w'
+  +#6'Height'#2#3#3'Top'#3#16#1#5'Width'#3#222#1#7'Anchors'#11#5'akTop'#6'akLef'
+  +'t'#7'akRight'#0#18'BorderSpacing.Left'#2#6#0#0#242#2#17#6'TBevel'#7'Bevel11'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#7'lblMisc'
+  +#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#7'lblMi'
+  +'sc'#4'Left'#2#0#6'Height'#2#3#3'Top'#3'L'#1#5'Width'#2'@'#7'Anchors'#11#5'a'
+  +'kTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#6#0#0#242#2#18#6'TLa'
+  +'bel'#7'lblMisc'#21'AnchorSideTop.Control'#7'$ShowHintsForMainSpeedButtonsCh'
+  +'eckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2#14#3
+  +'Top'#3'F'#1#5'Width'#2''''#17'BorderSpacing.Top'#2#6#7'Caption'#6#7'lblMisc'
+  +#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#242#2
+  +#19#6'TBevel'#7'Bevel12'#22'AnchorSideLeft.Control'#7#7'lblMisc'#19'AnchorSi'
+  +'deLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#7'lblMisc'#18'Ancho'
+  +'rSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'Anc'
+  +'horSideRight.Side'#7#9'asrBottom'#4'Left'#2's'#6'Height'#2#3#3'Top'#3'L'#1#5
+  +'Width'#3#226#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpaci'
+  +'ng.Left'#2#6#0#0#242#2#20#6'TLabel'#10'lblButtons'#22'AnchorSideLeft.Contro'
+  +'l'#7#5'Owner'#21'AnchorSideTop.Control'#7#6'Panel1'#18'AnchorSideTop.Side'#7
+  +#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#3#224#0#5'Width'#2':'#18'Bor'
+  +'derSpacing.Left'#2#6#7'Caption'#6#10'lblButtons'#10'Font.Style'#11#6'fsBold'
+  +#0#11'ParentColor'#8#10'ParentFont'#8#0#0#242#2#21#6'TLabel'#8'lblMenus'#22
+  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#6'Panel2'#18
+  +'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#3#244#0
+  +#5'Width'#2'3'#18'BorderSpacing.Left'#2#6#7'Caption'#6#8'lblMenus'#10'Font.S'
+  +'tyle'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#242#2#22#9'TChe'
+  +'ckBox#CheckDiskChangesWithLoadingCheckBox'#22'AnchorSideLeft.Control'#7#5'O'
+  +'wner'#21'AnchorSideTop.Control'#7#20'MsgViewFocusCheckBox'#18'AnchorSideTop'
+  +'.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#17#3'Top'#3'|'#1#5'Width'#3
+  +#221#0#18'BorderSpacing.Left'#2#6#7'Caption'#6'#CheckDiskChangesWithLoadingC'
+  +'heckBox'#8'TabOrder'#2#0#0#0#242#2#23#9'TCheckBox$ShowHintsForComponentPale'
+  +'tteCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
+  +#7#8'lblHints'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#17#3'Top'#3#30#1#5'Width'#3#220#0#18'BorderSpacing.Left'#2#6#17'BorderSpaci'
+  +'ng.Top'#2#6#7'Caption'#6'$ShowHintsForComponentPaletteCheckBox'#8'TabOrder'
+  +#2#1#0#0#242#2#24#9'TCheckBox$ShowHintsForMainSpeedButtonsCheckBox'#22'Ancho'
+  +'rSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7'$ShowHintsForComp'
+  +'onentPaletteCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
+  +'eight'#2#17#3'Top'#3'/'#1#5'Width'#3#223#0#18'BorderSpacing.Left'#2#6#7'Cap'
+  +'tion'#6'$ShowHintsForMainSpeedButtonsCheckBox'#8'TabOrder'#2#2#0#0#242#2#25
+  +#9'TCheckBox'#28'MsgViewDblClickJumpsCheckBox'#22'AnchorSideLeft.Control'#7#5
+  +'Owner'#21'AnchorSideTop.Control'#7#7'lblMisc'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#4'Left'#2#6#6'Height'#2#17#3'Top'#3'Z'#1#5'Width'#3#179#0#18'Borde'
+  +'rSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#28'MsgViewDblClic'
+  +'kJumpsCheckBox'#8'TabOrder'#2#3#0#0#242#2#26#9'TCheckBox'#20'MsgViewFocusCh'
+  +'eckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#28
+  +'MsgViewDblClickJumpsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
+  +#2#6#6'Height'#2#17#3'Top'#3'k'#1#5'Width'#3#139#0#18'BorderSpacing.Left'#2#6
+  +#7'Caption'#6#20'MsgViewFocusCheckBox'#8'TabOrder'#2#4#0#0#242#2#27#9'TCombo'
+  +'Box'#16'LanguageComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSi'
+  +'deTop.Control'#7#11'lblLanguage'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'A'
+  +'nchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2#6#6'Height'#2#21#3'Top'#2#20#5'Width'#3'I'#2#7'Anchors'#11#5'akTop'
+  ,#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6
+  +#19'BorderSpacing.Right'#2#6#10'ItemHeight'#2#13#5'Style'#7#14'csDropDownLis'
+  +'t'#8'TabOrder'#2#5#0#0#242#2#28#9'TComboBox'#30'AutoSaveIntervalInSecsCombo'
+  +'Box'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#27'A'
+  +'utoSaveIntervalInSecsLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anchor'
+  +'SideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Lef'
+  +'t'#2#6#6'Height'#2#21#3'Top'#2''#5'Width'#3'I'#2#7'Anchors'#11#5'akTop'#6
+  +'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Enabled'#8#10'ItemHeigh'
+  +'t'#2#13#13'Items.Strings'#1#6#4'1200'#6#3'600'#6#3'300'#6#3'120'#0#8'TabOrd'
+  +'er'#2#6#0#0#242#2#29#9'TCheckBox'#23'AutoSaveProjectCheckBox'#22'AnchorSide'
+  +'Left.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#27'AutoSaveEditorFiles'
+  +'CheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#17#3
+  +'Top'#2'T'#5'Width'#3#147#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#23'AutoS'
+  +'aveProjectCheckBox'#7'Enabled'#8#8'TabOrder'#2#7#0#0#242#2#30#9'TCheckBox'
+  +#27'AutoSaveEditorFilesCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'An'
+  +'chorSideTop.Control'#7#11'lblAutoSave'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#4'Left'#2#6#6'Height'#2#17#3'Top'#2'C'#5'Width'#3#162#0#18'BorderSpacing.Le'
+  +'ft'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#27'AutoSaveEditorFilesCheckB'
+  +'ox'#7'Enabled'#8#8'TabOrder'#2#8#0#0#242#2#31#7'TButton!LoadDesktopSettings'
+  +'FromFileButton'#22'AnchorSideLeft.Control'#7#9'lblCenter'#21'AnchorSideTop.'
+  +'Control'#7#15'lblDesktopFiles'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anc'
+  +'horSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#3'-'#1#6'Height'#2#23#3'Top'#3#174#0#5'Width'#3'"'#1#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#3#17'B'
+  +'orderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6'!LoadDesktop'
+  +'SettingsFromFileButton'#7'OnClick'#7'&LoadDesktopSettingsFromFileButtonClic'
+  +'k'#8'TabOrder'#2#9#0#0#242#2' '#7'TButton'#31'SaveDesktopSettingsToFileButt'
+  +'on'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#15'lb'
+  +'lDesktopFiles'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Con'
+  +'trol'#7#9'lblCenter'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6
+  +'Height'#2#23#3'Top'#3#174#0#5'Width'#3'"'#1#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'
+  +#2#6#19'BorderSpacing.Right'#2#3#7'Caption'#6#31'SaveDesktopSettingsToFileBu'
+  +'tton'#7'OnClick'#7'$SaveDesktopSettingsToFileButtonClick'#8'TabOrder'#2#10#0
+  +#0#242#2'!'#6'TPanel'#6'Panel1'#22'AnchorSideLeft.Control'#7#10'lblButtons'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'lblGly'
+  +'phs'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5
+  +'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2#17#3
+  +'Top'#3#223#0#5'Width'#3#9#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8
+  +'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderS'
+  +'pacing.Right'#2#6#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2#17#11'Clien'
+  +'tWidth'#3#9#2#8'TabOrder'#2#11#0#12'TRadioButton'#20'rbBtnGlyphShowSystem'
+  +#21'AnchorSideTop.Control'#7#6'Panel1'#23'AnchorSideRight.Control'#7#6'Panel'
+  +'1'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#134#1#6'Height'#2#17#3
+  +'Top'#2#0#5'Width'#3#131#0#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6
+  +#20'rbBtnGlyphShowSystem'#8'TabOrder'#2#0#0#0#12'TRadioButton'#19'rbBtnGlyph'
+  +'ShowNever'#22'AnchorSideLeft.Control'#7#6'Panel1'#19'AnchorSideLeft.Side'#7
+  +#9'asrCenter'#21'AnchorSideTop.Control'#7#6'Panel1'#4'Left'#3#197#0#6'Height'
+  +#2#17#3'Top'#2#0#5'Width'#2'~'#7'Caption'#6#19'rbBtnGlyphShowNever'#8'TabOrd'
+  +'er'#2#1#0#0#12'TRadioButton'#20'rbBtnGlyphShowAlways'#22'AnchorSideLeft.Con'
+  +'trol'#7#6'Panel1'#21'AnchorSideTop.Control'#7#6'Panel1'#4'Left'#2#0#6'Heigh'
+  +'t'#2#17#3'Top'#2#0#5'Width'#3#130#0#7'Caption'#6#20'rbBtnGlyphShowAlways'#8
+  +'TabOrder'#2#2#0#0#0#242#2'"'#6'TPanel'#6'Panel2'#22'AnchorSideLeft.Control'
+  +#7#6'Panel1'#21'AnchorSideTop.Control'#7#6'Panel1'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7
+  +#9'asrBottom'#4'Left'#2'F'#6'Height'#2#17#3'Top'#3#243#0#5'Width'#3#9#2#7'An'
+  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#17'BorderSpacing.To'
+  +'p'#2#3#19'BorderSpacing.Right'#2#6#10'BevelOuter'#7#6'bvNone'#12'ClientHeig'
+  +'ht'#2#17#11'ClientWidth'#3#9#2#8'TabOrder'#2#12#0#12'TRadioButton'#21'rbMen'
+  +'uGlyphShowSystem'#22'AnchorSideLeft.Control'#7#6'Panel2'#21'AnchorSideTop.C'
+  +'ontrol'#7#6'Panel2'#23'AnchorSideRight.Control'#7#6'Panel2'#20'AnchorSideRi'
+  +'ght.Side'#7#9'asrBottom'#4'Left'#3'{'#1#6'Height'#2#17#3'Top'#2#0#5'Width'#3
+  +#142#0#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#21'rbMenuGlyphShowSy'
+  +'stem'#8'TabOrder'#2#0#0#0#12'TRadioButton'#20'rbMenuGlyphShowNever'#22'Anch'
+  ,'orSideLeft.Control'#7#6'Panel2'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'A'
+  +'nchorSideTop.Control'#7#6'Panel2'#4'Left'#3#192#0#6'Height'#2#17#3'Top'#2#0
+  +#5'Width'#3#137#0#7'Caption'#6#20'rbMenuGlyphShowNever'#8'TabOrder'#2#1#0#0
+  +#12'TRadioButton'#21'rbMenuGlyphShowAlways'#22'AnchorSideLeft.Control'#7#6'P'
+  +'anel2'#21'AnchorSideTop.Control'#7#6'Panel2'#4'Left'#2#0#6'Height'#2#17#3'T'
+  +'op'#2#0#5'Width'#3#141#0#7'Caption'#6#21'rbMenuGlyphShowAlways'#8'TabOrder'
+  +#2#2#0#0#0#0
 ]);
diff --git a/ide/frames/desktop_options.pas b/ide/frames/desktop_options.pas
index b89a953c7a..2046fbf022 100644
--- a/ide/frames/desktop_options.pas
+++ b/ide/frames/desktop_options.pas
@@ -51,20 +51,27 @@ type
     Bevel8: TBevel;
     Bevel9: TBevel;
     CheckDiskChangesWithLoadingCheckBox: TCheckBox;
+    lblButtons: TLabel;
+    lblMenus: TLabel;
     lblHints: TLabel;
     lblCenter: TLabel;
     LanguageComboBox: TComboBox;
     lblDesktopFiles: TLabel;
-    lblButtonGlyphs: TLabel;
+    lblGlyphs: TLabel;
     lblMisc: TLabel;
     lblLanguage: TLabel;
     lblAutoSave: TLabel;
     LoadDesktopSettingsFromFileButton: TButton;
     MsgViewDblClickJumpsCheckBox: TCheckBox;
     MsgViewFocusCheckBox: TCheckBox;
-    rbGlyphShowAlways: TRadioButton;
-    rbGlyphShowNever: TRadioButton;
-    rbGlyphShowSystem: TRadioButton;
+    Panel1: TPanel;
+    Panel2: TPanel;
+    rbMenuGlyphShowAlways: TRadioButton;
+    rbMenuGlyphShowNever: TRadioButton;
+    rbMenuGlyphShowSystem: TRadioButton;
+    rbBtnGlyphShowAlways: TRadioButton;
+    rbBtnGlyphShowNever: TRadioButton;
+    rbBtnGlyphShowSystem: TRadioButton;
     SaveDesktopSettingsToFileButton: TButton;
     ShowHintsForComponentPaletteCheckBox: TCheckBox;
     ShowHintsForMainSpeedButtonsCheckBox: TCheckBox;
@@ -127,10 +134,15 @@ begin
   LoadDesktopSettingsFromFileButton.Caption := dlgLoadDFile;
 
   // button glyphs
-  lblButtonGlyphs.Caption := dlgDesktopButtonGlyphs;
-  rbGlyphShowAlways.Caption := dlgGlyphShowAlways;
-  rbGlyphShowNever.Caption := dlgGlyphShowNever;
-  rbGlyphShowSystem.Caption := dlgGlyphShowSystem;
+  lblGlyphs.Caption := dlgDesktopGlyphsFor;
+  lblButtons.Caption := dlgDesktopButtons;
+  lblMenus.Caption := dlgDesktopMenus;
+  rbBtnGlyphShowAlways.Caption := dlgGlyphShowAlways;
+  rbBtnGlyphShowNever.Caption := dlgGlyphShowNever;
+  rbBtnGlyphShowSystem.Caption := dlgGlyphShowSystem;
+  rbMenuGlyphShowAlways.Caption := dlgGlyphShowAlways;
+  rbMenuGlyphShowNever.Caption := dlgGlyphShowNever;
+  rbMenuGlyphShowSystem.Caption := dlgGlyphShowSystem;
 
   // hints
   lblHints.Caption := dlgDesktopHints;
@@ -170,11 +182,16 @@ begin
     MsgViewDblClickJumpsCheckBox.Checked:=MsgViewDblClickJumps;
     MsgViewFocusCheckBox.Checked:=MsgViewFocus;
 
-    // button glyphs
+    // glyphs
     case ShowButtonGlyphs of
-      sbgAlways: rbGlyphShowAlways.Checked := True;
-      sbgNever: rbGlyphShowNever.Checked := True;
-      sbgSystem: rbGlyphShowSystem.Checked := True;
+      sbgAlways: rbBtnGlyphShowAlways.Checked := True;
+      sbgNever: rbBtnGlyphShowNever.Checked := True;
+      sbgSystem: rbBtnGlyphShowSystem.Checked := True;
+    end;
+    case ShowMenuGlyphs of
+      sbgAlways: rbMenuGlyphShowAlways.Checked := True;
+      sbgNever: rbMenuGlyphShowNever.Checked := True;
+      sbgSystem: rbMenuGlyphShowSystem.Checked := True;
     end;
   end;
 end;
@@ -201,14 +218,21 @@ begin
     // messages view
     MsgViewDblClickJumps:=MsgViewDblClickJumpsCheckBox.Checked;
     MsgViewFocus:=MsgViewFocusCheckBox.Checked;
-    // button glyphs
-    if rbGlyphShowAlways.Checked then
+    // glyphs
+    if rbBtnGlyphShowAlways.Checked then
       ShowButtonGlyphs := sbgAlways
     else
-    if rbGlyphShowNever.Checked then
+    if rbBtnGlyphShowNever.Checked then
       ShowButtonGlyphs := sbgNever
     else
       ShowButtonGlyphs := sbgSystem;
+    if rbMenuGlyphShowAlways.Checked then
+      ShowMenuGlyphs := sbgAlways
+    else
+    if rbMenuGlyphShowNever.Checked then
+      ShowMenuGlyphs := sbgNever
+    else
+      ShowMenuGlyphs := sbgSystem;
   end;
 end;
 
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index abd5f7db04..7c5de59de7 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -964,7 +964,9 @@ resourcestring
   dlgDesktopHints = 'Hints';
   dlgPalHints = 'Hints for component palette';
   dlgSpBHints = 'Hints for main speed buttons (open, save, ...)';
-  dlgDesktopButtonGlyphs = 'Glyphs for Buttons';
+  dlgDesktopGlyphsFor = 'Glyphs for:';
+  dlgDesktopButtons = 'Buttons - ';
+  dlgDesktopMenus = 'Menus - ';
   dlgGlyphShowAlways = 'Show Always';
   dlgGlyphShowNever = 'Show Never';
   dlgGlyphShowSystem = 'Use System Defaults';
diff --git a/ide/main.pp b/ide/main.pp
index 7cdb36001c..0c43225e32 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -1097,6 +1097,7 @@ begin
     ExternalTools.OnFreeOutputFilter := @OnExtToolFreeOutputFilter;
     OnApplyWindowLayout := @Self.OnApplyWindowLayout;
     Application.ShowButtonGlyphs := ShowButtonGlyphs;
+    Application.ShowMenuGlyphs := ShowMenuGlyphs;
   end;
   UpdateDefaultPascalFileExtensions;
 
@@ -4181,6 +4182,7 @@ begin
       UpdateObjectInspector;
       SetupHints;
       Application.ShowButtonGlyphs := EnvironmentOptions.ShowButtonGlyphs;
+      Application.ShowMenuGlyphs := EnvironmentOptions.ShowMenuGlyphs;
 
       // reload lazarus packages
       if LazarusSrcDirChanged then