From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Wed, 6 Oct 2004 13:55:49 +0000 (+0000)
Subject: paper clip
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01e236e6b2bd8f9e63e360c84e0d4661f5a9e7e9;p=scalable-opengroupware.org

paper clip


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

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index e0696174..b81bc809 100644
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-06  Helge Hess  <helge.hess@opengroupware.org>
+
+	* UIxMailListView.m: added support for paper clip icon when messages
+	  are bigger than a certain size (v0.9.26)
+
 2004-10-05  Helge Hess  <helge.hess@opengroupware.org>
 
 	* v0.9.25
diff --git a/SOGo/UI/Mailer/Images/title_attachment.png b/SOGo/UI/Mailer/Images/title_attachment_14x14.png
similarity index 100%
rename from SOGo/UI/Mailer/Images/title_attachment.png
rename to SOGo/UI/Mailer/Images/title_attachment_14x14.png
diff --git a/SOGo/UI/Mailer/UIxMailListView.m b/SOGo/UI/Mailer/UIxMailListView.m
index a3d0ed69..e98e1ac3 100644
--- a/SOGo/UI/Mailer/UIxMailListView.m
+++ b/SOGo/UI/Mailer/UIxMailListView.m
@@ -39,6 +39,8 @@
 
 @implementation UIxMailListView
 
+static int attachmentFlagSize = 8096;
+
 - (void)dealloc {
   [self->sortedUIDs release];
   [self->messages   release];
@@ -81,6 +83,14 @@
   return [[[self message] valueForKey:@"uid"] stringValue];
 }
 
+- (BOOL)hasMessageAttachment {
+  /* we detect attachments by size ... */
+  unsigned size;
+  
+  size = [[[self message] valueForKey:@"size"] intValue];
+  return size > attachmentFlagSize;
+}
+
 /* fetching messages */
 
 - (NSArray *)fetchKeys {
diff --git a/SOGo/UI/Mailer/UIxMailListView.wox b/SOGo/UI/Mailer/UIxMailListView.wox
index a732baa9..5d90729c 100644
--- a/SOGo/UI/Mailer/UIxMailListView.wox
+++ b/SOGo/UI/Mailer/UIxMailListView.wox
@@ -59,6 +59,9 @@
           <td class="tbtv_headercell" width="17">
             <img rsrc:src="title_read_14x14.png" width="14" height="14" />
           </td>
+          <td class="tbtv_headercell" width="17">
+            <img rsrc:src="title_attachment_14x14.png" width="14" height="14" />
+          </td>
           <td class="tbtv_headercell">
             <a href="view" _sort="date">
               <var:string label:value="Date" />
@@ -70,7 +73,7 @@
           </td>
         </tr>
         <tr class="tableview">
-          <td colspan="4" class="tbtv_navcell" align="right">
+          <td colspan="5" class="tbtv_navcell" align="right">
             <var:if condition="showsAllMessages">
               <var:string value="sortedUIDs.count" />
               <var:string label:value="messages" />
@@ -121,6 +124,7 @@
             </td>
             <td>
               <!-- TODO: show compose links -->
+              <!-- TODO: different color for internal vs external addrs -->
               <var:if condition="showToAddress" const:negate="YES">
                 <var:string value="message.envelope.from"
                             formatter="context.mailEnvelopeAddressFormatter" />
@@ -145,6 +149,12 @@
                 </div>
               </var:if>
             </td>
+            <td>
+              <var:if condition="hasMessageAttachment">
+                <img rsrc:src="title_attachment_14x14.png" 
+                     width="14" height="14" />
+              </var:if>
+            </td>
 	    
             <td>
               <span class="mailer_datefield">
diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 8b283eb3..9c8dad69 100644
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=25
+SUBMINOR_VERSION:=26