Merge branch 'master' into users/niels9001/settings-incorrecttheminglabels

src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsUtils.cs

@@ -70,24 +70,33 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         {
             if (SettingsExists(powertoy, fileName))
             {
-                // Given the file already exists, to deserialize the file and read it's content.
-                T deserializedSettings = GetFile<T>(powertoy, fileName);
-
-                // IF the file needs to be modified, to save the new configurations accordingly.
-                if (deserializedSettings.UpgradeSettingsConfiguration())
+                try
                 {
-                    SaveSettings(deserializedSettings.ToJsonString(), powertoy, fileName);
+                    // Given the file already exists, to deserialize the file and read it's content.
+                    T deserializedSettings = GetFile<T>(powertoy, fileName);
+
+                    // If the file needs to be modified, to save the new configurations accordingly.
+                    if (deserializedSettings.UpgradeSettingsConfiguration())
+                    {
+                        SaveSettings(deserializedSettings.ToJsonString(), powertoy, fileName);
+                    }
+
+                    return deserializedSettings;
                 }
 
-                return deserializedSettings;
-            }
-            else
-            {
-                // If the settings file does not exist, to create a new object with default parameters and save it to a newly created settings file.
-                T newSettingsItem = new T();
-                SaveSettings(newSettingsItem.ToJsonString(), powertoy, fileName);
-                return newSettingsItem;
+                // Catch json deserialization exceptions when the file is corrupt and has an invalid json.
+                // If there are any deserialization issues like in https://github.com/microsoft/PowerToys/issues/7500, log the error and create a new settings.json file.
+                // This is different from the case where we have trailing zeros following a valid json file, which we have handled by trimming the trailing zeros.
+                catch (JsonException ex)
+                {
+                    Logger.LogError($"Exception encountered while loading {powertoy} settings.", ex);
+                }
             }
+
+            // If the settings file does not exist or if the file is corrupt, to create a new object with default parameters and save it to a newly created settings file.
+            T newSettingsItem = new T();
+            SaveSettings(newSettingsItem.ToJsonString(), powertoy, fileName);
+            return newSettingsItem;
         }
 
         // Given the powerToy folder name and filename to be accessed, this function deserializes and returns the file.

src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Logger.cs

@@ -32,6 +32,14 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
             Log(message, "INFO");
         }
 
+        public static void LogError(string message)
+        {
+            Log(message, "ERROR");
+#if DEBUG
+            Debugger.Break();
+#endif
+        }
+
         public static void LogError(string message, Exception e)
         {
             Log(
@@ -42,6 +50,9 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
                 "Stack trace: " + Environment.NewLine +
                 e?.StackTrace,
                 "ERROR");
+#if DEBUG
+            Debugger.Break();
+#endif
         }
 
         private static void Log(string message, string type)

src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ImageResizerViewModel.cs

@@ -86,6 +86,8 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
         private bool _keepDateModified;
         private int _encoderGuidId;
 
+        public bool IsListViewFocusRequested { get; set; }
+
         public bool IsEnabled
         {
             get
@@ -257,6 +259,9 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
             imageSizes.Add(newSize);
             _advancedSizes = imageSizes;
             SavesImageSizes(imageSizes);
+
+            // Set the focus requested flag to indicate that an add operation has occurred during the ContainerContentChanging event
+            IsListViewFocusRequested = true;
         }
 
         public void DeleteImageSize(int id)

src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Windows;
 using Microsoft.PowerLauncher.Telemetry;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.Views;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.Toolkit.Wpf.UI.XamlHost;
@@ -67,16 +68,17 @@ namespace Microsoft.PowerToys.Settings.UI.Runner
                 {
                     if (ShellPage.ShellHandler.IPCResponseHandleList != null)
                     {
-                        try
+                        var success = JsonObject.TryParse(msg, out JsonObject json);
+                        if (success)
                         {
-                            JsonObject json = JsonObject.Parse(msg);
                             foreach (Action<JsonObject> handle in ShellPage.ShellHandler.IPCResponseHandleList)
                             {
                                 handle(json);
                             }
                         }
-                        catch (Exception)
+                        else
                         {
+                            Logger.LogError("Failed to parse JSON from IPC message.");
                         }
                     }
                 };

src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj

@@ -69,6 +69,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
+      <Version>3.3.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

src/core/Microsoft.PowerToys.Settings.UI.Runner/Program.cs

@@ -13,7 +13,7 @@ using Windows.UI.Popups;
 
 namespace Microsoft.PowerToys.Settings.UI.Runner
 {
-    public class Program
+    public static class Program
     {
         // Quantity of arguments
         private const int ArgumentsQty = 5;
@@ -37,9 +37,9 @@ namespace Microsoft.PowerToys.Settings.UI.Runner
                 App app = new App();
                 app.InitializeComponent();
 
-                if (args.Length >= ArgumentsQty)
+                if (args != null && args.Length >= ArgumentsQty)
                 {
-                    int.TryParse(args[2], out int powerToysPID);
+                    _ = int.TryParse(args[2], out int powerToysPID);
                     PowerToysPID = powerToysPID;
 
                     if (args[4] == "true")

src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml

@@ -6,36 +6,25 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
+    AutomationProperties.Name="{x:Bind Header, Mode=OneTime}"
     d:DesignHeight="300"
     d:DesignWidth="400">
-    <StackPanel Orientation="Vertical">
+    <TextBox x:Name="HotkeyTextBox"
+             x:Uid="SettingsPage_SetShortcut"
+             AutomationProperties.HelpText="{Binding ElementName=ShortcutWarningLabelText, Path=Text}"
+             IsReadOnly="True">
         <ToolTipService.ToolTip>
-            <ToolTip>
-                <StackPanel Orientation="Vertical">
-                    <TextBlock x:Uid="ShortcutWarningLabel"/>
-                    <TextBlock Text="{x:Bind Keys, Mode=OneTime}" FontWeight="SemiBold"/>
-                </StackPanel>
-            </ToolTip>
+            <TextBlock x:Name="ShortcutWarningLabelText">
+                <Run x:Uid="ShortcutWarningLabel"/>
+                <LineBreak/>
+                <Run Text="{x:Bind Keys, Mode=OneTime}" FontWeight="SemiBold"/>
+            </TextBlock>
         </ToolTipService.ToolTip>
-
-        <StackPanel Orientation="Horizontal">
-            <TextBlock x:Name="TitleText"
-                       Text="{x:Bind Header, Mode=OneTime}"
-                       Foreground="{Binding Path=IsEnabled, ElementName=HotkeyTextBox, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
-                       />
-
-            <TextBlock x:Uid="SettingsPage_SetShortcut_Glyph"
-                       x:Name="TitleGlyph" Text="&#xE946;"
-                       FontFamily="Segoe MDL2 Assets"
-                       Margin="4,4,0,0"
-                       Foreground="{Binding Path=IsEnabled, ElementName=HotkeyTextBox, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
-                       />
-        
-        </StackPanel>
-        <TextBox x:Uid="SettingsPage_SetShortcut"
-                 x:Name="HotkeyTextBox"
-                 Margin="0,5,0,0"
-                 IsReadOnly="True"
-                 />
-    </StackPanel>
+        <TextBox.Header>
+            <TextBlock>
+                    <Run Text="{x:Bind Header, Mode=OneTime}"/>
+                    <Run Text="&#xE946;" FontFamily="Segoe MDL2 Assets"/>
+            </TextBlock>
+        </TextBox.Header>
+    </TextBox>
 </UserControl>

src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml

@@ -62,10 +62,10 @@
                     IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
                     AutomationProperties.LabeledBy="{Binding ElementName=FancyZones_LaunchEditorButtonControl}">
                 <StackPanel Orientation="Horizontal">
-                    <Viewbox Height="12" Width="12">
-                        <PathIcon Data="M896 0v896H0V0h896zM768 768V128H128v640h640zM0 1920v-896h1920v896H0zm128-768v640h1664v-640H128zM1024 0h896v896h-896V0zm768 768V128h-640v640h640z"/>
+                    <Viewbox Height="14" Width="14" Margin="-1,1,0,0">
+                        <PathIcon Data="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z"/>
                     </Viewbox>
-                    <TextBlock Margin="12,0,0,0"
+                    <TextBlock Margin="8,0,0,0"
                                Name="FancyZones_LaunchEditorButtonControl"
                                x:Uid="FancyZones_LaunchEditorButtonControl"/>
                 </StackPanel>

src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml

@@ -65,7 +65,8 @@
                       SelectionMode="None"
                       ScrollViewer.HorizontalScrollMode="Enabled"
                       ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                      ScrollViewer.IsHorizontalRailEnabled="True">
+                      ScrollViewer.IsHorizontalRailEnabled="True"
+                      ContainerContentChanging="ImagesSizesListView_ContainerContentChanging">
 
                 <ListView.ItemContainerStyle>
                     <Style TargetType="ListViewItem">
@@ -277,7 +278,9 @@
                       x:Uid="ImageResizer_FilenameFormatPlaceholder"
                       IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
                       Margin="{StaticResource SmallTopMargin}"
-                      AutomationProperties.LabeledBy="{Binding ElementName=ImageResizer_FilenameFormatHeader}">
+                      AutomationProperties.LabeledBy="{Binding ElementName=ImageResizer_FilenameFormatHeader}"
+                      AutomationProperties.HelpText="{Binding ElementName=FileFormatTextBlock, Path=Text}"
+                     >
                 <TextBox.Header>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Name="ImageResizer_FilenameFormatHeader"
@@ -290,44 +293,34 @@
                     </StackPanel>
                 </TextBox.Header>
                 <ToolTipService.ToolTip>
-                    <StackPanel>
-                        <TextBlock x:Uid="ImageResizer_FileFormatDescription"/>
-                        <TextBlock Margin="{StaticResource SmallTopMargin}">
-                            <Run Text="%1" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_Filename" />
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%2" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_Sizename"/>
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%3" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_SelectedWidth"/>
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%4" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_SelectedHeight"/>
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%5" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_ActualWidth"/>
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%6" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_ActualHeight"/>
-                        </TextBlock>
-                    </StackPanel>
+                    <TextBlock x:Name="FileFormatTextBlock">
+                        <Run x:Uid="ImageResizer_FileFormatDescription"/>
+                        <LineBreak/>
+                        <LineBreak/>
+                        <Run Text="%1" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_Filename" />
+                        <LineBreak/>
+                        <Run Text="%2" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_Sizename"/>
+                        <LineBreak/>
+                        <Run Text="%3" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_SelectedWidth"/>
+                        <LineBreak/>
+                        <Run Text="%4" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_SelectedHeight"/>
+                        <LineBreak/>
+                        <Run Text="%5" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_ActualWidth"/>
+                        <LineBreak/>
+                        <Run Text="%6" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_ActualHeight"/>
+                    </TextBlock>
                 </ToolTipService.ToolTip>
             </TextBox>
 

src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml.cs

@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Linq;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
@@ -45,5 +46,18 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             {
             }
         }
+
+        private void ImagesSizesListView_ContainerContentChanging(ListViewBase sender, ContainerContentChangingEventArgs args)
+        {
+            if (ViewModel.IsListViewFocusRequested)
+            {
+                // Set focus to the last item in the ListView
+                int size = ImagesSizesListView.Items.Count;
+                ((ListViewItem)ImagesSizesListView.ContainerFromIndex(size - 1)).Focus(FocusState.Programmatic);
+
+                // Reset the focus requested flag
+                ViewModel.IsListViewFocusRequested = false;
+            }
+        }
     }
 }

src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml

@@ -41,10 +41,9 @@
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
                 
-                <!-- TO DO: Update icon -->
                 <winui:NavigationViewItem x:Uid="Shell_FancyZones" helpers:NavHelper.NavigateTo="views:FancyZonesPage" AutomationProperties.HeadingLevel="Level1">
                     <winui:NavigationViewItem.Icon>
-                        <PathIcon Data="M896 0v896H0V0h896zM768 768V128H128v640h640zM0 1920v-896h1920v896H0zm128-768v640h1664v-640H128zM1024 0h896v896h-896V0zm768 768V128h-640v640h640z"></PathIcon>
+                        <PathIcon Data="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z"/>
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
 
@@ -54,35 +53,30 @@
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
 
-                <!-- TO DO: Update icon -->
                 <winui:NavigationViewItem x:Uid="Shell_ImageResizer" helpers:NavHelper.NavigateTo="views:ImageResizerPage" AutomationProperties.HeadingLevel="Level1">
                     <winui:NavigationViewItem.Icon>
                         <PathIcon Data="M0 768h1408v1152H0V768zm128 1024h870l-582-581-288 288v293zm1152 0v-102l-224-223-101 101 223 224h102zM128 896v421l288-287 448 447 192-191 224 224V896H128zm832 256q-26 0-45-19t-19-45q0-26 19-45t45-19q26 0 45 19t19 45q0 26-19 45t-45 19zm960-512V347l-339 338-90-90 338-339h-293V128h512v512h-128zm-768-512h256v128h-256V128zm-128 128H768V128h256v128zm-384 0H384V128h256v128zm-384 0H0V128h256v128zM128 640H0V384h128v256zm1920 128v256h-128V768h128zm-128 384h128v256h-128v-256zm0 384h128v256h-128v-256zm-384 256h256v128h-256v-128z"></PathIcon>
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
 
-                <!-- TO DO: Update icon -->
                 <winui:NavigationViewItem x:Uid="Shell_KeyboardManager" helpers:NavHelper.NavigateTo="views:KeyboardManagerPage" AutomationProperties.HeadingLevel="Level1">
                     <winui:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE765;"/>
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
 
-                <!-- TO DO: Update icon -->
                 <winui:NavigationViewItem x:Uid="Shell_PowerRename" helpers:NavHelper.NavigateTo="views:PowerRenamePage" AutomationProperties.HeadingLevel="Level1">
                     <winui:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE8AC;"/>
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
 
-                <!-- TO DO: Update icon -->
                 <winui:NavigationViewItem x:Uid="Shell_PowerLauncher" helpers:NavHelper.NavigateTo="views:PowerLauncherPage" AutomationProperties.HeadingLevel="Level1">
                     <winui:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE773;"/>
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
 
-                <!-- TO DO: Update icon -->
                 <winui:NavigationViewItem x:Uid="Shell_ShortcutGuide" helpers:NavHelper.NavigateTo="views:ShortcutGuidePage" AutomationProperties.HeadingLevel="Level1">
                     <winui:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xEDA7;"/>
@@ -94,7 +88,6 @@
                 DefaultHeader="{x:Bind ViewModel.Selected.Content, Mode=OneWay}">
                     <behaviors:NavigationViewHeaderBehavior.DefaultHeaderTemplate>
                         <DataTemplate>
-                            <!-- TODO: Style clean up-->
                             <Grid Margin="0, -2, 0, 6">
                                 <TextBlock
                                 Text="{Binding}"