EnableDWMDropShadow removed, some static resources fixed

BornToBeRoot · BornToBeRoot · commit 1e46355d482c · 2020-06-28T21:36:26.000+02:00
diff --git a/Source/NETworkManager.Converters/NETworkManager.Converters.csproj b/Source/NETworkManager.Converters/NETworkManager.Converters.csproj
@@ -24,7 +24,7 @@
   
   <ItemGroup>
     <PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.7" />
-    <PackageReference Include="MahApps.Metro" Version="2.0.1" />
+    <PackageReference Include="MahApps.Metro" Version="2.1.0" />
   </ItemGroup>
   
 </Project>
diff --git a/Source/NETworkManager.Localization/NETworkManager.Localization.csproj b/Source/NETworkManager.Localization/NETworkManager.Localization.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MahApps.Metro" Version="2.0.1" />
+    <PackageReference Include="MahApps.Metro" Version="2.1.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/Source/NETworkManager.Models/NETworkManager.Models.csproj b/Source/NETworkManager.Models/NETworkManager.Models.csproj
@@ -13,10 +13,10 @@
     <PackageReference Include="DnsClient" Version="1.3.2" />
     <PackageReference Include="IPNetwork2" Version="2.5.211" />
     <PackageReference Include="Lextm.SharpSnmpLib" Version="12.0.0" />
-    <PackageReference Include="MahApps.Metro" Version="2.0.1" />
+    <PackageReference Include="MahApps.Metro" Version="2.1.0" />
     <PackageReference Include="MahApps.Metro.IconPacks" Version="4.2.0" />
     <PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls.WebView" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls.WebView" Version="6.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 
diff --git a/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj b/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MahApps.Metro" Version="2.0.1" />
+    <PackageReference Include="MahApps.Metro" Version="2.1.0" />
     <PackageReference Include="MahApps.Metro.IconPacks" Version="4.2.0" />
   </ItemGroup>
   
diff --git a/Source/NETworkManager.Settings/NETworkManager.Settings.csproj b/Source/NETworkManager.Settings/NETworkManager.Settings.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="DnsClient" Version="1.3.2" />
     <PackageReference Include="Lextm.SharpSnmpLib" Version="12.0.0" />
-    <PackageReference Include="MahApps.Metro" Version="2.0.1" />
+    <PackageReference Include="MahApps.Metro" Version="2.1.0" />
     <PackageReference Include="MahApps.Metro.IconPacks" Version="4.2.0" />
   </ItemGroup>
   
diff --git a/Source/NETworkManager.Utilities.WPF/NETworkManager.Utilities.WPF.csproj b/Source/NETworkManager.Utilities.WPF/NETworkManager.Utilities.WPF.csproj
@@ -9,6 +9,6 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MahApps.Metro" Version="2.0.1" />
+    <PackageReference Include="MahApps.Metro" Version="2.1.0" />
   </ItemGroup>
 </Project>
diff --git a/Source/NETworkManager/App.xaml b/Source/NETworkManager/App.xaml
@@ -34,7 +34,7 @@
                 <ResourceDictionary Source="/Resources/Styles/GridSplitterStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/GroupBoxStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/MetroDialogStyles.xaml" />
-                <ResourceDictionary Source="/Resources/Styles/NumericUpDownStyles.xaml" />
+                <ResourceDictionary Source="/Resources/Styles/NumericUpDownStyles.xaml" />                
                 <ResourceDictionary Source="/Resources/Styles/RadioButtonStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/ScrollBarStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/ScrollViewerStyles.xaml" />
diff --git a/Source/NETworkManager/Controls/WebConsoleControl.xaml.cs b/Source/NETworkManager/Controls/WebConsoleControl.xaml.cs
@@ -94,7 +94,7 @@ public WebConsoleControl(WebConsoleSessionInfo info)
 
             Browser2.NavigationStarting += Browser2_NavigationStarting;
             Browser2.NavigationCompleted += Browser2_NavigationCompleted;
-
+            
             Dispatcher.ShutdownStarted += Dispatcher_ShutdownStarted;
         }
 
diff --git a/Source/NETworkManager/MainWindow.xaml b/Source/NETworkManager/MainWindow.xaml
@@ -13,7 +13,7 @@
         xmlns:resources="clr-namespace:NETworkManager.Properties"
         xmlns:networkManager="clr-namespace:NETworkManager"
         mc:Ignorable="d"
-        Title="{x:Static resources:Resources.NETworkManager_ProjectName}" Style="{DynamicResource DefaultWindow}" MinWidth="1050" MinHeight="700" SaveWindowPosition="True" TitleAlignment="Left" Closing="MetroWindowMain_Closing" StateChanged="MetroWindowMain_StateChanged"
+        Title="{x:Static resources:Resources.NETworkManager_ProjectName}" Style="{StaticResource DefaultWindow}" MinWidth="1050" MinHeight="700" SaveWindowPosition="True" TitleAlignment="Left" Closing="MetroWindowMain_Closing" StateChanged="MetroWindowMain_StateChanged"
         d:DataContext="{d:DesignInstance networkManager:MainWindow}">
     <!-- MetroDialogStyles.xaml must be adjusted if MinWidth/MinHeight is changed -->
     <mahAppsControls:MetroWindow.Resources>
@@ -268,7 +268,7 @@
                             </TextBox>
                             <ToggleButton Grid.Column="1" Width="32" Height="32" IsChecked="{Binding ExpandApplicationView}">
                                 <ToggleButton.Style>
-                                    <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MetroCircleButtonStyle}">
+                                    <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MahApps.Styles.Button.Circle}">
                                         <Setter Property="Visibility" Value="Collapsed" />
                                         <Setter Property="Template">
                                             <Setter.Value>
diff --git a/Source/NETworkManager/NETworkManager.csproj b/Source/NETworkManager/NETworkManager.csproj
@@ -20,10 +20,10 @@
     <PackageReference Include="Lextm.SharpSnmpLib" Version="12.0.0" />
     <PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.7" />
     <PackageReference Include="LoadingIndicators.WPF" Version="0.0.1" />
-    <PackageReference Include="MahApps.Metro" Version="2.0.1" />
+    <PackageReference Include="MahApps.Metro" Version="2.1.0" />
     <PackageReference Include="MahApps.Metro.IconPacks" Version="4.2.0" />
     <PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls.WebView" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls.WebView" Version="6.1.0" />
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
diff --git a/Source/NETworkManager/Resources/Styles/TabControlStyles.xaml b/Source/NETworkManager/Resources/Styles/TabControlStyles.xaml
@@ -12,7 +12,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
                     <Grid x:Name="PART_Grid" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" Margin="0">
-                        <ContentPresenter x:Name="PART_HeaderContent" Margin="{TemplateBinding Padding}" ContentSource="Header" VerticalAlignment="Center" HorizontalAlignment="Center" TextBlock.FontSize="18" TextBlock.FontFamily="{StaticResource HeaderFontFamily}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <ContentPresenter x:Name="PART_HeaderContent" Margin="{TemplateBinding Padding}" ContentSource="Header" VerticalAlignment="Center" HorizontalAlignment="Center" TextBlock.FontSize="18" TextBlock.FontFamily="{StaticResource MahApps.Fonts.Family.Header}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <!--<Rectangle x:Name="PART_Selector" VerticalAlignment="Bottom" Height="2" Visibility="Collapsed" Fill="{DynamicResource MahApps.Brushes.Accent}" />-->
                     </Grid>
                     <ControlTemplate.Triggers>
diff --git a/Source/NETworkManager/Resources/Styles/TextBlockStyles.xaml b/Source/NETworkManager/Resources/Styles/TextBlockStyles.xaml
@@ -6,7 +6,7 @@
     </Style>
 
     <Style x:Key="HeaderTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlock}">
-        <Setter Property="FontFamily" Value="{StaticResource HeaderFontFamily}" />
+        <Setter Property="FontFamily" Value="{StaticResource MahApps.Fonts.Family.Header}" />
         <Setter Property="FontSize" Value="18" />
         <Setter Property="Margin" Value="0,0,0,10" />
     </Style>
@@ -21,7 +21,7 @@
     </Style>
 
     <Style x:Key="MessageTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlock}">
-        <Setter Property="FontFamily" Value="{StaticResource HeaderFontFamily}" />
+        <Setter Property="FontFamily" Value="{StaticResource MahApps.Fonts.Family.Header}" />
         <Setter Property="FontSize" Value="18" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="VerticalAlignment" Value="Center" />
diff --git a/Source/NETworkManager/Resources/Styles/WindowStyles.xaml b/Source/NETworkManager/Resources/Styles/WindowStyles.xaml
@@ -2,8 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:mahAppsControls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro">
     <Style x:Key="DefaultWindow" TargetType="{x:Type mahAppsControls:MetroWindow}" BasedOn="{StaticResource MahApps.Styles.MetroWindow.Clean}" >
-        <Setter Property="TitleCharacterCasing" Value="Normal" />
-        <Setter Property="EnableDWMDropShadow" Value="True" />
+        <Setter Property="TitleCharacterCasing" Value="Normal" />        
         <Setter Property="TitleForeground" Value="{DynamicResource MahApps.Brushes.Gray3}" />
     </Style>
 </ResourceDictionary>
diff --git a/Source/NETworkManager/StatusWindow.xaml b/Source/NETworkManager/StatusWindow.xaml
@@ -11,7 +11,7 @@
         xmlns:networkManager="clr-namespace:NETworkManager"
         xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance networkManager:StatusWindow}"
-        Title="{x:Static resources:Resources.NETworkManager_ProjectName}" Height="300" Width="250" ShowInTaskbar="False" ResizeMode="NoResize" IsWindowDraggable="False" Style="{StaticResource DefaultWindow}" ShowMinButton="False" ShowMaxRestoreButton="False" Closing="StatusWindow_Closing">
+        Title="{x:Static resources:Resources.NETworkManager_ProjectName}" Style="{StaticResource DefaultWindow}" Height="300" Width="250" ShowInTaskbar="False" ResizeMode="NoResize" IsWindowDraggable="False" ShowMinButton="False" ShowMaxRestoreButton="False" Closing="StatusWindow_Closing">
     <mahAppsControls:MetroWindow.Resources>
         <converters:Bytes1000ToSpeedConverter x:Key="Bytes1000ToSpeedConverter" />
         <converters:IPAddressArrayToStringConverter x:Key="IPAddressArrayToStringConverter" />
diff --git a/Source/NETworkManager/Views/AboutView.xaml b/Source/NETworkManager/Views/AboutView.xaml
@@ -264,7 +264,7 @@
                     </ContextMenu>
                 </DataGrid.Resources>
                 <DataGrid.RowStyle>
-                    <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MetroDataGridRow}">
+                    <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MahApps.Styles.DataGridRow}">
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding SelectedItems.Count, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGrid}}}" Value="1" >
                                 <Setter Property="ContextMenu" Value="{StaticResource RowContextMenu}"/>

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public WebConsoleControl(WebConsoleSessionInfo info)`
`94`	`94`
`95`	`95`	`Browser2.NavigationStarting += Browser2_NavigationStarting;`
`96`	`96`	`Browser2.NavigationCompleted += Browser2_NavigationCompleted;`
`97`		`-`
	`97`	`+`
`98`	`98`	`Dispatcher.ShutdownStarted += Dispatcher_ShutdownStarted;`
`99`	`99`	`}`
`100`	`100`