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
Expand Up @@ -17,17 +17,17 @@
<NoWarn>1701;1702;CS1591</NoWarn>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs"/>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NETworkManager.Localization\NETworkManager.Localization.csproj"/>
<ProjectReference Include="..\NETworkManager.Models\NETworkManager.Models.csproj"/>
<ProjectReference Include="..\NETworkManager.Profiles\NETworkManager.Profiles.csproj"/>
<ProjectReference Include="..\NETworkManager.Settings\NETworkManager.Settings.csproj"/>
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj"/>
<ProjectReference Include="..\NETworkManager.Localization\NETworkManager.Localization.csproj" />
<ProjectReference Include="..\NETworkManager.Models\NETworkManager.Models.csproj" />
<ProjectReference Include="..\NETworkManager.Profiles\NETworkManager.Profiles.csproj" />
<ProjectReference Include="..\NETworkManager.Settings\NETworkManager.Settings.csproj" />
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="LiveCharts.Wpf" Version="0.9.7"/>
<PackageReference Include="MahApps.Metro" Version="2.4.10"/>
<PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
<PackageReference Include="MahApps.Metro" Version="2.4.11" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.4.10" />
<PackageReference Include="MahApps.Metro" Version="2.4.11" />
</ItemGroup>

<ItemGroup>
Expand Down
Binary file modified Source/NETworkManager.Localization/Resources/Flags/ja-JP.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 22 additions & 22 deletions Source/NETworkManager.Models/NETworkManager.Models.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,37 +14,37 @@
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>
<ItemGroup>
<None Remove="Resources\OUI.xml"/>
<None Remove="Resources\Ports.xml"/>
<None Remove="Resources\PSDiscoveryProtocol.psm1"/>
<None Remove="Resources\WhoisServers.xml"/>
<None Remove="Resources\OUI.xml" />
<None Remove="Resources\Ports.xml" />
<None Remove="Resources\PSDiscoveryProtocol.psm1" />
<None Remove="Resources\WhoisServers.xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs"/>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\PSDiscoveryProtocol.psm1"/>
<EmbeddedResource Include="Resources\PSDiscoveryProtocol.psm1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.7.401.6"/>
<PackageReference Include="DnsClient" Version="1.8.0"/>
<PackageReference Include="IPNetwork2" Version="3.0.712"/>
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.5"/>
<PackageReference Include="log4net" Version="3.0.3"/>
<PackageReference Include="MahApps.Metro" Version="2.4.10"/>
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.1.0"/>
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.1.0"/>
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.1.0"/>
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="5.1.0"/>
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0"/>
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2957.106"/>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0"/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6"/>
<PackageReference Include="AWSSDK.Core" Version="4.0.1.1" />
<PackageReference Include="DnsClient" Version="1.8.0" />
<PackageReference Include="IPNetwork2" Version="3.4.832" />
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.6" />
<PackageReference Include="log4net" Version="3.2.0" />
<PackageReference Include="MahApps.Metro" Version="2.4.11" />
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="6.1.0" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3537.50" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.12" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj"/>
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs"/>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.4.10"/>
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.1.0"/>
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.1.0"/>
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.1.0"/>
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="5.1.0"/>
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0"/>
<PackageReference Include="MahApps.Metro" Version="2.4.11" />
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="6.1.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NETworkManager.Models\NETworkManager.Models.csproj"/>
<ProjectReference Include="..\NETworkManager.Settings\NETworkManager.Settings.csproj"/>
<ProjectReference Include="..\NETworkManager.Models\NETworkManager.Models.csproj" />
<ProjectReference Include="..\NETworkManager.Settings\NETworkManager.Settings.csproj" />
</ItemGroup>
</Project>
34 changes: 17 additions & 17 deletions Source/NETworkManager.Settings/NETworkManager.Settings.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>
<ItemGroup>
<Page Remove="Themes\Dark.Accent1.xaml"/>
<Page Remove="Themes\Dark.Accent2.xaml"/>
<Page Remove="Themes\Light.Accent1.xaml"/>
<Page Remove="Themes\Light.Accent2.xaml"/>
<Page Remove="Themes\Dark.Accent1.xaml" />
<Page Remove="Themes\Dark.Accent2.xaml" />
<Page Remove="Themes\Light.Accent1.xaml" />
<Page Remove="Themes\Light.Accent2.xaml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs"/>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Themes\Dark.Accent1.xaml">
Expand All @@ -44,19 +44,19 @@
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="DnsClient" Version="1.8.0"/>
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.5"/>
<PackageReference Include="log4net" Version="3.0.3"/>
<PackageReference Include="MahApps.Metro" Version="2.4.10"/>
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.1.0"/>
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.1.0"/>
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.1.0"/>
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="5.1.0"/>
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0"/>
<PackageReference Include="DnsClient" Version="1.8.0" />
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.6" />
<PackageReference Include="log4net" Version="3.2.0" />
<PackageReference Include="MahApps.Metro" Version="2.4.11" />
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="6.1.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NETworkManager.Controls\NETworkManager.Controls.csproj"/>
<ProjectReference Include="..\NETworkManager.Models\NETworkManager.Models.csproj"/>
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj"/>
<ProjectReference Include="..\NETworkManager.Controls\NETworkManager.Controls.csproj" />
<ProjectReference Include="..\NETworkManager.Models\NETworkManager.Models.csproj" />
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions Source/NETworkManager.Update/NETworkManager.Update.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs"/>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="3.0.3"/>
<PackageReference Include="Octokit" Version="14.0.0"/>
<PackageReference Include="log4net" Version="3.2.0" />
<PackageReference Include="Octokit" Version="14.0.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs"/>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.4.10"/>
<PackageReference Include="MahApps.Metro" Version="2.4.11" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs"/>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DnsClient" Version="1.8.0"/>
<PackageReference Include="log4net" Version="3.0.3"/>
<PackageReference Include="DnsClient" Version="1.8.0" />
<PackageReference Include="log4net" Version="3.2.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs"/>
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.5"/>
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NETworkManager.Localization\NETworkManager.Localization.csproj"/>
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj"/>
<ProjectReference Include="..\NETworkManager.Localization\NETworkManager.Localization.csproj" />
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj" />
</ItemGroup>
</Project>
28 changes: 14 additions & 14 deletions Source/NETworkManager/NETworkManager.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,26 +60,26 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AirspaceFixer" Version="1.0.6" />
<PackageReference Include="AWSSDK.EC2" Version="3.7.429.1" />
<PackageReference Include="AWSSDK.EC2" Version="4.0.43.1" />
<PackageReference Include="DnsClient" Version="1.8.0" />
<PackageReference Include="gong-wpf-dragdrop" Version="4.0.0" />
<PackageReference Include="IPNetwork2" Version="3.0.712" />
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.5" />
<PackageReference Include="IPNetwork2" Version="3.4.832" />
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.6" />
<PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
<PackageReference Include="log4net" Version="3.0.3" />
<PackageReference Include="MahApps.Metro" Version="2.4.10" />
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="5.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0" />
<PackageReference Include="log4net" Version="3.2.0" />
<PackageReference Include="MahApps.Metro" Version="2.4.11" />
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="6.1.0" />
<PackageReference Include="MahApps.Metro.SimpleChildWindow" Version="2.2.1" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2957.106" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3537.50" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6" />
<PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.12" />
<PackageReference Include="nulastudio.NetBeauty" Version="2.1.5" />
<Reference Include="AxMSTSCLib">
<HintPath>$(TargetDir)\lib\AxMSTSCLib.dll</HintPath>
</Reference>
Expand Down
36 changes: 22 additions & 14 deletions Source/NETworkManager/ViewModels/ProfilesViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public ProfilesViewModel()
ListSortDirection.Ascending));

SetGroupsView();

ProfileManager.OnProfilesUpdated += ProfileManager_OnProfilesUpdated;

_searchDispatcherTimer.Interval = GlobalStaticConfiguration.SearchDispatcherTimerTimeSpan;
Expand All @@ -35,7 +35,7 @@ public ProfilesViewModel()
#endregion

#region Variables

private readonly DispatcherTimer _searchDispatcherTimer = new();
private bool _searchDisabled;

Expand All @@ -56,6 +56,8 @@ private set
}
}

private bool _disableProfileRefresh;

private ProfileInfo _lastSelectedProfileOnRefresh;

private GroupInfo _selectedGroup = new();
Expand All @@ -70,21 +72,22 @@ public GroupInfo SelectedGroup

_selectedGroup = value;

// NullReferenceException occurs if profile file is changed
if (value != null)
// Check for null, because a NullReferenceException can occur when a profile file is changed
// Temporarily disable profile refresh to avoid multiple refreshes and prevent the filter from being reset.
if (value != null && !_disableProfileRefresh)
{
// Set/update tags based on current group
CreateTags();

var filter = new ProfileFilterInfo
{
Search = Search,
Tags = [.. ProfileFilterTags.Where(x => x.IsSelected).Select(x => x.Name)],
TagsFilterMatch = ProfileFilterTagsMatchAny ? ProfileFilterTagsMatch.Any : ProfileFilterTagsMatch.All
};
SetProfilesView(filter ,value, _lastSelectedProfileOnRefresh);

SetProfilesView(filter, value, _lastSelectedProfileOnRefresh);

IsProfileFilterSet = !string.IsNullOrEmpty(filter.Search) || filter.Tags.Any();
}
else
Expand All @@ -95,7 +98,7 @@ public GroupInfo SelectedGroup
OnPropertyChanged();
}
}

private ICollectionView _profiles;

public ICollectionView Profiles
Expand Down Expand Up @@ -266,7 +269,7 @@ private void DeleteGroupAction()
{
ProfileDialogManager.ShowDeleteGroupDialog(Application.Current.MainWindow, this, SelectedGroup).ConfigureAwait(false);
}

public ICommand AddProfileCommand => new RelayCommand(_ => AddProfileAction());

private void AddProfileAction()
Expand Down Expand Up @@ -358,14 +361,19 @@ public void OnViewHide()

private void SetGroupsView(GroupInfo group = null)
{
_disableProfileRefresh = true;

Groups = new CollectionViewSource
{
Source = ProfileManager.Groups.Where(x => !x.IsDynamic).OrderBy(x => x.Name)
}.View;

// Set specific group or first if null
// Set to null, so even when the same group is selected, the profiles get refreshed
SelectedGroup = null;

_disableProfileRefresh = false;

// Set specific group or first if null
if (group != null)
SelectedGroup = Groups.SourceCollection.Cast<GroupInfo>().FirstOrDefault(x => x.Equals(group)) ??
Groups.SourceCollection.Cast<GroupInfo>().MinBy(x => x.Name);
Expand All @@ -378,7 +386,7 @@ private void CreateTags()
// Get all tags from profiles in the selected group
var tags = ProfileManager.Groups.First(x => x.Name == SelectedGroup.Name).Profiles
.SelectMany(x => x.TagsCollection).Distinct().ToList();

var tagSet = new HashSet<string>(tags);

for (var i = ProfileFilterTags.Count - 1; i >= 0; i--)
Expand All @@ -394,7 +402,7 @@ private void CreateTags()
ProfileFilterTags.Add(new ProfileFilterTagsInfo(false, tag));
}
}

private void SetProfilesView(ProfileFilterInfo filter, GroupInfo group, ProfileInfo profile = null)
{
Profiles = new CollectionViewSource
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading