Wallpaper page UI changes

AutoDarkModeApp/Helpers/EnumToStretchConverter.cs

@@ -0,0 +1,33 @@
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media;
+
+namespace AutoDarkModeApp.Helpers;
+
+public partial class EnumToStretchConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, string language)
+    {
+        var mode = (WallpaperFillingMode)value;
+        return mode switch
+        {
+            WallpaperFillingMode.Center => Stretch.Uniform,
+            WallpaperFillingMode.Stretch => Stretch.Fill,
+            WallpaperFillingMode.Fit => Stretch.Uniform,
+            WallpaperFillingMode.Fill => Stretch.UniformToFill,
+            _ => Stretch.None,
+        };
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        throw new NotImplementedException("Two-way binding is not supported for EnumToStretchConverter.");
+    }
+}
+
+public enum WallpaperFillingMode
+{
+    Center,
+    Stretch,
+    Fit,
+    Fill,
+}

AutoDarkModeApp/Strings/en-us/Resources.resw

@@ -127,7 +127,7 @@
     <value>Switch theme</value>
   </data>
   <data name="autoCheckBox" xml:space="preserve">
-    <value>Enable automatic theme switching</value>
+    <value>Automatically switch themes</value>
   </data>
   <data name="About" xml:space="preserve">
     <value>Settings</value>
@@ -231,9 +231,6 @@ Currently installed version: {0}, new version: {1}</value>
   <data name="userFeedback" xml:space="preserve">
     <value>Welcome</value>
   </data>
-  <data name="welcomeText" xml:space="preserve">
-    <value>Change settings here to modify the automatic theme switch behavior.</value>
-  </data>
   <data name="lblTranslator" xml:space="preserve">
     <value>Translator: Armin Osaj &amp; Samuel Schiegg</value>
   </data>
@@ -262,7 +259,7 @@ Currently installed version: {0}, new version: {1}</value>
     <value>Delete/Disable</value>
   </data>
   <data name="dbFilePicker" xml:space="preserve">
-    <value>Pick file</value>
+    <value>Browse photos</value>
   </data>
   <data name="dbLight" xml:space="preserve">
     <value>Wallpaper for light theme</value>
@@ -277,7 +274,7 @@ Currently installed version: {0}, new version: {1}</value>
     <value>Please select two wallpapers</value>
   </data>
   <data name="dbSelectImage" xml:space="preserve">
-    <value>Please select an image</value>
+    <value>Select an image</value>
   </data>
   <data name="dbTitle" xml:space="preserve">
     <value>Configure Desktop Background</value>
@@ -341,8 +338,7 @@ Please ensure:
 - the service is running
 - the config.yaml file is correct
 
-Would you like to create an issue on the Auto Dark Mode repository?
-</value>
+Would you like to create an issue on the Auto Dark Mode repository?</value>
     <comment>Text like "Click yes to..." is (and should be) obvious</comment>
   </data>
   <data name="errorNumberInput" xml:space="preserve">
@@ -361,11 +357,8 @@ Would you like to create an issue on the Auto Dark Mode repository?
   <data name="lblOffset" xml:space="preserve">
     <value>Offset</value>
   </data>
-  <data name="offsetButton" xml:space="preserve">
-    <value>Set</value>
-  </data>
   <data name="ToolTipDisabledDueTheme" xml:space="preserve">
-    <value>These options are disabled while using a Windows Theme. You can set them up individually in your Windows Theme.</value>
+    <value>These options are disabled when using a Windows Theme. You can set them up individually in your Windows Theme.</value>
   </data>
   <data name="NavbarApps" xml:space="preserve">
     <value>Apps</value>
@@ -386,7 +379,7 @@ Would you like to create an issue on the Auto Dark Mode repository?
     <value>Create your themes</value>
   </data>
   <data name="ThemeHeaderPick" xml:space="preserve">
-    <value>Pick your themes</value>
+    <value>Select your themes</value>
   </data>
   <data name="ThemeLight" xml:space="preserve">
     <value>Light theme</value>
@@ -401,7 +394,7 @@ Would you like to create an issue on the Auto Dark Mode repository?
     <value>Go to Windows Theme settings</value>
   </data>
   <data name="ThemeTutorialStep2" xml:space="preserve">
-    <value>Navigate to 'Colors' and change the system color to 'Light' for the light theme. Select your favorite wallpaper, mouse cursor and accent color.</value>
+    <value>Go to 'Colors' and change the system color to 'Light' for the light theme. Select your favorite wallpaper, mouse pointers and accent color.</value>
   </data>
   <data name="ThemeTutorialStep3" xml:space="preserve">
     <value>Go to theme settings and save your theme.</value>
@@ -422,7 +415,7 @@ Would you like to create an issue on the Auto Dark Mode repository?
     <value>Restart</value>
   </data>
   <data name="rbCustomHours" xml:space="preserve">
-    <value>Set custom time</value>
+    <value>Custom time</value>
   </data>
   <data name="rbLocation" xml:space="preserve">
     <value>From sunset to sunrise (location service)</value>
@@ -510,7 +503,7 @@ Sidenote: NEVER run Auto Dark Mode as administrator manually!</value>
     <value>Energy saver mitigation for theme switch</value>
   </data>
   <data name="cbSettingsEnergySaverMitigationInfo" xml:space="preserve">
-    <value>This only works if you haven't manually enabled battery saver!</value>
+    <value>This only works if you haven't manually enabled battery saver</value>
   </data>
   <data name="NavbarSwitchModes" xml:space="preserve">
     <value>Switch modes</value>
@@ -551,10 +544,10 @@ Sidenote: NEVER run Auto Dark Mode as administrator manually!</value>
     <value>Configuration</value>
   </data>
   <data name="lblPickTheme" xml:space="preserve">
-    <value>Pick a theme</value>
+    <value>Select a theme</value>
   </data>
   <data name="lblPickWallpaper" xml:space="preserve">
-    <value>Pick a wallpaper</value>
+    <value>Personalize your background</value>
   </data>
   <data name="rbDisabled" xml:space="preserve">
     <value>Disabled</value>
@@ -572,7 +565,7 @@ Sidenote: NEVER run Auto Dark Mode as administrator manually!</value>
     <value>Select a different Windows theme for dark and light mode respectively. Allows full theme customization, but requires you to set up .theme files.</value>
   </data>
   <data name="tbPickWallpaper" xml:space="preserve">
-    <value>Customize your desktop wallpaper for all monitors, individual monitors, set a background color or enable spotlight.</value>
+    <value>Customize your desktop for all monitors, individual monitors, set a background color or enable spotlight.</value>
   </data>
   <data name="tbUpdates" xml:space="preserve">
     <value>Check for new versions of Auto Dark Mode in the background. When an update is available, you will be notified.</value>
@@ -645,7 +638,7 @@ Sidenote: NEVER run Auto Dark Mode as administrator manually!</value>
     <value>Hex code</value>
   </data>
   <data name="WallpaperToggleSwitch" xml:space="preserve">
-    <value>Enable wallpaper switch</value>
+    <value>Switch desktop background</value>
   </data>
   <data name="SwitchModesCheckBoxGPUMonitoring" xml:space="preserve">
     <value>Don't switch while playing games</value>
@@ -737,9 +730,6 @@ Sidenote: NEVER run Auto Dark Mode as administrator manually!</value>
   <data name="UpdatesComboBoxInterval1" xml:space="preserve">
     <value>Every day</value>
   </data>
-  <data name="TimeTextBlockClickOnSetMessage" xml:space="preserve">
-    <value>Click Set to save changes.</value>
-  </data>
   <data name="AppsTextBlockAdaptiveTaskbarAccent" xml:space="preserve">
     <value>Use Taskbar Accent Color during</value>
   </data>
@@ -820,7 +810,7 @@ Sidenote: NEVER run Auto Dark Mode as administrator manually!</value>
 Do you really want to continue?</value>
   </data>
   <data name="SettingsPageTrayDisableMessageBoxHeader" xml:space="preserve">
-    <value>Hide Tray Icon</value>
+    <value>Hide tray icon</value>
   </data>
   <data name="TrayMenuItemOpenConfigDir" xml:space="preserve">
     <value>&amp;Open Config Directory</value>
@@ -863,7 +853,7 @@ Do you really want to continue?</value>
     <value>System idle checker</value>
   </data>
   <data name="RequestSwitchAction" xml:space="preserve">
-    <value>Hit confirm to request a theme switch immediately.</value>
+    <value>Confirm to request a theme switch immediately.</value>
   </data>
   <data name="Resume" xml:space="preserve">
     <value>Resume</value>
@@ -1022,13 +1012,13 @@ Do you really want to continue?</value>
     <value>Ignore background</value>
   </data>
   <data name="ThemeCheckBoxIgnoreCursor" xml:space="preserve">
-    <value>Ignore cursor</value>
+    <value>Ignore pointers</value>
   </data>
   <data name="ThemeCheckBoxIgnoreDesktopIcons" xml:space="preserve">
     <value>Ignore desktop icons</value>
   </data>
   <data name="ThemeCheckBoxIgnoreSound" xml:space="preserve">
-    <value>Ignore sound</value>
+    <value>Ignore sounds</value>
   </data>
   <data name="ThemeHeaderIgnoreFlags" xml:space="preserve">
     <value>Ignore settings</value>
@@ -1106,7 +1096,7 @@ Do you really want to continue?</value>
     <value>Enable custom scripts</value>
   </data>
   <data name="WallpaperTextBlockChooseWallpaper" xml:space="preserve">
-    <value>Choose your wallpaper</value>
+    <value>Choose a photo</value>
   </data>
   <data name="WallpaperTextBlockImagePath" xml:space="preserve">
     <value>Image path</value>
@@ -1121,7 +1111,7 @@ Do you really want to continue?</value>
     <value>Accent color</value>
   </data>
   <data name="ColorizationPick" xml:space="preserve">
-    <value>Pick an accent color</value>
+    <value>Select an accent color</value>
   </data>
   <data name="ColorizationTextBlockDescription" xml:space="preserve">
     <value>Customize the Windows system color scheme to your liking.</value>
@@ -1149,6 +1139,7 @@ Do you really want to continue?</value>
   </data>
   <data name="WallpaperTextBlockPosition" xml:space="preserve">
     <value>Choose a fit for your desktop image</value>
+    <comment>Must match Windows settings</comment>
   </data>
   <data name="DisplayMonitorDisconnected" xml:space="preserve">
     <value>Disconnected</value>
@@ -1157,9 +1148,9 @@ Do you really want to continue?</value>
     <value>Always refresh DWM on theme switch</value>
   </data>
   <data name="SettingsPageCheckBoxAlwaysRefreshDwmExplanation" xml:space="preserve">
-    <value>Attempts to reduce the occurrence of wrong UI colors in the explorer, taskbar and start menu. If you experience this often or are bothered by it, try enabling this setting.
+    <value>Attempts to reduce wrong UI colors in the explorer, taskbar and start menu. If you experience this often or are bothered by it, try enabling this setting.
 
-This may introduce slight to moderate lag on some systems during theme switch similar to how it happened in Windows 10. 
+This may introduce slight to moderate lag on some systems during theme switch, similar to how it happened in Windows 10. 
 On rare occasions, Windows may emit a beeping sound when the mouse is moved during DWM refreshes.</value>
   </data>
   <data name="SettingsPageCheckBoxAlwaysRefreshDwmHeader" xml:space="preserve">
@@ -1169,25 +1160,25 @@ On rare occasions, Windows may emit a beeping sound when the mouse is moved duri
     <value>Ok</value>
   </data>
   <data name="CursorsPageEnable" xml:space="preserve">
-    <value>Enable mouse cursor switch</value>
+    <value>Switch mouse pointers</value>
   </data>
   <data name="CursorsPageOpenPointerSettings" xml:space="preserve">
     <value>Open Windows pointer settings</value>
   </data>
   <data name="CursorsPageSelectDark" xml:space="preserve">
-    <value>Select dark cursor</value>
+    <value>Select dark pointers</value>
   </data>
   <data name="CursorsPageSelectLight" xml:space="preserve">
-    <value>Select light cursor</value>
+    <value>Select light pointers</value>
   </data>
   <data name="CursorsPageTitle" xml:space="preserve">
-    <value>Cursors</value>
+    <value>Mouse pointers</value>
   </data>
   <data name="PersonalizationPageCursorDescription" xml:space="preserve">
-    <value>Configure different mouse cursors for dark and light modes.</value>
+    <value>Configure different mouse pointers for dark and light modes.</value>
   </data>
   <data name="PersonalizationPageCursorTitle" xml:space="preserve">
-    <value>Pick mouse cursors</value>
+    <value>Select mouse pointers</value>
   </data>
   <data name="PersonalizationPageManagedMode" xml:space="preserve">
     <value>Let Auto Dark Mode manage my theme</value>
@@ -1205,7 +1196,7 @@ On rare occasions, Windows may emit a beeping sound when the mouse is moved duri
     <value>Open updater log</value>
   </data>
   <data name="ColorizationEnableSwitch" xml:space="preserve">
-    <value>Enable Accent color switch</value>
+    <value>Switch accent colors</value>
   </data>
   <data name="AppsLabelTouchKeyboard" xml:space="preserve">
     <value>Switch touch keyboard and input</value>
@@ -1244,7 +1235,7 @@ On rare occasions, Windows may emit a beeping sound when the mouse is moved duri
     <value>Try to fix the theme</value>
   </data>
   <data name="lblSet" xml:space="preserve">
-    <value>Settings</value>
+    <value>Select</value>
   </data>
   <data name="lblScripts" xml:space="preserve">
     <value>Scripts</value>
@@ -1264,4 +1255,7 @@ On rare occasions, Windows may emit a beeping sound when the mouse is moved duri
   <data name="PostponeButtonUnDelay" xml:space="preserve">
     <value>UnDelay</value>
   </data>
+  <data name="offsetButton" xml:space="preserve">
+    <value>Set</value>
+  </data>
 </root>

AutoDarkModeApp/Strings/fr/Resources.resw

@@ -233,9 +233,6 @@ Version installée : {0}, nouvelle version : {1}</value>
   <data name="userFeedback" xml:space="preserve">
     <value>Bienvenue</value>
   </data>
-  <data name="welcomeText" xml:space="preserve">
-    <value>Activez l'option pour activer le changement de thème automatique.</value>
-  </data>
   <data name="lblTranslator" xml:space="preserve">
     <value>Traducteurs : Nathan Bonnemains &amp; Damien Trouillet &amp; Maxence CHAIX</value>
   </data>
@@ -367,9 +364,6 @@ Mais elle réduit également l'autonomie de la batterie, alors ne l'activez que
   <data name="lblOffset" xml:space="preserve">
     <value>Décalage</value>
   </data>
-  <data name="offsetButton" xml:space="preserve">
-    <value>Définir</value>
-  </data>
   <data name="ToolTipDisabledDueTheme" xml:space="preserve">
     <value>Ces options sont désactivées lorsque vous utilisez un thème Windows.
 Vous pouvez les configurer individuellement dans votre thème Windows.</value>
@@ -742,9 +736,6 @@ Remarque : N'exécutez JAMAIS Auto Dark Mode en tant qu'administrateur manuellem
   <data name="UpdatesComboBoxInterval1" xml:space="preserve">
     <value>Chaque jour</value>
   </data>
-  <data name="TimeTextBlockClickOnSetMessage" xml:space="preserve">
-    <value>Cliquez sur Définir pour enregistrer les modifications.</value>
-  </data>
   <data name="AppsTextBlockAdaptiveTaskbarAccent" xml:space="preserve">
     <value>Utiliser la couleur d'accentuation de la barre des tâches</value>
   </data>

AutoDarkModeApp/Strings/ja/Resources.resw

@@ -233,9 +233,6 @@
   <data name="userFeedback" xml:space="preserve">
     <value>こんにちは</value>
   </data>
-  <data name="welcomeText" xml:space="preserve">
-    <value>ここで設定を変更すると、テーマ自動切り替えの動作を変更します。</value>
-  </data>
   <data name="lblTranslator" xml:space="preserve">
     <value>翻訳者: maboroshin, zhixuan2333</value>
   </data>
@@ -367,9 +364,6 @@ Auto Dark Mode のリポジトリに issue (問題) を投稿しますか？
   <data name="lblOffset" xml:space="preserve">
     <value>補正</value>
   </data>
-  <data name="offsetButton" xml:space="preserve">
-    <value>適用</value>
-  </data>
   <data name="ToolTipDisabledDueTheme" xml:space="preserve">
     <value>Windows テーマの使用中は、これらのオプションは無効です。
 これらの設定は、Windowsテーマから個別に設定できます。</value>
@@ -742,9 +736,6 @@ Auto Dark Mode のリポジトリに issue (問題) を投稿しますか？
   <data name="UpdatesComboBoxInterval1" xml:space="preserve">
     <value>毎日</value>
   </data>
-  <data name="TimeTextBlockClickOnSetMessage" xml:space="preserve">
-    <value>変更を保存するには「適用」をクリックします。</value>
-  </data>
   <data name="AppsTextBlockAdaptiveTaskbarAccent" xml:space="preserve">
     <value>使用するタスクバーのアクセントカラー</value>
   </data>

AutoDarkModeApp/Strings/zh-hans/Resources.resw

@@ -233,9 +233,6 @@ GitHub 上发布的新版本包含一些漏洞修复和改进。
   <data name="userFeedback" xml:space="preserve">
     <value>欢迎</value>
   </data>
-  <data name="welcomeText" xml:space="preserve">
-    <value>更改此处的设置以修改自动切换主题的行为。</value>
-  </data>
   <data name="lblTranslator" xml:space="preserve">
     <value>翻译者: zheolls、没有字的回音、ThrRip、shenzhiming88、Bill Lee</value>
   </data>
@@ -367,9 +364,6 @@ GitHub 上发布的新版本包含一些漏洞修复和改进。
   <data name="lblOffset" xml:space="preserve">
     <value>调整</value>
   </data>
-  <data name="offsetButton" xml:space="preserve">
-    <value>设置</value>
-  </data>
   <data name="ToolTipDisabledDueTheme" xml:space="preserve">
     <value>使用 Windows 主题模式时无法调整这些选项。
 您可以在 Windows 主题中单独设置这些选项。</value>
@@ -743,9 +737,6 @@ GitHub 上发布的新版本包含一些漏洞修复和改进。
   <data name="UpdatesComboBoxInterval1" xml:space="preserve">
     <value>每天</value>
   </data>
-  <data name="TimeTextBlockClickOnSetMessage" xml:space="preserve">
-    <value>单击“设置”保存更改。</value>
-  </data>
   <data name="AppsTextBlockAdaptiveTaskbarAccent" xml:space="preserve">
     <value>使用任务栏主题色</value>
   </data>

AutoDarkModeApp/Utils/Handlers/ThemeCollectionHandler.cs

@@ -1,4 +1,4 @@
-#region copyright
+#region copyright
 // TODO: Should we reduced copyright header? Made it more concise while keeping all important info
 // Copyright (C) 2025 Auto Dark Mode
 // This program is free software under GNU GPL v3.0