IDE: Move the option for single-click / double-click from messages options to desktop options page. Improve layout, add hints. Issue #18269.

git-svn-id: trunk@46734 -
This commit is contained in:
juha 2014-10-31 23:19:06 +00:00
parent 59938e4efe
commit c4286f5665
6 changed files with 226 additions and 220 deletions

View File

@ -351,7 +351,7 @@ begin
DiffSynEdit.Lines.Text:=lisDiskDiffClickOnOneOfTheAboveItemsToSeeTheDiff;
RevertAllButton.Caption:=lisDiskDiffRevertAll;
IgnoreDiskChangesButton.Caption:=lisDiskDiffIgnoreDiskChanges;
CheckDiskChangesWithLoadingCheckBox.Caption:=lisCheckForDiskFileChangesViaContentRatherThanTimesta;
CheckDiskChangesWithLoadingCheckBox.Caption:=lisCheckForDiskFileChangesViaContent;
CheckDiskChangesWithLoadingCheckBox.Checked:=EnvironmentOptions.CheckDiskChangesWithLoading;
end;

View File

@ -1,14 +1,14 @@
object DesktopOptionsFrame: TDesktopOptionsFrame
Left = 0
Height = 512
Height = 521
Top = 0
Width = 597
ClientHeight = 512
ClientHeight = 521
ClientWidth = 597
TabOrder = 0
Visible = False
DesignLeft = 573
DesignTop = 261
DesignLeft = 282
DesignTop = 91
object BevelLanguageLeft: TBevel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = lblLanguage
@ -16,7 +16,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideRight.Control = lblLanguage
Left = 0
Height = 3
Top = 6
Top = 9
Width = 64
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 6
@ -24,9 +24,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
object lblLanguage: TLabel
AnchorSideTop.Control = Owner
Left = 70
Height = 15
Height = 20
Top = 0
Width = 71
Width = 85
Caption = 'lblLanguage'
Font.Style = [fsBold]
ParentColor = False
@ -39,49 +39,49 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 147
Left = 161
Height = 3
Top = 6
Width = 450
Top = 9
Width = 436
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
end
object BevelAutoSaveLeft: TBevel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = lblAutoSave
AnchorSideTop.Control = lblCheckAndAutoSave
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = lblAutoSave
AnchorSideRight.Control = lblCheckAndAutoSave
Left = 0
Height = 3
Top = 62
Top = 69
Width = 64
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 6
end
object lblAutoSave: TLabel
object lblCheckAndAutoSave: TLabel
AnchorSideTop.Control = LanguageComboBox
AnchorSideTop.Side = asrBottom
Left = 70
Height = 15
Top = 56
Width = 71
Height = 20
Top = 60
Width = 154
BorderSpacing.Top = 6
Caption = 'lblAutoSave'
Caption = 'lblCheckAndAutoSave'
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object BevelAutoSizeRight: TBevel
AnchorSideLeft.Control = lblAutoSave
AnchorSideLeft.Control = lblCheckAndAutoSave
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = lblAutoSave
AnchorSideTop.Control = lblCheckAndAutoSave
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 147
Left = 230
Height = 3
Top = 62
Width = 450
Top = 69
Width = 367
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
end
@ -90,9 +90,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Control = AutoSaveProjectCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 15
Top = 155
Width = 157
Height = 20
Top = 182
Width = 189
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Caption = 'AutoSaveIntervalInSecsLabel'
@ -107,7 +107,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideRight.Control = lblDesktopFiles
Left = 0
Height = 3
Top = 215
Top = 251
Width = 64
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 6
@ -116,9 +116,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Control = AutoSaveIntervalInSecsComboBox
AnchorSideTop.Side = asrBottom
Left = 70
Height = 15
Top = 209
Width = 90
Height = 20
Top = 242
Width = 106
BorderSpacing.Top = 6
Caption = 'lblDesktopFiles'
Font.Style = [fsBold]
@ -132,10 +132,10 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 166
Left = 182
Height = 3
Top = 215
Width = 431
Top = 251
Width = 415
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
end
@ -146,7 +146,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideRight.Control = lblGlyphs
Left = 0
Height = 3
Top = 269
Top = 313
Width = 64
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 6
@ -155,9 +155,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Control = SaveDesktopSettingsToFileButton
AnchorSideTop.Side = asrBottom
Left = 70
Height = 15
Top = 263
Width = 54
Height = 20
Top = 304
Width = 65
BorderSpacing.Top = 6
Caption = 'lblGlyphs'
Font.Style = [fsBold]
@ -171,10 +171,10 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 130
Left = 141
Height = 3
Top = 269
Width = 467
Top = 313
Width = 456
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
end
@ -185,7 +185,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideRight.Control = lblHints
Left = 0
Height = 3
Top = 347
Top = 396
Width = 64
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 6
@ -194,9 +194,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Control = PanelGlyphsMenusOptions
AnchorSideTop.Side = asrBottom
Left = 70
Height = 15
Top = 341
Width = 45
Height = 20
Top = 387
Width = 54
BorderSpacing.Top = 6
Caption = 'lblHints'
Font.Style = [fsBold]
@ -210,49 +210,49 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 121
Left = 130
Height = 3
Top = 347
Width = 476
Top = 396
Width = 467
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
end
object Bevel1MiscLeft: TBevel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = lblMisc
AnchorSideTop.Control = lblMouseAction
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = lblMisc
AnchorSideRight.Control = lblMouseAction
Left = 0
Height = 3
Top = 422
Top = 470
Width = 64
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 6
end
object lblMisc: TLabel
AnchorSideTop.Control = ShowHintsForMainSpeedButtonsCheckBox
object lblMouseAction: TLabel
AnchorSideTop.Control = ShowHintsForComponentPaletteCheckBox
AnchorSideTop.Side = asrBottom
Left = 70
Height = 15
Top = 416
Width = 41
Height = 20
Top = 461
Width = 110
BorderSpacing.Top = 6
Caption = 'lblMisc'
Caption = 'lblMouseAction'
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object Bevel1MiscRight: TBevel
AnchorSideLeft.Control = lblMisc
AnchorSideLeft.Control = lblMouseAction
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = lblMisc
AnchorSideTop.Control = lblMouseAction
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 117
Left = 186
Height = 3
Top = 422
Width = 480
Top = 470
Width = 411
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
end
@ -261,9 +261,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Control = PanelGlyphsButtonsOptions
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15
Top = 289
Width = 60
Height = 20
Top = 332
Width = 73
BorderSpacing.Left = 6
Caption = 'lblButtons'
Font.Style = [fsBold]
@ -275,9 +275,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Control = PanelGlyphsMenusOptions
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15
Top = 316
Width = 53
Height = 20
Top = 359
Width = 64
BorderSpacing.Left = 6
Caption = 'lblMenus'
Font.Style = [fsBold]
@ -286,37 +286,38 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
end
object CheckDiskChangesWithLoadingCheckBox: TCheckBox
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = lblMisc
AnchorSideTop.Control = lblCheckAndAutoSave
AnchorSideTop.Side = asrBottom
Left = 6
Height = 24
Top = 431
Width = 251
Top = 80
Width = 296
BorderSpacing.Left = 6
Caption = 'CheckDiskChangesWithLoadingCheckBox'
ParentShowHint = False
ShowHint = True
TabOrder = 0
end
object ShowHintsForComponentPaletteCheckBox: TCheckBox
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = lblHints
AnchorSideTop.Control = ShowHintsForMainSpeedButtonsCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 24
Top = 362
Width = 259
Top = 431
Width = 303
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Caption = 'ShowHintsForComponentPaletteCheckBox'
TabOrder = 1
end
object ShowHintsForMainSpeedButtonsCheckBox: TCheckBox
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ShowHintsForComponentPaletteCheckBox
AnchorSideTop.Control = lblHints
AnchorSideTop.Side = asrBottom
Left = 6
Height = 24
Top = 386
Width = 259
Top = 407
Width = 304
BorderSpacing.Left = 6
Caption = 'ShowHintsForMainSpeedButtonsCheckBox'
TabOrder = 2
@ -328,14 +329,14 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 6
Height = 29
Top = 21
Height = 28
Top = 26
Width = 585
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderSpacing.Right = 6
ItemHeight = 0
ItemHeight = 20
ParentShowHint = False
ShowHint = True
Style = csDropDownList
@ -348,13 +349,13 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 6
Height = 27
Top = 176
Height = 28
Top = 208
Width = 585
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6
Enabled = False
ItemHeight = 0
ItemHeight = 20
Items.Strings = (
'1200'
'600'
@ -370,8 +371,8 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom
Left = 6
Height = 24
Top = 125
Width = 172
Top = 152
Width = 197
BorderSpacing.Left = 6
Caption = 'AutoSaveProjectCheckBox'
Enabled = False
@ -386,8 +387,8 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom
Left = 6
Height = 24
Top = 101
Width = 190
Top = 128
Width = 220
BorderSpacing.Left = 6
Caption = 'AutoSaveEditorFilesCheckBox'
Enabled = False
@ -404,8 +405,8 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 299
Height = 27
Top = 230
Height = 30
Top = 268
Width = 292
Anchors = [akTop, akLeft, akRight]
AutoSize = True
@ -422,8 +423,8 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = lblCenter
Left = 6
Height = 27
Top = 230
Height = 30
Top = 268
Width = 287
Anchors = [akTop, akLeft, akRight]
AutoSize = True
@ -441,10 +442,10 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 72
Left = 85
Height = 24
Top = 284
Width = 519
Top = 330
Width = 506
Anchors = [akTop, akLeft, akRight]
AutoSize = True
BorderSpacing.Left = 6
@ -454,14 +455,14 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 3
ClientHeight = 24
ClientWidth = 519
ClientWidth = 506
TabOrder = 9
object rbBtnGlyphShowSystem: TRadioButton
AnchorSideRight.Side = asrBottom
Left = 0
Height = 24
Top = 0
Width = 157
Width = 181
Caption = 'rbBtnGlyphShowSystem'
Checked = True
TabOrder = 0
@ -469,18 +470,18 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
end
object rbBtnGlyphShowNever: TRadioButton
AnchorSideLeft.Side = asrCenter
Left = 157
Left = 181
Height = 24
Top = 0
Width = 152
Width = 173
Caption = 'rbBtnGlyphShowNever'
TabOrder = 1
end
object rbBtnGlyphShowAlways: TRadioButton
Left = 309
Left = 354
Height = 24
Top = 0
Width = 155
Width = 180
Caption = 'rbBtnGlyphShowAlways'
TabOrder = 2
end
@ -491,10 +492,10 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 72
Left = 85
Height = 24
Top = 311
Width = 519
Top = 357
Width = 506
Anchors = [akTop, akLeft, akRight]
AutoSize = True
BorderSpacing.Top = 3
@ -503,7 +504,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 3
ClientHeight = 24
ClientWidth = 519
ClientWidth = 506
TabOrder = 10
object rbMenuGlyphShowSystem: TRadioButton
AnchorSideRight.Control = PanelGlyphsMenusOptions
@ -511,7 +512,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
Left = 0
Height = 24
Top = 0
Width = 168
Width = 196
Caption = 'rbMenuGlyphShowSystem'
Checked = True
TabOrder = 0
@ -519,18 +520,18 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
end
object rbMenuGlyphShowNever: TRadioButton
AnchorSideLeft.Side = asrCenter
Left = 168
Left = 196
Height = 24
Top = 0
Width = 163
Width = 188
Caption = 'rbMenuGlyphShowNever'
TabOrder = 1
end
object rbMenuGlyphShowAlways: TRadioButton
Left = 331
Left = 384
Height = 24
Top = 0
Width = 166
Width = 195
Caption = 'rbMenuGlyphShowAlways'
TabOrder = 2
end
@ -542,24 +543,37 @@ object DesktopOptionsFrame: TDesktopOptionsFrame
AnchorSideTop.Side = asrBottom
Left = 296
Height = 5
Top = 224
Top = 262
Width = 5
AutoSize = False
ParentColor = False
end
object AskSavingOnlySessionCheckBox: TCheckBox
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = lblAutoSave
AnchorSideTop.Control = CheckDiskChangesWithLoadingCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 24
Top = 77
Width = 199
Top = 104
Width = 234
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Caption = 'AskSavingOnlySessionCheckBox'
ParentShowHint = False
ShowHint = True
TabOrder = 11
end
object PreferDoubleClickCheckBox: TCheckBox
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = lblMouseAction
AnchorSideTop.Side = asrBottom
Left = 6
Height = 24
Top = 481
Width = 207
BorderSpacing.Left = 6
Caption = 'PreferDoubleClickCheckBox'
ParentShowHint = False
ShowHint = True
TabOrder = 12
end
end

View File

@ -51,7 +51,9 @@ type
BevelGlyphsLeft: TBevel;
BevelGlyphsRight: TBevel;
BevelHintsLeft: TBevel;
PreferDoubleClickCheckBox: TCheckBox;
CheckDiskChangesWithLoadingCheckBox: TCheckBox;
lblCheckAndAutoSave: TLabel;
lblButtons: TLabel;
lblCenter: TLabel;
lblMenus: TLabel;
@ -59,9 +61,8 @@ type
LanguageComboBox: TComboBox;
lblDesktopFiles: TLabel;
lblGlyphs: TLabel;
lblMisc: TLabel;
lblMouseAction: TLabel;
lblLanguage: TLabel;
lblAutoSave: TLabel;
LoadDesktopSettingsFromFileButton: TButton;
PanelGlyphsButtonsOptions: TPanel;
PanelGlyphsMenusOptions: TPanel;
@ -124,10 +125,13 @@ begin
LanguageComboBox.Items.Assign(sl);
sl.Free;
// auto save
lblAutoSave.Caption := dlgAutoSave;
// check and auto save files
lblCheckAndAutoSave.Caption := dlgCheckAndAutoSaveFiles;
CheckDiskChangesWithLoadingCheckBox.Caption := lisCheckForDiskFileChangesViaContent;
CheckDiskChangesWithLoadingCheckBox.Hint := lisSlowerButMoreAccurate;
AskSavingOnlySessionCheckBox.Caption := lisAskBeforeSavingProjectSSession;
AskSavingOnlySessionCheckBox.Hint := lisIfOnlySessionInfoChangedThenAsk;
// The following 3 are now hidden.
AutoSaveEditorFilesCheckBox.Caption := dlgEdFiles;
AutoSaveProjectCheckBox.Caption := dlgProject;
AutoSaveIntervalInSecsLabel.Caption := dlgIntvInSec;
@ -150,13 +154,13 @@ begin
// hints
lblHints.Caption := dlgDesktopHints;
ShowHintsForComponentPaletteCheckBox.Caption := dlgPalHints;
ShowHintsForMainSpeedButtonsCheckBox.Caption := dlgSpBHints;
ShowHintsForComponentPaletteCheckBox.Caption := dlgPalHints;
// misc
lblMisc.Caption := dlgDesktopMisc;
CheckDiskChangesWithLoadingCheckBox.Caption :=
lisCheckForDiskFileChangesViaContentRatherThanTimesta;
// mouse action
lblMouseAction.Caption := dlgMouseAction;
PreferDoubleClickCheckBox.Caption := dlgPreferDoubleClickOverSingleClick;
PreferDoubleClickCheckBox.Hint := dlgCurrentlyRespectedByMessagesWindow;
end;
procedure TDesktopOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
@ -167,7 +171,8 @@ begin
LanguageComboBox.Text:=LangIDToCaption(LanguageID);
//debugln('TEnvironmentOptionsDialog.ReadSettings LanguageComboBox.ItemIndex=',dbgs(LanguageComboBox.ItemIndex),' LanguageID="',LanguageID,'" LanguageComboBox.Text="',LanguageComboBox.Text,'"');
// auto save
// check and auto save files
CheckDiskChangesWithLoadingCheckBox.Checked:=CheckDiskChangesWithLoading;
AskSavingOnlySessionCheckBox.Checked:=AskSaveSessionOnly;
AutoSaveEditorFilesCheckBox.Checked:=AutoSaveEditorFiles;
AutoSaveProjectCheckBox.Checked:=AutoSaveProject;
@ -175,12 +180,8 @@ begin
,IntToStr(AutoSaveIntervalInSecs),cstCaseInsensitive);
// hints
CheckDiskChangesWithLoadingCheckBox.Checked:=
CheckDiskChangesWithLoading;
ShowHintsForComponentPaletteCheckBox.Checked:=
ShowHintsForComponentPalette;
ShowHintsForMainSpeedButtonsCheckBox.Checked:=
ShowHintsForMainSpeedButtons;
ShowHintsForMainSpeedButtonsCheckBox.Checked:=ShowHintsForMainSpeedButtons;
ShowHintsForComponentPaletteCheckBox.Checked:=ShowHintsForComponentPalette;
// glyphs
case ShowButtonGlyphs of
@ -193,6 +194,9 @@ begin
sbgNever: rbMenuGlyphShowNever.Checked := True;
sbgSystem: rbMenuGlyphShowSystem.Checked := True;
end;
// mouse action
PreferDoubleClickCheckBox.Checked := MsgViewDblClickJumps;
end;
end;
@ -204,7 +208,8 @@ begin
LanguageID:=CaptionToLangID(LanguageComboBox.Text);
//debugln('TEnvironmentOptionsDialog.WriteSettings A LanguageID="',LanguageID,'" LanguageComboBox.ItemIndex=',dbgs(LanguageComboBox.ItemIndex),' LanguageComboBox.Text=',LanguageComboBox.Text);
// auto save
// check and auto save files
CheckDiskChangesWithLoading:=CheckDiskChangesWithLoadingCheckBox.Checked;
AskSaveSessionOnly:=AskSavingOnlySessionCheckBox.Checked;
AutoSaveEditorFiles:=AutoSaveEditorFilesCheckBox.Checked;
AutoSaveProject:=AutoSaveProjectCheckBox.Checked;
@ -212,10 +217,9 @@ begin
AutoSaveIntervalInSecsComboBox.Text,AutoSaveIntervalInSecs);
// hints
CheckDiskChangesWithLoading:=CheckDiskChangesWithLoadingCheckBox.Checked;
ShowHintsForComponentPalette:=ShowHintsForComponentPaletteCheckBox.Checked;
ShowHintsForMainSpeedButtons:=ShowHintsForMainSpeedButtonsCheckBox.Checked;
ShowHintsForComponentPalette:=ShowHintsForComponentPaletteCheckBox.Checked;
// glyphs
if rbBtnGlyphShowAlways.Checked then
ShowButtonGlyphs := sbgAlways
@ -231,6 +235,9 @@ begin
ShowMenuGlyphs := sbgNever
else
ShowMenuGlyphs := sbgSystem;
// mouse action
MsgViewDblClickJumps := PreferDoubleClickCheckBox.Checked;
end;
end;

View File

@ -19,7 +19,7 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
Width = 495
Anchors = [akTop, akLeft, akRight]
Caption = 'MWColorsGroupBox'
ClientHeight = 155
ClientHeight = 147
ClientWidth = 491
TabOrder = 0
object MWColorListBox: TColorListBox
@ -28,7 +28,7 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
AnchorSideRight.Control = MWSpeedSetColorsGroupBox
AnchorSideBottom.Control = MWColorBox
Left = 6
Height = 108
Height = 103
Top = 6
Width = 303
Style = [cbCustomColors]
@ -38,7 +38,6 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
ItemHeight = 0
OnSelectionChange = MWColorListBoxSelectionChange
TabOrder = 0
TopIndex = -1
end
object MWColorBox: TColorBox
AnchorSideLeft.Control = MWColorsGroupBox
@ -46,19 +45,19 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
AnchorSideBottom.Control = MWColorsGroupBox
AnchorSideBottom.Side = asrBottom
Left = 6
Height = 29
Top = 120
Height = 26
Top = 115
Width = 303
Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbCustomColor, cbPrettyNames]
Anchors = [akLeft, akRight, akBottom]
BorderSpacing.Around = 6
ItemHeight = 0
ItemHeight = 20
OnChange = MWColorBoxChange
TabOrder = 1
end
object MWSpeedSetColorsGroupBox: TGroupBox
Left = 315
Height = 143
Height = 135
Top = 6
Width = 170
Align = alRight
@ -66,14 +65,14 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
Caption = 'MWSpeedSetColorsGroupBox'
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 1
ClientHeight = 126
ClientHeight = 110
ClientWidth = 166
TabOrder = 2
object MWSetEditorColorsButton: TButton
Left = 0
Height = 27
Height = 30
Top = 0
Width = 166
Width = 209
AutoSize = True
Caption = 'MWSetEditorColorsButton'
OnClick = MWSetEditorColorsButtonClick
@ -83,9 +82,9 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
AnchorSideTop.Side = asrBottom
AnchorSideRight.Side = asrBottom
Left = 0
Height = 27
Top = 33
Width = 166
Height = 30
Top = 36
Width = 209
AutoSize = True
BorderSpacing.Top = 6
BorderSpacing.Right = 6
@ -101,9 +100,9 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
AnchorSideTop.Control = MWColorsGroupBox
AnchorSideTop.Side = asrBottom
Left = 70
Height = 15
Height = 20
Top = 178
Width = 93
Width = 115
BorderSpacing.Left = 10
BorderSpacing.Top = 6
BorderSpacing.Right = 10
@ -117,7 +116,7 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
AnchorSideTop.Side = asrCenter
Left = 0
Height = 3
Top = 184
Top = 187
Width = 60
end
object MWOptsRightBevel: TBevel
@ -127,10 +126,10 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 173
Left = 195
Height = 3
Top = 184
Width = 322
Top = 187
Width = 300
Anchors = [akTop, akLeft, akRight]
end
object MWHideIconsCheckBox: TCheckBox
@ -139,41 +138,27 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
AnchorSideTop.Side = asrBottom
Left = 6
Height = 24
Top = 199
Width = 154
Top = 204
Width = 181
BorderSpacing.Left = 6
Caption = 'MWHideIconsCheckBox'
ParentShowHint = False
ShowHint = True
TabOrder = 1
end
object MWDblClickJumpsCheckBox: TCheckBox
object MWFocusCheckBox: TCheckBox
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MWAlwaysDrawFocusedCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 24
Top = 247
Width = 180
BorderSpacing.Left = 6
Caption = 'MWDblClickJumpsCheckBox'
ParentShowHint = False
ShowHint = True
TabOrder = 2
end
object MWFocusCheckBox: TCheckBox
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MWDblClickJumpsCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 24
Top = 271
Width = 132
Top = 252
Width = 152
BorderSpacing.Left = 6
Caption = 'MWFocusCheckBox'
ParentShowHint = False
ShowHint = True
TabOrder = 3
TabOrder = 2
end
object MWAlwaysDrawFocusedCheckBox: TCheckBox
AnchorSideLeft.Control = MWHideIconsCheckBox
@ -181,33 +166,33 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
AnchorSideTop.Side = asrBottom
Left = 6
Height = 24
Top = 223
Width = 212
Top = 228
Width = 250
Caption = 'MWAlwaysDrawFocusedCheckBox'
ParentShowHint = False
ShowHint = True
TabOrder = 4
TabOrder = 3
end
object MWMaxProcsSpinEdit: TSpinEdit
AnchorSideLeft.Control = MWMaxProcsLabel
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = MWFocusCheckBox
AnchorSideTop.Side = asrBottom
Left = 110
Height = 25
Top = 295
Left = 134
Height = 28
Top = 276
Width = 50
BorderSpacing.Left = 2
TabOrder = 5
TabOrder = 4
end
object MWMaxProcsLabel: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MWMaxProcsSpinEdit
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15
Top = 300
Width = 102
Height = 20
Top = 280
Width = 126
BorderSpacing.Left = 6
Caption = 'MWMaxProcsLabel'
ParentColor = False

View File

@ -41,7 +41,6 @@ type
TMsgWndOptionsFrame = class(TAbstractIDEOptionsEditor)
MWAlwaysDrawFocusedCheckBox: TCheckBox;
MWDblClickJumpsCheckBox: TCheckBox;
MWFocusCheckBox: TCheckBox;
MWHideIconsCheckBox: TCheckBox;
MWMaxProcsLabel: TLabel;
@ -156,7 +155,6 @@ begin
MWAlwaysDrawFocusedCheckBox.Caption:=lisAlwaysDrawSelectedItemsFocused;
MWAlwaysDrawFocusedCheckBox.Hint:=
lisDrawTheSelectionFocusedEvenIfTheMessagesWindowHasN;
MWDblClickJumpsCheckBox.Caption:=lisEnvJumpFromMessageToSrcOnDblClickOtherwiseSingleClick;
MWFocusCheckBox.Caption:=dlgEOFocusMessagesAfterCompilation;
MWMaxProcsLabel.Caption:=Format(lisMaximumParallelProcesses0MeansDefault, [
IntToStr(DefaultMaxProcessCount)]);
@ -184,10 +182,8 @@ begin
MWColorListBox.Colors[ord(c)] := o.MsgViewColors[c];
MWHideIconsCheckBox.Checked := o.HideMessagesIcons;
MWAlwaysDrawFocusedCheckBox.Checked := o.MsgViewAlwaysDrawFocused;
MWDblClickJumpsCheckBox.Checked:=o.MsgViewDblClickJumps;
MWFocusCheckBox.Checked:=o.MsgViewFocus;
MWMaxProcsSpinEdit.Value:=o.MaxExtToolsInParallel;
MWFocusCheckBox.Checked := o.MsgViewFocus;
MWMaxProcsSpinEdit.Value := o.MaxExtToolsInParallel;
fReady:=true;
end;
@ -201,7 +197,6 @@ begin
o.MsgViewColors[c] := MWColorListBox.Colors[ord(c)];
o.HideMessagesIcons := MWHideIconsCheckBox.Checked;
o.MsgViewAlwaysDrawFocused := MWAlwaysDrawFocusedCheckBox.Checked;
o.MsgViewDblClickJumps := MWDblClickJumpsCheckBox.Checked;
o.MsgViewFocus := MWFocusCheckBox.Checked;
o.MaxExtToolsInParallel := MWMaxProcsSpinEdit.Value;
end;

View File

@ -1132,7 +1132,6 @@ resourcestring
dlgGroupCodetools = 'Codetools';
dlgGroupCodeExplorer = 'Code Explorer';
dlgGroupDebugger = 'Debugger';
// Options dialog
dlgIDEOptions = 'IDE Options';
dlgBakNoSubDirectory = '(no subdirectory)';
@ -1140,9 +1139,10 @@ resourcestring
lisMaximumParallelProcesses0MeansDefault = 'Maximum parallel processes, 0 '
+'means default (%s)';
lisMessagesWindow = 'Messages Window';
lisCheckForDiskFileChangesViaContentRatherThanTimesta = 'Check for disk file'
+' changes via content rather than timestamp';
lisCheckForDiskFileChangesViaContent = 'Check for disk file changes via content '
+'rather than timestamp';
lisSlowerButMoreAccurate = 'Slower but more accurate.';
// Search dialog
dlgSearchCaption = 'Searching ...';
dlgSearchAbort = 'Search terminated by user.';
@ -1199,12 +1199,6 @@ resourcestring
lisCMParameter = 'Parameter';
lisInsertMacro = 'Insert Macro';
lisCTPleaseSelectAMacro = 'please select a macro';
dlgEnvLanguage = 'Language';
dlgEnvLanguageHint = 'Language of all IDE strings. Restart IDE after changing it for best result.';
dlgAutoSave = 'Auto Save';
lisAskBeforeSavingProjectSSession = 'Ask before saving project''s session';
lisIfOnlySessionInfoChangedThenAsk = 'If only the session info changed, ask about saving it.';
dlgEdFiles = 'Editor Files';
dlgEnvProject = 'Tabs for project';
lisCenterALostWindow = 'Center a lost window';
lisNumberOfFilesToConvert = 'Number of files to convert: %s';
@ -1216,10 +1210,31 @@ resourcestring
lisFilesNotInASCIINorUTF8Encoding = 'Files not in ASCII nor UTF-8 encoding';
podAddPackageUnitToUsesSection = 'Add package unit to uses section';
lisCodeBrowser = 'Code Browser';
// Desktop options
dlgEnvLanguage = 'Language';
dlgEnvLanguageHint = 'Language of all IDE strings. Restart IDE after changing it for best result.';
dlgCheckAndAutoSaveFiles = 'Check and Auto Save Files';
lisAskBeforeSavingProjectSSession = 'Ask before saving project''s session';
lisIfOnlySessionInfoChangedThenAsk = 'If only the session info changed, ask about saving it.';
dlgEdFiles = 'Editor Files';
dlgIntvInSec = 'Interval in secs';
dlgDesktopFiles = 'Desktop Files';
dlgSaveDFile = 'Save desktop settings to file';
dlgLoadDFile = 'Load desktop settings from file';
dlgDesktopHints = 'Hints';
dlgDesktopButtons = 'Buttons - ';
dlgDesktopMenus = 'Menus - ';
dlgPalHints = 'Hints for component palette';
dlgSpBHints = 'Hints for main speed buttons (open, save, ...)';
dlgMouseAction = 'Mouse Action';
dlgPreferDoubleClickOverSingleClick = 'Prefer double-click over single-click';
dlgCurrentlyRespectedByMessagesWindow = 'Currently respected by messages window, '
+'jump history and search results.';
lisSavedSuccessfully = 'Saved successfully';
lisLoadedSuccessfully = 'Loaded successfully';
// Window options
dlgSingleTaskBarButton = 'Show single button in TaskBar';
dlgHideIDEOnRun = 'Hide IDE windows on run';
dlgHideIDEOnRunHint = 'Do not show the IDE at all while program is running.';
@ -1227,29 +1242,11 @@ resourcestring
+'button in the taskbar for the whole IDE, instead of one per window. Some'
+' Linux Window Managers like Cinnamon do not support this and always show'
+' one button per window.';
dlgHideMessagesIcons = 'Hide Messages Icons';
lisAlwaysDrawSelectedItemsFocused = 'Always draw selected items focused';
lisDrawTheSelectionFocusedEvenIfTheMessagesWindowHasN = 'Draw the selection '
+'focused, even if the Messages window has no focus. Use this if your '
+'theme has a hardly visible unfocused drawing.';
lisEditorColors = 'Editor Colors';
lisIDETitleStartsWithProjectName = 'IDE title starts with project name';
lisIDETitleShowsProjectDir = 'IDE title shows project directory';
lisIDETitleShowsBuildMode = 'IDE title shows selected build mode';
lisWindowMenuWithNameForDesignedForm = 'Window menu shows designed form''s name instead of caption';
lisWindowMenuWithNameForDesignedFormHint = 'Useful especially if the caption is left empty.';
dlgDesktopHints = 'Hints';
dlgPalHints = 'Hints for component palette';
dlgSpBHints = 'Hints for main speed buttons (open, save, ...)';
dlgDesktopButtons = 'Buttons - ';
dlgDesktopMenus = 'Menus - ';
dlgDesktopMisc = 'Misc Options';
lisSavedSuccessfully = 'Saved successfully';
lisLoadedSuccessfully = 'Loaded successfully';
lisEnvJumpFromMessageToSrcOnDblClickOtherwiseSingleClick = 'Jump from '
+'message to source line on double click (otherwise: single click)';
dlgWinPos = 'Window positions';
lisTitleInTaskbarShowsForExampleProject1LpiLazarus = 'Title in taskbar '
+'shows for example: project1.lpi - Lazarus';
@ -1258,6 +1255,14 @@ resourcestring
lisProjectDirectoryIsShowedInIdeTitleBar = 'Title in taskbar '
+'shows also directory path of the project';
// Message window options
dlgHideMessagesIcons = 'Hide Messages Icons';
lisAlwaysDrawSelectedItemsFocused = 'Always draw selected items focused';
lisDrawTheSelectionFocusedEvenIfTheMessagesWindowHasN = 'Draw the selection '
+'focused, even if the Messages window has no focus. Use this if your '
+'theme has a hardly visible unfocused drawing.';
lisEditorColors = 'Editor Colors';
dlgMainMenu = 'Main Menu';
dlgSrcEdit = 'Source Editor';
dlgMsgs = 'Messages';
@ -5329,7 +5334,7 @@ resourcestring
lisImpossible = 'Impossible';
lisAProjectUnitCanNotBeUsedByOtherPackagesProjects = 'A project unit can '
+'not be used by other packages/projects';
lisShowGlyphsFor = 'Show Glyphs for:';
lisShowGlyphsFor = 'Show Glyphs for';
lisDirectoryNotWritable = 'Directory not writable';
lisTheDirectoryIsNotWritable = 'The directory "%s" is not writable.';
lisBuildingLazarusFailed = 'Building Lazarus failed';