From f12df52f69d1cebc952f797391de676795be19be Mon Sep 17 00:00:00 2001 From: brianlagunas_cp Date: Thu, 28 Jul 2011 20:19:32 +0000 Subject: [PATCH] CheckListBox: renamed properties --- .../Implementation/CheckListBox.cs | 60 +++++++++---------- .../CheckListBoxCheckedChangedEventArgs.cs | 17 ++++++ .../Implementation/CheckListBoxItem.cs | 18 +++--- .../CheckListBoxSelectionChangedEventArgs.cs | 17 ------ .../CheckListBox/Themes/Generic.xaml | 2 +- .../WPFToolkit.Extended.csproj | 2 +- 6 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxCheckedChangedEventArgs.cs delete mode 100644 ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxSelectionChangedEventArgs.cs diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs index d5465b97..31a30636 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs @@ -22,9 +22,9 @@ namespace Microsoft.Windows.Controls public CheckListBox() { - SelectedItems = new List(); - AddHandler(CheckListBox.SelectedEvent, new RoutedEventHandler(CheckListBox_Selected)); - AddHandler(CheckListBox.UnselectedEvent, new RoutedEventHandler(CheckListBox_Unselected)); + CheckedItems = new List(); + AddHandler(CheckListBox.CheckedEvent, new RoutedEventHandler(CheckListBox_Checked)); + AddHandler(CheckListBox.UncheckedEvent, new RoutedEventHandler(CheckListBox_Unchecked)); } #endregion //Constructors @@ -46,30 +46,30 @@ namespace Microsoft.Windows.Controls set { SetValue(CommandProperty, value); } } - #region SelectedItem + #region CheckedItem - public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register("SelectedItem", typeof(object), typeof(CheckListBox), new UIPropertyMetadata(null, OnSelectedItemChanged)); - public object SelectedItem + public static readonly DependencyProperty CheckedItemProperty = DependencyProperty.Register("CheckedItem", typeof(object), typeof(CheckListBox), new UIPropertyMetadata(null, OnCheckedItemChanged)); + public object CheckedItem { - get { return (object)GetValue(SelectedItemProperty); } - set { SetValue(SelectedItemProperty, value); } + get { return (object)GetValue(CheckedItemProperty); } + set { SetValue(CheckedItemProperty, value); } } - private static void OnSelectedItemChanged(DependencyObject o, DependencyPropertyChangedEventArgs e) + private static void OnCheckedItemChanged(DependencyObject o, DependencyPropertyChangedEventArgs e) { CheckListBox checkListBox = o as CheckListBox; if (checkListBox != null) - checkListBox.OnSelectedItemChanged((object)e.OldValue, (object)e.NewValue); + checkListBox.OnCheckedItemChanged((object)e.OldValue, (object)e.NewValue); } - protected virtual void OnSelectedItemChanged(object oldValue, object newValue) + protected virtual void OnCheckedItemChanged(object oldValue, object newValue) { } - #endregion //SelectedItem + #endregion //CheckedItem - public IList SelectedItems { get; private set; } + public IList CheckedItems { get; private set; } #endregion //Properties @@ -94,7 +94,7 @@ namespace Microsoft.Windows.Controls Binding isCheckedBinding = new Binding(CheckedMemberPath); isCheckedBinding.Mode = BindingMode.TwoWay; isCheckedBinding.Source = item; - checkListBoxItem.SetBinding(CheckListBoxItem.IsSelectedProperty, isCheckedBinding); + checkListBoxItem.SetBinding(CheckListBoxItem.IsCheckedProperty, isCheckedBinding); } base.PrepareContainerForItemOverride(element, item); _surpressSelectionChanged = false; @@ -104,39 +104,39 @@ namespace Microsoft.Windows.Controls #region Events - public static readonly RoutedEvent SelectedEvent = EventManager.RegisterRoutedEvent("Selected", RoutingStrategy.Bubble, typeof(SelectionChangedEventHandler), typeof(CheckListBox)); - public static readonly RoutedEvent UnselectedEvent = EventManager.RegisterRoutedEvent("Unselected", RoutingStrategy.Bubble, typeof(SelectionChangedEventHandler), typeof(CheckListBox)); - public static readonly RoutedEvent SelectionChangedEvent = EventManager.RegisterRoutedEvent("SelectionChanged", RoutingStrategy.Bubble, typeof(CheckListBoxSelectionChangedEventHandler), typeof(CheckListBox)); - public event CheckListBoxSelectionChangedEventHandler SelectionChanged + public static readonly RoutedEvent CheckedEvent = EventManager.RegisterRoutedEvent("CheckedEvent", RoutingStrategy.Bubble, typeof(SelectionChangedEventHandler), typeof(CheckListBox)); + public static readonly RoutedEvent UncheckedEvent = EventManager.RegisterRoutedEvent("UncheckedEvent", RoutingStrategy.Bubble, typeof(SelectionChangedEventHandler), typeof(CheckListBox)); + public static readonly RoutedEvent CheckedChangedEvent = EventManager.RegisterRoutedEvent("CheckedChanged", RoutingStrategy.Bubble, typeof(CheckListBoxCheckedChangedEventHandler), typeof(CheckListBox)); + public event CheckListBoxCheckedChangedEventHandler CheckedChanged { - add { AddHandler(SelectionChangedEvent, value); } - remove { RemoveHandler(SelectionChangedEvent, value); } + add { AddHandler(CheckedChangedEvent, value); } + remove { RemoveHandler(CheckedChangedEvent, value); } } #endregion //Events - void CheckListBox_Selected(object sender, RoutedEventArgs e) + void CheckListBox_Checked(object sender, RoutedEventArgs e) { - SetSelectedItem(e.OriginalSource); - SelectedItems.Add(SelectedItem); + SetCheckedItem(e.OriginalSource); + CheckedItems.Add(CheckedItem); OnCheckedChanged(); } - void CheckListBox_Unselected(object sender, RoutedEventArgs e) + void CheckListBox_Unchecked(object sender, RoutedEventArgs e) { - SetSelectedItem(e.OriginalSource); - SelectedItems.Remove(SelectedItem); + SetCheckedItem(e.OriginalSource); + CheckedItems.Remove(CheckedItem); OnCheckedChanged(); } - private void SetSelectedItem(object source) + private void SetCheckedItem(object source) { if (_surpressSelectionChanged) return; var selectedCheckListBoxItem = source as FrameworkElement; if (selectedCheckListBoxItem != null) - SelectedItem = selectedCheckListBoxItem.DataContext; + CheckedItem = selectedCheckListBoxItem.DataContext; } private void OnCheckedChanged() @@ -144,10 +144,10 @@ namespace Microsoft.Windows.Controls if (_surpressSelectionChanged) return; - RaiseEvent(new CheckListBoxSelectionChangedEventArgs(CheckListBox.SelectionChangedEvent, this, SelectedItem)); + RaiseEvent(new CheckListBoxCheckedChangedEventArgs(CheckListBox.CheckedChangedEvent, this, CheckedItem)); if (Command != null) - Command.Execute(SelectedItem); + Command.Execute(CheckedItem); } } } diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxCheckedChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxCheckedChangedEventArgs.cs new file mode 100644 index 00000000..7450379c --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxCheckedChangedEventArgs.cs @@ -0,0 +1,17 @@ +using System; +using System.Windows; + +namespace Microsoft.Windows.Controls +{ + public delegate void CheckListBoxCheckedChangedEventHandler(object sender, CheckListBoxCheckedChangedEventArgs e); + public class CheckListBoxCheckedChangedEventArgs : RoutedEventArgs + { + public object Item { get; private set; } + + public CheckListBoxCheckedChangedEventArgs(RoutedEvent routedEvent, object source, object item) + : base(routedEvent, source) + { + Item = item; + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxItem.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxItem.cs index af1b723c..1993c7ca 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxItem.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxItem.cs @@ -29,11 +29,11 @@ namespace Microsoft.Windows.Controls #region Properties - public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register("IsSelected", typeof(bool), typeof(CheckListBoxItem), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsSelectedChanged)); - public bool IsSelected + public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register("IsChecked", typeof(bool), typeof(CheckListBoxItem), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsSelectedChanged)); + public bool IsChecked { - get { return (bool)GetValue(IsSelectedProperty); } - set { SetValue(IsSelectedProperty, value); } + get { return (bool)GetValue(IsCheckedProperty); } + set { SetValue(IsCheckedProperty, value); } } private static void OnIsSelectedChanged(DependencyObject o, DependencyPropertyChangedEventArgs e) @@ -46,17 +46,17 @@ namespace Microsoft.Windows.Controls protected virtual void OnIsSelectedChanged(bool oldValue, bool newValue) { if (newValue) - RaiseSelectionChangedEvent(new RoutedEventArgs(CheckListBox.SelectedEvent, this)); + RaiseSelectionChangedEvent(new RoutedEventArgs(CheckListBox.CheckedEvent, this)); else - RaiseSelectionChangedEvent(new RoutedEventArgs(CheckListBox.UnselectedEvent, this)); + RaiseSelectionChangedEvent(new RoutedEventArgs(CheckListBox.UncheckedEvent, this)); } #endregion //Properties #region Events - public static readonly RoutedEvent SelectedEvent = CheckListBox.SelectedEvent.AddOwner(typeof(CheckListBoxItem)); - public static readonly RoutedEvent UnselectedEvent = CheckListBox.UnselectedEvent.AddOwner(typeof(CheckListBoxItem)); + public static readonly RoutedEvent SelectedEvent = CheckListBox.CheckedEvent.AddOwner(typeof(CheckListBoxItem)); + public static readonly RoutedEvent UnselectedEvent = CheckListBox.UncheckedEvent.AddOwner(typeof(CheckListBoxItem)); #endregion @@ -64,7 +64,7 @@ namespace Microsoft.Windows.Controls void CheckListBoxItem_MouseDown(object sender, MouseButtonEventArgs e) { - IsSelected = !IsSelected; + IsChecked = !IsChecked; } #endregion //Event Hanlders diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxSelectionChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxSelectionChangedEventArgs.cs deleted file mode 100644 index 9db590cd..00000000 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBoxSelectionChangedEventArgs.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Windows; - -namespace Microsoft.Windows.Controls -{ - public delegate void CheckListBoxSelectionChangedEventHandler(object sender, CheckListBoxSelectionChangedEventArgs e); - public class CheckListBoxSelectionChangedEventArgs : RoutedEventArgs - { - public object Item { get; private set; } - - public CheckListBoxSelectionChangedEventArgs(RoutedEvent routedEvent, object source, object item) - : base(routedEvent, source) - { - Item = item; - } - } -} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml index ed0f08c6..aa0c4359 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml @@ -36,7 +36,7 @@ - diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj index 919d4af9..34fdc425 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj @@ -156,7 +156,7 @@ - +