ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-21 22:07:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
windows/WinUI/NetworkList.xaml → windows/WinUI/NetworkListView.xaml
View File

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

4
windows/WinUI/NetworkList.xaml.cs → windows/WinUI/NetworkListView.xaml.cs
View File

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

8
windows/WinUI/ToolbarItem.xaml.cs
View File

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

6
windows/WinUI/WinUI.csproj
View File

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