From 8f767058b7ebcb7296e484b13e8c7ffabef05b90 Mon Sep 17 00:00:00 2001
From: Davide Giacometti <davide.giacometti@outlook.it>
Date: Sun, 15 Dec 2024 22:45:08 +0100
Subject: [PATCH] minor UI and accessibility fixes

---
 src/modules/PowerOCR/PowerOCR/OCROverlay.xaml |  4 +--
 .../PowerOCR/PowerOCR/OCROverlay.xaml.cs      | 30 +++++++++++++++----
 .../ViewModels/PowerOcrViewModel.cs           | 16 ++++++++--
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml b/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml
index 19944b04bf80..f28d642b6bcf 100644
--- a/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml
+++ b/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml
@@ -95,7 +95,7 @@
         <Border
             x:Name="TopButtonsStackPanel"
             Margin="12"
-            Padding="4,8,12,8"
+            Padding="4,8,4,8"
             HorizontalAlignment="Center"
             VerticalAlignment="Top"
             d:Visibility="Visible"
@@ -116,7 +116,6 @@
                 Orientation="Horizontal">
                 <ComboBox
                     x:Name="LanguagesComboBox"
-                    Height="32"
                     Margin="4,0"
                     AutomationProperties.Name="{x:Static p:Resources.SelectedLang}"
                     SelectionChanged="LanguagesComboBox_SelectionChanged">
@@ -156,6 +155,7 @@
                 </Button>
                 <Button
                     x:Name="CancelButton"
+                    AutomationProperties.Name="{x:Static p:Resources.Cancel}"
                     Click="CancelMenuItem_Click"
                     ToolTip="{x:Static p:Resources.CancelShortcut}">
                     <ui:SymbolIcon FontSize="18" Symbol="Dismiss24" />
diff --git a/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs b/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs
index 99e7e94be61b..2664b8f03b7d 100644
--- a/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs
+++ b/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows;
@@ -76,7 +77,7 @@ private void PopulateLanguageMenu()
         if (string.IsNullOrEmpty(selectedLanguageName))
         {
             selectedLanguage = ImageMethods.GetOCRLanguage();
-            selectedLanguageName = selectedLanguage?.DisplayName;
+            selectedLanguageName = selectedLanguage?.NativeName;
         }
 
         List<Language> possibleOcrLanguages = OcrEngine.AvailableRecognizerLanguages.ToList();
@@ -85,10 +86,10 @@ private void PopulateLanguageMenu()
 
         foreach (Language language in possibleOcrLanguages)
         {
-            MenuItem menuItem = new() { Header = language.NativeName, Tag = language, IsCheckable = true };
-            menuItem.IsChecked = language.DisplayName.Equals(selectedLanguageName, StringComparison.Ordinal);
-            LanguagesComboBox.Items.Add(language);
-            if (language.DisplayName.Equals(selectedLanguageName, StringComparison.Ordinal))
+            MenuItem menuItem = new() { Header = EnsureStartUpper(language.NativeName), Tag = language, IsCheckable = true };
+            menuItem.IsChecked = language.NativeName.Equals(selectedLanguageName, StringComparison.OrdinalIgnoreCase);
+            LanguagesComboBox.Items.Add(new ComboBoxItem { Content = EnsureStartUpper(language.NativeName), Tag = language });
+            if (language.NativeName.Equals(selectedLanguageName, StringComparison.OrdinalIgnoreCase))
             {
                 selectedLanguage = language;
                 LanguagesComboBox.SelectedIndex = count;
@@ -358,7 +359,12 @@ private void LanguagesComboBox_SelectionChanged(object sender, SelectionChangedE
 
         // TODO: Set the preferred language based upon what was chosen here
         int selection = languageComboBox.SelectedIndex;
-        selectedLanguage = languageComboBox.SelectedItem as Language;
+        selectedLanguage = (languageComboBox.SelectedItem as ComboBoxItem)?.Tag as Language;
+
+        if (selectedLanguage == null)
+        {
+            return;
+        }
 
         Logger.LogError($"Changed language to {selectedLanguage?.LanguageTag}");
 
@@ -499,4 +505,16 @@ public System.Drawing.Rectangle GetScreenRectangle()
     {
         return screenRectangle;
     }
+
+    private string EnsureStartUpper(string input)
+    {
+        if (string.IsNullOrEmpty(input))
+        {
+            return input;
+        }
+
+        var inputArray = input.ToCharArray();
+        inputArray[0] = char.ToUpper(inputArray[0], CultureInfo.CurrentCulture);
+        return new string(inputArray);
+    }
 }
diff --git a/src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs
index dc09c2cad95e..0fe65516ca73 100644
--- a/src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs
@@ -57,7 +57,7 @@ public int LanguageIndex
                     _languageIndex = value;
                     if (_powerOcrSettings != null && _languageIndex < possibleOcrLanguages.Count && _languageIndex >= 0)
                     {
-                        _powerOcrSettings.Properties.PreferredLanguage = possibleOcrLanguages[_languageIndex].DisplayName;
+                        _powerOcrSettings.Properties.PreferredLanguage = possibleOcrLanguages[_languageIndex].NativeName;
                         NotifySettingsChanged();
                     }
 
@@ -186,7 +186,7 @@ internal void UpdateLanguages()
                     systemLanguageIndex = AvailableLanguages.Count;
                 }
 
-                AvailableLanguages.Add(language.NativeName);
+                AvailableLanguages.Add(EnsureStartUpper(language.NativeName));
             }
 
             // if the previously stored preferred language is not available (has been deleted or this is the first run with language preference)
@@ -264,5 +264,17 @@ public void Dispose()
             Dispose(disposing: true);
             GC.SuppressFinalize(this);
         }
+
+        private string EnsureStartUpper(string input)
+        {
+            if (string.IsNullOrEmpty(input))
+            {
+                return input;
+            }
+
+            var inputArray = input.ToCharArray();
+            inputArray[0] = char.ToUpper(inputArray[0], CultureInfo.CurrentCulture);
+            return new string(inputArray);
+        }
     }
 }