re-implemented feature post merge screw up

Author: tig

src/Microsoft.PowerShell.ConsoleGuiTools/ConsoleGui.cs

@@ -62,7 +62,7 @@ public HashSet<int> Start(ApplicationData applicationData)
             AddListView(win);
 
             // Status bar is where our key-bindings are handled
-            AddStatusBar(!_applicationData.MinUI);
+            AddStatusBar();
 
             // If -Filter parameter is set, apply it. 
             ApplyFilter();
@@ -117,7 +117,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);
@@ -146,50 +147,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, "~^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();
+                }));
+
+                // Use Ctrl-N until Terminal.Gui supports ctrl-shift chords
+                statusItems.Add(new StatusItem(Key.N | Key.CtrlMask, "~^N~ 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);
         }
@@ -324,7 +347,8 @@ private void AddHeaders(Window win, List<string> gridHeaders)
                 }
             }
 
-            if (!_applicationData.MinUI){
+            if (!_applicationData.MinUI)
+            {
                 var headerLine = new Label(headerLineText.ToString())
                 {
                     X = 0,
@@ -341,7 +365,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