Fix: Find dialog coordinator in parent (dragged out) window (#2661)

* Fix: Find dialog coordinator in parent window

* Feature: Adjust design for RunCommand

* Fix: ShowAddProfileDialog context

* Fix: Dialog context in dragged out tab

* Chore: Code cleanup

* Chore: Code cleanup

* Fix: Add missing CloseTab()

Author: BornToBeRoot

Source/NETworkManager.Localization/Resources/Strings.Designer.cs

@@ -3811,4 +3811,7 @@ Try again in a few seconds.</value>
   <data name="CloseGroup" xml:space="preserve">
     <value>Close group</value>
   </data>
+  <data name="ToolTip_RunCommandWithHotKey" xml:space="preserve">
+    <value>Run command... (Ctrl+Shift+P)</value>
+  </data>
 </root>

Source/NETworkManager.Localization/Resources/Strings.resx

@@ -125,9 +125,6 @@ private static List<ConnectionInfo> GetActiveTcpConnections()
                     // Cache the result
                     _remoteHostNames.Add(remoteAddress,
                         !dnsResolverTask.Result.HasError ? dnsResolverTask.Result.Value : "-/-");
-
-                    Debug.WriteLine("Cache: Added " + remoteAddress + " -> " +
-                                    (!dnsResolverTask.Result.HasError ? dnsResolverTask.Result.Value : "-/-"));
                 }
 
                 result.Add(new ConnectionInfo(

Source/NETworkManager.Models/Network/Connection.cs

@@ -10,9 +10,11 @@
                  xmlns:application="clr-namespace:NETworkManager.Models;assembly=NETworkManager.Models"
                  xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
                  xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
+                 xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
                  mc:Ignorable="d"
                  Style="{DynamicResource DefaultWindow}" MinWidth="800" Width="1024" Height="768" MinHeight="600"
                  TitleAlignment="Left" Activated="MetroWindow_Activated"
+                 dialogs:DialogParticipation.Register="{Binding}"
                  d:DataContext="{d:DesignInstance controls:DragablzTabHostWindow}">
     <mah:MetroWindow.WindowButtonCommands>
         <mah:WindowButtonCommands Template="{DynamicResource MahApps.Templates.WindowButtonCommands.Win10}" />

Source/NETworkManager/Controls/DragablzTabHostWindow.xaml

@@ -135,8 +135,6 @@ private void CloseItemAction(ItemActionCallbackArgs<TabablzControl> args)
         // Switch between application identifiers...
         switch (_applicationName)
         {
-            case ApplicationName.None:
-                break;
             case ApplicationName.IPScanner:
                 ((IPScannerView)((DragablzTabItem)args.DragablzItem.Content).View).CloseTab();
                 break;
@@ -176,20 +174,10 @@ private void CloseItemAction(ItemActionCallbackArgs<TabablzControl> args)
             case ApplicationName.Whois:
                 ((WhoisView)((DragablzTabItem)args.DragablzItem.Content).View).CloseTab();
                 break;
-            case ApplicationName.Dashboard:
-            case ApplicationName.NetworkInterface:
-            case ApplicationName.WiFi:
-            case ApplicationName.PingMonitor:
-            case ApplicationName.DiscoveryProtocol:
-            case ApplicationName.WakeOnLAN:
-            case ApplicationName.SubnetCalculator:
-            case ApplicationName.BitCalculator:
-            case ApplicationName.Lookup:
-            case ApplicationName.Connections:
-            case ApplicationName.Listeners:
-            case ApplicationName.ARPTable:
-            default:
+            case ApplicationName.IPGeolocation:
+                ((IPGeolocationView)((DragablzTabItem)args.DragablzItem.Content).View).CloseTab();
                 break;
+                
         }
     }
 

Source/NETworkManager/Controls/DragablzTabHostWindow.xaml.cs

@@ -35,5 +35,6 @@ public string Header
     }
 
     public UserControl View { get; set; }
+    
     public Guid Id { get; set; }
 }

Source/NETworkManager/Controls/DragablzTabItem.cs

@@ -10,11 +10,13 @@
                  xmlns:asf="clr-namespace:AirspaceFixer;assembly=AirspaceFixer"
                  xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
                  xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
+                 xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
                  xmlns:resources="clr-namespace:NETworkManager.Properties"
                  xmlns:networkManager="clr-namespace:NETworkManager"
                  xmlns:models="clr-namespace:NETworkManager.Models;assembly=NETworkManager.Models"
                  mc:Ignorable="d"
                  Style="{DynamicResource DefaultWindow}"
+                 dialogs:DialogParticipation.Register="{Binding}"
                  MinWidth="800" Width="1024" Height="768" MinHeight="600"
                  SaveWindowPosition="True" TitleAlignment="Left"
                  ContentRendered="MetroMainWindow_ContentRendered" StateChanged="MetroWindowMain_StateChanged"
@@ -87,7 +89,22 @@
     </mah:MetroWindow.LeftWindowCommands>
     <mah:MetroWindow.RightWindowCommands>
         <mah:WindowCommands ShowSeparators="False">
+            <Button Command="{Binding OpenRunCommand}"
+                    Visibility="{Binding Path=FlyoutRunCommandIsOpen, Converter={StaticResource ResourceKey=BooleanReverseToVisibilityCollapsedConverter}}"
+                    ToolTip="{x:Static localization:Strings.ToolTip_RunCommandWithHotKey}"
+                    Cursor="Hand"
+                    Focusable="False">
+                <StackPanel Orientation="Horizontal">
+                    <Rectangle Width="20" Height="20"
+                               Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
+                        <Rectangle.OpacityMask>
+                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:FontAwesome Kind=TerminalSolid}" />
+                        </Rectangle.OpacityMask>
+                    </Rectangle>
+                </StackPanel>
+            </Button>
             <!-- ToDo: CenterWindowCommands https://github.com/MahApps/MahApps.Metro/issues/4419 -->
+            <!--
             <Button Command="{Binding Path=OpenRunCommand}"
                     Cursor="Hand"
                     Visibility="{Binding Path=FlyoutRunCommandIsOpen, Converter={StaticResource ResourceKey=BooleanReverseToVisibilityCollapsedConverter}}"
@@ -106,14 +123,16 @@
                                HorizontalAlignment="Right"
                                Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray8}">
                         <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ChevronRight}" />
+                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:FontAwesome Kind=TerminalSolid}" />
                         </Rectangle.OpacityMask>
                     </Rectangle>
+                    
                     <TextBlock Grid.Column="1" Grid.Row="0"
                                Style="{StaticResource ResourceKey=InfoTextBlock}"
                                Text="{x:Static Member=localization:Strings.Watermark_RunCommandWithHotKey}" />
                 </Grid>
             </Button>
+            -->
             <Button Command="{Binding RestartApplicationCommand}"
                     Opacity="1"
                     Visibility="{Binding IsRestartRequired, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"

Source/NETworkManager/MainWindow.xaml

@@ -301,8 +301,8 @@ private static GroupInfo ParseGroupInfo(GroupViewModel instance)
                 !string.Equals(instance.Group.Name, name, StringComparison.Ordinal))
                 foreach (var profile in profiles)
                     profile.Group = name;
-            else
-                Debug.WriteLine("Cannot update group in profiles");
+            //else
+            //    Debug.WriteLine("Cannot update group in profiles");
         }
 
         return new GroupInfo
@@ -468,7 +468,7 @@ private static GroupInfo ParseGroupInfo(GroupViewModel instance)
 
     #region Dialog to add, edit, copy as and delete profile
 
-    public static Task ShowAddProfileDialog(IProfileManagerMinimal viewModel,
+    public static Task ShowAddProfileDialog(object context, IProfileManagerMinimal viewModel,
         IDialogCoordinator dialogCoordinator, ProfileInfo profile = null, string group = null,
         ApplicationName applicationName = ApplicationName.None)
     {
@@ -480,13 +480,13 @@ public static Task ShowAddProfileDialog(IProfileManagerMinimal viewModel,
 
         ProfileViewModel profileViewModel = new(async instance =>
         {
-            await dialogCoordinator.HideMetroDialogAsync(viewModel, customDialog);
+            await dialogCoordinator.HideMetroDialogAsync(context, customDialog);
             viewModel.OnProfileManagerDialogClose();
 
             ProfileManager.AddProfile(ParseProfileInfo(instance));
         }, async _ =>
         {
-            await dialogCoordinator.HideMetroDialogAsync(viewModel, customDialog);
+            await dialogCoordinator.HideMetroDialogAsync(context, customDialog);
             viewModel.OnProfileManagerDialogClose();
         }, ProfileManager.GetGroupNames(), group, ProfileEditMode.Add, profile, applicationName);
 
@@ -497,7 +497,7 @@ public static Task ShowAddProfileDialog(IProfileManagerMinimal viewModel,
 
         viewModel.OnProfileManagerDialogOpen();
 
-        return dialogCoordinator.ShowMetroDialogAsync(viewModel, customDialog);
+        return dialogCoordinator.ShowMetroDialogAsync(context, customDialog);
     }
 
     public static Task ShowEditProfileDialog(IProfileManagerMinimal viewModel,

Source/NETworkManager/ProfileDialogManager.cs

@@ -423,7 +423,7 @@ private void ConnectProfileExternalAction()
     private void AddProfileAction()
     {
         ProfileDialogManager
-            .ShowAddProfileDialog(this, _dialogCoordinator, null, null, ApplicationName.AWSSessionManager)
+            .ShowAddProfileDialog(this, this, _dialogCoordinator, null, null, ApplicationName.AWSSessionManager)
             .ConfigureAwait(false);
     }
 

Source/NETworkManager/ViewModels/AWSSessionManagerHostViewModel.cs

@@ -234,7 +234,7 @@ private void LookupProfileAction()
 
     private void AddProfileAction()
     {
-        ProfileDialogManager.ShowAddProfileDialog(this, _dialogCoordinator, null, null, ApplicationName.DNSLookup)
+        ProfileDialogManager.ShowAddProfileDialog(this,this, _dialogCoordinator, null, null, ApplicationName.DNSLookup)
             .ConfigureAwait(false);
     }