Merge branch 'develop' into task/RDMP-100-allow-project-specific-extr…

…action-updates
HicServices · Feb 13, 2024 · 7c5c163 · 7c5c163
2 parents 903c93a + abcff70
commit 7c5c163
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj b/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj
@@ -80,7 +80,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="NunitXml.TestLogger" Version="3.1.15" />
+        <PackageReference Include="NunitXml.TestLogger" Version="3.1.20" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Rdmp.Core\Rdmp.Core.csproj" />

diff --git a/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj b/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj
@@ -27,7 +27,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="NunitXml.TestLogger" Version="3.1.15" />
+        <PackageReference Include="NunitXml.TestLogger" Version="3.1.20" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Application\ResearchDataManagementPlatform\ResearchDataManagementPlatform.csproj" />

diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleMainWindow.cs b/Tools/rdmp/CommandLine/Gui/ConsoleMainWindow.cs
@@ -157,12 +157,13 @@ internal void SetUp(Toplevel top)
 
         Application.RootMouseEvent = OnRootMouseEvent;
 
+
+
+
         _treeView.ObjectActivationButton = _rightClick;
-        _treeView.ObjectActivated += _treeView_ObjectActivated;
         _treeView.KeyPress += treeView_KeyPress;
         _treeView.SelectionChanged += _treeView_SelectionChanged;
         _treeView.AspectGetter = AspectGetter;
-
         var statusBar = new StatusBar(new StatusItem[]
         {
             new(Key.Q | Key.CtrlMask, "~^Q~ Quit", () => Quit()),
@@ -363,6 +364,10 @@ private void treeView_KeyPress(View.KeyEventEventArgs obj)
         {
             switch (obj.KeyEvent.Key)
             {
+                case Key.Enter:
+                    _treeView_ObjectActivated(null);
+                    obj.Handled = true;
+                    break;
                 case Key.DeleteChar:
                     var many = _treeView.GetAllSelectedObjects().ToArray();
                     obj.Handled = true;