See ChangeLog.

Monotone-Parent: 1ea08f6ec84d602c5e78b6c440e2f7d6297a82cd
Monotone-Revision: 61b12be970a9603306d37277ee431b6fd5ab89cd

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-12-02T07:22:47

UI/MailerUI/Toolbars/SOGoDraftObject.toolbar

@@ -10,7 +10,7 @@
   ),
   (
     { link  = "#";
-      onclick  = "return onContactAdd(null);";
+      onclick  = "return onContactAdd(this);";
       image = "tb-compose-contacts-flat-24x24.png";
       cssClass = "tbicon_addressbook";
       label = "Contacts";
@@ -35,5 +35,12 @@
       image = "options.png";
       cssClass = "tbicon_options";
       label = "Options"; }
+  ),
+  (
+    { link = "#";
+      isSafe = NO;
+      onclick = "return onCloseButtonClick(event);";
+      label = "Close";
+      image = "tb-mail-stop-flat-24x24.png"; }
   )
 )

UI/MailerUI/Toolbars/SOGoMailFolder.toolbar

@@ -0,0 +1,67 @@
+( /* the toolbar groups -*-cperl-*- */
+
+  ( // first group
+    { link  = "#";
+      image = "tb-mail-getmail-flat-24x24.png";
+      cssClass = "tbicon_getmail";
+      label = "Get Mail";
+      onclick = "return refreshMailbox(this);";
+      tooltip = "Get new messages"; },
+    { link     = "#";
+      isSafe   = NO;
+      image = "tb-mail-write-flat-24x24.png";
+      onclick  = "return onComposeMessage();";
+      cssClass = "tbicon_compose";
+      label = "Write";
+      tooltip = "Create a new message"; },
+  ),
+
+  ( // second group
+    { link = "#";
+      onclick = "return openMessageWindowsForSelection('reply');";
+      isSafe   = NO;
+      image = "tb-mail-reply-flat-24x24.png";
+      cssClass = "tbicon_reply";
+      label = "Reply";
+      tooltip = "Reply to the message"; },
+    { link = "#";
+      onclick = "return openMessageWindowsForSelection('replyall');";
+      isSafe   = NO;
+      image = "tb-mail-replyall-flat-24x24.png";
+      cssClass = "tbicon_replyall";
+      label = "Reply All";
+      tooltip = "Reply to sender and all recipients"; },
+    { link = "#";
+      onclick = "return openMessageWindowsForSelection('forward');";
+      isSafe   = NO;
+      image = "tb-mail-forward-flat-24x24.png";
+      cssClass = "tbicon_forward";
+      label = "Forward";
+      tooltip = "Forward selected message"; },
+  ),
+
+  ( // third group
+    { link = "#";
+      isSafe = NO;
+      onclick = "onMenuDeleteMessage(event);";
+//       enabled  = showMarkDeletedButton;
+      image = "tb-mail-delete-flat-24x24.png";
+      cssClass = "tbicon_delete";
+      label = "Delete";
+      tooltip = "Delete selected message or folder"; },
+//    { link = "#";
+//      isSafe = NO;
+//      image = "tb-mail-junk-flat-24x24.png";
+//      cssClass = "tbicon_junk";
+//      label = "Junk";
+//      tooltip = "Mark the selected messages as junk"; },
+  ),
+  (
+   { link = "#";
+     onclick = "return onPrintCurrentMessage(event);";
+     cssClass = "tbicon_print";
+     image = "tb-mail-print-flat-24x24.png";
+     label = "Print"; 
+     tooltip = "Print this message"; },
+  )
+)

UI/MailerUI/Toolbars/SOGoMailObject.toolbar

@@ -1,29 +1,6 @@
 ( /* the toolbar groups -*-cperl-*- */
 
-  ( /* first group */
-    { link  = "#";
-      image = "tb-mail-getmail-flat-24x24.png";
-      cssClass = "tbicon_getmail";
-      label = "Get Mail";
-      onclick = "return refreshMailbox(this);";
-      tooltip = "Get new messages"; },
-    { link     = "#";
-      isSafe   = NO;
-      image = "tb-mail-write-flat-24x24.png";
-      onclick  = "return onComposeMessage();";
-      cssClass = "tbicon_compose";
-      label = "Write";
-      tooltip = "Create a new message"; },
-    { link  = "#";
-      target = "addressbook";
-      onclick  = "openAddressbook(this);return false;";
-      image = "tb-mail-addressbook-flat-24x24.png";
-      cssClass = "tbicon_addressbook";
-      label = "Addressbook";
-      tooltip = "Go to address book"; },
-  ),
-
-  ( // second group
+  ( // first group
     { link = "#";
       onclick = "return openMessageWindowsForSelection('reply');";
       isSafe   = NO;
@@ -47,7 +24,7 @@
       tooltip = "Forward selected message"; },
   ),
 
-  ( // third group
+  ( // second group
     { link = "#";
       isSafe = NO;
       onclick = "onMenuDeleteMessage(event);";
@@ -71,4 +48,11 @@
      label = "Print"; 
      tooltip = "Print this message"; },
   ),
+  (
+   { link = "#";
+     isSafe = NO;
+      onclick = "return onCloseButtonClick(event);";
+     label = "Close";
+     image = "tb-mail-stop-flat-24x24.png"; }
+  )
 )

UI/MailerUI/UIxMailEditor.m

@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2004-2005 SKYRIX Software AG
-  Copyright (C) 2008-2010 Inverse inc.
+  Copyright (C) 2008-2011 Inverse inc.
 
   This file is part of SOGo.
 
@@ -47,15 +47,19 @@
 #import <NGMime/NGMimeType.h>
 
 #import <SOGo/SOGoUserDefaults.h>
-#import <Mailer/SOGoDraftObject.h>
-#import <Mailer/SOGoMailFolder.h>
-#import <Mailer/SOGoMailAccount.h>
-#import <Mailer/SOGoMailAccounts.h>
 #import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserFolder.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/WOResourceManager+SOGo.h>
 #import <SOGoUI/UIxComponent.h>
+#import <Mailer/SOGoDraftObject.h>
+#import <Mailer/SOGoMailFolder.h>
+#import <Mailer/SOGoMailAccount.h>
+#import <Mailer/SOGoMailAccounts.h>
+#import <Contacts/SOGoContactFolders.h>
+#import <Contacts/SOGoContactFolder.h>
+#import <Contacts/SOGoContactSourceFolder.h>
 
 /*
   UIxMailEditor
@@ -80,6 +84,7 @@
   NSString *priority;
   NSString *receipt;
   id item;
+  id currentFolder;
 
   /* these are for the inline attachment list */
   NSString *attachmentName;
@@ -108,6 +113,7 @@ static NSArray *infoKeys = nil;
     {
       priority = @"NORMAL";
       receipt = nil;
+      currentFolder = nil;
     }
   
   return self;
@@ -131,6 +137,7 @@ static NSArray *infoKeys = nil;
   [attachmentName release];
   [attachmentNames release];
   [attachedFiles release];
+  [currentFolder release];
   [super dealloc];
 }
 
@@ -386,6 +393,61 @@ static NSArray *infoKeys = nil;
   return [self valuesForKeys:infoKeys];
 }
 
+/* contacts search */
+- (NSArray *) contactFolders
+{
+  SOGoContactFolders *folderContainer;
+
+  folderContainer = (SOGoContactFolders *) [[[self clientObject] lookupUserFolder] privateContacts: @"Contacts"
+                                                                                        inContext: nil];
+  
+  return [folderContainer subFolders];
+}
+
+- (NSArray *) personalContactInfos
+{
+  SOGoContactFolders *folderContainer;
+  id <SOGoContactFolder> folder;
+  NSArray *contactInfos;
+
+  folderContainer = (SOGoContactFolders *) [[[self clientObject] lookupUserFolder] privateContacts: @"Contacts"
+                                                                                           inContext: nil];
+  folder = [folderContainer lookupPersonalFolder: @"personal" ignoringRights: YES];
+
+  contactInfos = [folder lookupContactsWithFilter: nil
+				       onCriteria: nil
+					   sortBy: @"c_cn"
+					 ordering: NSOrderedAscending];
+  
+  return contactInfos;
+}
+
+- (void) setCurrentFolder: (id) _currentFolder
+{
+  ASSIGN (currentFolder, _currentFolder);
+}
+
+- (NSString *) currentContactFolderId
+{
+  return [NSString stringWithFormat: @"/%@", [currentFolder nameInContainer]];
+}
+
+- (NSString *) currentContactFolderName
+{
+  return [currentFolder displayName];
+}
+
+- (NSString *) currentContactFolderOwner
+{
+  return [currentFolder ownerInContext: context];
+}
+
+- (NSString *) currentContactFolderClass
+{
+  return ([currentFolder isKindOfClass: [SOGoContactSourceFolder class]]
+          ? @"remote" : @"local");
+}
+
 /* requests */
 
 - (BOOL) shouldTakeValuesFromRequest: (WORequest *) request

UI/MailerUI/product.plist

@@ -73,7 +73,7 @@
       slots = {
         toolbar = {
           protectedBy = "View";
-          value = "SOGoMailObject.toolbar";
+          value = "SOGoMailFolder.toolbar";
         };
       };
       methods = {
@@ -184,7 +184,7 @@
       slots = {
         toolbar = {
           protectedBy = "View";
-          value = "SOGoMailObject.toolbar";
+          value = "SOGoMailFolder.toolbar";
         };
       };
       methods = {
@@ -329,7 +329,7 @@
       slots = {
         toolbar = {
           protectedBy = "View";
-          value = "SOGoMailObject.toolbar";
+          value = "SOGoMailFolder.toolbar";
         };
       };
       methods = {
@@ -369,7 +369,7 @@
       slots = {
         toolbar = {
           protectedBy = "View";
-          value = "SOGoMailObject.toolbar";
+          value = "SOGoMailFolder.toolbar";
         };
       };
       methods = {