Browse Source

DateTimePicker: added TimeFormat and TimeFormatString properties to control the formatting of rthe timeUpDown control.

pull/1645/head
brianlagunas_cp 15 years ago
parent
commit
5eb9c8e3bb
  1. 22
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs
  2. 3
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml

22
ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs

@ -31,6 +31,28 @@ namespace Microsoft.Windows.Controls
#endregion //IsOpen
#region TimeFormat
public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register("TimeFormat", typeof(TimeFormat), typeof(DateTimePicker), new UIPropertyMetadata(TimeFormat.ShortTime));
public TimeFormat TimeFormat
{
get { return (TimeFormat)GetValue(TimeFormatProperty); }
set { SetValue(TimeFormatProperty, value); }
}
#endregion //TimeFormat
#region TimeFormatString
public static readonly DependencyProperty TimeFormatStringProperty = DependencyProperty.Register("TimeFormatString", typeof(string), typeof(DateTimePicker), new UIPropertyMetadata(default(String)));
public string TimeFormatString
{
get { return (string)GetValue(TimeFormatStringProperty); }
set { SetValue(TimeFormatStringProperty, value); }
}
#endregion //TimeFormatString
#region TimeWatermark
public static readonly DependencyProperty TimeWatermarkProperty = DependencyProperty.Register("TimeWatermark", typeof(object), typeof(DateTimePicker), new UIPropertyMetadata(null));

3
ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml

@ -110,7 +110,8 @@
<StackPanel>
<Calendar x:Name="Part_Calendar" BorderThickness="0" />
<local:TimePicker x:Name="Part_TimeUpDown"
Format="ShortTime"
Format="{TemplateBinding TimeFormat}"
FormatString="{TemplateBinding TimeFormatString}"
Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
Watermark="{TemplateBinding TimeWatermark}"
WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"/>

Loading…
Cancel
Save