This commit is contained in:
Grant Limberg 2016-11-09 10:32:18 -08:00
parent 7cf3d2caa1
commit 005b5aacaf
4 changed files with 8 additions and 12 deletions

View File

@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WinUI"
mc:Ignorable="d" x:Class="WinUI.NetworkList"
mc:Ignorable="d" x:Class="WinUI.NetworkListView"
Title="ZeroTier One" Height="500" Width="500" Icon="ZeroTierIcon.ico">
<Window.Resources>

View File

@ -23,7 +23,7 @@ namespace WinUI
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class NetworkList : Window
public partial class NetworkListView : Window
{
Regex charRegex = new Regex("[0-9a-fxA-FX]");
Regex wholeStringRegex = new Regex("^[0-9a-fxA-FX]+$");
@ -32,7 +32,7 @@ namespace WinUI
bool connected = false;
public NetworkList()
public NetworkListView()
{
InitializeComponent();

View File

@ -26,7 +26,7 @@ namespace WinUI
{
private APIHandler handler = APIHandler.Instance;
NetworkList netList = null;
NetworkListView netList = null;
public ToolbarItem()
{
@ -52,12 +52,8 @@ namespace WinUI
{
if (netList == null)
{
netList = new WinUI.NetworkList();
netList = new WinUI.NetworkListView();
netList.Closed += ShowNetworksClosed;
}
if (!netList.IsVisible)
{
netList.Show();
}
}

View File

@ -115,7 +115,7 @@
<Compile Include="ZeroTierPeer.cs" />
<Compile Include="ZeroTierNetwork.cs" />
<Compile Include="ZeroTierStatus.cs" />
<Page Include="NetworkList.xaml">
<Page Include="NetworkListView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
@ -124,8 +124,8 @@
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="NetworkList.xaml.cs">
<DependentUpon>NetworkList.xaml</DependentUpon>
<Compile Include="NetworkListView.xaml.cs">
<DependentUpon>NetworkListView.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="NetworkInfoView.xaml">