diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs index aa87a36f..a6d0f3f6 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs @@ -33,6 +33,17 @@ namespace Microsoft.Windows.Controls #endregion //AvailableColors + #region AvailableColorsHeader + + public static readonly DependencyProperty AvailableColorsHeaderProperty = DependencyProperty.Register("AvailableColorsHeader", typeof(string), typeof(ColorPicker), new UIPropertyMetadata("Available Colors")); + public string AvailableColorsHeader + { + get { return (string)GetValue(AvailableColorsHeaderProperty); } + set { SetValue(AvailableColorsHeaderProperty, value); } + } + + #endregion //AvailableColorsHeader + #region ButtonStyle public static readonly DependencyProperty ButtonStyleProperty = DependencyProperty.Register("ButtonStyle", typeof(Style), typeof(ColorPicker)); @@ -77,6 +88,17 @@ namespace Microsoft.Windows.Controls #endregion //RecentColors + #region RecentColorsHeader + + public static readonly DependencyProperty RecentColorsHeaderProperty = DependencyProperty.Register("RecentColorsHeader", typeof(string), typeof(ColorPicker), new UIPropertyMetadata("Recent Colors")); + public string RecentColorsHeader + { + get { return (string)GetValue(RecentColorsHeaderProperty); } + set { SetValue(RecentColorsHeaderProperty, value); } + } + + #endregion //RecentColorsHeader + #region SelectedColor public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register("SelectedColor", typeof(Color), typeof(ColorPicker), new FrameworkPropertyMetadata(Colors.Black, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback(OnSelectedColorPropertyChanged))); @@ -122,7 +144,7 @@ namespace Microsoft.Windows.Controls { get { return (bool)GetValue(ShowAdvancedButtonProperty); } set { SetValue(ShowAdvancedButtonProperty, value); } - } + } #endregion //ShowAdvancedButton @@ -170,6 +192,17 @@ namespace Microsoft.Windows.Controls #endregion //StandardColors + #region StandardColorsHeader + + public static readonly DependencyProperty StandardColorsHeaderProperty = DependencyProperty.Register("StandardColorsHeader", typeof(string), typeof(ColorPicker), new UIPropertyMetadata("Standard Colors")); + public string StandardColorsHeader + { + get { return (string)GetValue(StandardColorsHeaderProperty); } + set { SetValue(StandardColorsHeaderProperty, value); } + } + + #endregion //StandardColorsHeader + #endregion //Properties #region Constructors diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml index 12d36ca1..dc31b269 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml @@ -185,7 +185,7 @@ - + - + - +