Set default value to 'Use scheme color'

microsoft · Jan 30, 2025 · cd8c7a2 · cd8c7a2
1 parent 23a2ab8
commit cd8c7a2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 26 deletions.
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -215,8 +215,7 @@
                                                 HasSettingValue="{x:Bind Appearance.HasForeground, Mode=OneWay}"
                                                 SettingOverrideSource="{x:Bind Appearance.ForegroundOverrideSource, Mode=OneWay}"
                                                 Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                            <local:NullableColorPicker x:Uid="Profile_Foreground_NullableColorPicker"
-                                                       ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
+                            <local:NullableColorPicker ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
                                                        CurrentColor="{x:Bind Appearance.Foreground, Mode=TwoWay}"
                                                        NullColorPreview="{x:Bind Appearance.CurrentColorScheme.ForegroundColor.Color, Mode=OneWay}" />
                         </local:SettingContainer>
@@ -231,8 +230,7 @@
                                                 HasSettingValue="{x:Bind Appearance.HasBackground, Mode=OneWay}"
                                                 SettingOverrideSource="{x:Bind Appearance.BackgroundOverrideSource, Mode=OneWay}"
                                                 Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                            <local:NullableColorPicker x:Uid="Profile_Background_NullableColorPicker"
-                                                       ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
+                            <local:NullableColorPicker ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
                                                        CurrentColor="{x:Bind Appearance.Background, Mode=TwoWay}"
                                                        NullColorPreview="{x:Bind Appearance.CurrentColorScheme.BackgroundColor.Color, Mode=OneWay}" />
                         </local:SettingContainer>
@@ -247,8 +245,7 @@
                                                 HasSettingValue="{x:Bind Appearance.HasSelectionBackground, Mode=OneWay}"
                                                 SettingOverrideSource="{x:Bind Appearance.SelectionBackgroundOverrideSource, Mode=OneWay}"
                                                 Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                            <local:NullableColorPicker x:Uid="Profile_SelectionBackground_NullableColorPicker"
-                                                       ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
+                            <local:NullableColorPicker ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
                                                        CurrentColor="{x:Bind Appearance.SelectionBackground, Mode=TwoWay}"
                                                        NullColorPreview="{x:Bind Appearance.CurrentColorScheme.SelectionBackgroundColor.Color, Mode=OneWay}" />
                         </local:SettingContainer>
@@ -517,8 +514,7 @@
                                     HasSettingValue="{x:Bind Appearance.HasCursorColor, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CursorColorOverrideSource, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                <local:NullableColorPicker x:Uid="Profile_CursorColor_NullableColorPicker"
-                                           ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
+                <local:NullableColorPicker ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
                                            CurrentColor="{x:Bind Appearance.CursorColor, Mode=TwoWay}"
                                            NullColorPreview="{x:Bind Appearance.CurrentColorScheme.CursorColor.Color, Mode=OneWay}" />
             </local:SettingContainer>

diff --git a/src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp b/src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp
@@ -81,7 +81,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                     L"NullColorButtonLabel",
                     xaml_typename<hstring>(),
                     xaml_typename<Editor::NullableColorPicker>(),
-                    PropertyMetadata{ nullptr });
+                    PropertyMetadata{ box_value(RS_(L"NullableColorPicker_DefaultNullColorButtonLabel")) });
         }
         if (!_NullColorPreviewProperty)
         {

diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -2032,22 +2032,6 @@
     <value>Cancel</value>
     <comment>Text label for secondary button the color picker content dialog. When clicked, the operation of selecting a color is cancelled by the user.</comment>
   </data>
-  <data name="Profile_CursorColor_NullableColorPicker.NullColorButtonLabel" xml:space="preserve">
-    <value>Cursor color from color scheme</value>
-    <comment>Label for a button directing the user to use the cursor color defined in the terminal's current color scheme.</comment>
-  </data>
-  <data name="Profile_Foreground_NullableColorPicker.NullColorButtonLabel" xml:space="preserve">
-    <value>Foreground color from color scheme</value>
-    <comment>Label for a button directing the user to use the foreground color defined in the terminal's current color scheme.</comment>
-  </data>
-  <data name="Profile_Background_NullableColorPicker.NullColorButtonLabel" xml:space="preserve">
-    <value>Background color from color scheme</value>
-    <comment>Label for a button directing the user to use the background color defined in the terminal's current color scheme.</comment>
-  </data>
-  <data name="Profile_SelectionBackground_NullableColorPicker.NullColorButtonLabel" xml:space="preserve">
-    <value>Selection background color from color scheme</value>
-    <comment>Label for a button directing the user to use the selection background color defined in the terminal's current color scheme.</comment>
-  </data>
   <data name="Profile_IconTypeNone" xml:space="preserve">
     <value>None</value>
     <comment>An option to choose from for the "icon style" dropdown. When selected, there will be no icon for the profile.</comment>
@@ -2324,4 +2308,8 @@
     <value>None</value>
     <comment>Text displayed when the tab title is not defined.</comment>
   </data>
-</root>
+  <data name="NullableColorPicker_DefaultNullColorButtonLabel" xml:space="preserve">
+    <value>Use scheme color</value>
+    <comment>Label for a button directing the user to use the color defined in the terminal's current color scheme.</comment>
+  </data>
+</root>