1.2.2 Release.

R2NorthstarTools · May 3, 2022 · 561f539 · 561f539
1 parent 5ba2794
commit 561f539
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 9 deletions.
diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -65,7 +65,7 @@
         </DataTemplate>
         <local:Server_Template_Selector x:Key="Server_Template_Selector" />
     </Window.Resources>
-
+   
 
     <Grid Visibility="Visible" >
 
@@ -75,6 +75,7 @@
             <ImageBrush x:Key="Search_ICON" ImageSource="/Resources/Search_Icon.png" Stretch="Uniform"/>
             <ImageBrush x:Key="NO_Texture" ImageSource="/Resources/NO_TEXTURE.png" Stretch="UniformToFill"/>
             <ImageBrush x:Key="BG_PANELS" ImageSource="/Resources/BG.jpg" Stretch="UniformToFill"/>
+            <ImageBrush x:Key="NS_ICON" ImageSource="/Resources/northstar_icon_ZfV_icon.ico" Stretch="UniformToFill"/>
 
         </Grid.Resources>
 
@@ -164,10 +165,19 @@
             <Label Content="{DynamicResource UI_TITLE_MAIN}" Height="44" Width="190" Margin="0,6,0,0" VerticalAlignment="Top" Background="{x:Null}" BorderBrush="{x:Null}" FontSize="20" FontWeight="Bold" FontFamily="Gadugi"/>
         </hc:SimplePanel>
         <hc:SimplePanel Background="Black" HorizontalAlignment="Left" Width="1010" Grid.Column="1" VerticalAlignment="Top" ScrollViewer.CanContentScroll="True" Grid.IsSharedSizeScope="True" ClipToBounds="True" Height="104" Grid.Row="1" Margin="0,212,0,0" Grid.RowSpan="2" Grid.ColumnSpan="3">
-            <Button x:Name="Titanfall_2_Btn" Content="{DynamicResource UI_BUTTON_MAIN_LAUNCH_TF2}" Height="54" Width="430" Background="#FF2C4C4C" BorderThickness="1,1,1,1" BorderBrush="{x:Null}" HorizontalAlignment="Left" Margin="35,0,0,0" MouseEnter="Titanfall_2_Btn_MouseEnter" Click="Titanfall_2_Btn_Click">
+            <Button x:Name="Titanfall_2_Btn"  Height="54" Width="430" Background="#FF2C4C4C" BorderThickness="1,1,1,1" BorderBrush="{x:Null}" HorizontalAlignment="Left" Margin="35,0,0,0" MouseEnter="Titanfall_2_Btn_MouseEnter" Click="Titanfall_2_Btn_Click"  >
+                <StackPanel Orientation="Horizontal">
+                    <Image Source="Resources/TF_ICON.png" Width="24" Height="24"/>
 
+                    <TextBlock Text="{DynamicResource UI_BUTTON_MAIN_LAUNCH_TF2}" VerticalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button x:Name="Northstar_Btn" Height="54" Background="#FF2C4C4C" BorderThickness="1,1,1,1" BorderBrush="#FF02FFB4" HorizontalAlignment="Stretch" Margin="524,0,35,0" MouseEnter="Northstar_Btn_MouseEnter" Click="Northstar_Btn_Click" Width="430">
+                <StackPanel Orientation="Horizontal">
+                    <Image Source="Resources/NS_ICON.png" Width="24" Height="24"/>
+                    <TextBlock Text="{DynamicResource UI_BUTTON_MAIN_LAUNCH_NS}" VerticalAlignment="Center" />
+                </StackPanel>
             </Button>
-            <Button x:Name="Northstar_Btn" Content="{DynamicResource UI_BUTTON_MAIN_LAUNCH_NS}" Height="54" Background="#FF2C4C4C" BorderThickness="1,1,1,1" BorderBrush="#FF02FFB4" HorizontalAlignment="Stretch" Margin="524,0,35,0" MouseEnter="Northstar_Btn_MouseEnter" Click="Northstar_Btn_Click" Width="430" hc:IconElement.Geometry="{StaticResource GithubGeometry}" />
         </hc:SimplePanel>
 
 

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -2596,7 +2596,7 @@ void WalkDirectoryTree(System.IO.DirectoryInfo root, String Search)
             }
 
         }
-        private void parse_git_to_zip(string address)
+        private void parse_git_to_zip(string address, bool skin = false)
         {
 
             Mod_Progress_BAR.Value = 0;

diff --git a/Resources/Languages/cn.xaml b/Resources/Languages/cn.xaml
@@ -3,7 +3,7 @@
     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <system:String x:Key="UI_SIDEMENU_TITLE_MAIN">主页</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_MODS">模组</system:String>
-    <system:String x:Key="UI_SIDEMENU_TITLE_THUNDERSTORE">浏览模组</system:String>
+    <system:String x:Key="UI_SIDEMENU_TITLE_THUNDERSTORE">Thunderstore</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_SKINS">皮肤</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_SERVER_CONF">独立服务器</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_LOG">日志</system:String>

diff --git a/Resources/Languages/de.xaml b/Resources/Languages/de.xaml
@@ -3,7 +3,7 @@
     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <system:String x:Key="UI_SIDEMENU_TITLE_MAIN">Startseite</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_MODS">Mods</system:String>
-    <system:String x:Key="UI_SIDEMENU_TITLE_THUNDERSTORE">Mod Browser</system:String>
+    <system:String x:Key="UI_SIDEMENU_TITLE_THUNDERSTORE">Thundersore</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_SKINS">Skins</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_SERVER_CONF">Dedizierter Server</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_LOG">Log</system:String>

diff --git a/Resources/Languages/en.xaml b/Resources/Languages/en.xaml
@@ -3,7 +3,7 @@
     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <system:String x:Key="UI_SIDEMENU_TITLE_MAIN">Main</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_MODS">Mods</system:String>
-    <system:String x:Key="UI_SIDEMENU_TITLE_THUNDERSTORE">Mod Browse</system:String>
+    <system:String x:Key="UI_SIDEMENU_TITLE_THUNDERSTORE">Thunderstore</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_SKINS">Skins</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_SERVER_CONF">Dedicated Server</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_LOG">Log</system:String>

diff --git a/Resources/Languages/fr.xaml b/Resources/Languages/fr.xaml
@@ -3,7 +3,7 @@
     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <system:String x:Key="UI_SIDEMENU_TITLE_MAIN">Accueil</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_MODS">Mods</system:String>
-    <system:String x:Key="UI_SIDEMENU_TITLE_THUNDERSTORE">Navigateur de mods</system:String>
+    <system:String x:Key="UI_SIDEMENU_TITLE_THUNDERSTORE">Thunderstore</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_SKINS">Skins</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_SERVER_CONF">Serveur dédié</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_LOG">Journalisation</system:String>

diff --git a/Resources/Languages/it.xaml b/Resources/Languages/it.xaml
@@ -3,7 +3,7 @@
     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <system:String x:Key="UI_SIDEMENU_TITLE_MAIN">Main</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_MODS">Mods</system:String>
-    <system:String x:Key="UI_SIDEMENU_TITLE_THUNDERSTORE">Cerca Mods</system:String>
+    <system:String x:Key="UI_SIDEMENU_TITLE_THUNDERSTORE">Thundersore</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_SKINS">Skins</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_SERVER_CONF">Server Dedicati</system:String>
     <system:String x:Key="UI_SIDEMENU_TITLE_LOG">Logs</system:String>

diff --git a/Resources/NS_ICON.png b/Resources/NS_ICON.png
diff --git a/Resources/TF_ICON.png b/Resources/TF_ICON.png
diff --git a/VTOL.csproj b/VTOL.csproj
@@ -69,6 +69,7 @@
     <None Remove="Resources\NorthStar_Smurfson.gif" />
     <None Remove="Resources\NO_TEXTURE.png" />
     <None Remove="Resources\NO_TEXTURE.png" />
+    <None Remove="Resources\NS_ICON.png" />
     <None Remove="Resources\Panel_Var_2.png" />
     <None Remove="Resources\Search_Icon.png" />
     <None Remove="Resources\Server_ICON.png" />
@@ -79,6 +80,7 @@
     <None Remove="Resources\target.png" />
     <None Remove="Resources\Test_Args_1.json" />
     <None Remove="Resources\TF2_Vanilla_promo.gif" />
+    <None Remove="Resources\TF_ICON.png" />
     <None Remove="Resources\Titanfall2_101.ico" />
     <None Remove="Resources\Update_ICON.png" />
     <None Remove="Resources\VTOL_Hover.ico" />
@@ -262,6 +264,9 @@
     <Resource Include="Resources\NorthStar_Smurfson.gif">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Resources\NS_ICON.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Resources\Sort_Off.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
@@ -295,6 +300,9 @@
     <Resource Include="Resources\TF2_Vanilla_promo.gif">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Resources\TF_ICON.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Resources\Titanfall2_101.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            private void parse_git_to_zip(string address)
+            private void parse_git_to_zip(string address, bool skin = false)
             {
                 Mod_Progress_BAR.Value = 0;
@@ Expand Down @@