2
0
Эх сурвалжийг харах

hyperlinks in the about page are clickable

Grant Limberg 8 жил өмнө
parent
commit
d3bd10952e

+ 9 - 17
windows/WinUI/AboutView.xaml

@@ -8,13 +8,17 @@
         Title="AboutView" Height="460" Width="300" Icon="ZeroTierIcon.ico">
     <Grid>
         <Image x:Name="image" HorizontalAlignment="Center" Height="100" Margin="0,10,0,0" VerticalAlignment="Top" Width="100" Source="ZeroTierIcon.ico"/>
-        <RichTextBox x:Name="richTextBox" HorizontalAlignment="Left" Height="307" Margin="10,115,0,0" VerticalAlignment="Top" Width="275">
+        <RichTextBox x:Name="richTextBox" HorizontalAlignment="Left" Height="307" Margin="10,115,0,0" VerticalAlignment="Top" Width="275" IsReadOnly="True" IsDocumentEnabled="True">
+            <RichTextBox.Resources>
+                <Style TargetType="Hyperlink">
+                    <Setter Property="Cursor" Value="Hand" />
+                </Style>
+            </RichTextBox.Resources>
             <FlowDocument>
                 <Paragraph>
                     <Span FontWeight="Bold" FontSize="18" FontFamily="HelveticaNeue">
                         <Run Text="Getting Started"/>
                     </Span>
-                    <Run Text=" "/>
                     <Span FontWeight="Bold" FontSize="12" FontFamily="HelveticaNeue">
                         <LineBreak/>
                     </Span>
@@ -26,29 +30,23 @@
                     <Span FontSize="12" FontFamily="HelveticaNeue">
                         <Run Text="Getting started is simple. Simply click "/>
                     </Span>
-                    <Run Text=" "/>
                     <Span FontSize="12" FontFamily="Menlo-Regular">
                         <Run Text="Join Network"/>
                     </Span>
-                    <Run Text=" "/>
                     <Span FontSize="12" FontFamily="HelveticaNeue">
                         <Run Text=" from the ZeroTier status bar menu. To join the public network &quot;Earth&quot;, enter "/>
                     </Span>
-                    <Run Text=" "/>
                     <Span FontSize="12" FontFamily="Menlo-Regular">
                         <Run Text="8056c2e21c000001"/>
                     </Span>
-                    <Run Text=" "/>
                     <Span FontSize="12" FontFamily="HelveticaNeue">
                         <Run Text=" and click the Join button. Once connected, you'll be able to navigate to "/>
                     </Span>
-                    <Run Text=" "/>
-                    <Hyperlink NavigateUri="http://earth.zerotier.net/">
+                    <Hyperlink NavigateUri="http://earth.zerotier.net/" RequestNavigate="Hyperlink_MouseLeftButtonDown">
                         <Span Foreground="#FF0000E9" FontSize="12" FontFamily="HelveticaNeue">
                             <Run Text="earth.zerotier.net"/>
                         </Span>
                     </Hyperlink>
-                    <Run Text=" "/>
                     <Span FontSize="12" FontFamily="HelveticaNeue">
                         <Run Text="."/>
                     </Span>
@@ -61,7 +59,6 @@
                     <Span FontWeight="Bold" FontSize="18" FontFamily="HelveticaNeue">
                         <Run Text="Create a Network"/>
                     </Span>
-                    <Run Text=" "/>
                     <Span FontWeight="Bold" FontSize="12" FontFamily="HelveticaNeue">
                         <LineBreak/>
                     </Span>
@@ -73,17 +70,14 @@
                     <Span FontSize="12" FontFamily="HelveticaNeue">
                         <Run Text="Visit "/>
                     </Span>
-                    <Run Text=" "/>
-                    <Hyperlink NavigateUri="http://my.zerotier.com/">
+                    <Hyperlink NavigateUri="http://my.zerotier.com/" RequestNavigate="Hyperlink_MouseLeftButtonDown">
                         <Span Foreground="#FF0000E9" FontSize="12" FontFamily="HelveticaNeue">
                             <Run Text="my.zerotier.com"/>
                         </Span>
                     </Hyperlink>
-                    <Run Text=" "/>
                     <Span FontSize="12" FontFamily="HelveticaNeue">
                         <Run Text=" to create and manage your own virtual networks."/>
                     </Span>
-                    <Run Text=" "/>
                     <Span FontSize="12" FontFamily="HelveticaNeue">
                         <LineBreak/>
                         <Run/>
@@ -93,13 +87,11 @@
                     <Span FontSize="12" FontFamily="HelveticaNeue">
                         <Run Text="For more information, visit "/>
                     </Span>
-                    <Run Text=" "/>
-                    <Hyperlink NavigateUri="http://www.zerotier.com/">
+                    <Hyperlink NavigateUri="http://www.zerotier.com/" RequestNavigate="Hyperlink_MouseLeftButtonDown">
                         <Span Foreground="#FF0000E9" FontSize="12" FontFamily="HelveticaNeue">
                             <Run Text="zerotier.com"/>
                         </Span>
                     </Hyperlink>
-                    <Run Text=" "/>
                     <Span FontSize="12" FontFamily="HelveticaNeue">
                         <Run Text="."/>
                     </Span>

+ 8 - 0
windows/WinUI/AboutView.xaml.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -10,6 +11,7 @@ using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
 using System.Windows.Shapes;
 
 namespace WinUI
@@ -23,5 +25,11 @@ namespace WinUI
         {
             InitializeComponent();
         }
+
+        private void Hyperlink_MouseLeftButtonDown(object sender, RequestNavigateEventArgs e)
+        {
+            var hyperlink = (Hyperlink)sender;
+            Process.Start(hyperlink.NavigateUri.ToString());
+        }
     }
 }