paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-21 00:39:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE/Options: Hide the panel of conflict shortcuts if they are absent. Merge request !435.

Browse Source
This commit is contained in:
n7800 2025-02-04 07:16:06 +05:00 committed by Juha
parent 42eb6a4a4d
commit a5bf264276
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/frames/editor_keymapping_options.lfm
View File

@ -217,6 +217,7 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame
Width = 459 Width = 459
Align = alBottom Align = alBottom
ResizeAnchor = akBottom ResizeAnchor = akBottom
Visible = False
OnMoved = KeyMapSplitterMoved OnMoved = KeyMapSplitterMoved
end end
object ConflictsTreeView: TTreeView object ConflictsTreeView: TTreeView
@ -232,6 +233,7 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame
RowSelect = True RowSelect = True
ScrollBars = ssAutoBoth ScrollBars = ssAutoBoth
TabOrder = 0 TabOrder = 0
Visible = False
Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoRightClickSelect, tvoRowSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw] Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoRightClickSelect, tvoRowSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
OnMouseDown = ConflictsTreeViewMouseDown OnMouseDown = ConflictsTreeViewMouseDown
end end

4
ide/frames/editor_keymapping_options.pas
View File

@ -709,8 +709,8 @@ begin
end; end;
end; end;
if ConflictsTreeView.Items.Count=0 then ConflictsTreeView.Visible:=ConflictsTreeView.Items.Count<>0;
ConflictsTreeView.Items.Add(nil, lisThereAreNoConflictingKeys); KeyMapSplitter.Visible:=ConflictsTreeView.Visible;
ConflictsTreeView.EndUpdate; ConflictsTreeView.EndUpdate;
end; end;

1
ide/lazarusidestrconsts.pas
View File

@ -3009,7 +3009,6 @@ resourcestring
+'%s%sRemove the old assignment and assign the key to the new function %s?'; +'%s%sRemove the old assignment and assign the key to the new function %s?';
lisAlternativeKeyOr2KeySequence = 'Alternative key (or 2 key sequence)'; lisAlternativeKeyOr2KeySequence = 'Alternative key (or 2 key sequence)';
srkmConflic = 'Conflict '; srkmConflic = 'Conflict ';
lisThereAreNoConflictingKeys = 'There are no conflicting keys.';
srkmEditForCmd = 'Edit keys of command'; srkmEditForCmd = 'Edit keys of command';
lisChooseAKey = 'Choose a key ...'; lisChooseAKey = 'Choose a key ...';