#124 Added change_resolution options and clean up SettingsWindow

Author: dos-ise

UWPHook/App.config

@@ -14,7 +14,7 @@
                 <value>False</value>
             </setting>
             <setting name="TargetLanguage" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="Seconds" serializeAs="String">
                 <value>5</value>
@@ -23,7 +23,7 @@
                 <value>False</value>
             </setting>
             <setting name="SteamGridDbApiKey" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="SelectedSteamGridDB_Style" serializeAs="String">
                 <value>0</value>
@@ -43,6 +43,9 @@
             <setting name="Tags" serializeAs="String">
                 <value>READY TO PLAY,XBOX</value>
             </setting>
+            <setting name="SelectedLogLevel" serializeAs="String">
+                <value>0</value>
+            </setting>
             <setting name="SteamGridDB_Style" serializeAs="Xml">
                 <value>
                     <ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -91,8 +94,11 @@
                     </ArrayOfString>
                 </value>
             </setting>
-            <setting name="SelectedLogLevel" serializeAs="String">
-                <value>0</value>
+            <setting name="ChangeResolution" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="TargetResolution" serializeAs="String">
+                <value />
             </setting>
         </UWPHook.Properties.Settings>
     </userSettings>

UWPHook/GamesWindow.xaml.cs

@@ -113,6 +113,12 @@ private async Task LauncherAsync(string[] args)
                     ScriptManager.RunScript("Set-WinUILanguageOverride " + Properties.Settings.Default.TargetLanguage);
                 }
 
+                if (Settings.Default.ChangeResolution && !String.IsNullOrEmpty(Settings.Default.TargetResolution))
+                {
+                    var targetResolution = ExtractDimensions(Settings.Default.TargetResolution);
+                    ScriptManager.RunScript("Set-DisplayResolution -Width " + targetResolution.Width + " - Height " + targetResolution.Height + " -Force");
+                }
+
                 //The only other parameter Steam will send is the app AUMID
                 AppManager.LaunchUWPApp(args);
 
@@ -139,6 +145,19 @@ private async Task LauncherAsync(string[] args)
             }
         }
 
+        static (int Width, int Height) ExtractDimensions(string resolution)
+        {
+            var parts = resolution.Split('x');
+            if (parts.Length == 2)
+            {
+                if (int.TryParse(parts[0].Trim(), out int width) && int.TryParse(parts[1].Trim(), out int height))
+                {
+                    return (width, height);
+                }
+            }
+            throw new FormatException("Invalid resolution format.");
+        }
+        
         /// <summary>
         /// Generates a CRC32 hash expected by Steam to link an image with a game in the library
         /// See https://blog.yo1.dog/calculate-id-for-non-steam-games-js/ for an example

UWPHook/Properties/Settings.Designer.cs

@@ -35,6 +35,9 @@
     <Setting Name="Tags" Type="System.String" Scope="User">
       <Value Profile="(Default)">READY TO PLAY,XBOX</Value>
     </Setting>
+    <Setting Name="SelectedLogLevel" Type="System.String" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
     <Setting Name="SteamGridDB_Style" Type="System.Collections.Specialized.StringCollection" Scope="User">
       <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
@@ -78,8 +81,11 @@
   &lt;string&gt;TRACE&lt;/string&gt;
 &lt;/ArrayOfString&gt;</Value>
     </Setting>
-    <Setting Name="SelectedLogLevel" Type="System.String" Scope="User">
-      <Value Profile="(Default)">0</Value>
+    <Setting Name="ChangeResolution" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="TargetResolution" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
     </Setting>
   </Settings>
 </SettingsFile>

UWPHook/Properties/Settings.settings

@@ -12,6 +12,15 @@
         TextElement.FontSize="14"
         FontFamily="Segoe UI Light"
         Title="Settings" Height="750" Width="800" Icon="Resources/hook2.ico">
+    <Window.Resources>
+        <Style TargetType="ToggleButton" BasedOn="{StaticResource MaterialDesignSwitchToggleButton}">
+            <Setter Property="LayoutTransform">
+                <Setter.Value>
+                    <ScaleTransform ScaleX="0.7" ScaleY="0.7" />
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="27*"/>
@@ -52,14 +61,14 @@
             <materialDesign:ColorZone Padding="16" Mode="PrimaryMid" VerticalAlignment="Top" Height="30" Grid.ColumnSpan="4" Grid.Row="0">
                 <Label  Content="Settings" HorizontalAlignment="Left" Margin="-10,-15,0,-17" VerticalAlignment="Top" FontFamily="Segoe UI Semibold" FontSize="14" Height="32" Foreground="#DDFFFFFF"/>
             </materialDesign:ColorZone>
-            <ToggleButton x:Name="language_toggle" Style="{StaticResource MaterialDesignSwitchToggleButton}" ToolTip="MaterialDesignSwitchToggleButton" IsChecked="False" RenderTransformOrigin="0.304,0.444" Grid.Row="1" Margin="5,3,6,4" />
+            <ToggleButton x:Name="language_toggle" ToolTip="MaterialDesignSwitchToggleButton" IsChecked="False" RenderTransformOrigin="0.304,0.444" Grid.Row="1" Margin="5,3,6,4" />
             <Label ToolTip="Some apps use the system language to choose what language to display, this setting will store your current language, change it so you can play in another language and then revert your system back to your default display language." x:Name="label_cultures" Content="Set system language when launching an app*" VerticalAlignment="Center" Height="29" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="1"/>
             <ComboBox ToolTip="Some apps use the system language to choose what language to display, this setting will store your current language, change it so you can play in another language and then revert your system back to your default display language." x:Name="cultures_comboBox" Margin="0,0,10,0" VerticalAlignment="Center" Height="32" Grid.Column="3" HorizontalAlignment="Right" Width="92" Grid.Row="1"/>
             <Label x:Name="label_seconds" ToolTip="If 0, UWPHook will not run in the background and will not update the in-game status" Content="Check if the launched app is running every" VerticalAlignment="Center" Height="29" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2"/>
             <ComboBox x:Name="seconds_comboBox" Margin="0,0,10,0" VerticalAlignment="Center" Height="32" Grid.Column="3" HorizontalAlignment="Right" Width="92" Grid.Row="2"/>
-            <ToggleButton x:Name="streaming_toggle" Style="{DynamicResource MaterialDesignSwitchToggleButton}" ToolTip="MaterialDesignSwitchToggleButton" IsChecked="False" Grid.Row="3" Margin="6,3,5,4" />
+            <ToggleButton x:Name="streaming_toggle" ToolTip="MaterialDesignSwitchToggleButton" IsChecked="False" Grid.Row="3" Margin="6,3,5,4" />
             <Label ToolTip="This fixes Steam in-home Streaming, set this in the host computer." x:Name="label_streaming" Content="Enable streaming mode" VerticalAlignment="Center" Height="29" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="3"/>
-            <ToggleButton x:Name="change_resolution_toggle" Style="{StaticResource MaterialDesignSwitchToggleButton}" ToolTip="Change host resolution on streaming mode" IsChecked="False" Grid.Row="4" Width="NaN" Margin="5,3,6,3" />
+            <ToggleButton x:Name="change_resolution_toggle" ToolTip="Change host resolution on streaming mode" IsChecked="False" Grid.Row="4" Margin="5,3,6,3" />
             <Label ToolTip="Change the host computer resolution on launch, return to previous after." x:Name="label_resolution" Content="Change host resolution to:" VerticalAlignment="Center" Height="29" Grid.Column="1" Grid.Row="4"/>
             <ComboBox x:Name="resolution_comboBox" Margin="0,0,10,0" VerticalAlignment="Center" Height="32" Grid.Column="2" Width="220" Grid.Row="4" Grid.ColumnSpan="2" HorizontalAlignment="Right"/>
             <Label ToolTip="Add these tags to exported games, use comma separated values" x:Name="label_tags" Content="Export with these tags:" Margin="0,0,8,0" VerticalAlignment="Center" Height="29" Grid.Column="1" Grid.Row="5"/>

UWPHook/SettingsWindow.xaml

@@ -1,8 +1,10 @@
 using System;
 using System.Diagnostics;
 using System.Globalization;
+using System.Management;
 using System.Security.Policy;
 using System.Windows;
+using UWPHook.Properties;
 using static System.Net.WebRequestMethods;
 
 namespace UWPHook
@@ -16,28 +18,23 @@ public SettingsWindow()
         {
             InitializeComponent();
 
-            this.Title = "UWPHook version " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+            Title = "UWPHook version " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
 
-            foreach (var culture in CultureInfo.GetCultures(CultureTypes.AllCultures))
-            {
-                cultures_comboBox.Items.Add(culture.TextInfo.CultureName);
-            }
+            cultures_comboBox.ItemsSource = CultureInfo.GetCultures(CultureTypes.AllCultures).Select(c => c.TextInfo.CultureName);
+            cultures_comboBox.SelectedItem = string.IsNullOrEmpty(Settings.Default.TargetLanguage) ? CultureInfo.CurrentCulture.TextInfo.CultureName : Properties.Settings.Default.TargetLanguage;
 
-            for (int i = 0; i < 10; i++)
-            {
-                seconds_comboBox.Items.Add(i + " seconds");
-                if (i == Properties.Settings.Default.Seconds)
-                {
-                    seconds_comboBox.SelectedIndex = i;
-                }
-            }
+            seconds_comboBox.ItemsSource = Enumerable.Range(0, 10).Select(i => i + " seconds");
+            seconds_comboBox.SelectedIndex = Properties.Settings.Default.Seconds;
+            
+            resolution_comboBox.ItemsSource = GetResolutions();
+            resolution_comboBox.SelectedItem = string.IsNullOrEmpty(Settings.Default.TargetResolution) ? GetCurrentResolution() : Properties.Settings.Default.TargetResolution;
 
             int logLevel_index = 0;
             int.TryParse(Properties.Settings.Default.SelectedLogLevel, out logLevel_index);
 
-            cultures_comboBox.SelectedItem = Properties.Settings.Default.TargetLanguage;
             language_toggle.IsChecked = Properties.Settings.Default.ChangeLanguage;
             streaming_toggle.IsChecked = Properties.Settings.Default.StreamMode;
+            change_resolution_toggle.IsChecked = Properties.Settings.Default.ChangeResolution;
             logLevel_comboBox.SelectedIndex = logLevel_index;
             steamgriddb_api_key.Text = Properties.Settings.Default.SteamGridDbApiKey;
             style_comboBox.SelectedIndex = Properties.Settings.Default.SelectedSteamGridDB_Style;
@@ -47,12 +44,45 @@ public SettingsWindow()
             tags_textBox.Text = Properties.Settings.Default.Tags;
         }
 
+#pragma warning disable CA1416 // Validate platform compatibility
+        private IEnumerable<string> GetResolutions()
+        {
+
+            using var searcher = new ManagementObjectSearcher("SELECT * FROM CIM_VideoControllerResolution");
+            foreach (var resolution in searcher.Get())
+            {
+                uint horizontalResolution = (uint)resolution["HorizontalResolution"];
+                uint verticalResolution = (uint)resolution["VerticalResolution"];
+                yield return horizontalResolution + " x " + verticalResolution;
+            }
+
+        }
+
+        private string GetCurrentResolution()
+        {
+            using var searcher = new ManagementObjectSearcher("SELECT * FROM Win32_VideoController");
+            foreach (var mo in searcher.Get())
+            {
+                var currentHorizontalResolution = mo["CurrentHorizontalResolution"];
+                var currentVerticalResolution = mo["CurrentVerticalResolution"];
+                if (currentHorizontalResolution != null && currentVerticalResolution != null)
+                {
+                    return $"{currentHorizontalResolution} x {currentVerticalResolution}";
+                }
+            }
+
+            return string.Empty;
+        }
+#pragma warning restore CA1416 // Validate platform compatibility
+
         private void saveButton_Click(object sender, RoutedEventArgs e)
         {
             Properties.Settings.Default.ChangeLanguage = (bool)language_toggle.IsChecked;
             Properties.Settings.Default.TargetLanguage = cultures_comboBox.SelectedItem.ToString();
             Properties.Settings.Default.Seconds = Int32.Parse(seconds_comboBox.SelectedItem.ToString().Substring(0, 1));
             Properties.Settings.Default.StreamMode = (bool)streaming_toggle.IsChecked;
+            Properties.Settings.Default.ChangeResolution = (bool)change_resolution_toggle.IsChecked;
+            Properties.Settings.Default.TargetResolution = resolution_comboBox.SelectedItem.ToString();
             Properties.Settings.Default.SelectedLogLevel = logLevel_comboBox.SelectedIndex.ToString();
             Properties.Settings.Default.SteamGridDbApiKey = steamgriddb_api_key.Text.Trim('\r', '\n');
             Properties.Settings.Default.SelectedSteamGridDB_Style = style_comboBox.SelectedIndex;
@@ -102,7 +132,7 @@ private void clearAll_button_Click(object sender, RoutedEventArgs e)
         private void key_Button_Click(object sender, RoutedEventArgs e)
         {
             MessageBox.Show(messageBoxText: "You are being redirected to SteamGridDB website!\r\n" +
-                "Log-in, or create your account, go to your profile preferences and click 'Generate API Key', then paste the key back on UWPHook.", "Attention!", MessageBoxButton.OK, MessageBoxImage.Information );
+                "Log-in, or create your account, go to your profile preferences and click 'Generate API Key', then paste the key back on UWPHook.", "Attention!", MessageBoxButton.OK, MessageBoxImage.Information);
             OpenUrl("https://www.steamgriddb.com/profile/preferences/api");
         }