Changeset 571

Timestamp:

12/29/09 14:10:12 (2 years ago)

Author:

octorian

Message:

Added subtle mailbox message icon modifier to indicate when a message is not loaded or cached

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail

Files:

• model/MessageNode.java (modified) (2 diffs)
• model/MessageNodeReader.java (modified) (1 diff)
• ui/MailboxMessageField.java (modified) (1 diff)

trunk/LogicMail/src/org/logicprobe/LogicMail/model/MessageNode.java

@@ -128 +128 @@
         /** True if the message is up-to-date in the cache */
         private boolean cached;
+        /** True if the message has cached content available for loading */
+        private boolean hasCachedContent;
         /** Bit-field set of message flags. */
         private int flags;
@@ -656 +658 @@
                         return (messageStructure != null) && (!messageContent.isEmpty());
                 }
+        }
+        
+        /**
+         * Sets whether this message has cached content available.
+         * This method should only be called by code which is creating
+         * a message note instance from local cache data.
+         * 
+         * @param hasCachedContent True if cached content is available for loading
+         */
+        public void setCachedContent(boolean hasCachedContent) {
+            this.hasCachedContent = hasCachedContent;
+        }
+        
+        /**
+         * Gets whether this message has cached content available.
+         * This is intended to be used as a quick check to determine whether
+         * message content can be loaded from local cache, without actually
+         * having to load that content first.  It checks a variable that should
+         * be set when message headers are loaded from cache.
+         * 
+         * @return True if cached content is available for loading
+         */
+        public boolean hasCachedContent() {
+            return hasCachedContent;
         }
         

trunk/LogicMail/src/org/logicprobe/LogicMail/model/MessageNodeReader.java

@@ -231 +231 @@
                 messageNode.setMessageStructure(messageStructure);
                 
+                if(contentCount > 0) {
+                    messageNode.setCachedContent(true);
+                }
+                
                 return messageNode;
         }

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/MailboxMessageField.java

@@ -155 +155 @@
         // Draw the message icon
         Bitmap messageIcon = NodeIcons.getIcon(messageNode);
-        graphics.drawBitmap(1, (lineHeight / 2) - (messageIcon.getHeight() / 2), 20, lineHeight*2, messageIcon, 0, 0);
+        int messageIconY = (lineHeight / 2) - (messageIcon.getHeight() / 2);
+        int messageIconW = messageIcon.getWidth();
+        int messageIconH = messageIcon.getHeight();
+        graphics.drawBitmap(1, messageIconY, messageIconW, messageIconH, messageIcon, 0, 0);
+        
+        if(!messageNode.hasCachedContent() && !messageNode.hasMessageContent()) {
+            graphics.setColor(graphics.getBackgroundColor());
+            graphics.drawFilledPath(
+                    new int[] { 7, 1 + messageIconW, 1 + messageIconW },
+                    new int[] { messageIconY + messageIconH, messageIconY - 6, messageIconY + messageIconH },
+                    null,
+                    null);
+            graphics.setColor(originalColor);
+        }
+        
         if(attachmentIcon != null) {
             graphics.drawBitmap(1, lineHeight, 20, lineHeight*2, attachmentIcon, 0, 0);