Chore: Refactoring & Cleanup & Docs

Author: BornToBeRoot

Source/NETworkManager/Controls/WebConsoleControl.xaml

@@ -5,10 +5,10 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:NETworkManager.Controls"
         xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-        xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
         xmlns:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
         xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"        
         xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+        xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
         xmlns:webview="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
         mah:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" Loaded="UserControl_Loaded" d:DataContext="{d:DesignInstance local:WebConsoleControl}">
@@ -24,7 +24,9 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Grid Grid.Row="0" Margin="10" Visibility="{Binding ShowAddressBar, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+        <Grid Grid.Column="0" Grid.Row="0" 
+              Margin="10"
+              Visibility="{Binding Source={x:Static Member=settings:SettingsManager.Current}, Path=WebConsole_ShowAddressBar, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="10" />

Source/NETworkManager/Controls/WebConsoleControl.xaml.cs

@@ -59,7 +59,6 @@ public string Url
         }
     }
 
-    public bool ShowAddressBar => SettingsManager.Current.WebConsole_ShowAddressBar;
     #endregion
 
     #region Constructor, load
@@ -74,8 +73,6 @@ public WebConsoleControl(WebConsoleSessionInfo sessionInfo)
         Browser2.NavigationCompleted += Browser2_NavigationCompleted;        
         Browser2.SourceChanged += Browser2_SourceChanged;
 
-        SettingsManager.Current.PropertyChanged += Current_PropertyChanged;
-
         Dispatcher.ShutdownStarted += Dispatcher_ShutdownStarted;
     }
 
@@ -179,16 +176,6 @@ private void Browser2_NavigationCompleted(object sender, CoreWebView2NavigationC
         IsLoading = false;
     }
 
-    private void Current_PropertyChanged(object sender, PropertyChangedEventArgs e)
-    {
-        switch (e.PropertyName)
-        {
-            case nameof(SettingsInfo.WebConsole_ShowAddressBar):
-                OnPropertyChanged(nameof(ShowAddressBar));
-                break;
-        }
-    }
-
     private void Dispatcher_ShutdownStarted(object sender, EventArgs e)
     {
         CloseTab();

Source/NETworkManager/Views/WebConsoleHostView.xaml

@@ -74,7 +74,7 @@
                             <Grid Height="32">
                                 <Grid.ContextMenu>
                                     <ContextMenu>
-                                        <MenuItem Header="{x:Static localization:Strings.Reload}" Command="{Binding Data.ReloadCommand, Source={StaticResource BindingProxy}}" CommandParameter="{Binding View}">
+                                        <MenuItem Header="{x:Static localization:Strings.Reload}" Command="{Binding Path=Data.(viewModels:WebConsoleHostViewModel.ReloadCommand), Source={StaticResource BindingProxy}}" CommandParameter="{Binding View}">
                                             <MenuItem.Icon>
                                                 <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                                     <Rectangle.OpacityMask>
@@ -318,7 +318,7 @@
                                                                         <ColumnDefinition Width="10" />
                                                                         <ColumnDefinition Width="Auto" />
                                                                     </Grid.ColumnDefinitions>
-                                                                    <Rectangle Grid.Column="0" Grid.ColumnSpan="4" Fill="Transparent" />
+                                                                    <Rectangle Grid.Column="0" Grid.ColumnSpan="3" Fill="Transparent" />
                                                                     <TextBlock Grid.Column="0" Text="{Binding (CollectionViewGroup.Name)}" Style="{DynamicResource ProfileGroupTextBlock}" />
                                                                     <Button Grid.Column="2" ToolTip="{x:Static localization:Strings.EditGroupDots}" Command="{Binding DataContext.EditGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBox}}}" CommandParameter="{Binding (CollectionViewGroup.Name)}" Visibility="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid}}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource CleanButton}">
                                                                         <Rectangle Width="16" Height="16">
@@ -467,7 +467,7 @@
                         </ToggleButton>
                         <TextBlock Grid.Column="0" Grid.Row="2" 
                                    Text="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=ProfileManagerErrorMessage}" 
-                                   Style="{StaticResource MessageTextBlock}" VerticalAlignment="Center" HorizontalAlignment="Center" 
+                                   Style="{StaticResource MessageTextBlock}"
                                    Margin="0,0,0,10" />
                     </Grid>
                 </Grid>

Source/NETworkManager/Views/WebConsoleHostView.xaml.cs

@@ -8,7 +8,7 @@ namespace NETworkManager.Views;
 
 public partial class WebConsoleHostView
 {
-    private readonly WebConsoleHostViewModel _viewModel = new WebConsoleHostViewModel(DialogCoordinator.Instance);
+    private readonly WebConsoleHostViewModel _viewModel = new(DialogCoordinator.Instance);
 
     public WebConsoleHostView()
     {