UI Adjustments

R2NorthstarTools · Jan 21, 2024 · b6c611f · b6c611f
1 parent 45d6a6d
commit b6c611f
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,8 @@
 [Tt]humbs.db 
 _ReSharper.*
 *.resharper
-Ankh.NoLoad
+Ankh.NoLoad
+/VTOL_2.0.0/Resources/Backgrounds/Backgrounds_Home_Page/VTOL_NIGHTLY-artifact.zip
+/VTOL_2.0.0/Resources/Backgrounds/Backgrounds_Home_Page/VTOL_NIGHTLY-artifact.zip
+/VTOL_2.0.0/Resources/Backgrounds/Backgrounds_Home_Page/VTOL_NIGHTLY-artifact.zip
+/VTOL_2.0.0/Resources/Backgrounds/Backgrounds_Home_Page/VTOL_NIGHTLY-artifact.zip
diff --git a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin
diff --git a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/0072e871-6b74-4081-b594-ee6d9254552a.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/0072e871-6b74-4081-b594-ee6d9254552a.vsidx
diff --git a/...6cedb23-8f2a-464d-85e3-13412a4ee003.vsidx → ...0b6800d-fbec-4b29-92fb-2aba7ae03006.vsidx b/...6cedb23-8f2a-464d-85e3-13412a4ee003.vsidx → ...0b6800d-fbec-4b29-92fb-2aba7ae03006.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/058e30bf-32f9-4834-9225-4174fb4441ad.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/058e30bf-32f9-4834-9225-4174fb4441ad.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/1357a2aa-2700-4e79-8d03-f2d6b7b71c22.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/1357a2aa-2700-4e79-8d03-f2d6b7b71c22.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/256766e8-1c07-48d1-ab39-cde41e11a985.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/256766e8-1c07-48d1-ab39-cde41e11a985.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/4f9bf00c-2bf2-49a6-ba33-e80a275dc26f.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/4f9bf00c-2bf2-49a6-ba33-e80a275dc26f.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/b142ca12-20ef-4e76-85a0-d6d38592c524.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/b142ca12-20ef-4e76-85a0-d6d38592c524.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/bc5ced4a-cd26-46f6-88e8-b81e38b1e385.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/bc5ced4a-cd26-46f6-88e8-b81e38b1e385.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/cdfa5812-62ad-45d2-994e-f1e0b8d557a7.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/cdfa5812-62ad-45d2-994e-f1e0b8d557a7.vsidx
diff --git a/VTOL_2.0.0/MainWindow.xaml b/VTOL_2.0.0/MainWindow.xaml
@@ -366,14 +366,14 @@
         <Grid xf:Animations.Primary="{StaticResource FadeIn}"
             Margin="0,7,2,663" ScrollViewer.VerticalScrollBarVisibility="Disabled" Grid.ColumnSpan="2" AllowDrop="False" HorizontalAlignment="Center" >
 
-            <StatusBar Margin="0,0,554,0" Background="Transparent" BorderThickness="0,0,0,0" HorizontalAlignment="Center" Width="644" Padding="0,0,0,0">
+            <StatusBar Margin="0,-5,554,0" Background="Transparent" BorderThickness="0,0,0,0" HorizontalAlignment="Center" Width="644" Padding="0,0,0,0" Height="32">
                 <StatusBarItem Margin="-24,-11,0,-11" Width="598">
-                    <StackPanel Orientation="Horizontal" Width="514" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0">
+                    <StackPanel Orientation="Horizontal" Width="514" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center">
 
                         <Image Source="/Resources/Icons/Main_UI/VTOL_multires.ico" Height="30" Width="33" Margin="-11,0,0,0"        RenderOptions.BitmapScalingMode="HighQuality"
 />
                         <TextBlock x:Name="VERSION_TEXT" Text="VTOL - 0.0.0 |" FontWeight="Normal" FontFamily="Nacelle" TextDecorations="{x:Null}" FontStyle="Normal" Margin="10,0,0,0" VerticalAlignment="Center"/>
-                        <ui:Button  x:Name="NORTHSTAR_BUTTON" Width="176" Height="21" Content="Northstar Version 0.0.0" Padding="0,0.5,0,0" VerticalAlignment="Stretch" FontSize="12" BorderThickness="1,1,1,1" Margin="5,0,0,-1" VerticalContentAlignment="Center" BorderBrush="{x:Null}" Click="NORTHSTAR_BUTTON_Click" FontFamily="Nacelle">
+                        <ui:Button  x:Name="NORTHSTAR_BUTTON" Width="190" Height="21" Content="Northstar Version 0.0.0" Padding="0,0.5,0,0" VerticalAlignment="Stretch" FontSize="12" BorderThickness="1,1,1,1" Margin="5,0,0,-1" VerticalContentAlignment="Center" BorderBrush="{x:Null}" Click="NORTHSTAR_BUTTON_Click" FontFamily="Nacelle">
                             <ui:Button.Background>
                                 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0" MappingMode="RelativeToBoundingBox" SpreadMethod="Repeat">
                                     <GradientStop Color="#D203606F" Offset="0.045"/>
@@ -391,7 +391,7 @@
                     </StackPanel>
                 </StatusBarItem>
             </StatusBar>
-            <Border  PreviewMouseLeftButtonDown="Grid_PreviewMouseLeftButtonDown" Margin="306,-7,0,0" Background="#00000000" />
+            <Border  PreviewMouseLeftButtonDown="Grid_PreviewMouseLeftButtonDown" Margin="322,-7,0,0" Background="#00000000" />
             <Grid x:Name="Progress_Header" Margin="700,2,219,0" Opacity="0" IsHitTestVisible="False">
                 <hc:Divider Margin="273,-2,-16,4" Orientation="Vertical" LineStrokeThickness="1.3"></hc:Divider>
                 <hc:ProgressButton x:Name="Action_Center_Progress" Width="244" ClickMode="Press" Padding="5,0,25,0" Margin="0,-4,-5,0" HorizontalContentAlignment="Left" MouseDown="Action_Center_Progress_MouseDown" Foreground="#FF969696" Checked="Action_Center_Progress_Checked" Unchecked="Action_Center_Progress_Unchecked" Background="#FF1C1C1C" VerticalAlignment="Top">

diff --git a/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs b/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs
@@ -3575,11 +3575,12 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                     }
                     else
                     {
+
                         Console.WriteLine("Candidate Detected ------\n\n\n\n\n");
 
                         DispatchIfNecessary(async () =>
                     {
-                        Update_ActionCard_Progress(Action_Card_, 20);
+                        Update_ActionCard_Progress(Action_Card_, 5);
 
 
                         if (Progress_Bar != null)
@@ -3607,22 +3608,20 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                                 await TryCopyFile(User_Settings_Vars.NorthstarInstallLocation + @"ns_startup_args.txt", User_Settings_Vars.NorthstarInstallLocation + @"TempCopyFolder\ns_startup_args.txt", true);
                             }
 
-                            Update_ActionCard_Progress(Action_Card_, 10);
 
 
 
 
-                            if (File.Exists(User_Settings_Vars.NorthstarInstallLocation + User_Settings_Vars.Profile_Path + @"\packages\Northstar.CustomServers\mod\cfg\autoexec_ns_server.cfg"))
+                            if (File.Exists(User_Settings_Vars.NorthstarInstallLocation + User_Settings_Vars.Profile_Path + @"\mods\Northstar.CustomServers\mod\cfg\autoexec_ns_server.cfg"))
                             {
 
-                                await TryCopyFile(User_Settings_Vars.NorthstarInstallLocation + User_Settings_Vars.Profile_Path + @"\packages\Northstar.CustomServers\mod\cfg\autoexec_ns_server.cfg", User_Settings_Vars.NorthstarInstallLocation + @"TempCopyFolder\autoexec_ns_server.cfg", true);
+                                await TryCopyFile(User_Settings_Vars.NorthstarInstallLocation + User_Settings_Vars.Profile_Path + @"\mods\Northstar.CustomServers\mod\cfg\autoexec_ns_server.cfg", User_Settings_Vars.NorthstarInstallLocation + @"TempCopyFolder\autoexec_ns_server.cfg", true);
 
 
 
                             }
 
-                            await Task.Delay(200); ;
-                            Update_ActionCard_Progress(Action_Card_, 10);
+                            await Task.Delay(100) ;
 
 
                             if (File.Exists(User_Settings_Vars.NorthstarInstallLocation + @"ns_startup_args_dedi.txt"))
@@ -3636,7 +3635,21 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
 
                         }
                         Update_ActionCard_Progress(Action_Card_, 10);
+                        string searchPattern = @"Northstar.*";
+                        string baseFolderPath = Path.Combine(User_Settings_Vars.NorthstarInstallLocation, User_Settings_Vars.Profile_Path + @"\mods");
+
+                        string[] matchingFolders = Directory.GetDirectories(baseFolderPath, searchPattern, SearchOption.AllDirectories);
+
 
+                        foreach (string folderPath in matchingFolders)
+                        {
+                            if (Directory.Exists(folderPath))
+                            {
+
+                                TryDeleteDirectory(folderPath, true);
+
+                            }
+                        }
                         string searchQuery3 = "*" + "Northstar.dll" + "*";
 
                         var Destinfo = new DirectoryInfo(Destination);
@@ -3665,7 +3678,6 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
 
                             }
 
-                            Update_ActionCard_Progress(Action_Card_, 5);
 
 
 
@@ -3685,7 +3697,7 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                                 if (File.Exists(User_Settings_Vars.NorthstarInstallLocation + @"TempCopyFolder\autoexec_ns_server.cfg"))
                                 {
 
-                                    await TryCopyFile(User_Settings_Vars.NorthstarInstallLocation + @"TempCopyFolder\autoexec_ns_server.cfg", User_Settings_Vars.NorthstarInstallLocation + User_Settings_Vars.Profile_Path + @"\packages\Northstar.CustomServers\mod\cfg\autoexec_ns_server.cfg", true);
+                                    await TryCopyFile(User_Settings_Vars.NorthstarInstallLocation + @"TempCopyFolder\autoexec_ns_server.cfg", User_Settings_Vars.NorthstarInstallLocation + User_Settings_Vars.Profile_Path + @"\mods\Northstar.CustomServers\mod\cfg\autoexec_ns_server.cfg", true);