From 2f50c837b6b34fe283b9d71420ec6b96d198aeac Mon Sep 17 00:00:00 2001 From: brianlagunas_cp Date: Tue, 22 Mar 2011 21:57:56 +0000 Subject: [PATCH] Merged all current 4.0 changes into the 3.5 solution. Didn't fully test all controls, but they all compile and seem to work. Not sure how much longer I will support 3.5 since it is so time consuming and a pain to do it. --- .../MainWindow.xaml | 8 +- .../MainWindow.xaml.cs | 9 + .../Core/Utilities/ContextMenuUtilities.cs | 2 +- .../Implementation/DateTimePicker.cs | 4 + .../Editors/FontComboBoxEditor.cs | 4 + .../WPFToolkit.Extended.Examples/Window1.xaml | 4 +- .../Window1.xaml.cs | 2 +- .../BusyIndicator/Themes/Generic.xaml | 144 +++ .../ButtonSpinner/Themes/Generic.xaml | 90 ++ .../ChildWindow/Themes/Generic.xaml | 234 ++++ .../Chromes/Themes/Generic.xaml | 266 ++++ .../ColorCanvas/Themes/Generic.xaml | 346 ++++++ .../ColorPicker/Themes/Generic.xaml | 275 +++++ .../DateTimePicker/Themes/Generic.xaml | 92 ++ .../DateTimeUpDown/Themes/Generic.xaml | 36 + .../Magnifier/Themes/Generic.xaml | 39 + .../MaskedTextBox/Themes/Generic.xaml | 36 + .../MessageBox/Themes/Generic.xaml | 299 +++++ .../NumericUpDown/Themes/Generic.xaml | 37 + .../Properties/AssemblyInfo.cs | 3 + .../Images/AdvancedProperties11.png | Bin 0 -> 156 bytes .../PropertyGrid/Images/Categorize16.png | Bin 0 -> 333 bytes .../PropertyGrid/Images/Database11.png | Bin 0 -> 201 bytes .../PropertyGrid/Images/Inheritance11.png | Bin 0 -> 205 bytes .../PropertyGrid/Images/Local11.png | Bin 0 -> 142 bytes .../PropertyGrid/Images/Resource11.png | Bin 0 -> 340 bytes .../PropertyGrid/Images/SortAscending16.png | Bin 0 -> 442 bytes .../PropertyGrid/Images/Style11.png | Bin 0 -> 303 bytes .../PropertyGrid/Themes/Generic.xaml | 368 ++++++ .../SplitButton/Themes/Generic.xaml | 104 ++ .../Themes/Common/Generic_Common.xaml | 99 ++ .../WPFToolkit.Extended/Themes/Generic.xaml | 1086 +---------------- .../TimePicker/Themes/Generic.xaml | 93 ++ .../WPFToolkit.Extended.csproj | 298 ++++- .../WatermarkTextBox/Themes/Generic.xaml | 96 ++ 35 files changed, 2949 insertions(+), 1125 deletions(-) create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/AdvancedProperties11.png create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Categorize16.png create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Database11.png create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Inheritance11.png create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Local11.png create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Resource11.png create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/SortAscending16.png create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Style11.png create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Common/Generic_Common.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml create mode 100644 ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/MainWindow.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/MainWindow.xaml index 0f66d220..816e834e 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/MainWindow.xaml +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/MainWindow.xaml @@ -1,9 +1,11 @@  + xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended" + xmlns:local="clr-namespace:WPFToolkit.Extended.Samples" + Title="MainWindow" Height="600" Width="800" WindowStartupLocation="CenterScreen" ForceCursor="True"> + - + diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/MainWindow.xaml.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/MainWindow.xaml.cs index f28170f3..07543ada 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/MainWindow.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/MainWindow.xaml.cs @@ -11,6 +11,9 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; +using System.ComponentModel; +using System.Collections.ObjectModel; +using Microsoft.Windows.Controls; namespace WPFToolkit.Extended.Samples { @@ -22,6 +25,12 @@ namespace WPFToolkit.Extended.Samples public MainWindow() { InitializeComponent(); + Loaded += new RoutedEventHandler(MainWindow_Loaded); + } + + void MainWindow_Loaded(object sender, RoutedEventArgs e) + { + } } } diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs index 7c317640..59b38f93 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs @@ -5,7 +5,7 @@ namespace Microsoft.Windows.Controls.Core.Utilities { public class ContextMenuUtilities { - public static readonly DependencyProperty OpenOnMouseLeftButtonClickProperty = DependencyProperty.RegisterAttached("OpenOnMouseLeftButtonClick", typeof(bool), typeof(FrameworkElement), new FrameworkPropertyMetadata(false, OpenOnMouseLeftButtonClickChanged)); + public static readonly DependencyProperty OpenOnMouseLeftButtonClickProperty = DependencyProperty.RegisterAttached("OpenOnMouseLeftButtonClick", typeof(bool), typeof(ContextMenuUtilities), new FrameworkPropertyMetadata(false, OpenOnMouseLeftButtonClickChanged)); public static void SetOpenOnMouseLeftButtonClick(FrameworkElement element, bool value) { element.SetValue(OpenOnMouseLeftButtonClickProperty, value); diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs index 9938a1eb..0b51b6c1 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs @@ -2,7 +2,11 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Input; +#if VS2008 +using Microsoft.Windows.Controls.Primitives; +#else using System.Windows.Controls.Primitives; +#endif namespace Microsoft.Windows.Controls { diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs index 16638929..987e45d6 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs @@ -23,7 +23,11 @@ namespace Microsoft.Windows.Controls.PropertyGrid.Editors private static IList GetFontFamilies() { +#if !VS2008 return Fonts.SystemFontFamilies.ToList(); +#else + return Fonts.SystemFontFamilies.Cast().ToList(); +#endif } private static IList GetFontWeights() diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml index 78cc5db9..c76c960b 100644 --- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml @@ -1,9 +1,9 @@  - + diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml.cs index 009eb35f..ae35ac34 100644 --- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml.cs +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml.cs @@ -27,7 +27,7 @@ namespace WPFToolkit.Extended.Examples void Window1_Loaded(object sender, RoutedEventArgs e) { - Microsoft.Windows.Controls.MessageBox.Show("MyStezt", "Test", MessageBoxButton.OKCancel, MessageBoxImage.Stop); + } } } diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml new file mode 100644 index 00000000..01119b0a --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Collapsed + + + + + + + Collapsed + + + + + + + + + + + Visible + + + + + + + Visible + + + + + + + + + + + + + True + + + + + + + + + + + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml new file mode 100644 index 00000000..00d06d5f --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml new file mode 100644 index 00000000..cb158d61 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Collapsed + + + + + + + + + + + Visible + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml new file mode 100644 index 00000000..0f0fd301 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml @@ -0,0 +1,266 @@ + + + + + + + 2.75 + 1.75 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml new file mode 100644 index 00000000..5b5fec6f --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml @@ -0,0 +1,346 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml new file mode 100644 index 00000000..96e1f751 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml new file mode 100644 index 00000000..3037efc3 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml new file mode 100644 index 00000000..188d4c2e --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml @@ -0,0 +1,36 @@ + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml new file mode 100644 index 00000000..bcbf1567 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml @@ -0,0 +1,39 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml new file mode 100644 index 00000000..8743492f --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml @@ -0,0 +1,36 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml new file mode 100644 index 00000000..efbd5084 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml new file mode 100644 index 00000000..c73b0d29 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml @@ -0,0 +1,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs index 60f0e673..8f0b3e76 100644 --- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs @@ -4,6 +4,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Windows; using System.Windows.Markup; +using System; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information @@ -21,6 +22,7 @@ using System.Windows.Markup; // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] +[assembly: CLSCompliant(true)] //In order to begin building localizable applications, set //CultureYouAreCodingWith in your .csproj file @@ -57,3 +59,4 @@ using System.Windows.Markup; [assembly: XmlnsPrefix("http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "extToolkit")] [assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "Microsoft.Windows.Controls")] +[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "Microsoft.Windows.Controls.PropertyGrid")] diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/AdvancedProperties11.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/AdvancedProperties11.png new file mode 100644 index 0000000000000000000000000000000000000000..0146e93220604ee4ae29f8d85d4cfa4e43033dc0 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhoCO|{#S9F5he4R}c>anMprD_p zi(`ny)T8G%avm_?ak=>Zf$G*nYac{uXR!9p3}H+5=vnpW-34uyR;h-WchzUiTzg(n zaD9LfL-^BP`Hd=f{`RQLB-cEaW%}}U$F{>o{FAN3<~l0(=L1b<@O1TaS?83{1OVMZ BHD&++ literal 0 HcmV?d00001 diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Categorize16.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Categorize16.png new file mode 100644 index 0000000000000000000000000000000000000000..51510df8fb30e788d7cfbcb2d04317818adddc5f GIT binary patch literal 333 zcmV-T0kZyyP)dj=4G`}Qrv-o1NKT*iW| z8AiW)^$M<_qoV__SHK2*`t*t6`t|D!nwpwm`q86Da0Qz;Z~p)MxfBCC`wfO;KfeOQ zCXI0xFw9_lMvz}qjs7!y{rVNGfrsZNn4Wdkn5ckcBoqq-T>vtG62L-80Z}fXBq6bY zGLWQNGGR+dKY#utEfDb~B%+e?ix)4z3F*Lr13>x^RLYpB fq)c%_0thewPE|0Im4j&D00000NkvXXu0mjfB$$jT literal 0 HcmV?d00001 diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Database11.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Database11.png new file mode 100644 index 0000000000000000000000000000000000000000..0f523fbd006382eb1e25194ddb888e6c070c2c89 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhoCO|{#S9F5he4R}c>anMpkTG9 zi(`ny)Z_#OMuS5V|Ns9_k1(_T@&CL2c}W#km4%DsCH4q?H!?DEnzHeLNPhI2Kk>mW zjgA)sxb;pQJaBMB?#9pcGZy+3SpTa@w!yhMMD&=TsOO6mP4&t$3B+3v>p9r>mdKI;Vst05D}vT>t<8 literal 0 HcmV?d00001 diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Inheritance11.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Inheritance11.png new file mode 100644 index 0000000000000000000000000000000000000000..7dd3b491d439df16c241d1a8891a48fb9f1e021b GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhoCO|{#S9F5he4R}c>anMpkTeH zi(`ny)U6W^ayC1NxZG!7{b8SNhq}Mm#tpnj#Du0DmD*FimCgF*?#$#O4o`zl0cO5G zhd;DGG~D3Kc42z+J^ANPQ&umKJbL&_?$_wODn;ie9l6H1{+WbwLy(ux**~H`CHWK? z9?UVG@wL(P-GK=u@y%)^8Zz@$1u0koy=sUHx3vIVCg!0I1$g APXGV_ literal 0 HcmV?d00001 diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Local11.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Local11.png new file mode 100644 index 0000000000000000000000000000000000000000..ec521dd495926ed922cad9a5f6955c50ef29dda3 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhoCO|{#S9F5he4R}c>anMprC`N zi(`ny)Tt9U@-i539R8$s{?&t;ucLK6Ua>Mf1{ literal 0 HcmV?d00001 diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Resource11.png b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Resource11.png new file mode 100644 index 0000000000000000000000000000000000000000..7275c981cfc2d53f9c1944f92e2b7ab623c85f4d GIT binary patch literal 340 zcmV-a0jvIrP)pG21!IgR2Y?&jR_>xjGGG5IsuPWqbliPx#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUzI7vi7R5(waQM+-&FbuUf&<559WS5d`^6981k~=$1oQ~;IS{r~H zP? zpuUZO)OTe}AW|n6>=pO~$#4e7+T&k;`rEUwxZ<~ kGypF;Ymb6R2Y?=kh^LEQ4of|vpJ?PDkwpaH4l)&e#?|%wT+!%tMzui zKy0=Pqz@@Awz5>x`3Q=om%_^yDiY+#SOgarZOjh?Gs6%61@3`}#HQNr$ao$~wcU}+ zKY%(f&CjkpD2v``$!@zLmCjHp75F_EJ{o1EltP~sw)+Fa@Q7^}Bh~(R#p`n-x|N9V z*7}mg9_-@FmCf07LOuyU?{#GXc&>vn=4K{i44&%%U;+5S0Il^+vep_u7{mkC{6L1` zk!&^>5ySPL=WoxA2TUg)ah@!Cqv=%}|LXZJoB-yaf_+9%NrM0Y002ovPDHLkV1mgy Be|Z1^ literal 0 HcmV?d00001 diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml new file mode 100644 index 00000000..f851614b --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml @@ -0,0 +1,368 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml new file mode 100644 index 00000000..9e863a17 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Common/Generic_Common.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Common/Generic_Common.xaml new file mode 100644 index 00000000..e1ef5440 --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Common/Generic_Common.xaml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml index 452b0bf8..828a14c9 100644 --- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml @@ -1,1070 +1,24 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Collapsed - - - - - - - Collapsed - - - - - - - - - - - Visible - - - - - - - Visible - - - - - - - - - - - - - True - - - - - - - - - - - False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:sys="clr-namespace:System;assembly=mscorlib"> + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml new file mode 100644 index 00000000..39f9d77e --- /dev/null +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj index a6c2a166..25754062 100644 --- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj +++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj @@ -19,6 +19,8 @@ SAK SAK SAK + true + ..\..\..\ExtendedWPFToolkitSolution\Src\WPFToolkit.Extended\sn.snk true @@ -66,95 +68,265 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + Designer MSBuild:Compile + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + - - BusyIndicator\BusyIndicator.cs + + BusyIndicator\Implementation\BusyIndicator.cs + + + BusyIndicator\Implementation\VisualStates.BusyIndicator.cs - - BusyIndicator\VisualStates.BusyIndicator.cs + + ButtonSpinner\Implementation\ButtonSpinner.cs - - ButtonSpinner\ButtonSpinner.cs + + ButtonSpinner\Implementation\SpinDirection.cs - - ButtonSpinner\SpinDirection.cs + + ButtonSpinner\Implementation\SpinEventArgs.cs - - ButtonSpinner\SpinEventArgs.cs + + ButtonSpinner\Implementation\Spinner.cs - - ButtonSpinner\Spinner.cs + + ButtonSpinner\Implementation\ValidSpinDirections.cs - - ButtonSpinner\ValidSpinDirections.cs + + ChildWindow\Implementation\ChildWindow.cs - - ChildWindow\ChildWindow.cs + + ChildWindow\Implementation\VisualStates.ChildWindow.cs - - ChildWindow\VisualStates.ChildWindow.cs + + ChildWindow\Implementation\WindowStartupLocation.cs - - ChildWindow\WindowState.cs + + ChildWindow\Implementation\WindowState.cs - - ColorPicker\ColorItem.cs + + Chromes\Implementation\ButtonChrome.cs - - ColorPicker\ColorPicker.cs + + ColorCanvas\Implementation\ColorCanvas.cs + + + ColorCanvas\Implementation\ColorSpectrumSlider.cs + + + ColorPicker\Implementation\ColorItem.cs + + + ColorPicker\Implementation\ColorPicker.cs + + + Core\Converters\ColorToSolidColorBrushConverter.cs Core\Converters\InverseBoolConverter.cs + + Core\Converters\SolidColorBrushToColorConverter.cs + + + Core\Converters\TimeFormatToDateTimeFormatConverter.cs + + + Core\Primitives\HsvColor.cs + Core\Primitives\InputBase.cs + + Core\Primitives\UpDownBase.cs + Core\UIElementAdorner.cs - - DateTimeUpDown\DateTimeFormat.cs + + Core\Utilities\ColorUtilities.cs + + + Core\Utilities\ContextMenuUtilities.cs + + + DateTimePicker\Implementation\DateTimePicker.cs + + + DateTimeUpDown\Implementation\DateTimeFormat.cs + + + DateTimeUpDown\Implementation\DateTimeInfo.cs + + + DateTimeUpDown\Implementation\DateTimePart.cs + + + DateTimeUpDown\Implementation\DateTimeUpDown.cs + + + Magnifier\Implementation\Converters\BorderThicknessToStrokeThicknessConverter.cs + + + Magnifier\Implementation\Converters\RadiusConverter.cs + + + Magnifier\Implementation\Magnifier.cs - - DateTimeUpDown\DateTimeInfo.cs + + Magnifier\Implementation\MagnifierAdorner.cs - - DateTimeUpDown\DateTimePart.cs + + Magnifier\Implementation\MagnifierManager.cs - - DateTimeUpDown\DateTimeUpDown.cs + + MaskedTextBox\Implementation\MaskedTextBox.cs - - Magnifier\Converters\BorderThicknessToStrokeThicknessConverter.cs + + MessageBox\Implementation\MessageBox.cs - - Magnifier\Converters\RadiusConverter.cs + + MessageBox\Implementation\VisualStates.MessageBox.cs - - Magnifier\Magnifier.cs + + NumericUpDown\Implementation\NumericUpDown.cs - - Magnifier\MagnifierAdorner.cs + + PropertyGrid\Implementation\Commands\PropertyItemCommands.cs - - Magnifier\MagnifierManager.cs + + PropertyGrid\Implementation\Converters\ValueSourceToImagePathConverter.cs - - MaskedTextBox\MaskedTextBox.cs + + PropertyGrid\Implementation\Converters\ValueSourceToToolTipConverter.cs - - MessageBox\MessageBox.cs + + PropertyGrid\Implementation\CustomTypeEditorCollection.cs - - MessageBox\VisualStates.MessageBox.cs + + PropertyGrid\Implementation\Editors\CheckBoxEditor.cs - - NumericUpDown\NumericUpDown.cs + + PropertyGrid\Implementation\Editors\ColorEditor.cs + + + PropertyGrid\Implementation\Editors\ComboBoxEditor.cs + + + PropertyGrid\Implementation\Editors\CustomTypeEditor.cs + + + PropertyGrid\Implementation\Editors\DateTimeUpDownEditor.cs + + + PropertyGrid\Implementation\Editors\EnumComboBoxEditor.cs + + + PropertyGrid\Implementation\Editors\FontComboBoxEditor.cs + + + PropertyGrid\Implementation\Editors\ICustomTypeEditor.cs + + + PropertyGrid\Implementation\Editors\IntegerUpDownEditor.cs + + + PropertyGrid\Implementation\Editors\ITypeEditor.cs + + + PropertyGrid\Implementation\Editors\NumericUpDownEditor.cs + + + PropertyGrid\Implementation\Editors\TextBlockEditor.cs + + + PropertyGrid\Implementation\Editors\TextBoxEditor.cs + + + PropertyGrid\Implementation\Editors\TypeEditor.cs + + + PropertyGrid\Implementation\PropertyCategoryItem.cs + + + PropertyGrid\Implementation\PropertyCollection.cs + + + PropertyGrid\Implementation\PropertyGrid.cs + + + PropertyGrid\Implementation\PropertyItem.cs RichTextBoxFormatBar\IRichTextBoxFormatBar.cs @@ -181,12 +353,21 @@ RichTextBox\RichTextBox.cs - - UpDownBase\UpDownBase.cs + + SplitButton\Implementation\SplitButton.cs + + + TimePicker\Implementation\TimeFormat.cs + + + TimePicker\Implementation\TimePicker.cs VisualStates.cs + + WatermarkTextBox\Implementation\WatermarkTextBox.cs + Code @@ -204,6 +385,9 @@ ResXFileCodeGenerator Resources.Designer.cs + + sn.snk + SettingsSingleFileGenerator Settings.Designer.cs @@ -231,6 +415,16 @@ + + + + + + + + + +