diff options
author | Grant Limberg <grant.limberg@zerotier.com> | 2016-11-09 10:32:18 -0800 |
---|---|---|
committer | Grant Limberg <grant.limberg@zerotier.com> | 2016-11-09 10:32:18 -0800 |
commit | 005b5aacaf504d6fdfec0088c0534fa9e606b844 (patch) | |
tree | 15b5d23b0a25e93b0a4be35e6512abe29d7f1949 /windows/WinUI | |
parent | 7cf3d2caa19da076ebd3539c8786ce62a53d35f9 (diff) | |
download | infinitytier-005b5aacaf504d6fdfec0088c0534fa9e606b844.tar.gz infinitytier-005b5aacaf504d6fdfec0088c0534fa9e606b844.zip |
rename
Diffstat (limited to 'windows/WinUI')
-rw-r--r-- | windows/WinUI/NetworkListView.xaml (renamed from windows/WinUI/NetworkList.xaml) | 2 | ||||
-rw-r--r-- | windows/WinUI/NetworkListView.xaml.cs (renamed from windows/WinUI/NetworkList.xaml.cs) | 4 | ||||
-rw-r--r-- | windows/WinUI/ToolbarItem.xaml.cs | 8 | ||||
-rw-r--r-- | windows/WinUI/WinUI.csproj | 6 |
4 files changed, 8 insertions, 12 deletions
diff --git a/windows/WinUI/NetworkList.xaml b/windows/WinUI/NetworkListView.xaml index 6010a990..f75b1dbe 100644 --- a/windows/WinUI/NetworkList.xaml +++ b/windows/WinUI/NetworkListView.xaml @@ -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> diff --git a/windows/WinUI/NetworkList.xaml.cs b/windows/WinUI/NetworkListView.xaml.cs index ae5e1c8e..6983a3fb 100644 --- a/windows/WinUI/NetworkList.xaml.cs +++ b/windows/WinUI/NetworkListView.xaml.cs @@ -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(); diff --git a/windows/WinUI/ToolbarItem.xaml.cs b/windows/WinUI/ToolbarItem.xaml.cs index b3a1aafd..d5cccbef 100644 --- a/windows/WinUI/ToolbarItem.xaml.cs +++ b/windows/WinUI/ToolbarItem.xaml.cs @@ -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(); } } diff --git a/windows/WinUI/WinUI.csproj b/windows/WinUI/WinUI.csproj index 70e07ba3..a301463a 100644 --- a/windows/WinUI/WinUI.csproj +++ b/windows/WinUI/WinUI.csproj @@ -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"> |