IDE: Replace Bevels + Label with DividerBevel in desktop options. Reorder the layout.

git-svn-id: trunk@46735 -
This commit is contained in:
juha 2014-10-31 23:19:15 +00:00
parent c4286f5665
commit c4d86d6845
2 changed files with 162 additions and 326 deletions

View File

@ -1,97 +1,21 @@
object DesktopOptionsFrame: TDesktopOptionsFrame object DesktopOptionsFrame: TDesktopOptionsFrame
Left = 0 Left = 0
Height = 521 Height = 523
Top = 0 Top = 0
Width = 597 Width = 596
ClientHeight = 521 ClientHeight = 523
ClientWidth = 597 ClientWidth = 596
TabOrder = 0 TabOrder = 0
Visible = False Visible = False
DesignLeft = 282 DesignLeft = 351
DesignTop = 91 DesignTop = 120
object BevelLanguageLeft: TBevel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = lblLanguage
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = lblLanguage
Left = 0
Height = 3
Top = 9
Width = 64
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 6
end
object lblLanguage: TLabel
AnchorSideTop.Control = Owner
Left = 70
Height = 20
Top = 0
Width = 85
Caption = 'lblLanguage'
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object BevelLanguageRight: TBevel
AnchorSideLeft.Control = lblLanguage
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = lblLanguage
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 161
Height = 3
Top = 9
Width = 436
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
end
object BevelAutoSaveLeft: TBevel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = lblCheckAndAutoSave
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = lblCheckAndAutoSave
Left = 0
Height = 3
Top = 69
Width = 64
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 6
end
object lblCheckAndAutoSave: TLabel
AnchorSideTop.Control = LanguageComboBox
AnchorSideTop.Side = asrBottom
Left = 70
Height = 20
Top = 60
Width = 154
BorderSpacing.Top = 6
Caption = 'lblCheckAndAutoSave'
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object BevelAutoSizeRight: TBevel
AnchorSideLeft.Control = lblCheckAndAutoSave
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = lblCheckAndAutoSave
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 230
Height = 3
Top = 69
Width = 367
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
end
object AutoSaveIntervalInSecsLabel: TLabel object AutoSaveIntervalInSecsLabel: TLabel
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = AutoSaveProjectCheckBox AnchorSideTop.Control = AutoSaveProjectCheckBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 20 Height = 20
Top = 182 Top = 383
Width = 189 Width = 189
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 6 BorderSpacing.Top = 6
@ -100,169 +24,13 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
ParentColor = False ParentColor = False
Visible = False Visible = False
end end
object BevelDesktopFilesLeft: TBevel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = lblDesktopFiles
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = lblDesktopFiles
Left = 0
Height = 3
Top = 251
Width = 64
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 6
end
object lblDesktopFiles: TLabel
AnchorSideTop.Control = AutoSaveIntervalInSecsComboBox
AnchorSideTop.Side = asrBottom
Left = 70
Height = 20
Top = 242
Width = 106
BorderSpacing.Top = 6
Caption = 'lblDesktopFiles'
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object BevelDesktopFilesRight: TBevel
AnchorSideLeft.Control = lblDesktopFiles
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = lblDesktopFiles
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 182
Height = 3
Top = 251
Width = 415
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
end
object BevelGlyphsLeft: TBevel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = lblGlyphs
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = lblGlyphs
Left = 0
Height = 3
Top = 313
Width = 64
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 6
end
object lblGlyphs: TLabel
AnchorSideTop.Control = SaveDesktopSettingsToFileButton
AnchorSideTop.Side = asrBottom
Left = 70
Height = 20
Top = 304
Width = 65
BorderSpacing.Top = 6
Caption = 'lblGlyphs'
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object BevelGlyphsRight: TBevel
AnchorSideLeft.Control = lblGlyphs
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = lblGlyphs
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 141
Height = 3
Top = 313
Width = 456
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
end
object BevelHintsLeft: TBevel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = lblHints
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = lblHints
Left = 0
Height = 3
Top = 396
Width = 64
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 6
end
object lblHints: TLabel
AnchorSideTop.Control = PanelGlyphsMenusOptions
AnchorSideTop.Side = asrBottom
Left = 70
Height = 20
Top = 387
Width = 54
BorderSpacing.Top = 6
Caption = 'lblHints'
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object BevelHintsRight: TBevel
AnchorSideLeft.Control = lblHints
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = lblHints
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 130
Height = 3
Top = 396
Width = 467
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
end
object Bevel1MiscLeft: TBevel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = lblMouseAction
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = lblMouseAction
Left = 0
Height = 3
Top = 470
Width = 64
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 6
end
object lblMouseAction: TLabel
AnchorSideTop.Control = ShowHintsForComponentPaletteCheckBox
AnchorSideTop.Side = asrBottom
Left = 70
Height = 20
Top = 461
Width = 110
BorderSpacing.Top = 6
Caption = 'lblMouseAction'
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object Bevel1MiscRight: TBevel
AnchorSideLeft.Control = lblMouseAction
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = lblMouseAction
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 186
Height = 3
Top = 470
Width = 411
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
end
object lblButtons: TLabel object lblButtons: TLabel
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = PanelGlyphsButtonsOptions AnchorSideTop.Control = PanelGlyphsButtonsOptions
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 6 Left = 6
Height = 20 Height = 20
Top = 332 Top = 206
Width = 73 Width = 73
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'lblButtons' Caption = 'lblButtons'
@ -276,7 +44,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 6 Left = 6
Height = 20 Height = 20
Top = 359 Top = 233
Width = 64 Width = 64
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'lblMenus' Caption = 'lblMenus'
@ -290,7 +58,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 24 Height = 24
Top = 80 Top = 281
Width = 296 Width = 296
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'CheckDiskChangesWithLoadingCheckBox' Caption = 'CheckDiskChangesWithLoadingCheckBox'
@ -304,7 +72,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 24 Height = 24
Top = 431 Top = 151
Width = 303 Width = 303
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'ShowHintsForComponentPaletteCheckBox' Caption = 'ShowHintsForComponentPaletteCheckBox'
@ -316,7 +84,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 24 Height = 24
Top = 407 Top = 127
Width = 304 Width = 304
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'ShowHintsForMainSpeedButtonsCheckBox' Caption = 'ShowHintsForMainSpeedButtonsCheckBox'
@ -330,11 +98,11 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 28 Height = 28
Top = 26 Top = 23
Width = 585 Width = 584
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 6 BorderSpacing.Top = 3
BorderSpacing.Right = 6 BorderSpacing.Right = 6
ItemHeight = 20 ItemHeight = 20
ParentShowHint = False ParentShowHint = False
@ -350,8 +118,8 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 28 Height = 28
Top = 208 Top = 409
Width = 585 Width = 584
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Enabled = False Enabled = False
@ -371,7 +139,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 24 Height = 24
Top = 152 Top = 353
Width = 197 Width = 197
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'AutoSaveProjectCheckBox' Caption = 'AutoSaveProjectCheckBox'
@ -387,7 +155,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 24 Height = 24
Top = 128 Top = 329
Width = 220 Width = 220
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'AutoSaveEditorFilesCheckBox' Caption = 'AutoSaveEditorFilesCheckBox'
@ -400,18 +168,16 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
object LoadDesktopSettingsFromFileButton: TButton object LoadDesktopSettingsFromFileButton: TButton
AnchorSideLeft.Control = SaveDesktopSettingsToFileButton AnchorSideLeft.Control = SaveDesktopSettingsToFileButton
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = lblDesktopFiles AnchorSideTop.Control = SaveDesktopSettingsToFileButton
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 299 Left = 299
Height = 30 Height = 30
Top = 268 Top = 466
Width = 292 Width = 291
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = True AutoSize = True
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderSpacing.Right = 6 BorderSpacing.Right = 6
Caption = 'LoadDesktopSettingsFromFileButton' Caption = 'LoadDesktopSettingsFromFileButton'
OnClick = LoadDesktopSettingsFromFileButtonClick OnClick = LoadDesktopSettingsFromFileButtonClick
@ -424,12 +190,12 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideRight.Control = lblCenter AnchorSideRight.Control = lblCenter
Left = 6 Left = 6
Height = 30 Height = 30
Top = 268 Top = 466
Width = 287 Width = 287
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = True AutoSize = True
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 6 BorderSpacing.Top = 3
BorderSpacing.Right = 3 BorderSpacing.Right = 3
Caption = 'SaveDesktopSettingsToFileButton' Caption = 'SaveDesktopSettingsToFileButton'
OnClick = SaveDesktopSettingsToFileButtonClick OnClick = SaveDesktopSettingsToFileButtonClick
@ -444,18 +210,18 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 85 Left = 85
Height = 24 Height = 24
Top = 330 Top = 204
Width = 506 Width = 505
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = True AutoSize = True
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 6 BorderSpacing.Top = 3
BorderSpacing.Right = 6 BorderSpacing.Right = 6
BevelOuter = bvNone BevelOuter = bvNone
ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 3 ChildSizing.ControlsPerLine = 3
ClientHeight = 24 ClientHeight = 24
ClientWidth = 506 ClientWidth = 505
TabOrder = 9 TabOrder = 9
object rbBtnGlyphShowSystem: TRadioButton object rbBtnGlyphShowSystem: TRadioButton
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
@ -494,8 +260,8 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 85 Left = 85
Height = 24 Height = 24
Top = 357 Top = 231
Width = 506 Width = 505
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = True AutoSize = True
BorderSpacing.Top = 3 BorderSpacing.Top = 3
@ -504,7 +270,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 3 ChildSizing.ControlsPerLine = 3
ClientHeight = 24 ClientHeight = 24
ClientWidth = 506 ClientWidth = 505
TabOrder = 10 TabOrder = 10
object rbMenuGlyphShowSystem: TRadioButton object rbMenuGlyphShowSystem: TRadioButton
AnchorSideRight.Control = PanelGlyphsMenusOptions AnchorSideRight.Control = PanelGlyphsMenusOptions
@ -543,7 +309,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 296 Left = 296
Height = 5 Height = 5
Top = 262 Top = 463
Width = 5 Width = 5
AutoSize = False AutoSize = False
ParentColor = False ParentColor = False
@ -554,7 +320,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 24 Height = 24
Top = 104 Top = 305
Width = 234 Width = 234
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'AskSavingOnlySessionCheckBox' Caption = 'AskSavingOnlySessionCheckBox'
@ -568,7 +334,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 24 Height = 24
Top = 481 Top = 77
Width = 207 Width = 207
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'PreferDoubleClickCheckBox' Caption = 'PreferDoubleClickCheckBox'
@ -576,4 +342,86 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
ShowHint = True ShowHint = True
TabOrder = 12 TabOrder = 12
end end
object lblLanguage: TDividerBevel
AnchorSideTop.Control = Owner
Left = 0
Height = 20
Top = 0
Width = 590
Caption = 'lblLanguage'
Anchors = [akTop, akLeft, akRight]
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object lblCheckAndAutoSave: TDividerBevel
AnchorSideTop.Control = PanelGlyphsMenusOptions
AnchorSideTop.Side = asrBottom
Left = 0
Height = 20
Top = 261
Width = 597
Caption = 'lblCheckAndAutoSave'
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object lblDesktopFiles: TDividerBevel
AnchorSideTop.Control = AutoSaveIntervalInSecsComboBox
AnchorSideTop.Side = asrBottom
Left = 0
Height = 20
Top = 443
Width = 597
Caption = 'lblDesktopFiles'
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object lblGlyphs: TDividerBevel
AnchorSideTop.Control = ShowHintsForComponentPaletteCheckBox
AnchorSideTop.Side = asrBottom
Left = 0
Height = 20
Top = 181
Width = 597
Caption = 'lblGlyphs'
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object lblHints: TDividerBevel
AnchorSideTop.Control = PreferDoubleClickCheckBox
AnchorSideTop.Side = asrBottom
Left = 0
Height = 20
Top = 107
Width = 597
Caption = 'lblHints'
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object lblMouseAction: TDividerBevel
AnchorSideTop.Control = LanguageComboBox
AnchorSideTop.Side = asrBottom
Left = 0
Height = 20
Top = 57
Width = 597
Caption = 'lblMouseAction'
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
end end

View File

@ -27,7 +27,7 @@ interface
uses uses
Classes, SysUtils, FileUtil, Forms, StdCtrls, Dialogs, LCLProc, Classes, SysUtils, FileUtil, Forms, StdCtrls, Dialogs, LCLProc,
ExtCtrls, EnvironmentOpts, LazarusIDEStrConsts, IDETranslations, InputHistory, ExtCtrls, EnvironmentOpts, LazarusIDEStrConsts, IDETranslations, InputHistory,
IDEProcs, IDEOptionsIntf, IDEWindowIntf, IDEUtils; IDEProcs, IDEOptionsIntf, IDEWindowIntf, IDEUtils, DividerBevel;
type type
@ -39,30 +39,18 @@ type
AutoSaveIntervalInSecsComboBox: TComboBox; AutoSaveIntervalInSecsComboBox: TComboBox;
AutoSaveIntervalInSecsLabel: TLabel; AutoSaveIntervalInSecsLabel: TLabel;
AutoSaveProjectCheckBox: TCheckBox; AutoSaveProjectCheckBox: TCheckBox;
BevelLanguageLeft: TBevel; lblCheckAndAutoSave: TDividerBevel;
BevelHintsRight: TBevel; lblDesktopFiles: TDividerBevel;
Bevel1MiscLeft: TBevel; lblGlyphs: TDividerBevel;
Bevel1MiscRight: TBevel; lblHints: TDividerBevel;
BevelLanguageRight: TBevel; lblLanguage: TDividerBevel;
BevelAutoSaveLeft: TBevel; lblMouseAction: TDividerBevel;
BevelAutoSizeRight: TBevel;
BevelDesktopFilesLeft: TBevel;
BevelDesktopFilesRight: TBevel;
BevelGlyphsLeft: TBevel;
BevelGlyphsRight: TBevel;
BevelHintsLeft: TBevel;
PreferDoubleClickCheckBox: TCheckBox; PreferDoubleClickCheckBox: TCheckBox;
CheckDiskChangesWithLoadingCheckBox: TCheckBox; CheckDiskChangesWithLoadingCheckBox: TCheckBox;
lblCheckAndAutoSave: TLabel;
lblButtons: TLabel; lblButtons: TLabel;
lblCenter: TLabel; lblCenter: TLabel;
lblMenus: TLabel; lblMenus: TLabel;
lblHints: TLabel;
LanguageComboBox: TComboBox; LanguageComboBox: TComboBox;
lblDesktopFiles: TLabel;
lblGlyphs: TLabel;
lblMouseAction: TLabel;
lblLanguage: TLabel;
LoadDesktopSettingsFromFileButton: TButton; LoadDesktopSettingsFromFileButton: TButton;
PanelGlyphsButtonsOptions: TPanel; PanelGlyphsButtonsOptions: TPanel;
PanelGlyphsMenusOptions: TPanel; PanelGlyphsMenusOptions: TPanel;
@ -125,6 +113,27 @@ begin
LanguageComboBox.Items.Assign(sl); LanguageComboBox.Items.Assign(sl);
sl.Free; sl.Free;
// mouse action
lblMouseAction.Caption := dlgMouseAction;
PreferDoubleClickCheckBox.Caption := dlgPreferDoubleClickOverSingleClick;
PreferDoubleClickCheckBox.Hint := dlgCurrentlyRespectedByMessagesWindow;
// hints
lblHints.Caption := dlgDesktopHints;
ShowHintsForMainSpeedButtonsCheckBox.Caption := dlgSpBHints;
ShowHintsForComponentPaletteCheckBox.Caption := dlgPalHints;
// button glyphs
lblGlyphs.Caption := lisShowGlyphsFor;
lblButtons.Caption := dlgDesktopButtons;
lblMenus.Caption := dlgDesktopMenus;
rbBtnGlyphShowAlways.Caption := lisAlways;
rbBtnGlyphShowNever.Caption := lisNever;
rbBtnGlyphShowSystem.Caption := lisDefault;
rbMenuGlyphShowAlways.Caption := lisAlways;
rbMenuGlyphShowNever.Caption := lisNever;
rbMenuGlyphShowSystem.Caption := lisDefault;
// check and auto save files // check and auto save files
lblCheckAndAutoSave.Caption := dlgCheckAndAutoSaveFiles; lblCheckAndAutoSave.Caption := dlgCheckAndAutoSaveFiles;
CheckDiskChangesWithLoadingCheckBox.Caption := lisCheckForDiskFileChangesViaContent; CheckDiskChangesWithLoadingCheckBox.Caption := lisCheckForDiskFileChangesViaContent;
@ -140,27 +149,6 @@ begin
lblDesktopFiles.Caption := dlgDesktopFiles; lblDesktopFiles.Caption := dlgDesktopFiles;
SaveDesktopSettingsToFileButton.Caption := dlgSaveDFile; SaveDesktopSettingsToFileButton.Caption := dlgSaveDFile;
LoadDesktopSettingsFromFileButton.Caption := dlgLoadDFile; LoadDesktopSettingsFromFileButton.Caption := dlgLoadDFile;
// button glyphs
lblGlyphs.Caption := lisShowGlyphsFor;
lblButtons.Caption := dlgDesktopButtons;
lblMenus.Caption := dlgDesktopMenus;
rbBtnGlyphShowAlways.Caption := lisAlways;
rbBtnGlyphShowNever.Caption := lisNever;
rbBtnGlyphShowSystem.Caption := lisDefault;
rbMenuGlyphShowAlways.Caption := lisAlways;
rbMenuGlyphShowNever.Caption := lisNever;
rbMenuGlyphShowSystem.Caption := lisDefault;
// hints
lblHints.Caption := dlgDesktopHints;
ShowHintsForMainSpeedButtonsCheckBox.Caption := dlgSpBHints;
ShowHintsForComponentPaletteCheckBox.Caption := dlgPalHints;
// mouse action
lblMouseAction.Caption := dlgMouseAction;
PreferDoubleClickCheckBox.Caption := dlgPreferDoubleClickOverSingleClick;
PreferDoubleClickCheckBox.Hint := dlgCurrentlyRespectedByMessagesWindow;
end; end;
procedure TDesktopOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); procedure TDesktopOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
@ -171,13 +159,8 @@ begin
LanguageComboBox.Text:=LangIDToCaption(LanguageID); LanguageComboBox.Text:=LangIDToCaption(LanguageID);
//debugln('TEnvironmentOptionsDialog.ReadSettings LanguageComboBox.ItemIndex=',dbgs(LanguageComboBox.ItemIndex),' LanguageID="',LanguageID,'" LanguageComboBox.Text="',LanguageComboBox.Text,'"'); //debugln('TEnvironmentOptionsDialog.ReadSettings LanguageComboBox.ItemIndex=',dbgs(LanguageComboBox.ItemIndex),' LanguageID="',LanguageID,'" LanguageComboBox.Text="',LanguageComboBox.Text,'"');
// check and auto save files // mouse action
CheckDiskChangesWithLoadingCheckBox.Checked:=CheckDiskChangesWithLoading; PreferDoubleClickCheckBox.Checked := MsgViewDblClickJumps;
AskSavingOnlySessionCheckBox.Checked:=AskSaveSessionOnly;
AutoSaveEditorFilesCheckBox.Checked:=AutoSaveEditorFiles;
AutoSaveProjectCheckBox.Checked:=AutoSaveProject;
SetComboBoxText(AutoSaveIntervalInSecsComboBox
,IntToStr(AutoSaveIntervalInSecs),cstCaseInsensitive);
// hints // hints
ShowHintsForMainSpeedButtonsCheckBox.Checked:=ShowHintsForMainSpeedButtons; ShowHintsForMainSpeedButtonsCheckBox.Checked:=ShowHintsForMainSpeedButtons;
@ -195,8 +178,13 @@ begin
sbgSystem: rbMenuGlyphShowSystem.Checked := True; sbgSystem: rbMenuGlyphShowSystem.Checked := True;
end; end;
// mouse action // check and auto save files
PreferDoubleClickCheckBox.Checked := MsgViewDblClickJumps; CheckDiskChangesWithLoadingCheckBox.Checked:=CheckDiskChangesWithLoading;
AskSavingOnlySessionCheckBox.Checked:=AskSaveSessionOnly;
AutoSaveEditorFilesCheckBox.Checked:=AutoSaveEditorFiles;
AutoSaveProjectCheckBox.Checked:=AutoSaveProject;
SetComboBoxText(AutoSaveIntervalInSecsComboBox
,IntToStr(AutoSaveIntervalInSecs),cstCaseInsensitive);
end; end;
end; end;
@ -208,13 +196,8 @@ begin
LanguageID:=CaptionToLangID(LanguageComboBox.Text); LanguageID:=CaptionToLangID(LanguageComboBox.Text);
//debugln('TEnvironmentOptionsDialog.WriteSettings A LanguageID="',LanguageID,'" LanguageComboBox.ItemIndex=',dbgs(LanguageComboBox.ItemIndex),' LanguageComboBox.Text=',LanguageComboBox.Text); //debugln('TEnvironmentOptionsDialog.WriteSettings A LanguageID="',LanguageID,'" LanguageComboBox.ItemIndex=',dbgs(LanguageComboBox.ItemIndex),' LanguageComboBox.Text=',LanguageComboBox.Text);
// check and auto save files // mouse action
CheckDiskChangesWithLoading:=CheckDiskChangesWithLoadingCheckBox.Checked; MsgViewDblClickJumps := PreferDoubleClickCheckBox.Checked;
AskSaveSessionOnly:=AskSavingOnlySessionCheckBox.Checked;
AutoSaveEditorFiles:=AutoSaveEditorFilesCheckBox.Checked;
AutoSaveProject:=AutoSaveProjectCheckBox.Checked;
AutoSaveIntervalInSecs:=StrToIntDef(
AutoSaveIntervalInSecsComboBox.Text,AutoSaveIntervalInSecs);
// hints // hints
ShowHintsForMainSpeedButtons:=ShowHintsForMainSpeedButtonsCheckBox.Checked; ShowHintsForMainSpeedButtons:=ShowHintsForMainSpeedButtonsCheckBox.Checked;
@ -236,8 +219,13 @@ begin
else else
ShowMenuGlyphs := sbgSystem; ShowMenuGlyphs := sbgSystem;
// mouse action // check and auto save files
MsgViewDblClickJumps := PreferDoubleClickCheckBox.Checked; CheckDiskChangesWithLoading:=CheckDiskChangesWithLoadingCheckBox.Checked;
AskSaveSessionOnly:=AskSavingOnlySessionCheckBox.Checked;
AutoSaveEditorFiles:=AutoSaveEditorFilesCheckBox.Checked;
AutoSaveProject:=AutoSaveProjectCheckBox.Checked;
AutoSaveIntervalInSecs:=StrToIntDef(
AutoSaveIntervalInSecsComboBox.Text,AutoSaveIntervalInSecs);
end; end;
end; end;