Fixed minor visual details

muqiuq · Dec 17, 2021 · d7a6126 · d7a6126
1 parent 9e0361c
commit d7a6126
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/BeARouter/BeARouter.csproj b/BeARouter/BeARouter.csproj
@@ -4,11 +4,22 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
+    <ApplicationIcon>c_router_blue_BoB_icon.ico</ApplicationIcon>
+    <Authors>Philipp Albrecht</Authors>
+    <Version>1.0</Version>
+    <PackageProjectUrl>https://github.com/muqiuq/BeASwitch</PackageProjectUrl>
+    <PackageIcon>c_router_blue.png</PackageIcon>
+    <PackageIconUrl />
+    <RepositoryUrl>https://github.com/muqiuq/BeASwitch</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
     <None Remove="images\Funnel.svg" />
     <None Remove="images\rj45.png" />
+    <None Include="images\c_router_blue.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BeARouter/ExplainWindow.xaml b/BeARouter/ExplainWindow.xaml
@@ -5,8 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BeARouter"
         mc:Ignorable="d"
-        Title="ExplainWindow" Height="450" Width="1050">
+        Title="Explanation" Height="450" Width="1050">
     <Grid>
-        <TextBox x:Name="InfoBox" HorizontalAlignment="Stretch" Text="TextBox" TextWrapping="Wrap" VerticalAlignment="Stretch" Padding="10,10,10,10" FontFamily="Courier New"/>
+        <TextBox x:Name="InfoBox" HorizontalAlignment="Stretch" IsReadOnly="True" Text="N/A" TextWrapping="Wrap" VerticalAlignment="Stretch" Padding="10,10,10,10" FontFamily="Courier New"/>
     </Grid>
 </Window>
diff --git a/BeARouter/MainWindow.xaml b/BeARouter/MainWindow.xaml
@@ -10,10 +10,10 @@
         <Label x:Name="label" Content="ip address" HorizontalAlignment="Left" Margin="406,390,0,0" VerticalAlignment="Top" FontFamily="Courier New"/>
         <Label x:Name="label1" Content="ip route" HorizontalAlignment="Left" Margin="358,67,0,0" VerticalAlignment="Top" FontFamily="Courier New"/>
         <TextBox x:Name="textBoxIpAddress" HorizontalAlignment="Left" Margin="405,415,0,0" Text="" TextWrapping="Wrap" VerticalAlignment="Top" Width="455" Height="150" FontFamily="Courier New" IsReadOnly="True" FontSize="13"/>
-        <TextBox x:Name="textBoxIpRoute" HorizontalAlignment="Left" Margin="358,90,0,0" Text="" TextWrapping="Wrap" VerticalAlignment="Top" Width="502" Height="150" FontFamily="Courier New" IsReadOnly="True" FontSize="13"/>
+        <TextBox x:Name="textBoxIpRoute" HorizontalAlignment="Left" Margin="358,90,0,0" Text="" TextWrapping="Wrap" VerticalAlignment="Top" Width="502" Height="175" FontFamily="Courier New" IsReadOnly="True" FontSize="13"/>
         <svgc:SvgViewbox Source="/images/Funnel.svg" Width="400" HorizontalAlignment="Left" Stretch="Fill" Margin="0,60,0,0"/>
         <Button x:Name="masterButton" Content="N/A" HorizontalAlignment="Left" Height="86" VerticalAlignment="Top" Width="48" FontWeight="Bold" Margin="405,285,0,0" Click="masterButton_Click"/>
-        <TextBlock HorizontalAlignment="Left" Margin="405,570,0,0" Text="TextBlock" TextWrapping="Wrap" VerticalAlignment="Top" Height="30" Width="455" Background="#FFF3FF00" FontFamily="Courier New"/>
+        <TextBlock HorizontalAlignment="Left" Margin="405,570,0,0" Text="TextBlock" TextWrapping="Wrap" VerticalAlignment="Top" Height="30" Width="455" Background="#FFF3FF00" FontFamily="Courier New" Visibility="Hidden"/>
         <Grid x:Name="pointsGrid" HorizontalAlignment="Left" Height="68" Margin="271,456,0,0" VerticalAlignment="Top" Width="97">
             <Rectangle x:Name="pointsRectangle" HorizontalAlignment="Stretch" Margin="0,0,0,0" Stroke="Black" VerticalAlignment="Stretch" Fill="#FF3AFF00"/>
             <TextBlock x:Name="pointsText" HorizontalAlignment="Center" Margin="10,10,10,10" Text="0/0" TextWrapping="Wrap" VerticalAlignment="Center" TextAlignment="Center" FontSize="30"/>

diff --git a/BeARouter/MainWindow.xaml.cs b/BeARouter/MainWindow.xaml.cs
@@ -4,6 +4,7 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -43,6 +44,8 @@ public MainWindow()
             textBoxIpAddress.Text = gameEngine.Ports.ToString();
 
             UpdateAll();
+
+            this.Title += $" {Assembly.GetEntryAssembly().GetName().Version}";
         }
 
         private void ListProcesses()

diff --git a/BeARouter/c_router_blue_BoB_icon.ico b/BeARouter/c_router_blue_BoB_icon.ico
diff --git a/BeARouter/images/c_router_blue.png b/BeARouter/images/c_router_blue.png