Add tooltip, refactor

Author: BornToBeRoot

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

@@ -2295,4 +2295,10 @@ is disabled!</value>
   <data name="DeleteCustomCommandMessage" xml:space="preserve">
     <value>The selected custom command will be deleted permanently.</value>
   </data>
+  <data name="HelpMessage_CustomCommandVariables" xml:space="preserve">
+    <value>The following variables are available:
+
+$$ipaddress$$	--&gt;	IP adresse
+$$hostname$$	--&gt;	Hostname</value>
+  </data>
 </root>

Source/NETworkManager/Resources/Localization/Strings.resx

@@ -372,28 +372,9 @@ private void PerformDNSLookupHostnameAction()
 
         private void CustomCommandAction(object guid)
         {
-            Debug.WriteLine(guid.ToString());
-
-            if (guid is Guid id)
-            {
-                CustomCommandInfo info = (CustomCommandInfo)CustomCommands.FirstOrDefault(x => x.ID == id).Clone();
-
-                if (info == null)
-                    return; // ToDo: Log and error message
-
-                // Replace vars
-                string hostname = !string.IsNullOrEmpty(SelectedHostResult.Hostname) ? SelectedHostResult.Hostname.TrimEnd('.') : "";
-                string ipAddress = SelectedHostResult.PingInfo.IPAddress.ToString();
-
-                info.FilePath = Regex.Replace(info.FilePath, "\\$\\$hostname\\$\\$", hostname, RegexOptions.IgnoreCase);
-                info.FilePath = Regex.Replace(info.FilePath, "\\$\\$ipaddress\\$\\$", ipAddress , RegexOptions.IgnoreCase);
-                info.Arguments = Regex.Replace(info.Arguments, "\\$\\$hostname\\$\\$", hostname, RegexOptions.IgnoreCase);
-                info.Arguments = Regex.Replace(info.Arguments, "\\$\\$ipaddress\\$\\$", ipAddress, RegexOptions.IgnoreCase);
-                
-                CustomCommand.Run(info);
-            }            
+            CustomCommand(guid);            
         }
-
+                
         public ICommand AddProfileSelectedHostCommand => new RelayCommand(p => AddProfileSelectedHostAction());
         private async void AddProfileSelectedHostAction()
         {
@@ -609,6 +590,28 @@ private void ScanFinished()
             IsScanRunning = false;
         }
 
+        private void CustomCommand(object guid)
+        {
+            if (guid is Guid id)
+            {
+                CustomCommandInfo info = (CustomCommandInfo)CustomCommands.FirstOrDefault(x => x.ID == id).Clone();
+
+                if (info == null)
+                    return; // ToDo: Log and error message
+
+                // Replace vars
+                string hostname = !string.IsNullOrEmpty(SelectedHostResult.Hostname) ? SelectedHostResult.Hostname.TrimEnd('.') : "";
+                string ipAddress = SelectedHostResult.PingInfo.IPAddress.ToString();
+
+                info.FilePath = Regex.Replace(info.FilePath, "\\$\\$hostname\\$\\$", hostname, RegexOptions.IgnoreCase);
+                info.FilePath = Regex.Replace(info.FilePath, "\\$\\$ipaddress\\$\\$", ipAddress, RegexOptions.IgnoreCase);
+                info.Arguments = Regex.Replace(info.Arguments, "\\$\\$hostname\\$\\$", hostname, RegexOptions.IgnoreCase);
+                info.Arguments = Regex.Replace(info.Arguments, "\\$\\$ipaddress\\$\\$", ipAddress, RegexOptions.IgnoreCase);
+
+                Utilities.CustomCommand.Run(info);
+            }
+        }
+
         private void AddHostToHistory(string ipRange)
         {
             // Create the new list

Source/NETworkManager/ViewModels/IPScannerViewModel.cs

@@ -23,6 +23,8 @@
                 <ColumnDefinition Width="1*" />
                 <ColumnDefinition Width="10" />
                 <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="10" />
+                <ColumnDefinition Width="24" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -74,8 +76,18 @@
                     </Binding>
                 </TextBox.Text>
             </TextBox>
+            <Rectangle Grid.Column="4" Grid.Row="2" Width="24" Height="24" VerticalAlignment="Top" ToolTip="{x:Static localization:Strings.HelpMessage_CustomCommandVariables}" Style="{StaticResource HelpImageRectangle}">
+                <Rectangle.Resources>
+                    <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
+                </Rectangle.Resources>
+            </Rectangle>
             <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.Arguments}" />
             <TextBox x:Name="TextBoxArguments" Grid.Column="2" Grid.Row="4" Text="{Binding Arguments, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleCustomCommandVariableHostname}" />
+            <Rectangle Grid.Column="4" Grid.Row="4" Width="24" Height="24" VerticalAlignment="Top" ToolTip="{x:Static localization:Strings.HelpMessage_CustomCommandVariables}" Style="{StaticResource HelpImageRectangle}">
+                <Rectangle.Resources>
+                    <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
+                </Rectangle.Resources>
+            </Rectangle>
         </Grid>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />