Merge lp:~mandel/ubuntuone-windows-installer/improve_sso_ui into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Improves the login view used in the Ubuntu SSO to match better the one present in linux.

[John Lenton (chipaca)]

review: Approve

[Rick McBride (rmcbride)]

review: Approve

=== modified file 'src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj'
--- src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj	2010-10-05 11:24:46 +0000
+++ src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj	2010-10-05 11:24:47 +0000
@@ -72,11 +72,23 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="Resources\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="WatermarkAdorner.cs" />
+    <Compile Include="WatermarkService.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

=== modified file 'src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml'
--- src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml	2010-10-05 11:24:46 +0000
+++ src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml	2010-10-05 11:24:47 +0000
@@ -1,8 +1,10 @@
 <Window x:Class="Canonical.Ubuntu.SSO.Views.LoginDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Title="Login" Height="300" Width="300">
-    <Grid>
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+    xmlns:controls="clr-namespace:Canonical.Ubuntu.SSO.Views" 
+    xmlns:resx="clr-namespace:Canonical.Ubuntu.SSO.Views.Resources"
+    Title="Login" Height="350" Width="550">
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="28" />
@@ -12,35 +14,48 @@
                 <RowDefinition Height="*" />
                 <RowDefinition Height="34" />
                 <RowDefinition Height="34" />
+                <RowDefinition Height="34" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <Grid Grid.Row="0">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="32" />
+                    <RowDefinition Height="*" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <Label Name="InfoLabel" Grid.Row="0" Margin="3" >Please provide the email you used register in</Label>
-                <Label Grid.Row="1">Ubuntu One and you password.</Label>
+                <TextBlock Name="TitleLabel" Grid.Row="0" Margin="3" FontSize="20" FontFamily="Calibry" Text="{x:Static resx:Resources.LoginViewTitle}"></TextBlock>
+                <TextBlock Name="InfoText" Grid.Row="1" Margin="3" FontFamily="Calibry" Text="{x:Static resx:Resources.LoginViewInfo}"></TextBlock>
             </Grid>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="120"/>
-                    <ColumnDefinition Width="120"/>
+                    <ColumnDefinition Width="240"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <Label Name="MessageLabel" Grid.Column="1" Margin="3">Email</Label>
-                <TextBox Name="EmailTextBox" Grid.Column="2" Margin="3"></TextBox>
+                <TextBox Name="EmailTextBox" Grid.Column="1" Margin="3">
+                    <controls:WatermarkService.Watermark>
+                        <TextBlock Text="{x:Static resx:Resources.LoginEmailAddressWatermark}"></TextBlock>
+                    </controls:WatermarkService.Watermark>
+                </TextBox>
             </Grid>
             <Grid Grid.Row="2">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="120"/>
-                    <ColumnDefinition Width="120"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-                <Label Name="PasswordLabel" Grid.Column="1" Margin="3">Password</Label>
-                <PasswordBox  Name="PasswordTextBox" Grid.Column="2" Margin="3" PasswordChar="*"></PasswordBox >
+                    <ColumnDefinition Width="240"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <PasswordBox  Name="PasswordTextBox" Grid.Column="1" Margin="3" PasswordChar="*">
+                    <controls:WatermarkService.Watermark>
+                        <TextBlock Text="{x:Static resx:Resources.LoginPasswordWatermark}"></TextBlock>
+                    </controls:WatermarkService.Watermark>
+                </PasswordBox >
+            </Grid>
+            <Grid Grid.Row="3">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="240"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock Name="ForgottenLink" Grid.Column="1" Margin="3" TextAlignment="Center"><Hyperlink >I've forgotten my password.</Hyperlink></TextBlock>
             </Grid>
         </Grid>
         <Grid Grid.Row="1">
@@ -49,7 +64,7 @@
                 <ColumnDefinition Width="85"/>
                 <ColumnDefinition Width="85"/>
             </Grid.ColumnDefinitions>
-            <Button Name="LoginButton" Grid.Column="1" Margin="3" Click="LoginButton_Click">Login</Button>
+            <Button Name="LoginButton" Grid.Column="1" Margin="3" Click="LoginButton_Click">Connect</Button>
             <Button Name="CancelButton" Grid.Column="2" Margin="3" Click="CancelButton_Click">Cancel</Button>
         </Grid>
     </Grid>

=== added directory 'src/Canonical.Ubuntu.SSO.Views/Resources'
=== added file 'src/Canonical.Ubuntu.SSO.Views/Resources/Resources.Designer.cs'
--- src/Canonical.Ubuntu.SSO.Views/Resources/Resources.Designer.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.Ubuntu.SSO.Views/Resources/Resources.Designer.cs	2010-10-05 11:24:47 +0000
@@ -0,0 +1,108 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4952
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Canonical.Ubuntu.SSO.Views.Resources {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // 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", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public 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() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Canonical.Ubuntu.SSO.Views.Resources.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Email address.
+        /// </summary>
+        public static string LoginEmailAddressWatermark {
+            get {
+                return ResourceManager.GetString("LoginEmailAddressWatermark", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to I&apos;ve forgotten my password..
+        /// </summary>
+        public static string LoginForgottenLink {
+            get {
+                return ResourceManager.GetString("LoginForgottenLink", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Password.
+        /// </summary>
+        public static string LoginPasswordWatermark {
+            get {
+                return ResourceManager.GetString("LoginPasswordWatermark", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to To connect this computer to Ubuntu One enter your details below..
+        /// </summary>
+        public static string LoginViewInfo {
+            get {
+                return ResourceManager.GetString("LoginViewInfo", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connect to Ubuntu One.
+        /// </summary>
+        public static string LoginViewTitle {
+            get {
+                return ResourceManager.GetString("LoginViewTitle", resourceCulture);
+            }
+        }
+    }
+}

=== added file 'src/Canonical.Ubuntu.SSO.Views/Resources/Resources.resx'
--- src/Canonical.Ubuntu.SSO.Views/Resources/Resources.resx	1970-01-01 00:00:00 +0000
+++ src/Canonical.Ubuntu.SSO.Views/Resources/Resources.resx	2010-10-05 11:24:47 +0000
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="LoginEmailAddressWatermark" xml:space="preserve">
+    <value>Email address</value>
+  </data>
+  <data name="LoginForgottenLink" xml:space="preserve">
+    <value>I've forgotten my password.</value>
+  </data>
+  <data name="LoginPasswordWatermark" xml:space="preserve">
+    <value>Password</value>
+  </data>
+  <data name="LoginViewInfo" xml:space="preserve">
+    <value>To connect this computer to Ubuntu One enter your details below.</value>
+  </data>
+  <data name="LoginViewTitle" xml:space="preserve">
+    <value>Connect to Ubuntu One</value>
+  </data>
+</root>
\ No newline at end of file

=== added file 'src/Canonical.Ubuntu.SSO.Views/WatermarkAdorner.cs'
--- src/Canonical.Ubuntu.SSO.Views/WatermarkAdorner.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.Ubuntu.SSO.Views/WatermarkAdorner.cs	2010-10-05 11:24:47 +0000
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Media;
+
+namespace Canonical.Ubuntu.SSO.Views
+{
+    /// <summary>
+    /// Adorner for the watermark
+    /// </summary>
+    internal class WatermarkAdorner : Adorner
+    {
+        #region Private Fields
+
+        /// <summary>
+        /// <see cref="ContentPresenter"/> that holds the watermark
+        /// </summary>
+        private readonly ContentPresenter _contentPresenter;
+
+        #endregion
+
+        #region Constructor
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WatermarkAdorner"/> class
+        /// </summary>
+        /// <param name="adornedElement"><see cref="UIElement"/> to be adorned</param>
+        /// <param name="watermark">The watermark</param>
+        public WatermarkAdorner(UIElement adornedElement, object watermark) :
+            base(adornedElement)
+        {
+            IsHitTestVisible = false;
+
+            _contentPresenter = new ContentPresenter
+            {
+                Content = watermark,
+                Opacity = 0.5,
+                Margin =
+                new Thickness(Control.Margin.Left + Control.Padding.Left,
+                    Control.Margin.Top + Control.Padding.Top, 0, 0)
+            };
+
+            if (Control is ItemsControl && !(Control is ComboBox))
+            {
+                _contentPresenter.VerticalAlignment = VerticalAlignment.Center;
+                _contentPresenter.HorizontalAlignment = HorizontalAlignment.Center;
+            }
+
+            // Hide the control adorner when the adorned element is hidden
+            var binding = new Binding("IsVisible")
+            {
+                Source = adornedElement,
+                Converter = new BooleanToVisibilityConverter()
+            };
+            SetBinding(VisibilityProperty, binding);
+        }
+
+        #endregion
+
+        #region Protected Properties
+
+        /// <summary>
+        /// Gets the number of children for the <see cref="ContainerVisual"/>.
+        /// </summary>
+        protected override int VisualChildrenCount
+        {
+            get { return 1; }
+        }
+
+        #endregion
+
+        #region Private Properties
+
+        /// <summary>
+        /// Gets the control that is being adorned
+        /// </summary>
+        private Control Control
+        {
+            get { return (Control)AdornedElement; }
+        }
+
+        #endregion
+
+        #region Protected Overrides
+
+        /// <summary>
+        /// Returns a specified child <see cref="Visual"/> for the parent <see cref="ContainerVisual"/>.
+        /// </summary>
+        /// <param name="index">A 32-bit signed integer that represents the index value of the child <see cref="Visual"/>. The value of index must be between 0 and <see cref="VisualChildrenCount"/> - 1.</param>
+        /// <returns>The child <see cref="Visual"/>.</returns>
+        protected override Visual GetVisualChild(int index)
+        {
+            return _contentPresenter;
+        }
+
+        /// <summary>
+        /// Implements any custom measuring behavior for the adorner.
+        /// </summary>
+        /// <param name="constraint">A size to constrain the adorner to.</param>
+        /// <returns>A <see cref="Size"/> object representing the amount of layout space needed by the adorner.</returns>
+        protected override Size MeasureOverride(Size constraint)
+        {
+            // Here's the secret to getting the adorner to cover the whole control
+            _contentPresenter.Measure(Control.RenderSize);
+            return Control.RenderSize;
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, positions child elements and determines a size for a <see cref="FrameworkElement"/> derived class. 
+        /// </summary>
+        /// <param name="finalSize">The final area within the parent that this element should use to arrange itself and its children.</param>
+        /// <returns>The actual size used.</returns>
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            _contentPresenter.Arrange(new Rect(finalSize));
+            return finalSize;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

=== added file 'src/Canonical.Ubuntu.SSO.Views/WatermarkService.cs'
--- src/Canonical.Ubuntu.SSO.Views/WatermarkService.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.Ubuntu.SSO.Views/WatermarkService.cs	2010-10-05 11:24:47 +0000
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Documents;
+
+namespace Canonical.Ubuntu.SSO.Views
+{
+    /// <summary>
+    /// Class that provides the Watermark attached property
+    /// </summary>
+    public static class WatermarkService
+    {
+        /// <summary>
+        /// Watermark Attached Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty WatermarkProperty = DependencyProperty.RegisterAttached(
+            "Watermark",
+            typeof(object),
+            typeof(WatermarkService),
+            new FrameworkPropertyMetadata(null, new PropertyChangedCallback(OnWatermarkChanged)));
+
+        #region Private Fields
+
+        /// <summary>
+        /// Dictionary of ItemsControls
+        /// </summary>
+        private static readonly Dictionary<object, ItemsControl> _itemsControls = new Dictionary<object, ItemsControl>();
+
+        #endregion
+
+        /// <summary>
+        /// Gets the Watermark property.  This dependency property indicates the watermark for the control.
+        /// </summary>
+        /// <param name="d"><see cref="DependencyObject"/> to get the property from</param>
+        /// <returns>The value of the Watermark property</returns>
+        public static object GetWatermark(DependencyObject d)
+        {
+            return d.GetValue(WatermarkProperty);
+        }
+
+        /// <summary>
+        /// Sets the Watermark property.  This dependency property indicates the watermark for the control.
+        /// </summary>
+        /// <param name="d"><see cref="DependencyObject"/> to set the property on</param>
+        /// <param name="value">value of the property</param>
+        public static void SetWatermark(DependencyObject d, object value)
+        {
+            d.SetValue(WatermarkProperty, value);
+        }
+
+        /// <summary>
+        /// Handles changes to the Watermark property.
+        /// </summary>
+        /// <param name="d"><see cref="DependencyObject"/> that fired the event</param>
+        /// <param name="e">A <see cref="DependencyPropertyChangedEventArgs"/> that contains the event data.</param>
+        private static void OnWatermarkChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var control = (Control)d;
+            control.Loaded += ControlLoaded;
+
+            if (d is ComboBox || d is TextBox || d is PasswordBox)
+            {
+                control.GotKeyboardFocus += ControlGotKeyboardFocus;
+                control.LostKeyboardFocus += ControlLoaded;
+            }
+
+            if (d is ItemsControl && !(d is ComboBox))
+            {
+                var i = (ItemsControl)d;
+
+                // for Items property  
+                i.ItemContainerGenerator.ItemsChanged += ItemsChanged;
+                _itemsControls.Add(i.ItemContainerGenerator, i);
+
+                // for ItemsSource property  
+                DependencyPropertyDescriptor prop = DependencyPropertyDescriptor.FromProperty(ItemsControl.ItemsSourceProperty, i.GetType());
+                prop.AddValueChanged(i, ItemsSourceChanged);
+            }
+        }
+
+        #region Event Handlers
+
+        /// <summary>
+        /// Handle the GotFocus event on the control
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">A <see cref="RoutedEventArgs"/> that contains the event data.</param>
+        private static void ControlGotKeyboardFocus(object sender, RoutedEventArgs e)
+        {
+            var c = (Control)sender;
+            if (ShouldShowWatermark(c))
+            {
+                RemoveWatermark(c);
+            }
+        }
+
+        /// <summary>
+        /// Handle the Loaded and LostFocus event on the control
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">A <see cref="RoutedEventArgs"/> that contains the event data.</param>
+        private static void ControlLoaded(object sender, RoutedEventArgs e)
+        {
+            var control = (Control)sender;
+            if (ShouldShowWatermark(control))
+            {
+                ShowWatermark(control);
+            }
+        }
+
+        /// <summary>
+        /// Event handler for the items source changed event
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">A <see cref="EventArgs"/> that contains the event data.</param>
+        private static void ItemsSourceChanged(object sender, EventArgs e)
+        {
+            var c = (ItemsControl)sender;
+            if (c.ItemsSource != null)
+            {
+                if (ShouldShowWatermark(c))
+                {
+                    ShowWatermark(c);
+                }
+                else
+                {
+                    RemoveWatermark(c);
+                }
+            }
+            else
+            {
+                ShowWatermark(c);
+            }
+        }
+
+        /// <summary>
+        /// Event handler for the items changed event
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">A <see cref="ItemsChangedEventArgs"/> that contains the event data.</param>
+        private static void ItemsChanged(object sender, ItemsChangedEventArgs e)
+        {
+            ItemsControl control;
+            if (_itemsControls.TryGetValue(sender, out control))
+            {
+                if (ShouldShowWatermark(control))
+                {
+                    ShowWatermark(control);
+                }
+                else
+                {
+                    RemoveWatermark(control);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Helper Methods
+
+        /// <summary>
+        /// Remove the watermark from the specified element
+        /// </summary>
+        /// <param name="control">Element to remove the watermark from</param>
+        private static void RemoveWatermark(UIElement control)
+        {
+            AdornerLayer layer = AdornerLayer.GetAdornerLayer(control);
+
+            // layer could be null if control is no longer in the visual tree
+            if (layer != null)
+            {
+                Adorner[] adorners = layer.GetAdorners(control);
+                if (adorners == null)
+                {
+                    return;
+                }
+
+                foreach (Adorner adorner in adorners)
+                {
+                    if (adorner is WatermarkAdorner)
+                    {
+                        adorner.Visibility = Visibility.Hidden;
+                        layer.Remove(adorner);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Show the watermark on the specified control
+        /// </summary>
+        /// <param name="control">Control to show the watermark on</param>
+        private static void ShowWatermark(Control control)
+        {
+            AdornerLayer layer = AdornerLayer.GetAdornerLayer(control);
+
+            // layer could be null if control is no longer in the visual tree
+            if (layer != null)
+            {
+                layer.Add(new WatermarkAdorner(control, GetWatermark(control)));
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether or not the watermark should be shown on the specified control
+        /// </summary>
+        /// <param name="c"><see cref="Control"/> to test</param>
+        /// <returns>true if the watermark should be shown; false otherwise</returns>
+        private static bool ShouldShowWatermark(Control c)
+        {
+            if (c is ComboBox)
+            {
+                return (c as ComboBox).Text == string.Empty;
+            }
+            if (c is TextBoxBase)
+            {
+                return (c as TextBox).Text == string.Empty;
+            }
+            if(c is PasswordBox)
+            {
+                return (c as PasswordBox).Password == string.Empty;
+            }
+            if (c is ItemsControl)
+            {
+                return (c as ItemsControl).Items.Count == 0;
+            }
+            return false;
+        }
+
+        #endregion
+    }
+}