MediaPortal/Incubator/Login/Language/strings_en.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="Login.Title">User profile</string>
+  <string name="Login.Title.Help">Change user profile</string>
+</resources>

MediaPortal/Incubator/Login/Login.csproj

@@ -63,13 +63,25 @@
       <Name>MediaPortal.UI</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\Source\UI\UiComponents\SkinBase\SkinBase.csproj">
+      <Project>{4EFED5BE-2F6A-4944-BB96-053D5945BA1F}</Project>
+      <Name>SkinBase</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Language\strings_en.xml" />
     <Content Include="plugin.xml" />
+    <Content Include="Skin\default\workflow\login-actions.xml" />
   </ItemGroup>
   <ItemGroup>
     <None Include="build.targets" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="build.targets" />
+  <ItemGroup>
+    <Folder Include="Skin\default\themes\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Skin\default\screens\Login.xaml" />
+  </ItemGroup>
 </Project>

MediaPortal/Incubator/Login/LoginModel.cs

@@ -23,12 +23,14 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 using MediaPortal.Common;
 using MediaPortal.Common.General;
+using MediaPortal.Common.UserProfileDataManagement;
 using MediaPortal.UI.Presentation.DataObjects;
-using MediaPortal.UI.UserManagement;
+using MediaPortal.UiComponents.SkinBase.General;
+using MediaPortal.UI.Services.UserManagement;
 
 namespace MediaPortal.UiComponents.Login
 {
@@ -37,64 +39,88 @@ namespace MediaPortal.UiComponents.Login
   /// </summary>
   public class LoginModel
   {
-    private ItemsList _usersExposed = new ItemsList();
+    private readonly ItemsList _usersExposed = new ItemsList();
     private AbstractProperty _currentUser;
+    const string KEY_PROFILE_ID = "ProfileId";
 
     /// <summary>
     /// constructor
     /// </summary>
     public LoginModel()
     {
-      _currentUser = new WProperty(null);
+      _currentUser = new WProperty(typeof(UserProfile), null);
       LoadUsers();
+      SetCurrentUser();
     }
 
     /// <summary>
     /// will load the users from somewhere
     /// </summary>
     private void LoadUsers()
     {
-      IUserService userService = ServiceRegistration.Get<IUserService>();
-      // add a few dummy users, later this should be more flexible and handled by a login manager / user account control
-      IUser u1 = userService.AddUser(SystemInformation.ComputerName.ToLower());
-      u1.NeedsPassword = true;
-      u1.LastLogin = new DateTime(2007, 10, 25, 12, 20, 30);
-      u1.UserImage = SystemInformation.ComputerName.ToLower() + ".jpg";
-      IUser u2 = userService.AddUser(SystemInformation.UserName.ToLower());
-      u2.NeedsPassword = false;
-      u2.LastLogin = new DateTime(2007, 10, 26, 10, 30, 13);
-      u2.UserImage = SystemInformation.UserName.ToLower() + ".jpg";
+      IUserManagement userManagement = ServiceRegistration.Get<IUserManagement>();
+      if (userManagement.UserProfileDataManagement == null)
+        return;
+
+      UserProfile u1;
+      string profileName = SystemInformation.ComputerName.ToLower();
+      if (!userManagement.UserProfileDataManagement.GetProfileByName(profileName, out u1))
+      {
+        // add a few dummy users, later this should be more flexible and handled by a login manager / user account control
+        Guid userId1 = userManagement.UserProfileDataManagement.CreateProfile(profileName);
+        if (!userManagement.UserProfileDataManagement.GetProfile(userId1, out u1))
+          return;
+      }
+
+      //u1.NeedsPassword = true;
+      //u1.LastLogin = new DateTime(2007, 10, 25, 12, 20, 30);
+      //u1.UserImage = SystemInformation.ComputerName.ToLower() + ".jpg";
+      //IUser u2 = userService.AddUser(SystemInformation.UserName.ToLower());
+      //u2.NeedsPassword = false;
+      //u2.LastLogin = new DateTime(2007, 10, 26, 10, 30, 13);
+      //u2.UserImage = SystemInformation.UserName.ToLower() + ".jpg";
       RefreshUserList();
     }
 
+    private void SetCurrentUser(UserProfile userProfile = null)
+    {
+      IUserManagement userProfileDataManagement = ServiceRegistration.Get<IUserManagement>();
+      if (userProfile == null)
+      {
+        // Init with system default
+        userProfile = userProfileDataManagement.CurrentUser;
+      }
+      else
+      {
+        userProfileDataManagement.CurrentUser = userProfile;
+      }
+      CurrentUser = userProfile;
+    }
+
     /// <summary>
     /// this will turn the _users list into the _usersExposed list
     /// </summary>
     private void RefreshUserList()
     {
-      IList<IUser> users = ServiceRegistration.Get<IUserService>().GetUsers();
       // clear the exposed users list
       Users.Clear();
+
+      IUserManagement userManagement = ServiceRegistration.Get<IUserManagement>();
+      if (userManagement.UserProfileDataManagement == null)
+        return;
       // add users to expose them
-      foreach (IUser user in users)
+      var users = userManagement.UserProfileDataManagement.GetProfiles();
+      foreach (UserProfile user in users.Where(u => u != null))
       {
-        if (user == null)
-        {
-          continue;
-        }
-        ListItem buff = new ListItem();
-        buff.SetLabel("UserName", user.UserName);
-        buff.SetLabel("UserImage", user.UserImage);
-        if (user.NeedsPassword)
-        {
-          buff.SetLabel("NeedsPassword", "true");
-        }
-        else
-        {
-          buff.SetLabel("NeedsPassword", "false");
-        }
-        buff.SetLabel("LastLogin", user.LastLogin.ToString("G"));
-        Users.Add(buff);
+        ListItem item = new ListItem();
+        item.SetLabel(Consts.KEY_NAME, user.Name);
+
+        item.AdditionalProperties[KEY_PROFILE_ID] = user.ProfileId;
+        item.SetLabel("UserName", user.Name);
+        item.SetLabel("HasImage", user.Image != null ? "true" : "false");
+        item.SetLabel("HasPassword", !string.IsNullOrEmpty(user.Password) ? "true" : "false");
+        item.SetLabel("LastLogin", user.LastLogin.HasValue ? user.LastLogin.Value.ToString("G") : "");
+        Users.Add(item);
       }
       // tell the skin that something might have changed
       Users.FireChange();
@@ -106,16 +132,16 @@ private void RefreshUserList()
     /// <param name="item"></param>
     public void SelectUser(ListItem item)
     {
-      IList<IUser> users = ServiceRegistration.Get<IUserService>().GetUsers();
-
-      foreach (IUser user in users)
-      {
-        if (user.UserName == item.Labels["UserName"].Evaluate())
-        {
-          CurrentUser = user;
-          return;
-        }
-      }
+      Guid profileId = (Guid)item.AdditionalProperties[KEY_PROFILE_ID];
+      IUserManagement userManagement = ServiceRegistration.Get<IUserManagement>();
+
+      UserProfile userProfile;
+      if (userManagement.UserProfileDataManagement == null)
+        return;
+      if (!userManagement.UserProfileDataManagement.GetProfile(profileId, out userProfile))
+        return;
+      SetCurrentUser(userProfile);
+      userManagement.UserProfileDataManagement.LoginProfile(profileId);
     }
 
     /// <summary>
@@ -130,9 +156,9 @@ public AbstractProperty CurrentUserProperty
     /// <summary>
     /// exposes the current user to the skin
     /// </summary>
-    public IUser CurrentUser
+    public UserProfile CurrentUser
     {
-      get { return (IUser) _currentUser.GetValue(); }
+      get { return (UserProfile)_currentUser.GetValue(); }
       set { _currentUser.SetValue(value); }
     }
 

MediaPortal/Incubator/Login/Skin/default/screens/Login.xaml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include
+    xmlns="www.team-mediaportal.com/2008/mpf/directx"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Source="screens\master_menu.xaml"
+    >
+  <Include.Resources>
+
+    <!-- Header -->
+    <ResourceWrapper x:Key="Header_Text" Resource="[Login.Title]"/>
+
+    <!-- Login model -->
+    <Model x:Key="Model" Id="82582433-FD64-41bd-9059-7F662DBDA713"/>
+
+    <!-- Contents -->
+    <ControlTemplate x:Key="Contents_Template">
+      <DockPanel DataContext="{Binding Source={StaticResource Model}}">
+        <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+          </Grid.ColumnDefinitions>
+          <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+          </Grid.RowDefinitions>
+          <!-- User profile list -->
+          <ListView Margin="10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+              Style="{ThemeResource MenuListViewStyle}"
+              ItemsSource="{Binding Path=Users}" >
+            <ListView.Resources>
+              <Command x:Key="Menu_Command" Source="{StaticResource Model}" Path="SelectUser"
+                  Parameters="{LateBoundValue BindingValue={Binding}}"/>
+            </ListView.Resources>
+          </ListView>
+
+          <Label Grid.Row="2" HorizontalAlignment="Left" DataContext="{Binding Source={StaticResource Model}, Path=CurrentUser}" Content="{Binding Path=Name}" Color="{ThemeResource TextColor}"/>
+        </Grid>
+      </DockPanel>
+    </ControlTemplate>
+
+  </Include.Resources>
+</Include>

MediaPortal/Incubator/Login/Skin/default/workflow/login-actions.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- News workflow state actions -->
+<Workflow DescriptorVersion="1.0">
+  <MenuActions>
+    <PushNavigationTransition Id="ABEDFC40-7F02-4FBB-AA1E-9F57B131BBB6"
+        Name="Home->Login"
+        DisplayCategory="z-Login"
+        SortOrder="z"
+        SourceStates="7F702D9C-F2DD-42da-9ED8-0BA92F07787F"
+        TargetState="2529B0F0-8415-4A4E-971B-38D6CDD2406A"
+        DisplayTitle="[Login.Title]"
+        HelpText="[Login.Title.Help]"/>
+  </MenuActions>
+</Workflow>

MediaPortal/Incubator/Login/build.targets

@@ -10,8 +10,18 @@
     <PluginFiles Include="$(ProjectDir)plugin.xml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <LanguageFiles Include="$(ProjectDir)Language\*.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <SkinFiles Include="$(ProjectDir)Skin\**\*.*" />
+  </ItemGroup>
+
   <Target Name="AfterBuild">
     <Copy SourceFiles="@(PluginFiles)" DestinationFolder="$(PluginDestination)" />
+    <Copy SourceFiles="@(LanguageFiles)" DestinationFolder="$(PluginDestination)Language\" />
+    <Copy SourceFiles="@(SkinFiles)" DestinationFiles="@(SkinFiles->'$(PluginDestination)Skin\%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 
-</Project>
+</Project>

MediaPortal/Incubator/Login/plugin.xml

@@ -10,7 +10,7 @@
     PluginVersion="1.0"
     ReleaseDate="2013-11-11 01:00:00 GMT+01:00"
     CurrentAPI="1"/>
-  
+
   <DependsOn>
     <CoreDependency Name="MediaPortal.Common" CompatibleAPI="2" />
     <CoreDependency Name="MediaPortal.UI" CompatibleAPI="2" />
@@ -21,6 +21,20 @@
   </Runtime>
 
   <Register Location="/Models">
-    <Model Id="{82582433-FD64-41bd-9059-7F662DBDA713}" Name="LoginModel" ClassName="MediaPortal.UiComponents.Login.LoginModel"/>
+    <Model Id="82582433-FD64-41bd-9059-7F662DBDA713" Name="LoginModel" ClassName="MediaPortal.UiComponents.Login.LoginModel"/>
+  </Register>
+
+  <Register Location="/Workflow/States">
+    <WorkflowState Id="2529B0F0-8415-4A4E-971B-38D6CDD2406A" Name="Login" MainScreen="Login"
+        DisplayLabel="[Login.Title]" />
+  </Register>
+
+  <Register Location="/Resources/Language">
+    <Resource Id="LoginLanguage" Directory="Language" Type="Language"/>
+  </Register>
+
+  <Register Location = "/Resources/Skin">
+    <Resource Id="LoginSkin" Directory="Skin" Type="Skin"/>
   </Register>
-</Plugin>
+
+</Plugin>