diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml
index b32ac3277..770b86e37 100644
--- a/windows/WinUI/AboutView.xaml
+++ b/windows/WinUI/AboutView.xaml
@@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WinUI"
mc:Ignorable="d"
- Title="AboutView" Height="300" Width="300">
+ Title="AboutView" Height="300" Width="300" Icon="ZeroTierIcon.ico">
diff --git a/windows/WinUI/JoinNetworkView.xaml b/windows/WinUI/JoinNetworkView.xaml
index 789be1064..0bd065a41 100644
--- a/windows/WinUI/JoinNetworkView.xaml
+++ b/windows/WinUI/JoinNetworkView.xaml
@@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WinUI"
mc:Ignorable="d"
- Title="Join a Network" Height="120" Width="320">
+ Title="Join a Network" Height="120" Width="320" Icon="ZeroTierIcon.ico">
diff --git a/windows/WinUI/PreferencesView.xaml b/windows/WinUI/PreferencesView.xaml
new file mode 100644
index 000000000..09440236d
--- /dev/null
+++ b/windows/WinUI/PreferencesView.xaml
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/windows/WinUI/PreferencesView.xaml.cs b/windows/WinUI/PreferencesView.xaml.cs
new file mode 100644
index 000000000..9de8766ec
--- /dev/null
+++ b/windows/WinUI/PreferencesView.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace WinUI
+{
+ ///
+ /// Interaction logic for PreferencesView.xaml
+ ///
+ public partial class PreferencesView : Window
+ {
+ public PreferencesView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/windows/WinUI/ToolbarItem.xaml b/windows/WinUI/ToolbarItem.xaml
index bbc176497..9ec159b9e 100644
--- a/windows/WinUI/ToolbarItem.xaml
+++ b/windows/WinUI/ToolbarItem.xaml
@@ -42,8 +42,10 @@
-
-
+
+
diff --git a/windows/WinUI/ToolbarItem.xaml.cs b/windows/WinUI/ToolbarItem.xaml.cs
index b7ac793f5..1a39ce0fb 100644
--- a/windows/WinUI/ToolbarItem.xaml.cs
+++ b/windows/WinUI/ToolbarItem.xaml.cs
@@ -31,6 +31,8 @@ namespace WinUI
private NetworkListView netListView = null;
private JoinNetworkView joinNetView = null;
+ private AboutView aboutView = null;
+ private PreferencesView prefsView = null;
private NetworkMonitor mon = NetworkMonitor.Instance;
@@ -108,7 +110,7 @@ namespace WinUI
private void ToolbarItem_NodeIDClicked(object sender, System.Windows.RoutedEventArgs e)
{
-
+ // TODO: Copy Node ID to clipboard
}
private void ToolbarItem_ShowNetworksClicked(object sender, System.Windows.RoutedEventArgs e)
@@ -141,6 +143,36 @@ namespace WinUI
joinNetView = null;
}
+ private void ToolbarItem_AboutClicked(object sender, System.EventArgs e)
+ {
+ if (aboutView == null)
+ {
+ aboutView = new AboutView();
+ aboutView.Closed += AboutClosed;
+ aboutView.Show();
+ }
+ }
+
+ private void AboutClosed(object sender, System.EventArgs e)
+ {
+ aboutView = null;
+ }
+
+ private void ToolbarItem_PreferencesClicked(object sender, System.EventArgs e)
+ {
+ if (prefsView == null)
+ {
+ prefsView = new PreferencesView();
+ prefsView.Closed += PreferencesClosed;
+ prefsView.Show();
+ }
+ }
+
+ private void PreferencesClosed(object sender, System.EventArgs e)
+ {
+ prefsView = null;
+ }
+
private void ToolbarItem_NetworkClicked(object sender, System.Windows.RoutedEventArgs e)
{
if(sender.GetType() == typeof(MenuItem))
diff --git a/windows/WinUI/WinUI.csproj b/windows/WinUI/WinUI.csproj
index 53f715d0c..4fcf1bc43 100644
--- a/windows/WinUI/WinUI.csproj
+++ b/windows/WinUI/WinUI.csproj
@@ -115,6 +115,9 @@
PeersPage.xaml
+
+ PreferencesView.xaml
+
ToolbarItem.xaml
@@ -155,6 +158,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
MSBuild:Compile
Designer