Skip to content

Commit fd6483e

Browse files
committed
tweaks
1 parent 75ca4d1 commit fd6483e

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/Microsoft.PowerShell.ConsoleGuiTools/ConsoleGui.cs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public HashSet<int> Start(ApplicationData applicationData)
6262
AddListView(win);
6363

6464
// Status bar is where our key-bindings are handled
65-
AddStatusBar();
65+
AddStatusBar(!_applicationData.MinUI);
6666

6767
// If -Filter parameter is set, apply it.
6868
ApplyFilter();
@@ -169,16 +169,16 @@ private void AddStatusBar(bool visible)
169169

170170
if (_applicationData.OutputMode == OutputModeOption.Multiple)
171171
{
172-
statusItems.Add(new StatusItem(Key.A | Key.CtrlMask, "~^A~ Select All", () =>
172+
statusItems.Add(new StatusItem(Key.A | Key.CtrlMask, "~CTRL-A~ Select All", () =>
173173
{
174174
// This selects only the items that match the Filter
175175
var gvds = _listView.Source as GridViewDataSource;
176176
gvds.GridViewRowList.ForEach(i => i.IsMarked = true);
177177
_listView.SetNeedsDisplay();
178178
}));
179179

180-
// Use Ctrl-N until Terminal.Gui supports ctrl-shift chords
181-
statusItems.Add(new StatusItem(Key.N | Key.CtrlMask, "~^N~ Select None", () =>
180+
// Ctrl-D is commonly used in GUIs for select-none
181+
statusItems.Add(new StatusItem(Key.D | Key.CtrlMask, "~CTRL-D~ Select None", () =>
182182
{
183183
// This un-selects only the items that match the Filter
184184
var gvds = _listView.Source as GridViewDataSource;
@@ -240,7 +240,6 @@ private void CalculateColumnWidths(List<string> gridHeaders)
240240
{
241241
listViewColumnWidths[index] = len;
242242
}
243-
244243
index++;
245244
}
246245
}
@@ -282,6 +281,13 @@ private void AddFilter(Window win)
282281
Width = Dim.Fill() - _filterLabel.Text.Length
283282
};
284283

284+
// TextField captures Ctrl-A (select all text) and Ctrl-D (delete backwards)
285+
// In OCGV these are used for select-all/none of items. Selecting items is more
286+
// common than editing the filter field so we turn them off in the filter textview.
287+
// BACKSPACE still works for delete backwards
288+
_filterField.ClearKeybinding(Key.A | Key.CtrlMask);
289+
_filterField.ClearKeybinding(Key.D | Key.CtrlMask);
290+
285291
var filterErrorLabel = new Label(string.Empty)
286292
{
287293
X = Pos.Right(_filterLabel) + 1,

0 commit comments

Comments
 (0)