From b4ad07b61df42e6108f21c25d9d4d76fcf911a7b Mon Sep 17 00:00:00 2001 From: brianlagunas_cp Date: Fri, 5 Aug 2011 04:47:41 +0000 Subject: [PATCH] added WatermakrTextBox samples to Sample application. --- .../Images/PencilTool16.png | Bin 0 -> 348 bytes .../Samples.Modules.Text.csproj | 11 +++++ .../Samples.Modules.Text/TextModule.cs | 1 + .../Views/NavigationView.xaml | 1 + .../Views/WatermarkTextBoxView.xaml | 41 ++++++++++++++++++ .../Views/WatermarkTextBoxView.xaml.cs | 18 ++++++++ .../Src/Samples/Samples/App.xaml | 1 + .../Samples/Resources/TextBlockStyles.xaml | 11 +++++ .../Samples/Resources/TreeViewStyles.xaml | 2 +- .../Src/Samples/Samples/Samples.csproj | 4 ++ 10 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Images/PencilTool16.png create mode 100644 ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml create mode 100644 ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs create mode 100644 ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Images/PencilTool16.png b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Images/PencilTool16.png new file mode 100644 index 0000000000000000000000000000000000000000..df0970c4085fd0014dc6d5e7b81d3b02d8b25482 GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!H=FUjv*HQdnYX{I&8qx_F1E`xv@1(dUayt z8Mf?go7nn}ZdlWlEUa@z`Gp`4H|yztnmf5ABHz5tQ!~5p-CMohH@NcHK5;I&IYL?& zm;JQ)rZb(z(se?4LbZ5%jC*rFOQpPmp+c$bq2OpSgTt$Yi_`>+e>|ApaPZw(PO%^7 z0#s8v6O3*w>)6fr_w~-dh6fU&63+@2ZGIXn^T+!)cf~Jvi(2X3n?BEf;Q0RXrnjky zrgQuApDRAk*&va#?COEf_Ck^2p$`^{8O(gX@6GBkPA3D?^y97v NavigationView.xaml + + WatermarkTextBoxView.xaml + ResXFileCodeGenerator Resources.Designer.cs @@ -110,6 +113,14 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs index 23fb8bac..3cac99eb 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs @@ -20,6 +20,7 @@ namespace Samples.Modules.Text protected override void RegisterViewsAndTypes() { Container.RegisterNavigationType(typeof(HomeView)); + Container.RegisterNavigationType(typeof(WatermarkTextBoxView)); } } } diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml index e681092c..87929223 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml @@ -11,5 +11,6 @@ + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml new file mode 100644 index 00000000..33a04260 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs new file mode 100644 index 00000000..899e78b5 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs @@ -0,0 +1,18 @@ +using System; +using Samples.Infrastructure.Controls; +using Microsoft.Practices.Prism.Regions; + +namespace Samples.Modules.Text.Views +{ + /// + /// Interaction logic for WatermarkTextBoxView.xaml + /// + [RegionMemberLifetime(KeepAlive=false)] + public partial class WatermarkTextBoxView : DemoView + { + public WatermarkTextBoxView() + { + InitializeComponent(); + } + } +} diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml index 9d675434..99b2dad0 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml @@ -5,6 +5,7 @@ + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml new file mode 100644 index 00000000..b5b8bd85 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml index fad1f6eb..40015624 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml @@ -1,6 +1,6 @@  - + diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj index 3943e042..7f7b711a 100644 --- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj +++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj @@ -115,6 +115,10 @@ + + Designer + MSBuild:Compile + Designer MSBuild:Compile