From 723e8f30e3e627ce3575b452d5cfd9068404b07d Mon Sep 17 00:00:00 2001 From: James Craddock-Jones Date: Thu, 12 Oct 2023 17:49:34 +0100 Subject: [PATCH] Bug fixes --- .../Universal x86 Tuning Utility V2.vdproj | 6 +++--- Universal x86 Tuning Utility/App.xaml.cs | 2 +- .../Scripts/RyzenAdj_To_UXTU.cs | 2 +- .../Universal x86 Tuning Utility.csproj | 6 +++--- .../Views/Pages/CustomPresets.xaml | 10 +++++----- .../Views/Pages/CustomPresets.xaml.cs | 10 ++++++---- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Universal x86 Tuning Utility V2/Universal x86 Tuning Utility V2.vdproj b/Universal x86 Tuning Utility V2/Universal x86 Tuning Utility V2.vdproj index 98112c9..b801e3f 100644 --- a/Universal x86 Tuning Utility V2/Universal x86 Tuning Utility V2.vdproj +++ b/Universal x86 Tuning Utility V2/Universal x86 Tuning Utility V2.vdproj @@ -218,15 +218,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Universal x86 Tuning Utility" - "ProductCode" = "8:{D1CDBFEB-0761-4A8A-9E28-5A3AD0B68540}" - "PackageCode" = "8:{9D39DD25-DCD7-4B33-980C-2B3A5FF56AC6}" + "ProductCode" = "8:{D3889586-39F6-4BC2-A3C2-4EB56A72D22E}" + "PackageCode" = "8:{EAA26209-C856-4EFB-803E-7D0984DD9FE1}" "UpgradeCode" = "8:{300E743A-4C69-440D-9425-14C446AB2658}" "AspNetVersion" = "8:" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:2.0.50" + "ProductVersion" = "8:2.0.60" "Manufacturer" = "8:JamesCJ60" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/Universal x86 Tuning Utility/App.xaml.cs b/Universal x86 Tuning Utility/App.xaml.cs index b620de8..955ef06 100644 --- a/Universal x86 Tuning Utility/App.xaml.cs +++ b/Universal x86 Tuning Utility/App.xaml.cs @@ -61,7 +61,7 @@ public static bool IsAdministrator() return principal.IsInRole(WindowsBuiltInRole.Administrator); } - public static string version = "2.0.4.2"; + public static string version = "2.0.6"; private Mutex mutex; private const string MutexName = "UniversalX86TuningUtility"; diff --git a/Universal x86 Tuning Utility/Scripts/RyzenAdj_To_UXTU.cs b/Universal x86 Tuning Utility/Scripts/RyzenAdj_To_UXTU.cs index 71ca3e3..e642c34 100644 --- a/Universal x86 Tuning Utility/Scripts/RyzenAdj_To_UXTU.cs +++ b/Universal x86 Tuning Utility/Scripts/RyzenAdj_To_UXTU.cs @@ -121,7 +121,7 @@ private static void UXTUSR(string command, string value) if (command == "UXTUSR") { - Universal_x86_Tuning_Utility.Properties.Settings.Default.AdapterIdx = -1; + Universal_x86_Tuning_Utility.Properties.Settings.Default.AdapterIdx = 0; Universal_x86_Tuning_Utility.Properties.Settings.Default.isMagpie = Convert.ToBoolean(variables[0]); Universal_x86_Tuning_Utility.Properties.Settings.Default.VSync = Convert.ToBoolean(variables[1]); Universal_x86_Tuning_Utility.Properties.Settings.Default.Sharpness = Convert.ToDouble(variables[2]); diff --git a/Universal x86 Tuning Utility/Universal x86 Tuning Utility.csproj b/Universal x86 Tuning Utility/Universal x86 Tuning Utility.csproj index 7f927a5..52ab9f0 100644 --- a/Universal x86 Tuning Utility/Universal x86 Tuning Utility.csproj +++ b/Universal x86 Tuning Utility/Universal x86 Tuning Utility.csproj @@ -15,11 +15,11 @@ True False © UXTU Team 2020 - 2023 - 2.0.50 - 2.0.50 + 2.0.60 + 2.0.60 true 10.0.22621.0 - 2.0.50 + 2.0.60 diff --git a/Universal x86 Tuning Utility/Views/Pages/CustomPresets.xaml b/Universal x86 Tuning Utility/Views/Pages/CustomPresets.xaml index f371d99..0ac8f3c 100644 --- a/Universal x86 Tuning Utility/Views/Pages/CustomPresets.xaml +++ b/Universal x86 Tuning Utility/Views/Pages/CustomPresets.xaml @@ -817,7 +817,7 @@ Icon="Image24" Margin="0,8,15,0"> + Text="Powered by a customised version of Magpie. Use Alt+F to toggle."/> @@ -1562,7 +1562,7 @@ VerticalAlignment="Center" SelectedIndex="0" MinWidth="138" Name="cbxResScale" H + VerticalAlignment="Center" SelectedIndex="0" MinWidth="164" Name="cbxBoost" Height="37"> Auto Power Saving Performance @@ -1588,11 +1588,11 @@ Icon="Desktop20" Margin="0,8,15,0"> + Text="Provides the ability to set a custom supported display refresh rate. Many not work for everyone!"/> + VerticalAlignment="Center" SelectedIndex="0" MinWidth="164" Name="cbxRefreshRate" Height="37"> @@ -1619,7 +1619,7 @@ Icon="Power20" Margin="0,8,15,0"> + VerticalAlignment="Center" SelectedIndex="0" MinWidth="164" Name="cbxAsusPower" Height="37"> AC Controlled Silent Performance diff --git a/Universal x86 Tuning Utility/Views/Pages/CustomPresets.xaml.cs b/Universal x86 Tuning Utility/Views/Pages/CustomPresets.xaml.cs index 7bcdc53..889894e 100644 --- a/Universal x86 Tuning Utility/Views/Pages/CustomPresets.xaml.cs +++ b/Universal x86 Tuning Utility/Views/Pages/CustomPresets.xaml.cs @@ -23,6 +23,7 @@ using Universal_x86_Tuning_Utility.Services; using Wpf.Ui.Common.Interfaces; using Wpf.Ui.Controls; +using static System.Runtime.InteropServices.JavaScript.JSType; using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button; namespace Universal_x86_Tuning_Utility.Views.Pages @@ -79,15 +80,16 @@ public CustomPresets() { if (Display.uniqueRefreshRates.Count > 1) { + cbxRefreshRate.Items.Add($"System Controlled"); foreach (var rate in Display.uniqueRefreshRates) { cbxRefreshRate.Items.Add($"{rate} Hz"); } } - else cbxRefreshRate.Visibility = Visibility.Collapsed; + else sdRefreshRate.Visibility = Visibility.Collapsed; } catch { - cbxRefreshRate.Visibility = Visibility.Collapsed; + sdRefreshRate.Visibility = Visibility.Collapsed; } if (Family.TYPE == Family.ProcessorType.Amd_Apu) @@ -921,9 +923,9 @@ public string getCommandValues() if(sdAsusUlti.Visibility == Visibility.Visible) commandValues = commandValues + $"--ASUS-MUX={tsASUSUlti.IsChecked} "; } - if (cbxRefreshRate.Visibility == Visibility.Visible) + if (sdRefreshRate.Visibility == Visibility.Visible && cbxRefreshRate.SelectedIndex > 0) { - commandValues = commandValues + $"--Refresh-Rate={Display.uniqueRefreshRates[cbxRefreshRate.SelectedIndex]} "; + commandValues = commandValues + $"--Refresh-Rate={Display.uniqueRefreshRates[cbxRefreshRate.SelectedIndex - 1]} "; } if (Family.TYPE == Family.ProcessorType.Amd_Apu)