From da1bd483a5933f9ab4cbf647aca7f677222a33d7 Mon Sep 17 00:00:00 2001
From: num0005 <num0005@outlook.com>
Date: Tue, 2 Jul 2024 19:31:02 +0100
Subject: [PATCH] Rename bitmaps import.

---
 Launcher/MainWindow.xaml    |  4 +--
 Launcher/MainWindow.xaml.cs | 65 ++++++++++++++-----------------------
 2 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/Launcher/MainWindow.xaml b/Launcher/MainWindow.xaml
index a88c1cc..0245211 100644
--- a/Launcher/MainWindow.xaml
+++ b/Launcher/MainWindow.xaml
@@ -481,7 +481,7 @@
                                     </Grid>
                                 </Grid>
                             </TabItem>
-                            <TabItem Header="Import Bitmap" Margin="-2,2,0,-6">
+                            <TabItem Header="Import Bitmaps" Margin="-2,2,0,-6">
                                 <Grid Background="{DynamicResource WindowSecondaryColor}">
                                     <Grid>
                                         <Grid.RowDefinitions>
@@ -513,7 +513,7 @@
                                                         <ColumnDefinition Width="2"/>
                                                         <ColumnDefinition/>
                                                     </Grid.ColumnDefinitions>
-                                                    <TextBlock Grid.Column="1" x:Name="textBlock" Text="Select image to import." HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="{StaticResource brushWatermarkForeground}" Visibility="{Binding ElementName=compile_image_path, Path=Text.IsEmpty, Converter={StaticResource BooleanToVisibilityConverter}}" FontStyle="Italic" Padding="4"/>
+                                                    <TextBlock Grid.Column="1" x:Name="textBlock" Text="Select image import folder." HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="{StaticResource brushWatermarkForeground}" Visibility="{Binding ElementName=compile_image_path, Path=Text.IsEmpty, Converter={StaticResource BooleanToVisibilityConverter}}" FontStyle="Italic" Padding="4"/>
                                                 </Grid>
                                                 <TextBox Grid.Column="2" Name="compile_image_path" BorderBrush="{StaticResource brushWatermarkBorder}" Foreground="{DynamicResource TextColor}" VerticalAlignment="Center" Background="{DynamicResource brushTextboxBackground}" MinHeight="26" MaxHeight="26" CaretBrush="{DynamicResource TextColor}"/>
                                             </Grid>
diff --git a/Launcher/MainWindow.xaml.cs b/Launcher/MainWindow.xaml.cs
index e1b0917..fc4b79b 100644
--- a/Launcher/MainWindow.xaml.cs
+++ b/Launcher/MainWindow.xaml.cs
@@ -1388,54 +1388,39 @@ private void Browse_text_Click(object sender, RoutedEventArgs e)
             picker.Prompt();
         }
 
-        readonly FilePicker.Options gen1BitmapOptions = FilePicker.Options.FileSelect(
-           "Select Image File",
-           "Supported image files|*.tif",
-           FilePicker.Options.PathRoot.Data,
-           parent: true
-        );
-
-        readonly FilePicker.Options gen2BitmapOptions = FilePicker.Options.FileSelect(
-           "Select Image File",
-           "Supported image files|*.tif;*.tiff;*.tga;*.jpg;*.bmp",
-           FilePicker.Options.PathRoot.Data,
-           parent: true
-        );
-
-        readonly FilePicker.Options gen2H2CodezBitmapOptions = FilePicker.Options.FileSelect(
-           "Select Image File",
-           "Supported image files|*.tif;*.tiff;*.tga;*.jpg;*.bmp;*.png",
-           FilePicker.Options.PathRoot.Data,
-           parent: true
-        );
-
-        readonly FilePicker.Options MCCBitmapOptions = FilePicker.Options.FileSelect(
-           "Select Image File",
-           "Supported image files|*.tif;*.tiff",
-           FilePicker.Options.PathRoot.Data,
-           parent: true
-        );
-
         private void browse_bitmap_Click(object sender, RoutedEventArgs e)
         {
-            bool tag_dir = false;
-            bool is_file = false;
-            string default_path = get_default_path(compile_image_path.Text, tag_dir, is_file);
-            var bitmapOptions = gen1BitmapOptions;
-            if (halo_2_standalone_stock)
-            {
-                bitmapOptions = gen2BitmapOptions;
-            }
-            else if (halo_2_standalone_community)
+            const string gen1BitmapOptions = "*.tif";
+            const string gen2BitmapOptions = "*.tif;*.tiff;*.tga;*.jpg;*.bmp";
+            const string MCCBitmapOptions = "*.tif;*.tiff";
+
+            string bitmap_file_types = gen1BitmapOptions;
+            if (halo_2_standalone)
             {
-                bitmapOptions = gen2H2CodezBitmapOptions;
+                bitmap_file_types = gen2BitmapOptions;
+                if (halo_community)
+                {
+                    bitmap_file_types += ";*.png";
+                }
             }
             else if (halo_mcc)
             {
-                bitmapOptions = MCCBitmapOptions;
+                bitmap_file_types = MCCBitmapOptions;
             }
 
-            var picker = new FilePicker(compile_image_path, toolkit, bitmapOptions, default_path);
+            FilePicker.Options BitmapOptions = FilePicker.Options.FileSelect(
+               "Select any source image file to choose folder",
+               "Supported image files|" + bitmap_file_types,
+               FilePicker.Options.PathRoot.Data,
+               parent: true
+            );
+
+            bool tag_dir = false;
+            bool is_file = false;
+            string default_path = get_default_path(compile_image_path.Text, tag_dir, is_file);
+
+
+            var picker = new FilePicker(compile_image_path, toolkit, BitmapOptions, default_path);
             picker.Prompt();
         }