Merge branch 'select_all' into fix_121_filter_input

Author: tig

src/Microsoft.PowerShell.ConsoleGuiTools/ConsoleGui.cs

@@ -120,7 +120,8 @@ private GridViewDataSource LoadData()
             return new GridViewDataSource(items);
         }
 
-        private void ApplyFilter(){
+        private void ApplyFilter()
+        {
             List<GridViewRow> itemList = GridViewHelpers.FilterData(_itemSource.GridViewRowList, _applicationData.Filter ?? string.Empty);
             // Set the ListView to show only the subset defined by the filter
             _listView.Source = new GridViewDataSource(itemList);
@@ -149,50 +150,72 @@ private Window CreateTopLevelWindow()
                 Width = Dim.Fill(_applicationData.MinUI ? -1 : 0),
                 Height = Dim.Fill(_applicationData.MinUI ? -1 : 1)
             };
-            
-            if (_applicationData.MinUI) {
+
+            if (_applicationData.MinUI)
+            {
                 win.Border.BorderStyle = BorderStyle.None;
-            } 
-            
+            }
+
             Application.Top.Add(win);
             return win;
         }
 
         private void AddStatusBar(bool visible)
         {
-            var statusBar = new StatusBar(
-                    _applicationData.OutputMode != OutputModeOption.None
-                    ? new StatusItem[]
+            var statusItems = new List<StatusItem>();
+            if (_applicationData.OutputMode != OutputModeOption.None)
+            {
+                // Use Key.Unknown for SPACE with no delegate because ListView already
+                // handles SPACE
+                statusItems.Add(new StatusItem(Key.Unknown, "~SPACE~ Select Item", null));
+            }
+
+            if (_applicationData.OutputMode == OutputModeOption.Multiple)
+            {
+                statusItems.Add(new StatusItem(Key.A | Key.CtrlMask, "~CTRL-A~ Select All", () =>
+                {
+                    // This selects only the items that match the Filter
+                    var gvds = _listView.Source as GridViewDataSource;
+                    gvds.GridViewRowList.ForEach(i => i.IsMarked = true);
+                    _listView.SetNeedsDisplay();
+                }));
+
+                // Ctrl-D is commonly used in GUIs for select-none 
+                statusItems.Add(new StatusItem(Key.D | Key.CtrlMask, "~CTRL-D~ Select None", () =>
+                {
+                    // This un-selects only the items that match the Filter
+                    var gvds = _listView.Source as GridViewDataSource;
+                    gvds.GridViewRowList.ForEach(i => i.IsMarked = false);
+                    _listView.SetNeedsDisplay();
+                }));
+            }
+
+            if (_applicationData.OutputMode != OutputModeOption.None)
+            {
+                statusItems.Add(new StatusItem(Key.Enter, "~ENTER~ Accept", () =>
+                {
+                    if (Application.Top.MostFocused == _listView)
                     {
-                        // Use Key.Unknown for SPACE with no delegate because ListView already
-                        // handles SPACE
-                        new StatusItem(Key.Unknown, "~SPACE~ Mark Item", null),
-                        new StatusItem(Key.Enter, "~ENTER~ Accept", () =>
+                        // If nothing was explicitly marked, we return the item that was selected
+                        // when ENTER is pressed in Single mode. If something was previously selected
+                        // (using SPACE) then honor that as the single item to return
+                        if (_applicationData.OutputMode == OutputModeOption.Single &&
+                            _itemSource.GridViewRowList.Find(i => i.IsMarked) == null)
                         {
-                            if (Application.Top.MostFocused == _listView)
-                            {
-                                // If nothing was explicitly marked, we return the item that was selected
-                                // when ENTER is pressed in Single mode. If something was previously selected
-                                // (using SPACE) then honor that as the single item to return
-                                if (_applicationData.OutputMode == OutputModeOption.Single &&
-                                    _itemSource.GridViewRowList.Find(i => i.IsMarked) == null)
-                                {
-                                    _listView.MarkUnmarkRow();
-                                }
-                                Accept();
-                            }
-                            else if (Application.Top.MostFocused == _filterField)
-                            {
-                                _listView.SetFocus();
-                            }
-                        }),
-                        new StatusItem(Key.Esc, "~ESC~ Close", () => Close())
+                            _listView.MarkUnmarkRow();
+                        }
+                        Accept();
                     }
-                    : new StatusItem[]
+                    else if (Application.Top.MostFocused == _filterField)
                     {
-                        new StatusItem(Key.Esc, "~ESC~ Close",  () => Close())
+                        _listView.SetFocus();
                     }
-            );
+                }));
+            }
+
+            statusItems.Add(new StatusItem(Key.Esc, "~ESC~ Close", () => Close()));
+
+            var statusBar = new StatusBar(statusItems.ToArray());
             statusBar.Visible = visible;
             Application.Top.Add(statusBar);
         }
@@ -220,7 +243,6 @@ private void CalculateColumnWidths(List<string> gridHeaders)
                     {
                         listViewColumnWidths[index] = len;
                     }
-
                     index++;
                 }
             }
@@ -262,6 +284,13 @@ private void AddFilter(Window win)
                 Width = Dim.Fill() - _filterLabel.Text.Length
             };
 
+            // TextField captures Ctrl-A (select all text) and Ctrl-D (delete backwards)
+            // In OCGV these are used for select-all/none of items. Selecting items is more
+            // common than editing the filter field so we turn them off in the filter textview. 
+            // BACKSPACE still works for delete backwards
+            _filterField.ClearKeybinding(Key.A | Key.CtrlMask);
+            _filterField.ClearKeybinding(Key.D | Key.CtrlMask);
+
             var filterErrorLabel = new Label(string.Empty)
             {
                 X = Pos.Right(_filterLabel) + 1,
@@ -327,7 +356,8 @@ private void AddHeaders(Window win, List<string> gridHeaders)
                 }
             }
 
-            if (!_applicationData.MinUI){
+            if (!_applicationData.MinUI)
+            {
                 var headerLine = new Label(headerLineText.ToString())
                 {
                     X = 0,
@@ -344,7 +374,7 @@ private void AddListView(Window win)
             if (!_applicationData.MinUI)
             {
                 _listView.Y = Pos.Bottom(_filterLabel) + 3; // 1 for space, 1 for header, 1 for header underline
-            } 
+            }
             else
             {
                 _listView.Y = 1; // 1 for space, 1 for header, 1 for header underline