diff --git a/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln b/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln index c062fd05..475e236b 100644 --- a/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln +++ b/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln @@ -3,20 +3,37 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFToolkit.Extended", "Src\WPFToolkit.Extended\WPFToolkit.Extended.csproj", "{72E591D6-8F83-4D8C-8F67-9C325E623234}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFToolkit.Extended.Samples", "Src\WPFToolkit.Extended.Samples\WPFToolkit.Extended.Samples.csproj", "{47B3F3DF-FAB7-4D0A-9267-109D30BF387F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{01F2E61E-7F20-4F2E-8A3C-6604B18415B9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples", "Src\Samples\Samples\Samples.csproj", "{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{F927B3FE-820C-4EE1-921F-D10D3AE287AE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.BusyIndicator", "Src\Samples\Modules\Samples.Modules.BusyIndicator\Samples.Modules.BusyIndicator.csproj", "{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Infrastructure", "Src\Samples\Samples.Infrastructure\Samples.Infrastructure.csproj", "{A4A049A4-665A-4651-9046-7D06E9D0CCDC}" EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 3 + SccNumberOfProjects = 5 SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} SccTeamFoundationServer = https://tfs.codeplex.com/tfs/tfs02 SccLocalPath0 = . SccProjectUniqueName1 = Src\\WPFToolkit.Extended\\WPFToolkit.Extended.csproj SccProjectName1 = Src/WPFToolkit.Extended SccLocalPath1 = Src\\WPFToolkit.Extended - SccProjectUniqueName2 = Src\\WPFToolkit.Extended.Samples\\WPFToolkit.Extended.Samples.csproj - SccProjectName2 = Src/WPFToolkit.Extended.Samples - SccLocalPath2 = Src\\WPFToolkit.Extended.Samples + SccProjectUniqueName2 = Src\\Samples\\Samples\\Samples.csproj + SccProjectTopLevelParentUniqueName2 = ExtendedWPFToolkit.sln + SccProjectName2 = Src/Samples/Samples + SccLocalPath2 = Src\\Samples\\Samples + SccProjectUniqueName3 = Src\\Samples\\Modules\\Samples.Modules.BusyIndicator\\Samples.Modules.BusyIndicator.csproj + SccProjectTopLevelParentUniqueName3 = ExtendedWPFToolkit.sln + SccProjectName3 = Src/Samples/Modules/Samples.Modules.BusyIndicator + SccLocalPath3 = Src\\Samples\\Modules\\Samples.Modules.BusyIndicator + SccProjectUniqueName4 = Src\\Samples\\Samples.Infrastructure\\Samples.Infrastructure.csproj + SccProjectTopLevelParentUniqueName4 = ExtendedWPFToolkit.sln + SccProjectName4 = Src/Samples/Samples.Infrastructure + SccLocalPath4 = Src\\Samples\\Samples.Infrastructure EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,18 +54,44 @@ Global {72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Mixed Platforms.Build.0 = Release|Any CPU {72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|x86.ActiveCfg = Release|Any CPU - {47B3F3DF-FAB7-4D0A-9267-109D30BF387F}.Debug|Any CPU.ActiveCfg = Debug|x86 - {47B3F3DF-FAB7-4D0A-9267-109D30BF387F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {47B3F3DF-FAB7-4D0A-9267-109D30BF387F}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {47B3F3DF-FAB7-4D0A-9267-109D30BF387F}.Debug|x86.ActiveCfg = Debug|x86 - {47B3F3DF-FAB7-4D0A-9267-109D30BF387F}.Debug|x86.Build.0 = Debug|x86 - {47B3F3DF-FAB7-4D0A-9267-109D30BF387F}.Release|Any CPU.ActiveCfg = Release|x86 - {47B3F3DF-FAB7-4D0A-9267-109D30BF387F}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {47B3F3DF-FAB7-4D0A-9267-109D30BF387F}.Release|Mixed Platforms.Build.0 = Release|x86 - {47B3F3DF-FAB7-4D0A-9267-109D30BF387F}.Release|x86.ActiveCfg = Release|x86 - {47B3F3DF-FAB7-4D0A-9267-109D30BF387F}.Release|x86.Build.0 = Release|x86 + {6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Debug|Any CPU.ActiveCfg = Debug|x86 + {6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Debug|x86.ActiveCfg = Debug|x86 + {6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Debug|x86.Build.0 = Debug|x86 + {6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Release|Any CPU.ActiveCfg = Release|x86 + {6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Release|Mixed Platforms.Build.0 = Release|x86 + {6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Release|x86.ActiveCfg = Release|x86 + {6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Release|x86.Build.0 = Release|x86 + {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Debug|x86.ActiveCfg = Debug|Any CPU + {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Release|Any CPU.Build.0 = Release|Any CPU + {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Release|x86.ActiveCfg = Release|Any CPU + {A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Debug|x86.ActiveCfg = Debug|Any CPU + {A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Release|Any CPU.Build.0 = Release|Any CPU + {A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99} = {01F2E61E-7F20-4F2E-8A3C-6604B18415B9} + {F927B3FE-820C-4EE1-921F-D10D3AE287AE} = {01F2E61E-7F20-4F2E-8A3C-6604B18415B9} + {A4A049A4-665A-4651-9046-7D06E9D0CCDC} = {01F2E61E-7F20-4F2E-8A3C-6604B18415B9} + {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE} + EndGlobalSection EndGlobal diff --git a/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.UnityExtensions.dll b/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.UnityExtensions.dll new file mode 100644 index 00000000..99c42d6b Binary files /dev/null and b/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.UnityExtensions.dll differ diff --git a/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.dll b/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.dll new file mode 100644 index 00000000..383c1f46 Binary files /dev/null and b/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.dll differ diff --git a/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Unity.dll b/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Unity.dll new file mode 100644 index 00000000..84f1870d Binary files /dev/null and b/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Unity.dll differ diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs new file mode 100644 index 00000000..95fdf14e --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs @@ -0,0 +1,20 @@ +using System; +using Samples.Infrastructure; +using Microsoft.Practices.Unity; +using Microsoft.Practices.Prism.Regions; + +namespace Samples.Modules.BusyIndicator +{ + public class BusyIndicatorModule : ModuleBase + { + protected BusyIndicatorModule(IUnityContainer container, IRegionManager regionManager) + : base(container, regionManager) + { + } + + protected override void RegisterViewsAndTypes() + { + + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..ca0c8bbf --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Samples.Modules.BusyIndicator")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("Samples.Modules.BusyIndicator")] +[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// 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)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/Resources.Designer.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/Resources.Designer.cs new file mode 100644 index 00000000..60f1e1db --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.235 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Samples.Modules.BusyIndicator.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [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 { + + 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() { + } + + /// + /// 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 (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Samples.Modules.BusyIndicator.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 { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/Properties/Resources.resx b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/Resources.resx similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/Properties/Resources.resx rename to ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/Resources.resx diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/Properties/Settings.Designer.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/Settings.Designer.cs similarity index 78% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/Properties/Settings.Designer.cs rename to ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/Settings.Designer.cs index a353c3db..0253ff22 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/Properties/Settings.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.1 +// Runtime Version:4.0.30319.235 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace WPFToolkit.Extended.Samples.Properties -{ - - +namespace Samples.Modules.BusyIndicator.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/WPFToolkit.Extended.Design/Properties/Settings.settings b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/Settings.settings similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/Properties/Settings.settings rename to ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/Settings.settings diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Samples.Modules.BusyIndicator.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Samples.Modules.BusyIndicator.csproj new file mode 100644 index 00000000..cc65cec7 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Samples.Modules.BusyIndicator.csproj @@ -0,0 +1,99 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6} + library + Properties + Samples.Modules.BusyIndicator + Samples.Modules.BusyIndicator + v4.0 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + SAK + SAK + SAK + SAK + Client + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll + + + False + ..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll + + + + + + + + + + + + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + {A4A049A4-665A-4651-9046-7D06E9D0CCDC} + Samples.Infrastructure + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/WPFToolkit.Extended.Design.csproj.vspscc b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Samples.Modules.BusyIndicator.csproj.vspscc similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/WPFToolkit.Extended.Design.csproj.vspscc rename to ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Samples.Modules.BusyIndicator.csproj.vspscc diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ModuleBase.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ModuleBase.cs new file mode 100644 index 00000000..435f55e1 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ModuleBase.cs @@ -0,0 +1,26 @@ +using System; +using Microsoft.Practices.Prism.Modularity; +using Microsoft.Practices.Unity; +using Microsoft.Practices.Prism.Regions; + +namespace Samples.Infrastructure +{ + public abstract class ModuleBase : IModule + { + protected IRegionManager RegionManager { get; private set; } + protected IUnityContainer Container { get; private set; } + + protected ModuleBase(IUnityContainer container, IRegionManager regionManager) + { + Container = container; + RegionManager = regionManager; + } + + public void Initialize() + { + RegisterViewsAndTypes(); + } + + protected abstract void RegisterViewsAndTypes(); + } +} diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/AssemblyInfo.cs similarity index 88% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/Properties/AssemblyInfo.cs rename to ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/AssemblyInfo.cs index 35e4c7aa..81334bfe 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/Properties/AssemblyInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/AssemblyInfo.cs @@ -7,12 +7,12 @@ using System.Windows; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("WPFToolkit.Extended.Samples")] +[assembly: AssemblyTitle("Samples.Infrastructure")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("WPFToolkit.Extended.Samples")] -[assembly: AssemblyCopyright("Copyright © 2010")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("Samples.Infrastructure")] +[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/Properties/Resources.Designer.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/Resources.Designer.cs similarity index 90% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/Properties/Resources.Designer.cs rename to ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/Resources.Designer.cs index 7ef72466..000b63d2 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/Properties/Resources.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/Resources.Designer.cs @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.1 +// Runtime Version:4.0.30319.235 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace WPFToolkit.Extended.Design.Properties +namespace Samples.Infrastructure.Properties { @@ -44,7 +44,7 @@ namespace WPFToolkit.Extended.Design.Properties { if ((resourceMan == null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WPFToolkit.Extended.Design.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Samples.Infrastructure.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/Properties/Resources.resx b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/Resources.resx similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/Properties/Resources.resx rename to ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/Resources.resx diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/Properties/Settings.Designer.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/Settings.Designer.cs similarity index 89% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/Properties/Settings.Designer.cs rename to ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/Settings.Designer.cs index 72d80d66..b6b97418 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/Properties/Settings.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/Settings.Designer.cs @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.1 +// Runtime Version:4.0.30319.235 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace WPFToolkit.Extended.Design.Properties +namespace Samples.Infrastructure.Properties { diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/Properties/Settings.settings b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/Settings.settings similarity index 100% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/Properties/Settings.settings rename to ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/Settings.settings diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/WPFToolkit.Extended.Design.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Samples.Infrastructure.csproj similarity index 75% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/WPFToolkit.Extended.Design.csproj rename to ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Samples.Infrastructure.csproj index fd0fa3fa..398ef30f 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Design/WPFToolkit.Extended.Design.csproj +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Samples.Infrastructure.csproj @@ -5,11 +5,11 @@ AnyCPU 8.0.30703 2.0 - {FA6645C6-7CA5-427C-91F2-916D9FECD76C} + {A4A049A4-665A-4651-9046-7D06E9D0CCDC} library Properties - WPFToolkit.Extended.Design - WPFToolkit.Extended.Design + Samples.Infrastructure + Samples.Infrastructure v4.0 Client 512 @@ -24,7 +24,7 @@ true full false - ..\WPFToolkit.Extended\bin\Debug\ + bin\Debug\ DEBUG;TRACE prompt 4 @@ -32,14 +32,20 @@ pdbonly true - ..\WPFToolkit.Extended\bin\Release\ + bin\Release\ TRACE prompt 4 - - + + False + ..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll + + + False + ..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll + @@ -55,7 +61,7 @@ - + Code @@ -79,15 +85,6 @@ - - - {72E591D6-8F83-4D8C-8F67-9C325E623234} - WPFToolkit.Extended - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/Settings.Designer.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/Settings.Designer.cs new file mode 100644 index 00000000..2afd4b0b --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/Settings.Designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.235 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Samples.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 { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/Settings.settings b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/Settings.settings new file mode 100644 index 00000000..8f2fd95d --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/WPFToolkit.Extended.Samples.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj similarity index 70% rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/WPFToolkit.Extended.Samples.csproj rename to ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj index e49eab24..e5efe58a 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/WPFToolkit.Extended.Samples.csproj +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj @@ -5,13 +5,12 @@ x86 8.0.30703 2.0 - {47B3F3DF-FAB7-4D0A-9267-109D30BF387F} + {6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99} WinExe Properties - WPFToolkit.Extended.Samples - WPFToolkit.Extended.Samples + Samples + Samples v4.0 - Client 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -19,6 +18,7 @@ SAK SAK SAK + Client x86 @@ -40,16 +40,25 @@ 4 + + False + ..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll + + + False + ..\..\..\Libs\Prism\Microsoft.Practices.Prism.UnityExtensions.dll + + + False + ..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll + + - - - 4.0 - @@ -59,17 +68,13 @@ MSBuild:Compile Designer - - MSBuild:Compile - Designer - App.xaml Code - - MainWindow.xaml - Code + + + Shell.xaml @@ -97,10 +102,20 @@ - + {72E591D6-8F83-4D8C-8F67-9C325E623234} WPFToolkit.Extended + + {A4A049A4-665A-4651-9046-7D06E9D0CCDC} + Samples.Infrastructure + + + + + Designer + MSBuild:Compile + - - - - - - - - - - - - - - - - - - - - - diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/MainWindow.xaml.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/MainWindow.xaml.cs deleted file mode 100644 index 688a567d..00000000 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended.Samples/MainWindow.xaml.cs +++ /dev/null @@ -1,128 +0,0 @@ -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; -using System.ComponentModel; -using System.Collections.ObjectModel; -using Microsoft.Windows.Controls; -using System.Text.RegularExpressions; -using System.Diagnostics; - -namespace WPFToolkit.Extended.Samples -{ - /// - /// Interaction logic for MainWindow.xaml - /// - public partial class MainWindow : Window - { - public MainWindow() - { - InitializeComponent(); - DataContext = new Data(); - Loaded += new RoutedEventHandler(MainWindow_Loaded); - } - - void MainWindow_Loaded(object sender, RoutedEventArgs e) - { - - } - - private void Calculator_ValueChanged(object sender, RoutedPropertyChangedEventArgs e) - { - Debug.WriteLine(e.NewValue.HasValue ? e.NewValue.Value.ToString() : "NULL"); - } - - private void ColorCanvas_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs e) - { - Debug.WriteLine(e.NewValue); - } - } - - public class Data : System.ComponentModel.INotifyPropertyChanged - { - - protected string _Text = "C2"; - public string Text - { - get { return _Text; } - set - { - _Text = value; - NotifyPropertyChanged("Text"); - } - } - - private int? _integer = 5; - public int? Integer - { - get { return _integer; } - set - { - _integer = value; - NotifyPropertyChanged("Integer"); - } - } - - private double? _double = 5; - public double? Double - { - get { return _double; } - set - { - _double = value; - NotifyPropertyChanged("Double"); - } - } - - private decimal? _decimal = 5; - public decimal? Decimal - { - get { return _decimal; } - set - { - _decimal = value; - NotifyPropertyChanged("Decimal"); - } - } - - - private DateTime? _dueDate; - public DateTime? DueDate - { - get { return _dueDate; } - set - { - _dueDate = value; - NotifyPropertyChanged("DueDate"); - } - } - - - - public Data() - { - //Text = "testm"; - } - - #region PropertyChanged - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - private void NotifyPropertyChanged(string info) - { - if (PropertyChanged != null) - { - PropertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(info)); - } - } - #endregion - } -}