Monotone-Parent: 56e8fb42c60b615f9c931f4b5e80a51560db4269

Monotone-Revision: d25dc292baa2e15a7f6d397c032c8cb30ccdafb2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-06T17:13:15
Monotone-Branch: ca.inverse.sogo

UI/PreferencesUI/English.lproj/Localizable.strings

@@ -82,6 +82,9 @@
 "messageforward_inline" = "Inline";
 "messageforward_attached" = "As Attachment";
 
+"Default identity:" = "Default identity:";
+"Manage identities..." = "Manage identities...";
+
 /* password */
 "New password:" = "New password:";
 "Confirmation:" = "Confirmation:";

UI/PreferencesUI/French.lproj/Localizable.strings

@@ -79,6 +79,9 @@
 "messageforward_inline" = "intégrés";
 "messageforward_attached" = "en pièces jointes";
 
+"Default identity:" = "Identité par défaut :";
+"Manage identities..." = "Gérer les identitiés...";
+
 /* password */
 "New password:" = "Nouveau mot de passe :";
 "Confirmation:" = "Confirmation :";

UI/PreferencesUI/GNUmakefile

@@ -11,6 +11,7 @@ PreferencesUI_LANGUAGES = English French German
 PreferencesUI_OBJC_FILES =		\
 	PreferencesUIProduct.m		\
 	\
+	UIxIdentities.m			\
 	UIxJSONPreferences.m		\
 	UIxPreferences.m
 

UI/PreferencesUI/German.lproj/Localizable.strings

@@ -79,6 +79,9 @@
 "messageforward_inline" = "Eingebunden";
 "messageforward_attached" = "Als Anhang";
 
+"Default identity:" = "Default identity:";
+"Manage identities..." = "Manage identities...";
+
 /* password */
 "New password:" = "Neues Passwort:";
 "Confirmation:" = "Bestätigung:";

UI/PreferencesUI/UIxPreferences.h

@@ -32,7 +32,7 @@
 
 @interface UIxPreferences : UIxComponent
 {
-  NSString *item;
+  id item;
   SOGoUser *user;
   NSUserDefaults *userDefaults;
   NSCalendarDate *today;

UI/PreferencesUI/UIxPreferences.m

@@ -28,6 +28,7 @@
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
 
+#import <SoObjects/SOGo/NSDictionary+Utilities.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 
 #import "UIxPreferences.h"
@@ -466,6 +467,35 @@ static BOOL shouldDisplayPasswordChange = NO;
   [userDefaults setObject: newMessageForwarding forKey: @"MessageForwarding"];
 }
 
+// 	<label><var:string label:value="Default identity:"/>
+// 	  <var:popup list="identitiesList" item="item"
+// 	    string="itemIdentityText" selection="defaultIdentity"/></label>
+- (NSArray *) identitiesList
+{
+  return [user allIdentities];
+}
+
+- (NSString *) itemIdentityText
+{
+  return [item keysWithFormat: @"%{fullName} <%{email}>"];
+}
+
+- (NSDictionary *) defaultIdentity
+{
+  NSDictionary *currentIdentity, *defaultIdentity;
+  NSEnumerator *identities;
+
+  defaultIdentity = nil;
+
+  identities = [[user allIdentities] objectEnumerator];
+  while (!defaultIdentity
+	 && (currentIdentity = [identities nextObject]))
+    if ([[currentIdentity objectForKey: @"isDefault"] boolValue])
+      defaultIdentity = currentIdentity;
+
+  return defaultIdentity;
+}
+
 - (id <WOActionResults>) defaultAction
 {
   id <WOActionResults> results;

UI/PreferencesUI/product.plist

@@ -20,6 +20,10 @@
 	      protectedBy = "View";
 	      pageName = "UIxPreferences";
 	   };
+	   identities = {
+	      protectedBy = "View";
+	      pageName = "UIxIdentities";
+	   };
 	   jsonDefaults = {
 	      protectedBy = "View";
 	      actionClass = "UIxJSONPreferences";