Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using System;
using System.Globalization;
using System.Linq;
using System.Windows;
using System.Windows.Data;

namespace NETworkManager.Converters;

public sealed class BooleansAndToVisibilityCollapsedConverter : IMultiValueConverter
{
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
{
return values.OfType<bool>().All(b => b) ? Visibility.Visible : Visibility.Collapsed;
}

public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace NETworkManager.Converters;

public sealed class BooleanToVisibilityCollapsedMultiConverter : IMultiValueConverter
public sealed class BooleansOrToVisibilityCollapsedConverter : IMultiValueConverter
{
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
{
Expand Down
4 changes: 4 additions & 0 deletions Source/NETworkManager.Models/Network/NetworkInterface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public static List<NetworkInterfaceInfo> GetNetworkInterfaces()
var ipProperties = networkInterface.GetIPProperties();

foreach (var unicastIPAddrInfo in ipProperties.UnicastAddresses)
{
switch (unicastIPAddrInfo.Address.AddressFamily)
{
case AddressFamily.InterNetwork:
Expand All @@ -74,11 +75,13 @@ public static List<NetworkInterfaceInfo> GetNetworkInterfaces()
listIPv6Address.Add(unicastIPAddrInfo.Address);
break;
}
}

var listIPv4Gateway = new List<IPAddress>();
var listIPv6Gateway = new List<IPAddress>();

foreach (var gatewayIPAddrInfo in ipProperties.GatewayAddresses)
{
switch (gatewayIPAddrInfo.Address.AddressFamily)
{
case AddressFamily.InterNetwork:
Expand All @@ -88,6 +91,7 @@ public static List<NetworkInterfaceInfo> GetNetworkInterfaces()
listIPv6Gateway.Add(gatewayIPAddrInfo.Address);
break;
}
}

// Check if autoconfiguration for DNS is enabled (only via registry key)
var nameServerKey =
Expand Down
8 changes: 4 additions & 4 deletions Source/NETworkManager/Views/IPScannerView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
<converters:BooleanToStringConverter x:Key="BooleanToStringConverter" />
<converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
<converters:BooleanToVisibilityCollapsedMultiConverter x:Key="BooleanToVisibilityCollapsedMultiConverter" />
<converters:BooleansOrToVisibilityCollapsedConverter x:Key="BooleansOrToVisibilityCollapsedConverter" />
<converters:HostUpStyleConverter x:Key="HostUpStyleConverter" />
<converters:IPStatusToStringConverter x:Key="IPStatusToStringConverter" />
<converters:IntNotZeroToVisibilityCollapsedConverter x:Key="IntNotZeroToVisibilityCollapsedConverter" />
Expand Down Expand Up @@ -518,7 +518,7 @@
SortMemberPath="Hostname"
MinWidth="150">
<DataGridTextColumn.Visibility>
<MultiBinding Converter="{StaticResource BooleanToVisibilityCollapsedMultiConverter}">
<MultiBinding Converter="{StaticResource BooleansOrToVisibilityCollapsedConverter}">
<Binding Source="{x:Static Member=settings:SettingsManager.Current}"
Path="IPScanner_ResolveHostname" />
<Binding Source="{x:Static Member=settings:SettingsManager.Current}"
Expand All @@ -544,7 +544,7 @@
SortMemberPath="MACAddress"
MinWidth="150">
<DataGridTextColumn.Visibility>
<MultiBinding Converter="{StaticResource BooleanToVisibilityCollapsedMultiConverter}">
<MultiBinding Converter="{StaticResource BooleansOrToVisibilityCollapsedConverter}">
<Binding Source="{x:Static Member=settings:SettingsManager.Current}"
Path="IPScanner_ResolveMACAddress" />
<Binding Source="{x:Static Member=settings:SettingsManager.Current}"
Expand All @@ -557,7 +557,7 @@
SortMemberPath="Vendor"
MinWidth="200">
<DataGridTextColumn.Visibility>
<MultiBinding Converter="{StaticResource BooleanToVisibilityCollapsedMultiConverter}">
<MultiBinding Converter="{StaticResource BooleansOrToVisibilityCollapsedConverter}">
<Binding Source="{x:Static Member=settings:SettingsManager.Current}"
Path="IPScanner_ResolveMACAddress" />
<Binding Source="{x:Static Member=settings:SettingsManager.Current}"
Expand Down
Loading