diff --git a/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln b/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln index 4b3ad1c6..ac099b96 100644 --- a/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln +++ b/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln @@ -23,7 +23,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.BusyIndicat EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Infrastructure", "Src\Samples\Samples.Infrastructure\Samples.Infrastructure.csproj", "{A4A049A4-665A-4651-9046-7D06E9D0CCDC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Caclulator", "Src\Samples\Modules\Samples.Modules.Caclulator\Samples.Modules.Caclulator.csproj", "{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Calculator", "Src\Samples\Modules\Samples.Modules.Caclulator\Samples.Modules.Calculator.csproj", "{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.ChildWindow", "Src\Samples\Modules\Samples.Modules.ChildWindow\Samples.Modules.ChildWindow.csproj", "{44733C25-7F22-4B91-83C7-4E654063DFD6}" EndProject @@ -60,38 +60,38 @@ Global SccProjectTopLevelParentUniqueName4 = ExtendedWPFToolkit.sln SccProjectName4 = Src/Samples/Samples.Infrastructure SccLocalPath4 = Src\\Samples\\Samples.Infrastructure - SccProjectUniqueName5 = Src\\Samples\\Modules\\Samples.Modules.Caclulator\\Samples.Modules.Caclulator.csproj + SccProjectUniqueName5 = Src\\Samples\\Modules\\Samples.Modules.ChildWindow\\Samples.Modules.ChildWindow.csproj SccProjectTopLevelParentUniqueName5 = ExtendedWPFToolkit.sln - SccProjectName5 = Src/Samples/Modules/Samples.Modules.Caclulator - SccLocalPath5 = Src\\Samples\\Modules\\Samples.Modules.Caclulator - SccProjectUniqueName6 = Src\\Samples\\Modules\\Samples.Modules.ChildWindow\\Samples.Modules.ChildWindow.csproj + SccProjectName5 = Src/Samples/Modules/Samples.Modules.ChildWindow + SccLocalPath5 = Src\\Samples\\Modules\\Samples.Modules.ChildWindow + SccProjectUniqueName6 = Src\\Samples\\Modules\\Samples.Modules.Color\\Samples.Modules.Color.csproj SccProjectTopLevelParentUniqueName6 = ExtendedWPFToolkit.sln - SccProjectName6 = Src/Samples/Modules/Samples.Modules.ChildWindow - SccLocalPath6 = Src\\Samples\\Modules\\Samples.Modules.ChildWindow - SccProjectUniqueName7 = Src\\Samples\\Modules\\Samples.Modules.Color\\Samples.Modules.Color.csproj + SccProjectName6 = Src/Samples/Modules/Samples.Modules.Color + SccLocalPath6 = Src\\Samples\\Modules\\Samples.Modules.Color + SccProjectUniqueName7 = Src\\Samples\\Modules\\Samples.Modules.DateTime\\Samples.Modules.DateTime.csproj SccProjectTopLevelParentUniqueName7 = ExtendedWPFToolkit.sln - SccProjectName7 = Src/Samples/Modules/Samples.Modules.Color - SccLocalPath7 = Src\\Samples\\Modules\\Samples.Modules.Color - SccProjectUniqueName8 = Src\\Samples\\Modules\\Samples.Modules.DateTime\\Samples.Modules.DateTime.csproj + SccProjectName7 = Src/Samples/Modules/Samples.Modules.DateTime + SccLocalPath7 = Src\\Samples\\Modules\\Samples.Modules.DateTime + SccProjectUniqueName8 = Src\\Samples\\Modules\\Samples.Modules.Numeric\\Samples.Modules.Numeric.csproj SccProjectTopLevelParentUniqueName8 = ExtendedWPFToolkit.sln - SccProjectName8 = Src/Samples/Modules/Samples.Modules.DateTime - SccLocalPath8 = Src\\Samples\\Modules\\Samples.Modules.DateTime - SccProjectUniqueName9 = Src\\Samples\\Modules\\Samples.Modules.Numeric\\Samples.Modules.Numeric.csproj + SccProjectName8 = Src/Samples/Modules/Samples.Modules.Numeric + SccLocalPath8 = Src\\Samples\\Modules\\Samples.Modules.Numeric + SccProjectUniqueName9 = Src\\Samples\\Modules\\Samples.Modules.Text\\Samples.Modules.Text.csproj SccProjectTopLevelParentUniqueName9 = ExtendedWPFToolkit.sln - SccProjectName9 = Src/Samples/Modules/Samples.Modules.Numeric - SccLocalPath9 = Src\\Samples\\Modules\\Samples.Modules.Numeric - SccProjectUniqueName10 = Src\\Samples\\Modules\\Samples.Modules.Text\\Samples.Modules.Text.csproj + SccProjectName9 = Src/Samples/Modules/Samples.Modules.Text + SccLocalPath9 = Src\\Samples\\Modules\\Samples.Modules.Text + SccProjectUniqueName10 = Src\\Samples\\Modules\\Samples.Modules.Button\\Samples.Modules.Button.csproj SccProjectTopLevelParentUniqueName10 = ExtendedWPFToolkit.sln - SccProjectName10 = Src/Samples/Modules/Samples.Modules.Text - SccLocalPath10 = Src\\Samples\\Modules\\Samples.Modules.Text - SccProjectUniqueName11 = Src\\Samples\\Modules\\Samples.Modules.Button\\Samples.Modules.Button.csproj + SccProjectName10 = Src/Samples/Modules/Samples.Modules.Button + SccLocalPath10 = Src\\Samples\\Modules\\Samples.Modules.Button + SccProjectUniqueName11 = Src\\Samples\\Modules\\Samples.Modules.PropertyGrid\\Samples.Modules.PropertyGrid.csproj SccProjectTopLevelParentUniqueName11 = ExtendedWPFToolkit.sln - SccProjectName11 = Src/Samples/Modules/Samples.Modules.Button - SccLocalPath11 = Src\\Samples\\Modules\\Samples.Modules.Button - SccProjectUniqueName12 = Src\\Samples\\Modules\\Samples.Modules.PropertyGrid\\Samples.Modules.PropertyGrid.csproj + SccProjectName11 = Src/Samples/Modules/Samples.Modules.PropertyGrid + SccLocalPath11 = Src\\Samples\\Modules\\Samples.Modules.PropertyGrid + SccProjectUniqueName12 = Src\\Samples\\Modules\\Samples.Modules.Caclulator\\Samples.Modules.Calculator.csproj SccProjectTopLevelParentUniqueName12 = ExtendedWPFToolkit.sln - SccProjectName12 = Src/Samples/Modules/Samples.Modules.PropertyGrid - SccLocalPath12 = Src\\Samples\\Modules\\Samples.Modules.PropertyGrid + SccProjectName12 = Src/Samples/Modules/Samples.Modules.Caclulator + SccLocalPath12 = Src\\Samples\\Modules\\Samples.Modules.Caclulator EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs index 2dc93141..a3344928 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs @@ -2,6 +2,7 @@ using Samples.Infrastructure; using Microsoft.Practices.Unity; using Microsoft.Practices.Prism.Regions; +using Samples.Infrastructure.Extensions; namespace Samples.Modules.BusyIndicator { @@ -14,7 +15,7 @@ namespace Samples.Modules.BusyIndicator protected override void RegisterViewsAndTypes() { - Container.RegisterType(typeof(object), typeof(HomeView), typeof(HomeView).FullName); + Container.RegisterNavigationType(typeof(HomeView)); } protected override void InitializeModule() diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/HomeView.xaml.cs index 2eb741a3..53693a91 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/HomeView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/HomeView.xaml.cs @@ -11,6 +11,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; +using Microsoft.Practices.Prism.Regions; namespace Samples.Modules.BusyIndicator { diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/NavigationView.xaml index 812bb747..9030f59b 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/NavigationView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/NavigationView.xaml @@ -4,8 +4,4 @@ Header="BusyIndicator" Tag="Samples.Modules.BusyIndicator.HomeView"> - - - - diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs index 2945fdb2..89ea486a 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs @@ -1,10 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Samples.Infrastructure; using Microsoft.Practices.Prism.Regions; using Microsoft.Practices.Unity; +using Samples.Infrastructure.Extensions; +using Samples.Modules.Button.Views; namespace Samples.Modules.Button { @@ -20,7 +19,9 @@ namespace Samples.Modules.Button protected override void RegisterViewsAndTypes() { - Container.RegisterType(typeof(object), typeof(HomeView), typeof(HomeView).FullName); + Container.RegisterNavigationType(typeof(HomeView)); + Container.RegisterNavigationType(typeof(ButtonSpinnerView)); + Container.RegisterNavigationType(typeof(SplitButtonView)); } } } diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/Resources.Designer.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/Resources.Designer.cs index 406364c8..ae461a5e 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/Resources.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Samples.Modules.Button.Properties +namespace Samples.Modules.Calculator.Properties { diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/Settings.Designer.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/Settings.Designer.cs index 373c1d84..2b836727 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/Settings.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/Settings.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Samples.Modules.Button.Properties +namespace Samples.Modules.Calculator.Properties { diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Samples.Modules.Button.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Samples.Modules.Button.csproj index 7a9be585..9fc66fc8 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Samples.Modules.Button.csproj +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Samples.Modules.Button.csproj @@ -62,6 +62,9 @@ + + ButtonSpinnerView.xaml + Code @@ -81,6 +84,9 @@ NavigationView.xaml + + SplitButtonView.xaml + ResXFileCodeGenerator Resources.Designer.cs @@ -92,6 +98,10 @@ + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -100,8 +110,16 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + + + {72E591D6-8F83-4D8C-8F67-9C325E623234} + WPFToolkit.Extended + {A4A049A4-665A-4651-9046-7D06E9D0CCDC} Samples.Infrastructure diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml new file mode 100644 index 00000000..e1ceacb6 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml @@ -0,0 +1,11 @@ + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml.cs new file mode 100644 index 00000000..e0309ba4 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.Button.Views +{ + /// + /// Interaction logic for ButtonSpinnerView.xaml + /// + public partial class ButtonSpinnerView : UserControl + { + public ButtonSpinnerView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/HomeView.xaml index 06a7e3a2..b82e6c2a 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/HomeView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/HomeView.xaml @@ -1,4 +1,4 @@ - /// Interaction logic for HomeView.xaml diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/NavigationView.xaml index 8d928f2e..306f10c2 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/NavigationView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/NavigationView.xaml @@ -1,9 +1,9 @@ - + Header="Button Controls" Tag="Samples.Modules.Button.Views.HomeView"> - - + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/NavigationView.xaml.cs index 2eb33028..d43c73dc 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/NavigationView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/NavigationView.xaml.cs @@ -12,7 +12,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace Samples.Modules.Button +namespace Samples.Modules.Button.Views { /// /// Interaction logic for NavigationView.xaml diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml new file mode 100644 index 00000000..4facf2e2 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml @@ -0,0 +1,7 @@ + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml.cs new file mode 100644 index 00000000..8dc319fa --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.Button.Views +{ + /// + /// Interaction logic for SplitButtonView.xaml + /// + public partial class SplitButtonView : UserControl + { + public SplitButtonView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/CalculatorModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/CalculatorModule.cs new file mode 100644 index 00000000..bf2f25ad --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/CalculatorModule.cs @@ -0,0 +1,27 @@ +using System; +using Samples.Infrastructure; +using Microsoft.Practices.Prism.Regions; +using Microsoft.Practices.Unity; +using Samples.Infrastructure.Extensions; +using Samples.Modules.Calculator.Views; + +namespace Samples.Modules.Calculator +{ + public class CalculatorModule : ModuleBase + { + public CalculatorModule(IUnityContainer container, IRegionManager regionManager) + : base(container, regionManager) { } + + protected override void InitializeModule() + { + RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView)); + } + + protected override void RegisterViewsAndTypes() + { + Container.RegisterNavigationType(typeof(HomeView)); + Container.RegisterNavigationType(typeof(CalculatorView)); + Container.RegisterNavigationType(typeof(CalculatorUpDownView)); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Properties/Resources.Designer.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Properties/Resources.Designer.cs index f82f4f1b..d4117d8c 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Properties/Resources.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace Samples.Modules.Caclulator.Properties -{ - - +namespace Samples.Modules.Calculator.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -22,48 +22,40 @@ namespace Samples.Modules.Caclulator.Properties [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Samples.Modules.Caclulator.Properties.Resources", typeof(Resources).Assembly); + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Samples.Modules.Calculator.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Properties/Settings.Designer.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Properties/Settings.Designer.cs index af5b1d08..856bc8b3 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Properties/Settings.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace Samples.Modules.Caclulator.Properties -{ - - +namespace Samples.Modules.Calculator.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Caclulator.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Calculator.csproj similarity index 60% rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Caclulator.csproj rename to ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Calculator.csproj index 76b97031..ec89567b 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Caclulator.csproj +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Calculator.csproj @@ -8,8 +8,8 @@ {EF6701CF-21C3-45B5-9C90-40BE6130BB7D} library Properties - Samples.Modules.Caclulator - Samples.Modules.Caclulator + Samples.Modules.Calculator + Samples.Modules.Calculator v4.0 Client 512 @@ -38,6 +38,14 @@ 4 + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll + + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll + @@ -53,6 +61,13 @@ + + + HomeView.xaml + + + NavigationView.xaml + Code @@ -66,6 +81,12 @@ Settings.settings True + + CalculatorUpDownView.xaml + + + CalculatorView.xaml + ResXFileCodeGenerator Resources.Designer.cs @@ -76,6 +97,35 @@ + + + {72E591D6-8F83-4D8C-8F67-9C325E623234} + WPFToolkit.Extended + + + {A4A049A4-665A-4651-9046-7D06E9D0CCDC} + Samples.Infrastructure + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Caclulator.csproj.vspscc b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Calculator.csproj.vspscc similarity index 100% rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Caclulator.csproj.vspscc rename to ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Samples.Modules.Calculator.csproj.vspscc diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml new file mode 100644 index 00000000..ee37c6b6 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml @@ -0,0 +1,11 @@ + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml.cs new file mode 100644 index 00000000..5e83f236 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.Calculator.Views +{ + /// + /// Interaction logic for CalculatorUpDownView.xaml + /// + public partial class CalculatorUpDownView : UserControl + { + public CalculatorUpDownView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml new file mode 100644 index 00000000..1f10fb36 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml @@ -0,0 +1,11 @@ + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml.cs new file mode 100644 index 00000000..f7f9d219 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.Calculator.Views +{ + /// + /// Interaction logic for CalculatorView.xaml + /// + public partial class CalculatorView : UserControl + { + public CalculatorView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/HomeView.xaml new file mode 100644 index 00000000..63e61871 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/HomeView.xaml @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/HomeView.xaml.cs new file mode 100644 index 00000000..7df133d9 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/HomeView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.Calculator.Views +{ + /// + /// Interaction logic for HomeView.xaml + /// + public partial class HomeView : UserControl + { + public HomeView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml new file mode 100644 index 00000000..bb162dd6 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml @@ -0,0 +1,9 @@ + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml.cs new file mode 100644 index 00000000..3bca58ee --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/NavigationView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.Calculator.Views +{ + /// + /// Interaction logic for NavigationView.xaml + /// + public partial class NavigationView : TreeViewItem + { + public NavigationView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/ChildWindowModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/ChildWindowModule.cs new file mode 100644 index 00000000..2718933a --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/ChildWindowModule.cs @@ -0,0 +1,25 @@ +using System; +using Microsoft.Practices.Unity; +using Microsoft.Practices.Prism.Regions; +using Samples.Infrastructure; +using Samples.Infrastructure.Extensions; +using Samples.Modules.ChildWindow.Views; + +namespace Samples.Modules.ChildWindow +{ + public class ChildWindowModule: ModuleBase + { + public ChildWindowModule(IUnityContainer container, IRegionManager regionManager) + : base(container, regionManager) { } + + protected override void InitializeModule() + { + RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView)); + } + + protected override void RegisterViewsAndTypes() + { + Container.RegisterNavigationType(typeof(HomeView)); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Samples.Modules.ChildWindow.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Samples.Modules.ChildWindow.csproj index dd7a5998..1e6e1f34 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Samples.Modules.ChildWindow.csproj +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Samples.Modules.ChildWindow.csproj @@ -38,6 +38,14 @@ 4 + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll + + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll + @@ -53,6 +61,7 @@ + Code @@ -66,6 +75,12 @@ Settings.settings True + + HomeView.xaml + + + NavigationView.xaml + ResXFileCodeGenerator Resources.Designer.cs @@ -76,6 +91,26 @@ + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + + + {72E591D6-8F83-4D8C-8F67-9C325E623234} + WPFToolkit.Extended + + + {A4A049A4-665A-4651-9046-7D06E9D0CCDC} + Samples.Infrastructure + + xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml new file mode 100644 index 00000000..39f5206e --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml @@ -0,0 +1,11 @@ + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml.cs new file mode 100644 index 00000000..3873e24c --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.ChildWindow.Views +{ + /// + /// Interaction logic for HomeView.xaml + /// + public partial class HomeView : UserControl + { + public HomeView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml new file mode 100644 index 00000000..497eb83c --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml @@ -0,0 +1,6 @@ + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml.cs new file mode 100644 index 00000000..0b945bd3 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.ChildWindow.Views +{ + /// + /// Interaction logic for NavigationView.xaml + /// + public partial class NavigationView : TreeViewItem + { + public NavigationView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/ColorModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/ColorModule.cs new file mode 100644 index 00000000..14d15354 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/ColorModule.cs @@ -0,0 +1,26 @@ +using System; +using Microsoft.Practices.Unity; +using Microsoft.Practices.Prism.Regions; +using Samples.Infrastructure; +using Samples.Infrastructure.Extensions; +using Samples.Modules.Color.Views; + + +namespace Samples.Modules.Color +{ + public class ColorModule: ModuleBase + { + public ColorModule(IUnityContainer container, IRegionManager regionManager) + : base(container, regionManager) { } + + protected override void InitializeModule() + { + RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView)); + } + + protected override void RegisterViewsAndTypes() + { + Container.RegisterNavigationType(typeof(HomeView)); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Samples.Modules.Color.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Samples.Modules.Color.csproj index 37d454ee..4de8f9f0 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Samples.Modules.Color.csproj +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Samples.Modules.Color.csproj @@ -38,6 +38,14 @@ 4 + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll + + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll + @@ -53,6 +61,7 @@ + Code @@ -66,6 +75,12 @@ Settings.settings True + + HomeView.xaml + + + NavigationView.xaml + ResXFileCodeGenerator Resources.Designer.cs @@ -76,6 +91,26 @@ + + + {72E591D6-8F83-4D8C-8F67-9C325E623234} + WPFToolkit.Extended + + + {A4A049A4-665A-4651-9046-7D06E9D0CCDC} + Samples.Infrastructure + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml new file mode 100644 index 00000000..3df4d713 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml @@ -0,0 +1,11 @@ + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml.cs new file mode 100644 index 00000000..038784df --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.Color.Views +{ + /// + /// Interaction logic for HomeView.xaml + /// + public partial class HomeView : UserControl + { + public HomeView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml new file mode 100644 index 00000000..d54b09af --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml @@ -0,0 +1,6 @@ + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml.cs new file mode 100644 index 00000000..eb1edea2 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.Color.Views +{ + /// + /// Interaction logic for NavigationView.xaml + /// + public partial class NavigationView : TreeViewItem + { + public NavigationView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/DateTimeModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/DateTimeModule.cs new file mode 100644 index 00000000..c96be567 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/DateTimeModule.cs @@ -0,0 +1,25 @@ +using System; +using Microsoft.Practices.Unity; +using Microsoft.Practices.Prism.Regions; +using Samples.Infrastructure; +using Samples.Infrastructure.Extensions; +using Samples.Modules.DateTime.Views; + +namespace Samples.Modules.DateTime +{ + public class DateTimeModule: ModuleBase + { + public DateTimeModule(IUnityContainer container, IRegionManager regionManager) + : base(container, regionManager) { } + + protected override void InitializeModule() + { + RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView)); + } + + protected override void RegisterViewsAndTypes() + { + Container.RegisterNavigationType(typeof(HomeView)); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Samples.Modules.DateTime.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Samples.Modules.DateTime.csproj index 541cedd5..771be94a 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Samples.Modules.DateTime.csproj +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Samples.Modules.DateTime.csproj @@ -38,6 +38,14 @@ 4 + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll + + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll + @@ -53,6 +61,7 @@ + Code @@ -66,6 +75,12 @@ Settings.settings True + + HomeView.xaml + + + NavigationView.xaml + ResXFileCodeGenerator Resources.Designer.cs @@ -76,6 +91,26 @@ + + + {72E591D6-8F83-4D8C-8F67-9C325E623234} + WPFToolkit.Extended + + + {A4A049A4-665A-4651-9046-7D06E9D0CCDC} + Samples.Infrastructure + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml new file mode 100644 index 00000000..1afdee3e --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml @@ -0,0 +1,11 @@ + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml.cs new file mode 100644 index 00000000..3ba282e1 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.DateTime.Views +{ + /// + /// Interaction logic for HomeView.xaml + /// + public partial class HomeView : UserControl + { + public HomeView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml new file mode 100644 index 00000000..1309e19c --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml @@ -0,0 +1,6 @@ + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml.cs new file mode 100644 index 00000000..7f51386e --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.DateTime.Views +{ + /// + /// Interaction logic for NavigationView.xaml + /// + public partial class NavigationView : TreeViewItem + { + public NavigationView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/NumericModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/NumericModule.cs new file mode 100644 index 00000000..c5046a06 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/NumericModule.cs @@ -0,0 +1,25 @@ +using System; +using Microsoft.Practices.Unity; +using Microsoft.Practices.Prism.Regions; +using Samples.Infrastructure; +using Samples.Infrastructure.Extensions; +using Samples.Modules.Numeric.Views; + +namespace Samples.Modules.Numeric +{ + public class NumericModule: ModuleBase + { + public NumericModule(IUnityContainer container, IRegionManager regionManager) + : base(container, regionManager) { } + + protected override void InitializeModule() + { + RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView)); + } + + protected override void RegisterViewsAndTypes() + { + Container.RegisterNavigationType(typeof(HomeView)); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Samples.Modules.Numeric.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Samples.Modules.Numeric.csproj index 11d612e3..6b077378 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Samples.Modules.Numeric.csproj +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Samples.Modules.Numeric.csproj @@ -38,6 +38,14 @@ 4 + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll + + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll + @@ -53,6 +61,7 @@ + Code @@ -66,6 +75,12 @@ Settings.settings True + + HomeView.xaml + + + NavigationView.xaml + ResXFileCodeGenerator Resources.Designer.cs @@ -76,6 +91,26 @@ + + + {72E591D6-8F83-4D8C-8F67-9C325E623234} + WPFToolkit.Extended + + + {A4A049A4-665A-4651-9046-7D06E9D0CCDC} + Samples.Infrastructure + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml new file mode 100644 index 00000000..50c738c4 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml @@ -0,0 +1,11 @@ + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml.cs new file mode 100644 index 00000000..859345a8 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.Numeric.Views +{ + /// + /// Interaction logic for HomeView.xaml + /// + public partial class HomeView : UserControl + { + public HomeView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml new file mode 100644 index 00000000..d806c6a3 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml @@ -0,0 +1,6 @@ + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml.cs new file mode 100644 index 00000000..3cf8349e --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.Numeric.Views +{ + /// + /// Interaction logic for NavigationView.xaml + /// + public partial class NavigationView : TreeViewItem + { + public NavigationView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/PropertyGridModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/PropertyGridModule.cs new file mode 100644 index 00000000..00a102e6 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/PropertyGridModule.cs @@ -0,0 +1,25 @@ +using System; +using Microsoft.Practices.Unity; +using Microsoft.Practices.Prism.Regions; +using Samples.Infrastructure; +using Samples.Infrastructure.Extensions; +using Samples.Modules.PropertyGrid.Views; + +namespace Samples.Modules.PropertyGrid +{ + public class PropertyGridModule: ModuleBase + { + public PropertyGridModule(IUnityContainer container, IRegionManager regionManager) + : base(container, regionManager) { } + + protected override void InitializeModule() + { + RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView)); + } + + protected override void RegisterViewsAndTypes() + { + Container.RegisterNavigationType(typeof(HomeView)); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Samples.Modules.PropertyGrid.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Samples.Modules.PropertyGrid.csproj index 09a38f77..d9daf2d2 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Samples.Modules.PropertyGrid.csproj +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Samples.Modules.PropertyGrid.csproj @@ -38,6 +38,14 @@ 4 + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll + + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll + @@ -53,6 +61,7 @@ + Code @@ -66,6 +75,12 @@ Settings.settings True + + HomeView.xaml + + + NavigationView.xaml + ResXFileCodeGenerator Resources.Designer.cs @@ -76,6 +91,26 @@ + + + {72E591D6-8F83-4D8C-8F67-9C325E623234} + WPFToolkit.Extended + + + {A4A049A4-665A-4651-9046-7D06E9D0CCDC} + Samples.Infrastructure + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml new file mode 100644 index 00000000..90d8f569 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml @@ -0,0 +1,11 @@ + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml.cs new file mode 100644 index 00000000..64fb8750 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.PropertyGrid.Views +{ + /// + /// Interaction logic for HomeView.xaml + /// + public partial class HomeView : UserControl + { + public HomeView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml new file mode 100644 index 00000000..1c59039f --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml @@ -0,0 +1,6 @@ + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml.cs new file mode 100644 index 00000000..70fc1e1b --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.PropertyGrid.Views +{ + /// + /// Interaction logic for NavigationView.xaml + /// + public partial class NavigationView : TreeViewItem + { + public NavigationView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj index 812aba9f..cc27c8ca 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj @@ -38,6 +38,14 @@ 4 + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll + + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll + @@ -53,6 +61,7 @@ + Code @@ -66,6 +75,12 @@ Settings.settings True + + HomeView.xaml + + + NavigationView.xaml + ResXFileCodeGenerator Resources.Designer.cs @@ -76,6 +91,26 @@ + + + {72E591D6-8F83-4D8C-8F67-9C325E623234} + WPFToolkit.Extended + + + {A4A049A4-665A-4651-9046-7D06E9D0CCDC} + Samples.Infrastructure + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs new file mode 100644 index 00000000..23fb8bac --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs @@ -0,0 +1,25 @@ +using System; +using Microsoft.Practices.Unity; +using Microsoft.Practices.Prism.Regions; +using Samples.Infrastructure; +using Samples.Infrastructure.Extensions; +using Samples.Modules.Text.Views; + +namespace Samples.Modules.Text +{ + public class TextModule: ModuleBase + { + public TextModule(IUnityContainer container, IRegionManager regionManager) + : base(container, regionManager) { } + + protected override void InitializeModule() + { + RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView)); + } + + protected override void RegisterViewsAndTypes() + { + Container.RegisterNavigationType(typeof(HomeView)); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml new file mode 100644 index 00000000..0ba2d46f --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml @@ -0,0 +1,11 @@ + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml.cs new file mode 100644 index 00000000..66ff7523 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.Text.Views +{ + /// + /// Interaction logic for HomeView.xaml + /// + public partial class HomeView : UserControl + { + public HomeView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml new file mode 100644 index 00000000..72a69ada --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml @@ -0,0 +1,6 @@ + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml.cs new file mode 100644 index 00000000..d7ff8652 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Samples.Modules.Text.Views +{ + /// + /// Interaction logic for NavigationView.xaml + /// + public partial class NavigationView : TreeViewItem + { + public NavigationView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Extensions/UnityContainerExtensions.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Extensions/UnityContainerExtensions.cs new file mode 100644 index 00000000..89917b56 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Extensions/UnityContainerExtensions.cs @@ -0,0 +1,13 @@ +using System; +using Microsoft.Practices.Unity; + +namespace Samples.Infrastructure.Extensions +{ + public static class UnityContainerExtensions + { + public static void RegisterNavigationType(this IUnityContainer container, Type type) + { + container.RegisterType(typeof(Object), type, type.FullName); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Samples.Infrastructure.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Samples.Infrastructure.csproj index ef0e2949..aaec73af 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Samples.Infrastructure.csproj +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Samples.Infrastructure.csproj @@ -63,6 +63,7 @@ + Code diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config index 5ee48336..2257053b 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config @@ -7,5 +7,13 @@ + + + + + + + + \ No newline at end of file