Skip to content

Commit f8d58c4

Browse files
BornToBeRootBornToBeRoot
committed
Update
1 parent 6301534 commit f8d58c4

23 files changed

Lines changed: 143 additions & 35 deletions

Source/NETworkManager/Controls/MultiSelectDataGrid.cs renamed to Source/NETworkManager.Controls/MultiSelectDataGrid.cs

File renamed without changes.

Source/NETworkManager/Controls/MultiSelectScrollingDataGrid.cs renamed to Source/NETworkManager.Controls/MultiSelectScrollingDataGrid.cs

File renamed without changes.

‎Source/NETworkManager.Controls/NETworkManager.Controls.csproj‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{95EA884C-E498-4A47-A316-DC890BF7F0D2}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>NETworkManager.Controls</RootNamespace>
11+
<AssemblyName>NETworkManager.Controls</AssemblyName>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<Deterministic>true</Deterministic>
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<DebugSymbols>true</DebugSymbols>
18+
<DebugType>full</DebugType>
19+
<Optimize>false</Optimize>
20+
<OutputPath>bin\Debug\</OutputPath>
21+
<DefineConstants>DEBUG;TRACE</DefineConstants>
22+
<ErrorReport>prompt</ErrorReport>
23+
<WarningLevel>4</WarningLevel>
24+
<DocumentationFile>bin\Debug\NETworkManager.Controls.xml</DocumentationFile>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<DebugType>pdbonly</DebugType>
28+
<Optimize>true</Optimize>
29+
<OutputPath>bin\Release\</OutputPath>
30+
<DefineConstants>TRACE</DefineConstants>
31+
<ErrorReport>prompt</ErrorReport>
32+
<WarningLevel>4</WarningLevel>
33+
</PropertyGroup>
34+
<ItemGroup>
35+
<Reference Include="PresentationCore" />
36+
<Reference Include="PresentationFramework" />
37+
<Reference Include="System" />
38+
<Reference Include="System.Core" />
39+
<Reference Include="System.Xml.Linq" />
40+
<Reference Include="System.Data.DataSetExtensions" />
41+
<Reference Include="Microsoft.CSharp" />
42+
<Reference Include="System.Data" />
43+
<Reference Include="System.Net.Http" />
44+
<Reference Include="System.Xml" />
45+
<Reference Include="WindowsBase" />
46+
</ItemGroup>
47+
<ItemGroup>
48+
<Compile Include="MultiSelectDataGrid.cs" />
49+
<Compile Include="MultiSelectScrollingDataGrid.cs" />
50+
<Compile Include="ObservableSetCollection.cs" />
51+
<Compile Include="Properties\AssemblyInfo.cs" />
52+
</ItemGroup>
53+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
54+
</Project>

Source/NETworkManager/Controls/ObservableSetCollection.cs renamed to Source/NETworkManager.Controls/ObservableSetCollection.cs

File renamed without changes.

‎Source/NETworkManager.Controls/Properties/AssemblyInfo.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("NETworkManager.Controls")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("NETworkManager.Controls")]
13+
[assembly: AssemblyCopyright("Copyright © 2020")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
19+
// COM, set the ComVisible attribute to true on that type.
20+
[assembly: ComVisible(false)]
21+
22+
// The following GUID is for the ID of the typelib if this project is exposed to COM
23+
[assembly: Guid("95ea884c-e498-4a47-a316-dc890bf7f0d2")]
24+
25+
// Version information for an assembly consists of the following four values:
26+
//
27+
// Major Version
28+
// Minor Version
29+
// Build Number
30+
// Revision
31+
//
32+
// You can specify all the values or you can default the Build and Revision Numbers
33+
// by using the '*' as shown below:
34+
// [assembly: AssemblyVersion("1.0.*")]
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎Source/NETworkManager.sln‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NETworkManager.Models", "NE
2020
EndProject
2121
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NETworkManager.Update", "NETworkManager.Update\NETworkManager.Update.csproj", "{008467AF-D83F-4B1E-8733-B65136F595F2}"
2222
EndProject
23+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NETworkManager.Controls", "NETworkManager.Controls\NETworkManager.Controls.csproj", "{95EA884C-E498-4A47-A316-DC890BF7F0D2}"
24+
EndProject
2325
Global
2426
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2527
Debug|Any CPU = Debug|Any CPU
@@ -175,6 +177,26 @@ Global
175177
{008467AF-D83F-4B1E-8733-B65136F595F2}.Release|x64.Build.0 = Release|Any CPU
176178
{008467AF-D83F-4B1E-8733-B65136F595F2}.Release|x86.ActiveCfg = Release|Any CPU
177179
{008467AF-D83F-4B1E-8733-B65136F595F2}.Release|x86.Build.0 = Release|Any CPU
180+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
181+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
182+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Debug|ARM.ActiveCfg = Debug|Any CPU
183+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Debug|ARM.Build.0 = Debug|Any CPU
184+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Debug|ARM64.ActiveCfg = Debug|Any CPU
185+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Debug|ARM64.Build.0 = Debug|Any CPU
186+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Debug|x64.ActiveCfg = Debug|Any CPU
187+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Debug|x64.Build.0 = Debug|Any CPU
188+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Debug|x86.ActiveCfg = Debug|Any CPU
189+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Debug|x86.Build.0 = Debug|Any CPU
190+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
191+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Release|Any CPU.Build.0 = Release|Any CPU
192+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Release|ARM.ActiveCfg = Release|Any CPU
193+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Release|ARM.Build.0 = Release|Any CPU
194+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Release|ARM64.ActiveCfg = Release|Any CPU
195+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Release|ARM64.Build.0 = Release|Any CPU
196+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Release|x64.ActiveCfg = Release|Any CPU
197+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Release|x64.Build.0 = Release|Any CPU
198+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Release|x86.ActiveCfg = Release|Any CPU
199+
{95EA884C-E498-4A47-A316-DC890BF7F0D2}.Release|x86.Build.0 = Release|Any CPU
178200
EndGlobalSection
179201
GlobalSection(SolutionProperties) = preSolution
180202
HideSolutionNode = FALSE

‎Source/NETworkManager/NETworkManager.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@
133133
<Compile Include="Controls\LvlChartsWiFiChannelTooltip.xaml.cs">
134134
<DependentUpon>LvlChartsWiFiChannelTooltip.xaml</DependentUpon>
135135
</Compile>
136-
<Compile Include="Controls\ObservableSetCollection.cs" />
137136
<Compile Include="Controls\PowerShellControl.xaml.cs">
138137
<DependentUpon>PowerShellControl.xaml</DependentUpon>
139138
</Compile>
@@ -995,8 +994,6 @@
995994
<DependentUpon>App.xaml</DependentUpon>
996995
<SubType>Code</SubType>
997996
</Compile>
998-
<Compile Include="Controls\MultiSelectDataGrid.cs" />
999-
<Compile Include="Controls\MultiSelectScrollingDataGrid.cs" />
1000997
<Compile Include="Models\Network\ARP.cs" />
1001998
<Compile Include="Utilities\HostRangeHelper.cs" />
1002999
<Compile Include="Models\Network\PortInfo.cs" />
@@ -1260,6 +1257,10 @@
12601257
<Folder Include="Models\Update\" />
12611258
</ItemGroup>
12621259
<ItemGroup>
1260+
<ProjectReference Include="..\NETworkManager.Controls\NETworkManager.Controls.csproj">
1261+
<Project>{95ea884c-e498-4a47-a316-dc890bf7f0d2}</Project>
1262+
<Name>NETworkManager.Controls</Name>
1263+
</ProjectReference>
12631264
<ProjectReference Include="..\NETworkManager.Converters\NETworkManager.Converters.csproj">
12641265
<Project>{bd4ddc21-7b64-41b2-bac7-8173e0fe84be}</Project>
12651266
<Name>NETworkManager.Converters</Name>

‎Source/NETworkManager/Resources/Styles/DataGridStyles.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:mahAppsControls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
4-
xmlns:networkManagerControls="clr-namespace:NETworkManager.Controls">
4+
xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls">
55
<Style x:Key="DefaultDataGrid" TargetType="{x:Type DataGrid}" BasedOn="{StaticResource MetroDataGrid}">
66
<Setter Property="FontSize" Value="14" />
77
<Setter Property="BorderThickness" Value="0" />
@@ -12,7 +12,7 @@
1212
</Style>
1313

1414
<Style TargetType="{x:Type DataGrid}" BasedOn="{StaticResource DefaultDataGrid}" />
15-
<Style TargetType="{x:Type networkManagerControls:MultiSelectScrollingDataGrid}" BasedOn="{StaticResource DefaultDataGrid}" />
15+
<Style TargetType="{x:Type controls:MultiSelectScrollingDataGrid}" BasedOn="{StaticResource DefaultDataGrid}" />
1616

1717
<Style x:Key="DefaultDataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MetroDataGridColumnHeader}" >
1818
<Setter Property="mahAppsControls:ControlsHelper.ContentCharacterCasing" Value="Normal" />

‎Source/NETworkManager/Resources/Styles/ScrollBarStyles.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:networkManagerControls="clr-namespace:NETworkManager.Controls">
3+
xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls">
44
<Style x:Key="ScrollViewerScrollBar" TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource MetroScrollBar}">
55
<Style.Triggers>
66
<DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ScrollViewer}}, Path=IsMouseOver}" Value="False">
@@ -67,7 +67,7 @@
6767
<Setter Property="Width" Value="8"/>
6868
<Setter Property="Height" Value="Auto" />
6969
</Trigger>
70-
<DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type networkManagerControls:MultiSelectDataGrid}}, Path=IsMouseOver}" Value="False">
70+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type controls:MultiSelectDataGrid}}, Path=IsMouseOver}" Value="False">
7171
<Setter Property="Opacity" Value="0.5" />
7272
</DataTrigger>
7373
</Style.Triggers>
@@ -83,7 +83,7 @@
8383
<Setter Property="Width" Value="8"/>
8484
<Setter Property="Height" Value="Auto" />
8585
</Trigger>
86-
<DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type networkManagerControls:MultiSelectScrollingDataGrid}}, Path=IsMouseOver}" Value="False">
86+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type controls:MultiSelectScrollingDataGrid}}, Path=IsMouseOver}" Value="False">
8787
<Setter Property="Opacity" Value="0.5" />
8888
</DataTrigger>
8989
</Style.Triggers>

‎Source/NETworkManager/Views/ARPTableView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
xmlns:network="clr-namespace:NETworkManager.Models.Network"
1313
xmlns:utilities="clr-namespace:NETworkManager.Utilities"
1414
xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
15-
xmlns:controls="clr-namespace:NETworkManager.Controls"
15+
xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
1616
dialogs:DialogParticipation.Register="{Binding}" d:DataContext="{d:DesignInstance viewModels:ARPTableViewModel}"
1717
mc:Ignorable="d">
1818
<UserControl.InputBindings>

0 commit comments

Comments
 (0)