some additions

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@418 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj
index d7333037cda1bc13fb4c97679c59372c326736db..e579c534d75008b4dc5f86f1a3d968c790f2e3d9 100644 (file)
--- a/SOGo/SOGo.xcode/project.pbxproj
+++ b/SOGo/SOGo.xcode/project.pbxproj
@@ -1465,6 +1465,110 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
+               ADBE3E5B0727167A000FEA6A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text;
+                       path = README;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADBE3E5C0727167A000FEA6A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoDraftObject.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADBE3E5D0727167A000FEA6A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoDraftObject.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADBE3E5E0727167A000FEA6A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoDraftsFolder.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADBE3E5F0727167A000FEA6A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoDraftsFolder.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADBE3E600727167A000FEA6A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoMailBaseObject.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADBE3E610727167A000FEA6A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoMailBaseObject.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADBE3E620727167A000FEA6A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoMailBodyPart.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADBE3E630727167A000FEA6A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoMailBodyPart.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADBE3E640727167A000FEA6A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoMailConnectionEntry.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADBE3E650727167A000FEA6A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoMailConnectionEntry.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADBE3E660727167A000FEA6A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoMailManager.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADBE3E670727167A000FEA6A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoMailManager.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
                ADCDE53106ADA8AC00BFCE2B = {
                        fileEncoding = 5;
                        indentWidth = 8;
@@ -1920,6 +2024,7 @@
                };
                ADDF4D6806DE0BAB00C4E7F8 = {
                        children = (
+                               ADBE3E5B0727167A000FEA6A,
                                ADDF4D6906DE0BAB00C4E7F8,
                                ADDF4D7306DE0BAB00C4E7F8,
                                ADDF4D6E06DE0BAB00C4E7F8,
@@ -2062,14 +2167,26 @@
                        children = (
                                ADDF4D6A06DE0BAB00C4E7F8,
                                ADDF4D6D06DE0BAB00C4E7F8,
+                               ADBE3E5C0727167A000FEA6A,
+                               ADBE3E5D0727167A000FEA6A,
+                               ADBE3E5E0727167A000FEA6A,
+                               ADBE3E5F0727167A000FEA6A,
+                               ADBE3E600727167A000FEA6A,
+                               ADBE3E610727167A000FEA6A,
+                               ADDF4D7106DE0BAB00C4E7F8,
+                               ADDF4D7206DE0BAB00C4E7F8,
+                               ADDF4D6F06DE0BAB00C4E7F8,
+                               ADDF4D7006DE0BAB00C4E7F8,
+                               ADBE3E620727167A000FEA6A,
+                               ADBE3E630727167A000FEA6A,
+                               ADBE3E640727167A000FEA6A,
+                               ADBE3E650727167A000FEA6A,
+                               ADBE3E660727167A000FEA6A,
+                               ADBE3E670727167A000FEA6A,
                                AD494D1A06F6EB3A00E51EC9,
                                AD494D1B06F6EB3A00E51EC9,
                                AD494D1806F6EB3A00E51EC9,
                                AD494D1906F6EB3A00E51EC9,
-                               ADDF4D6F06DE0BAB00C4E7F8,
-                               ADDF4D7006DE0BAB00C4E7F8,
-                               ADDF4D7106DE0BAB00C4E7F8,
-                               ADDF4D7206DE0BAB00C4E7F8,
                        );
                        isa = PBXGroup;
                        name = Classes;

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 34eb3b603cd307cc545c4dd9d90480743d3e28cd..90a66e606059086ffb363fc08b0c2e3c3aa06e87 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,3 +1,14 @@
+2004-10-20  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+        * v0.9.41
+        
+        * UIxMailListView.wox: localized labels and added some JavaScript
+          templates for doing nifty row selection
+
+        * UIxMailListView.m: added JavaScript method (stub only)
+
+        * English.lproj/default.strings: new localized strings
+
 2004-10-13  Helge Hess  <helge.hess@opengroupware.org>
 
        * v0.9.40

diff --git a/SOGo/UI/Mailer/English.lproj/default.strings b/SOGo/UI/Mailer/English.lproj/default.strings
index d3ed4dc3263dd7c57885f82d07dfa03c78548c89..c9d8f3d21e9c70d9fecf7a395e9ec256b35bb0d9 100644 (file)
--- a/SOGo/UI/Mailer/English.lproj/default.strings
+++ b/SOGo/UI/Mailer/English.lproj/default.strings
@@ -10,3 +10,17 @@
 
 "Addressbook"   = "Addressbook";
 "Anais"         = "Anais";
+
+/* MailListView */
+
+"View"          = "View";
+"All"           = "All";
+"Unread"        = "Unread";
+"messages"      = "messages";
+
+"first"         = "first";
+"previous"      = "prev";
+"next"          = "next";
+
+"msgnumber_to"  = "to";
+"msgnumber_of"  = "of";

diff --git a/SOGo/UI/Mailer/UIxMailListView.m b/SOGo/UI/Mailer/UIxMailListView.m
index e98e1ac3e459c88e815f8edb3fc9c4fec69eed6e..c1014889031525f67c8a231c38f2bdc67a7ec3b5 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailListView.m
+++ b/SOGo/UI/Mailer/UIxMailListView.m
@@ -271,6 +271,14 @@ static int attachmentFlagSize = 8096;
                     [self messageUidString]];
 }
 
+- (NSString *)jsCode {
+  static NSString *script = \
+    @"function toggleRowSelectionStatus(sender) {\n"
+    @"}\n"
+    @"";
+  return script;
+}
+
 /* actions */
 
 - (id)defaultAction {

diff --git a/SOGo/UI/Mailer/UIxMailListView.wox b/SOGo/UI/Mailer/UIxMailListView.wox
index f30e5e511b57fe195dc1bcd05d7f40e40ac03312..d33fa4769fe61a55e71465fcca540bec4ffda969 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailListView.wox
+++ b/SOGo/UI/Mailer/UIxMailListView.wox
@@ -10,10 +10,10 @@
   title="name"
 >
   <div class="titlediv">
-    <a rsrc:href="tbird_073_mailwelcome.png">View:</a>, <!-- TODO ;-) -->
+    <a rsrc:href="tbird_073_mailwelcome.png"><var:string label:value="View" />:</a>, <!-- TODO ;-) -->
     <select name="viewfilter">    <!-- var:popup? -->
-      <option value="all"   >All</option>
-      <option value="unread">Unread</option>
+      <option value="all"   ><var:string label:value="All" /></option>
+      <option value="unread"><var:string label:value="Unread" /></option>
     </select>
 
     Subject or Sender contains:
@@ -23,10 +23,15 @@
 
   <div class="embedwhite_out">
     <div class="embedwhite_in">
+      <script language="JavaScript">
+        <var:string value="jsCode" const:escapeHTML="NO" />
+      </script>
       <table border="0" width="100%" cellspacing="0" cellpadding="1">
         <tr class="tableview">
          <!-- TODO: see AB for sorting -->
-          
+          <td class="tbtv_headercell" width="17">
+            <var:entity const:name="nbsp" />
+          </td>
           <td class="tbtv_headercell" width="50%">
            <a href="view" _sort="subject">
               <var:string label:value="Subject" />
@@ -73,7 +78,7 @@
           </td>
         </tr>
         <tr class="tableview">
-          <td colspan="5" class="tbtv_navcell" align="right">
+          <td colspan="6" class="tbtv_navcell" align="right">
             <var:if condition="showsAllMessages">
               <var:string value="sortedUIDs.count" />
               <var:string label:value="messages" />
@@ -81,18 +86,24 @@
             
             <var:if condition="showsAllMessages" const:negate="YES">
               <var:if condition="hasPrevious">
-                <a href="view" _idx="1">first</a> |
-                <a href="view" var:_idx="prevFirstMessageNumber">prev</a> |
+                <a href="view"
+                   _idx="1"
+                ><var:string label:value="first"/></a> |
+                <a href="view"
+                   var:_idx="prevFirstMessageNumber"
+                ><var:string label:value="previous"/></a> |
               </var:if>
   
               <var:string value="firstMessageNumber"/>
-              <var:string label:value="to" />
+              <var:string label:value="msgnumber_to" />
               <var:string value="lastMessageNumber"/>
-              <var:string label:value="of" />
+              <var:string label:value="msgnumber_of" />
               <var:string value="sortedUIDs.count" />
   
               <var:if condition="hasNext">
-                | <a href="view" var:_idx="nextFirstMessageNumber">next</a>
+                | <a href="view"
+                     var:_idx="nextFirstMessageNumber"
+                  ><var:string label:value="next" /></a>
               </var:if>
             </var:if>
           </td>
@@ -100,6 +111,12 @@
         
         <var:foreach list="messages" item="message">
           <tr class="tableview" var:id="msgRowID">
+            <td>
+              <input type="checkbox"
+                     var:value="msgRowID"
+                     onclick="javascript:toggleRowSelectionStatus(this);"
+              />
+            </td>
             <td>
               <var:if condition="isMessageRead">
                 <div class="mailer_readmailsubject" var:id="msgDivID"
@@ -164,6 +181,8 @@
             </td>
           </tr>
         </var:foreach>
+        <span id="selected_uids" style="visibility: hidden;">
+        </span>
       </table>
     </div>
   </div>

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index d3d7995a946cb8741ec4e7a9dcf1b0a92263088a..b64cd5801f8619965d88b347e58edfa46efd36d2 100644 (file)
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=40
+SUBMINOR_VERSION:=41