Merge branch 'main' into minor-fixes

Author: tobibodamer

H2MLauncher.UI/Constants.cs

@@ -47,5 +47,8 @@ public static class Constants
         public const string BackgroundImageBlurRadiusKey = "BackgroundImageBlurRadius";
         public const string BackgroundVideoSourceKey = "BackgroundVideoSource";
         public const string CurrentThemeDirectoryKey = "CurrentThemeDirectory";
+
+        public const string EmbeddedThemesRelativePath = "Themes";
+        public const string EmbeddedThemesAbsolutePath = $"pack://application:,,,/{EmbeddedThemesRelativePath}";
     }
 }

H2MLauncher.UI/Dialog/Views/CustomizationDialogView.xaml

@@ -297,7 +297,7 @@
                                         <!-- Kebab menu button -->
                                         <ToggleButton x:Name="KebabMenuButton" Content="⋮" Margin="0,5,5,5" Width="0"
                                                       FontSize="15" Style="{DynamicResource LinkToggleButtonStyle}"
-                                                      Visibility="{Binding IsDefault, Converter={StaticResource InverseBoolToVisibilityConverter}, ConverterParameter={x:Static Visibility.Hidden}}">
+                                                      Visibility="{Binding IsInternal, Converter={StaticResource InverseBoolToVisibilityConverter}, ConverterParameter={x:Static Visibility.Hidden}}">
                                         </ToggleButton>
 
                                         <!-- Kebab menu popup -->

H2MLauncher.UI/Dialog/Views/SettingsDialogView.xaml

@@ -26,13 +26,7 @@
             </Style.Triggers>
         </Style>
 
-        <Style TargetType="{x:Type TextBox}">
-            <Style.Setters>
-                <Setter Property="Foreground" Value="{DynamicResource TextLight}"/>
-                <Setter Property="Background" Value="{DynamicResource TextBoxBackgroundDark}"/>
-                <Setter Property="CaretBrush" Value="{DynamicResource TextLight}"/>
-            </Style.Setters>
-        </Style>
+        <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource TransparentDarkTextBoxStyle}"/>
 
         <Style TargetType="ToolTip">
             <Style.Resources>
@@ -83,7 +77,7 @@
                     <TextBlock Text="📂" Padding="0,0,0,2" FontSize="13"/>
                 </Button>
                 <TextBox Text="{Binding MwrLocation}" BorderThickness="0" IsReadOnly="True" 
-                         FocusVisualStyle="{x:Null}" Foreground="{DynamicResource TextLight}" Margin="0,3" Background="Transparent">
+                         FocusVisualStyle="{x:Null}" Foreground="{DynamicResource TextBoxForegroundDark}" Margin="0,3" Background="Transparent">
                     <TextBox.Style>
                         <Style TargetType="TextBox">
                             <Style.Triggers>

H2MLauncher.UI/GlobalResources.xaml

@@ -153,6 +153,7 @@
 
     <!-- TextBox Brushes -->
     <SolidColorBrush x:Key="TextBoxBackgroundDark" Color="{DynamicResource ColorBlack}" Opacity="0.2"/>
+    <SolidColorBrush x:Key="TextBoxForegroundDark" Color="{DynamicResource ColorLight}"/>
     <SolidColorBrush x:Key="TextBoxBorderBrush" Color="{DynamicResource ColorNeutral400}"/>
 
     <!-- Transparent Item Brushes -->
@@ -990,6 +991,13 @@
     </Style>
 
 
+    <Style x:Key="ServerTabControlStyle" TargetType="TabControl">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlBorderBrush}"/>
+    </Style>
+
+
     <SolidColorBrush x:Key="ServerDataGridHeaderBackground" Color="{DynamicResource ColorBlack}" Opacity="0.9"/>
 
     <Style x:Key="ServerDataGridStyle" TargetType="DataGrid">
@@ -1047,4 +1055,13 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+
+    <!-- Dark TextBox used in dialogs on dark background -->
+    <Style x:Key="TransparentDarkTextBoxStyle" TargetType="{x:Type TextBox}">
+        <Style.Setters>
+            <Setter Property="Foreground" Value="{DynamicResource TextBoxForegroundDark}"/>
+            <Setter Property="Background" Value="{DynamicResource TextBoxBackgroundDark}"/>
+            <Setter Property="CaretBrush" Value="{DynamicResource TextBoxForegroundDark}"/>
+        </Style.Setters>
+    </Style>
 </ResourceDictionary>

H2MLauncher.UI/H2MLauncher.UI.csproj

@@ -25,10 +25,16 @@
     <None Remove="Assets\h2m.png" />
     <None Remove="Assets\hmw.png" />
     <None Remove="Assets\Icon.ico" />
+    <None Remove="Themes\Nyan\back.jpg" />
+    <None Remove="Themes\Nyan\icon.jpg" />
+    <None Remove="Themes\Nyan\metadata.json" />
+    <None Remove="Themes\Nyan\nian-cat.gif" />
+    <None Remove="Themes\Nyan\nyan-cat-cat.gif" />
   </ItemGroup>
 
   <ItemGroup>
     <Page Remove="GlobalResources.xaml" />
+    <Page Remove="Themes\Nyan\Nyan.xaml" />
   </ItemGroup>
 
   <ItemGroup>
@@ -96,6 +102,12 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     <Resource Include="GlobalResources.xaml" />
+    <Resource Include="Themes\Nyan\back.jpg" />
+    <Resource Include="Themes\Nyan\icon.jpg" />
+    <Resource Include="Themes\Nyan\metadata.json" />
+    <Resource Include="Themes\Nyan\nian-cat.gif" />
+    <Resource Include="Themes\Nyan\nyan-cat-cat.gif" />
+    <Resource Include="Themes\Nyan\Nyan.xaml" />
   </ItemGroup>
 
   <ItemGroup>

H2MLauncher.UI/MainWindow.xaml

@@ -314,8 +314,7 @@
 
                     <!-- Server tabs -->
                     <TabControl ItemsSource="{Binding ServerTabs}" SelectedItem="{Binding SelectedTab}" 
-                                Grid.RowSpan="2" Margin="0,10,0,5" BorderThickness="1" 
-                                BorderBrush="{DynamicResource ControlBorderBrush}" Background="Transparent" >
+                                Grid.RowSpan="2" Margin="0,10,0,5" Style="{DynamicResource ServerTabControlStyle}" >
                         <TabControl.ItemTemplate>
                             <DataTemplate DataType="{x:Type vm:IServerTabViewModel}">
                                 <TextBlock Text="{Binding TabName}"/>
@@ -458,18 +457,19 @@
                                             <DataGridTemplateColumn Header="Favourite" MinWidth="69" SortMemberPath="IsFavorite" CanUserResize="False">
                                                 <DataGridTemplateColumn.CellTemplate>
                                                     <DataTemplate>
-                                                        <Button Content="{Binding IsFavorite, Converter={StaticResource BooleanToStarConverter}}"
-                                                        Command="{Binding DataContext.ToggleFavouriteCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                                        CommandParameter="{Binding}"
-                                                        HorizontalAlignment="Center" 
-                                                        VerticalAlignment="Center"
-                                                        FontSize="16"
-                                                        Background="Transparent"
-                                                        BorderThickness="0"
-                                                        Margin="5,0,0,0"
-                                                        Focusable="False"
-                                                        IsTabStop="False" 
-                                                        Cursor="Hand"/>
+                                                        <Button Style="{StaticResource LinkButtonStyle}"
+                                                                Content="{Binding IsFavorite, Converter={StaticResource BooleanToStarConverter}}"
+                                                                Command="{Binding DataContext.ToggleFavouriteCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}"
+                                                                CommandParameter="{Binding}"
+                                                                HorizontalAlignment="Center" 
+                                                                VerticalAlignment="Center"
+                                                                FontSize="16"
+                                                                Background="Transparent"
+                                                                BorderThickness="0"
+                                                                Margin="5,0,0,0"
+                                                                Focusable="False"
+                                                                IsTabStop="False" 
+                                                                Cursor="Hand"/>
                                                     </DataTemplate>
                                                 </DataGridTemplateColumn.CellTemplate>
                                             </DataGridTemplateColumn>

H2MLauncher.UI/Services/CustomizationManager.cs

@@ -14,6 +14,7 @@
 
 namespace H2MLauncher.UI.Services;
 
+
 public partial class CustomizationManager : ObservableObject
 {
     internal const string DefaultResourceDirectory = "pack://application:,,,/H2MLauncher.UI;component";
@@ -93,7 +94,9 @@ public async Task LoadInitialValues()
         if (customizationSettings?.Themes is not null &&
             customizationSettings.Themes.Count > 0)
         {
-            if (!File.Exists(customizationSettings.Themes[0]))
+            string selectedThemeFile = customizationSettings.Themes[0];
+            bool isInternal = selectedThemeFile.StartsWith(Constants.EmbeddedThemesAbsolutePath);
+            if (isInternal ? !Uri.TryCreate(selectedThemeFile, UriKind.Absolute, out Uri? themeResourceUri) : !File.Exists(selectedThemeFile))
             {
                 UpdateCustomizationSettings(settings => settings with
                 {
@@ -102,8 +105,8 @@ public async Task LoadInitialValues()
             }
             else
             {
-            LoadTheme(customizationSettings.Themes[0]);
-        }
+                LoadTheme(customizationSettings.Themes[0]);
+            }
         }
 
         HotReloadThemes = customizationSettings?.HotReloadThemes ?? false;
@@ -248,15 +251,19 @@ public bool LoadTheme(string xamlPath)
             {
                 string themeDirectory = Path.GetDirectoryName(xamlPath)! + '\\';
 
+                bool isEmbedded = xamlPath.StartsWith("pack://application");
+
                 // load resource dictionary
-                using FileStream stream = new(xamlPath, FileMode.Open, FileAccess.Read);
+                using Stream stream = isEmbedded
+                    ? Application.GetResourceStream(new Uri(xamlPath)).Stream
+                    : new FileStream(xamlPath, FileMode.Open, FileAccess.Read);
 
                 ParserContext parserContext = new()
                 {
                     // Critical: this makes relative URIs work!
-                    BaseUri = new Uri(themeDirectory, UriKind.Absolute)
+                    BaseUri = new Uri(isEmbedded ? xamlPath.Substring(0, xamlPath.LastIndexOf('/') + 1) : themeDirectory, UriKind.Absolute)
                 };
-                
+
                 ResourceDictionary resourceDictionary = (ResourceDictionary)XamlReader.Load(stream, parserContext);
 
                 // remove old one
@@ -295,19 +302,20 @@ public void ResetTheme()
         if (Application.Current.Resources.MergedDictionaries.Count > 1)
         {
             Application.Current.Resources.MergedDictionaries.RemoveAt(1);
+        }
 
-            // reset resource directory
-            Application.Current.Resources.Remove(Constants.CurrentThemeDirectoryKey);
-            CurrentThemeDirectory = DefaultResourceDirectory;
-            CurrentThemeFile = null;
+        // reset resource directory
+        Application.Current.Resources.Remove(Constants.CurrentThemeDirectoryKey);
+        CurrentThemeDirectory = DefaultResourceDirectory;
+        CurrentThemeFile = null;
 
-            UpdateCustomizationSettings(settings => settings with
-            {
-                Themes = []
-            });
+        UpdateCustomizationSettings(settings => settings with
+        {
+            Themes = []
+        });
+
+        ThemeLoadingError = false;
 
-            ThemeLoadingError = false;
-        }
     }
 
     partial void OnBackgroundBlurChanged(double value)

H2MLauncher.UI/Services/ResourceHelper.cs

@@ -0,0 +1,62 @@
+using System.Collections;
+using System.IO;
+using System.Reflection;
+using System.Resources;
+using System.Windows;
+
+namespace H2MLauncher.UI.Services;
+
+public static class ResourceHelper
+{
+    /// <summary>
+    /// Gets a list of resource names under a specific folder (case-insensitive).
+    /// </summary>
+    /// <param name="folder">The folder path within the resources (e.g., "Images" or "Data/TextFiles").</param>
+    /// <returns>An array of resource names (relative to the folder).</returns>
+    public static List<string> GetResourcesUnder(string folder)
+    {
+        folder = folder.ToLower().TrimEnd('/') + "/"; // Ensure consistent folder format
+        Assembly assembly = Assembly.GetCallingAssembly(); // Or Assembly.GetEntryAssembly() for the main executable
+        string resourcesName = assembly.GetName().Name + ".g.resources";
+
+        using Stream? stream = assembly.GetManifestResourceStream(resourcesName);
+        if (stream is null)
+        {
+            // This can happen if there are no 'Resource' files in the assembly,
+            // or if the assembly name is different from what's expected.
+            return [];
+        }
+
+        using ResourceReader resourceReader = new(stream);
+        List<string> resourceNames = [];
+        foreach (DictionaryEntry entry in resourceReader)
+        {
+            string? resourceKey = entry.Key.ToString()?.ToLower();
+            if (resourceKey is not null && resourceKey.StartsWith(folder))
+            {
+                resourceNames.Add(resourceKey.Substring(folder.Length));
+            }
+        }
+        return resourceNames;
+    }
+
+    /// <summary>
+    /// Gets a Stream for a specific WPF resource file using a Pack URI.
+    /// </summary>
+    /// <param name="relativePath">The relative path to the resource within your project (e.g., "Images/myImage.png").</param>
+    /// <returns>A Stream for the resource, or null if not found.</returns>
+    public static Stream? GetWpfResourceStream(string relativePath)
+    {
+        try
+        {
+            // Construct a Pack URI. The "///" indicates the current assembly.
+            // Adjust if the resource is in a different assembly.
+            Uri uri = new Uri($"pack://application:,,,/{relativePath.Replace('\\', '/')}", UriKind.Absolute);
+            return Application.GetResourceStream(uri).Stream;
+        }
+        catch
+        {
+            return null;
+        }
+    }
+}