diff --git a/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceMacroControlView.xaml b/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceMacroControlView.xaml index 987c0ed89..0192dd503 100644 --- a/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceMacroControlView.xaml +++ b/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceMacroControlView.xaml @@ -57,29 +57,29 @@ + TickUpCommandParameter="true" + TickDownCommandParameter="false" /> + TickUpCommandParameter="true" + TickDownCommandParameter="false" /> + TickUpCommandParameter="true" + TickDownCommandParameter="false" /> + TickUpCommandParameter="true" + TickDownCommandParameter="false" /> + TickUpCommandParameter="true" + TickDownCommandParameter="false" /> diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDown.xaml b/src/client/spark/view/Controls/TickUpDown/TickUpDown.xaml index 1915202c2..dbd4a569c 100644 --- a/src/client/spark/view/Controls/TickUpDown/TickUpDown.xaml +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDown.xaml @@ -50,7 +50,7 @@ HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" /> - + @@ -58,7 +58,7 @@ - + @@ -100,7 +100,7 @@ HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" /> - + @@ -108,7 +108,7 @@ - + diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDown.xaml.cs b/src/client/spark/view/Controls/TickUpDown/TickUpDown.xaml.cs index 33719bb60..89b7a10ec 100644 --- a/src/client/spark/view/Controls/TickUpDown/TickUpDown.xaml.cs +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDown.xaml.cs @@ -17,9 +17,9 @@ namespace mbts.ui.controls { _mouse_wheel_dispatcher.Debounce(_timeout_ms, (a) => { if (ActivateOnMouseWheel) { if (e.Delta > 0) { - TickUpCommand.TryExecuteIfCan(TickUpParameter); + TickUpCommand.TryExecuteIfCan(TickUpCommandParameter); } else { - TickDownCommand.TryExecuteIfCan(TickDownParameter); + TickDownCommand.TryExecuteIfCan(TickDownCommandParameter); } e.Handled = true; } else { @@ -33,11 +33,11 @@ namespace mbts.ui.controls { if (Keyboard.Modifiers == ArrowKeyTickModifiers) { switch (e.Key) { case Key.Up: - TickUpCommand.TryExecuteIfCan(TickUpParameter); + TickUpCommand.TryExecuteIfCan(TickUpCommandParameter); e.Handled = true; break; case Key.Down: - TickDownCommand.TryExecuteIfCan(TickDownParameter); + TickDownCommand.TryExecuteIfCan(TickDownCommandParameter); e.Handled = true; break; } @@ -45,11 +45,11 @@ namespace mbts.ui.controls { // see: https://stackoverflow.com/questions/3099472/previewkeydown-is-not-seeing-alt-modifiers switch (e.SystemKey) { case Key.Up: - TickUpCommand.TryExecuteIfCan(TickUpAltParameter); + TickUpCommand.TryExecuteIfCan(TickUpCommandAltParameter); e.Handled = true; break; case Key.Down: - TickDownCommand.TryExecuteIfCan(TickDownAltParameter); + TickDownCommand.TryExecuteIfCan(TickDownCommandAltParameter); e.Handled = true; break; } @@ -100,56 +100,56 @@ namespace mbts.ui.controls { DependencyProperty.Register("TickDownCommand", typeof(ICommand), typeof(TickUpDown), new PropertyMetadata(null)); #endregion - #region TickUpParameter - public object TickUpParameter { - get { return GetValue(TickUpParameterProperty); } - set { SetValue(TickUpParameterProperty, value); } + #region TickUpCommandParameter + public object TickUpCommandParameter { + get { return GetValue(TickUpCommandParameterProperty); } + set { SetValue(TickUpCommandParameterProperty, value); } } - public static readonly DependencyProperty TickUpParameterProperty = - DependencyProperty.Register("TickUpParameter", typeof(object), typeof(TickUpDown), new PropertyMetadata(OnTickUpParameterChanged)); + public static readonly DependencyProperty TickUpCommandParameterProperty = + DependencyProperty.Register("TickUpCommandParameter", typeof(object), typeof(TickUpDown), new PropertyMetadata(OnTickUpCommandParameterChanged)); - static void OnTickUpParameterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => - d.CoerceValue(TickUpAltParameterProperty); + static void OnTickUpCommandParameterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => + d.CoerceValue(TickUpCommandAltParameterProperty); #endregion - #region TickDownParameter - public object TickDownParameter { - get => GetValue(TickDownParameterProperty); - set => SetValue(TickDownParameterProperty, value); + #region TickDownCommandParameter + public object TickDownCommandParameter { + get => GetValue(TickDownCommandParameterProperty); + set => SetValue(TickDownCommandParameterProperty, value); } - public static readonly DependencyProperty TickDownParameterProperty = - DependencyProperty.Register("TickDownParameter", typeof(object), typeof(TickUpDown), new PropertyMetadata(OnTickDownParameterChanged)); + public static readonly DependencyProperty TickDownCommandParameterProperty = + DependencyProperty.Register("TickDownCommandParameter", typeof(object), typeof(TickUpDown), new PropertyMetadata(OnTickDownCommandParameterChanged)); - static void OnTickDownParameterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => - d.CoerceValue(TickDownAltParameterProperty); + static void OnTickDownCommandParameterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => + d.CoerceValue(TickDownCommandAltParameterProperty); #endregion - #region TickUpAltParameter - public object TickUpAltParameter { - get { return GetValue(TickUpAltParameterProperty); } - set { SetValue(TickUpAltParameterProperty, value); } + #region TickUpCommandAltParameter + public object TickUpCommandAltParameter { + get { return GetValue(TickUpCommandAltParameterProperty); } + set { SetValue(TickUpCommandAltParameterProperty, value); } } - public static readonly DependencyProperty TickUpAltParameterProperty = DependencyProperty.Register( - nameof(TickUpAltParameter), typeof(object), typeof(TickUpDown), new PropertyMetadata(null, null, CoerceTickUpAltParameter)); + public static readonly DependencyProperty TickUpCommandAltParameterProperty = DependencyProperty.Register( + nameof(TickUpCommandAltParameter), typeof(object), typeof(TickUpDown), new PropertyMetadata(null, null, CoerceTickUpCommandAltParameter)); - static object CoerceTickUpAltParameter(DependencyObject d, object baseValue) => - baseValue ?? d.GetValue(TickUpParameterProperty); + static object CoerceTickUpCommandAltParameter(DependencyObject d, object baseValue) => + baseValue ?? d.GetValue(TickUpCommandParameterProperty); #endregion - #region TickDownAlt - public object TickDownAltParameter { - get { return GetValue(TickDownAltParameterProperty); } - set { SetValue(TickDownAltParameterProperty, value); } + #region TickDownCommandAlt + public object TickDownCommandAltParameter { + get { return GetValue(TickDownCommandAltParameterProperty); } + set { SetValue(TickDownCommandAltParameterProperty, value); } } - public static readonly DependencyProperty TickDownAltParameterProperty = DependencyProperty.Register( - nameof(TickDownAltParameter), typeof(object), typeof(TickUpDown), new PropertyMetadata(null, null, CoerceTickDownAltParameter)); + public static readonly DependencyProperty TickDownCommandAltParameterProperty = DependencyProperty.Register( + nameof(TickDownCommandAltParameter), typeof(object), typeof(TickUpDown), new PropertyMetadata(null, null, CoerceTickDownCommandAltParameter)); - static object CoerceTickDownAltParameter(DependencyObject d, object baseValue) => - baseValue ?? d.GetValue(TickDownParameterProperty); + static object CoerceTickDownCommandAltParameter(DependencyObject d, object baseValue) => + baseValue ?? d.GetValue(TickDownCommandParameterProperty); #endregion #region ActivateOnMouseWheel diff --git a/src/client/spark/view/Controls/Time/DateTimePicker.xaml b/src/client/spark/view/Controls/Time/DateTimePicker.xaml index 0097d1968..db193fb8e 100644 --- a/src/client/spark/view/Controls/Time/DateTimePicker.xaml +++ b/src/client/spark/view/Controls/Time/DateTimePicker.xaml @@ -24,7 +24,7 @@ Grid.Column="1" HorizontalAlignment="Right" Command="{TemplateBinding TickUpCommand}" - CommandParameter="{TemplateBinding TickUpParameter}" + CommandParameter="{TemplateBinding TickUpCommandParameter}" Visibility="Collapsed" Focusable="False" > @@ -46,7 +46,7 @@ Grid.Column="1" HorizontalAlignment="Right" Command="{TemplateBinding TickDownCommand}" - CommandParameter="{TemplateBinding TickDownParameter}" + CommandParameter="{TemplateBinding TickDownCommandParameter}" Visibility="Collapsed" Focusable="False" > diff --git a/src/client/spark/view/Controls/Time/DateTimePicker.xaml.cs b/src/client/spark/view/Controls/Time/DateTimePicker.xaml.cs index 5ce9bc087..c607c64ab 100644 --- a/src/client/spark/view/Controls/Time/DateTimePicker.xaml.cs +++ b/src/client/spark/view/Controls/Time/DateTimePicker.xaml.cs @@ -80,10 +80,10 @@ namespace mbts.ui.controls { time.CommandBindings.Add(new CommandBinding(TextBoxBehavior.SelectAllCommand, TextBoxBehavior.SelectAllCommandExecutedHandler)); time.SetBinding(TickUpDown.TickCommandProperty, new Binding("tick_time") { Source = _controller }); - time.TickUpParameter = 1; - time.TickDownParameter = -1; - time.TickUpAltParameter = 60; - time.TickDownAltParameter = -60; + time.TickUpCommandParameter = 1; + time.TickDownCommandParameter = -1; + time.TickUpCommandAltParameter = 60; + time.TickDownCommandAltParameter = -60; _time_text.SetBinding(TextBox.TextProperty, new Binding("time_text") { Source = _controller, ValidatesOnExceptions = true }); _hooks.Add(_time_text.SubscribePreviewTextInput((s, e) => { string preview = _time_text.PeekText(e); @@ -97,24 +97,24 @@ namespace mbts.ui.controls { })); month.SetBinding(TickUpDown.TickCommandProperty, new Binding("tick_month") { Source = _controller }); - month.TickUpParameter = 1; - month.TickDownParameter = -1; + month.TickUpCommandParameter = 1; + month.TickDownCommandParameter = -1; _month_text.SetBinding(TextBox.TextProperty, new Binding("month_text") { Source = _controller }); _hooks.Add(_month_text.SubscribePreviewTextInput((s, e) => e.Handled = !RegexFilters.Time.MonthAbbrev.IsMatch(_month_text.PeekText(e)) )); day.SetBinding(TickUpDown.TickCommandProperty, new Binding("tick_day") { Source = _controller }); - day.TickUpParameter = 1; - day.TickDownParameter = -1; + day.TickUpCommandParameter = 1; + day.TickDownCommandParameter = -1; _day_text.SetBinding(TextBox.TextProperty, new Binding("day_text") { Source = _controller }); _hooks.Add(_day_text.SubscribePreviewTextInput((s, e) => e.Handled = !RegexFilters.Time.DaysInMonth.IsMatch(_day_text.PeekText(e)) )); year.SetBinding(TickUpDown.TickCommandProperty, new Binding("tick_year") { Source = _controller }); - year.TickUpParameter = 1; - year.TickDownParameter = -1; + year.TickUpCommandParameter = 1; + year.TickDownCommandParameter = -1; _year_text.SetBinding(TextBox.TextProperty, new Binding("year_text") { Source = _controller }); _hooks.Add(_year_text.SubscribePreviewTextInput((s, e) => e.Handled = !RegexFilters.Time.Year.IsMatch(_year_text.PeekText(e))