Feature: Profile description and tooltip

Author: BornToBeRoot

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

@@ -227,7 +227,7 @@
     <data name="ExamplePortScanRange" xml:space="preserve">
     <value>22; 80; 443; 500 - 999; 8080</value>
   </data>
-    <data name="ExampleRemoteDesktopProfileName" xml:space="preserve">
+    <data name="ExampleProfileName" xml:space="preserve">
     <value>Webserver</value>
   </data>
     <data name="ExampleSerialLine" xml:space="preserve">

Source/NETworkManager.Localization/Resources/StaticStrings.resx

@@ -3851,4 +3851,7 @@ Right-click for more options.</value>
     <data name="SetDefault" xml:space="preserve">
     <value>Set default</value>
   </data>
+    <data name="ExampleProfileDescription" xml:space="preserve">
+      <value>Ubuntu Server running Docker with Nextcloud and Traefik...</value>
+    </data>
 </root>

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

@@ -31,6 +31,7 @@ public ProfileInfo(ProfileInfo profile)
     {
         Name = profile.Name;
         Host = profile.Host;
+        Description = profile.Description;
         Group = profile.Group;
         Tags = profile.Tags;
 
@@ -248,11 +249,16 @@ public ProfileInfo(ProfileInfo profile)
     /// </summary>
     public string Host { get; set; }
 
+    /// <summary>
+    ///     Description of the profile.
+    /// </summary>
+    public string Description { get; set; }
+    
     /// <summary>
     ///     Name of the group. Profiles are grouped based on the name.
     /// </summary>
     public string Group { get; set; }
-
+    
     /// <summary>
     ///     Tags to classify the profiles and to filter by it.
     /// </summary>

Source/NETworkManager.Localization/Resources/Strings.resx

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Security;
-using System.Threading.Tasks;
-using System.Windows;
-using MahApps.Metro.Controls.Dialogs;
+using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models;
 using NETworkManager.Models.Network;
@@ -12,6 +7,11 @@
 using NETworkManager.Profiles;
 using NETworkManager.ViewModels;
 using NETworkManager.Views;
+using System;
+using System.Collections.Generic;
+using System.Security;
+using System.Threading.Tasks;
+using System.Windows;
 
 namespace NETworkManager;
 
@@ -31,6 +31,7 @@ private static ProfileInfo ParseProfileInfo(ProfileViewModel instance)
         {
             Name = instance.Name.Trim(),
             Host = instance.Host.Trim(),
+            Description = instance.Description?.Trim(),
             Group = instance.Group.Trim(),
             Tags = instance.Tags?.Trim(),
 

Source/NETworkManager.Profiles/ProfileInfo.cs

@@ -43,16 +43,18 @@ public ProfileViewModel(Action<ProfileViewModel> saveCommand, Action<ProfileView
 
         Host = profileInfo.Host;
 
+        Description = profileInfo.Description;
+        
         // Try to get group (name) as parameter, then from profile, then the first in the list of groups, then the default group            
         Group = group ?? (string.IsNullOrEmpty(profileInfo.Group)
             ? groups.Count > 0 ? groups.OrderBy(x => x).First() : Strings.Default
             : profileInfo.Group);
-
-        Tags = profileInfo.Tags;
-
+        
         Groups = CollectionViewSource.GetDefaultView(groups);
         Groups.SortDescriptions.Add(new SortDescription());
 
+        Tags = profileInfo.Tags;
+        
         // Network Interface
         NetworkInterface_Enabled = editMode == ProfileEditMode.Add
             ? applicationName == ApplicationName.NetworkInterface
@@ -449,6 +451,21 @@ public bool ShowCouldNotResolveHostnameWarning
             OnPropertyChanged();
         }
     }
+    
+    private string _description;
+
+    public string Description
+    {
+        get => _description;
+        set
+        {
+            if (value == _description)
+                return;
+
+            _description = value;
+            OnPropertyChanged();
+        }
+    }
 
     private string _group;
 

Source/NETworkManager/ProfileDialogManager.cs

@@ -370,7 +370,7 @@
                     </Grid>
                     <ListBox Grid.Column="0" Grid.Row="2" ItemsSource="{Binding Path=Profiles}"
                              Visibility="{Binding Path=IsSearching, Converter={StaticResource ResourceKey=BooleanReverseToVisibilityCollapsedConverter}}"
-                             DisplayMemberPath="Name" SelectedItem="{Binding Path=SelectedProfile}"
+                             SelectedItem="{Binding Path=SelectedProfile}"
                              Style="{StaticResource ResourceKey=ProfileListBox}"
                              ScrollViewer.CanContentScroll="True"
                              VirtualizingPanel.IsVirtualizing="True"
@@ -502,8 +502,26 @@
                                    BasedOn="{StaticResource ResourceKey=MahApps.Styles.ListBoxItem}">
                                 <Setter Property="ContextMenu" Value="{StaticResource ResourceKey=ProfileContextMenu}" />
                                 <EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick" />
+                                <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+                                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                             </Style>
                         </ListBox.ItemContainerStyle>
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <Grid Background="Transparent">
+                                    <Grid.ToolTip>
+                                        <ToolTip MinWidth="250">
+                                            <StackPanel Margin="10">
+                                                <TextBlock Text="{Binding PingMonitor_Host}" Style="{StaticResource DefaultTextBlock}" />
+                                                <Separator Background="{DynamicResource MahApps.Brushes.Gray8}" Margin="0,10" />
+                                                <TextBlock Text="{Binding Description}" Style="{StaticResource InfoTextBlock}" TextWrapping="Wrap" />
+                                            </StackPanel>
+                                        </ToolTip>                                        
+                                    </Grid.ToolTip>
+                                    <TextBlock Text="{Binding Name}" Style="{StaticResource CenterTextBlock}" />
+                                </Grid>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
                     </ListBox>
                     <mah:ProgressRing Grid.Row="2" Height="50" Width="50" IsActive="{Binding Path=IsSearching}" />
                     <Grid Grid.Row="2" VerticalAlignment="Center">

Source/NETworkManager/ViewModels/ProfileViewModel.cs

@@ -1286,6 +1286,8 @@
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="10" />
                                     <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="10" />
+                                    <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="1*" />
@@ -1296,7 +1298,7 @@
                                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Name}" />
                                 <TextBox x:Name="TextBoxName" GotFocus="TextBoxName_OnGotFocus"
                                          TextChanged="TextBoxName_OnTextChanged" Grid.Column="2" Grid.Row="0"
-                                         mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleRemoteDesktopProfileName}">
+                                         mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleProfileName}">
                                     <TextBox.Text>
                                         <Binding Path="Name" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -1364,8 +1366,20 @@
                                         <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource WarnToolTip}" />
                                     </Rectangle.Resources>
                                 </Rectangle>
-                                <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.Group}" />
-                                <ComboBox x:Name="ComboBoxGroup" Grid.Column="2" Grid.Row="4"
+                                <TextBlock Grid.Column="0" Grid.Row="4" 
+                                           Text="{x:Static Member=localization:Strings.Description}" 
+                                           Margin="0,5,0,0"
+                                           VerticalAlignment="Top" />
+                                <TextBox Grid.Column="2" Grid.Row="4"
+                                         AcceptsReturn="True"
+                                         TextWrapping="Wrap"
+                                         VerticalScrollBarVisibility="Auto"
+                                         VerticalContentAlignment="Top"
+                                         Height="150"
+                                         Text="{Binding Path=Description, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         mah:TextBoxHelper.Watermark="{x:Static Member=localization:Strings.ExampleDescription}" />
+                                <TextBlock Grid.Column="0" Grid.Row="6" Text="{x:Static localization:Strings.Group}" />
+                                <ComboBox x:Name="ComboBoxGroup" Grid.Column="2" Grid.Row="6"
                                           Style="{StaticResource EditableComboBox}" ItemsSource="{Binding Groups}"
                                           mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleGroupServers}">
                                     <ComboBox.Text>
@@ -1377,22 +1391,22 @@
                                         </Binding>
                                     </ComboBox.Text>
                                 </ComboBox>
-                                <TextBlock Grid.Column="0" Grid.Row="6" Text="{x:Static localization:Strings.Tags}" />
-                                <TextBox Grid.Column="2" Grid.Row="6"
-                                         Text="{Binding Tags, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                         mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleTags}" />
+                                <TextBlock Grid.Column="0" Grid.Row="8" Text="{x:Static Member=localization:Strings.Tags}" />
+                                <TextBox Grid.Column="2" Grid.Row="8"
+                                         Text="{Binding Path=Tags, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         mah:TextBoxHelper.Watermark="{x:Static Member=localization:StaticStrings.ExampleTags}" />
                                 <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="6"
-                                           ToolTip="{x:Static localization:Strings.HelpMessage_Tags}"
-                                           Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
+                                           ToolTip="{x:Static Member=localization:Strings.HelpMessage_Tags}"
+                                           Style="{StaticResource ResourceKey=HelpImageRectangle}" Margin="10,0,0,0">
                                     <Rectangle.Resources>
-                                        <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
+                                        <Style TargetType="{x:Type TypeName=ToolTip}" BasedOn="{StaticResource ResourceKey=HelpToolTip}" />
                                     </Rectangle.Resources>
                                 </Rectangle>
                             </Grid>
                         </StackPanel>
                     </ScrollViewer>
                 </TabItem>
-                <TabItem Header="{x:Static localization:Strings.NetworkInterface}">
+                <TabItem Header="{x:Static Member=localization:Strings.NetworkInterface}">
                     <ScrollViewer HorizontalScrollBarVisibility="Disabled">
                         <StackPanel IsEnabled="{Binding NetworkInterface_Enabled}">
                             <RadioButton x:Name="RadioButtonEnableDynamicIPAddress"

Source/NETworkManager/Views/PingMonitorHostView.xaml

@@ -43,7 +43,7 @@
                        Visibility="{Binding ConnectAs, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
                        Margin="0,0,0,10" />
             <TextBox x:Name="TextBoxName" Grid.Column="2" Grid.Row="0"
-                     mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleRemoteDesktopProfileName}"
+                     mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleProfileName}"
                      Visibility="{Binding ConnectAs, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
                      IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}"
                      Margin="0,0,0,10">