From 005b5aacaf504d6fdfec0088c0534fa9e606b844 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Wed, 9 Nov 2016 10:32:18 -0800 Subject: [PATCH] rename --- windows/WinUI/{NetworkList.xaml => NetworkListView.xaml} | 2 +- .../{NetworkList.xaml.cs => NetworkListView.xaml.cs} | 4 ++-- windows/WinUI/ToolbarItem.xaml.cs | 8 ++------ windows/WinUI/WinUI.csproj | 6 +++--- 4 files changed, 8 insertions(+), 12 deletions(-) rename windows/WinUI/{NetworkList.xaml => NetworkListView.xaml} (99%) rename windows/WinUI/{NetworkList.xaml.cs => NetworkListView.xaml.cs} (98%) diff --git a/windows/WinUI/NetworkList.xaml b/windows/WinUI/NetworkListView.xaml similarity index 99% rename from windows/WinUI/NetworkList.xaml rename to 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"> diff --git a/windows/WinUI/NetworkList.xaml.cs b/windows/WinUI/NetworkListView.xaml.cs similarity index 98% rename from windows/WinUI/NetworkList.xaml.cs rename to 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 /// /// Interaction logic for MainWindow.xaml /// - 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 @@ - + MSBuild:Compile Designer @@ -124,8 +124,8 @@ App.xaml Code - - NetworkList.xaml + + NetworkListView.xaml Code