* Change headers list tree view rows layout (flags, header, date).
[modest] / src / widgets / modest-header-view-render.c
index b5aeace..d1b22bb 100644 (file)
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include <modest-header-view.h>
 #include <modest-header-view-priv.h>
 #include <modest-icon-names.h>
 #include <modest-text-utils.h>
 #include <modest-runtime.h>
 #include <glib/gi18n.h>
-
-static GdkPixbuf*
-get_cached_icon (const gchar *name)
-{
-       GError *err = NULL;
-       gpointer pixbuf;
-       gpointer orig_key;
-       static GHashTable *icon_cache = NULL;
-       
-       g_return_val_if_fail (name, NULL);
-
-       if (G_UNLIKELY(!icon_cache))
-               icon_cache = modest_cache_mgr_get_cache (modest_runtime_get_cache_mgr(),
-                                                        MODEST_CACHE_MGR_CACHE_TYPE_PIXBUF);
-       
-       if (!icon_cache || !g_hash_table_lookup_extended (icon_cache, name, &orig_key,&pixbuf)) {
-               pixbuf = (gpointer)gdk_pixbuf_new_from_file (name, &err);
-               if (!pixbuf) {
-                       g_printerr ("modest: error in icon factory while loading '%s': %s\n",
-                                   name, err->message);
-                       g_error_free (err);
-               }
-               /* if we cannot find it, we still insert (if we have a cache), so we get the error
-                * only once */
-               if (icon_cache)
-                       g_hash_table_insert (icon_cache, g_strdup(name),(gpointer)pixbuf);
-       }
-       return GDK_PIXBUF(pixbuf);
-}
+#include <modest-platform.h>
 
 
-
-/*
- * optimization
- */
 static GdkPixbuf*
 get_pixbuf_for_flag (TnyHeaderFlags flag)
 {
        /* optimization */
-       static GdkPixbuf *deleted_pixbuf       = NULL;
-       static GdkPixbuf *seen_pixbuf          = NULL;
-       static GdkPixbuf *unread_pixbuf        = NULL;
-       static GdkPixbuf *attachments_pixbuf   = NULL;
+       static GdkPixbuf *deleted_pixbuf          = NULL;
+       static GdkPixbuf *seen_pixbuf             = NULL;
+       static GdkPixbuf *unread_pixbuf           = NULL;
+       static GdkPixbuf *attachments_pixbuf      = NULL;
        
        switch (flag) {
        case TNY_HEADER_FLAG_DELETED:
                if (G_UNLIKELY(!deleted_pixbuf))
-                       deleted_pixbuf = get_cached_icon (MODEST_HEADER_ICON_DELETED);
+                       deleted_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_DELETED);
                return deleted_pixbuf;
        case TNY_HEADER_FLAG_SEEN:
                if (G_UNLIKELY(!seen_pixbuf))
-                       seen_pixbuf = get_cached_icon (MODEST_HEADER_ICON_READ);
+                       seen_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_READ);
                return seen_pixbuf;
        case TNY_HEADER_FLAG_ATTACHMENTS:
                if (G_UNLIKELY(!attachments_pixbuf))
-                       attachments_pixbuf = get_cached_icon (MODEST_HEADER_ICON_ATTACH);
+                       attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH);
                return attachments_pixbuf;
        default:
                if (G_UNLIKELY(!unread_pixbuf))
-                       unread_pixbuf = get_cached_icon (MODEST_HEADER_ICON_UNREAD);
+                       unread_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_UNREAD);
                return unread_pixbuf;
        }
 }
 
+static GdkPixbuf*
+get_pixbuf_for_compact_flag (TnyHeaderFlags flag)
+{
+       /* optimization */
+       static GdkPixbuf *high_attachments_pixbuf   = NULL;
+       static GdkPixbuf *normal_attachments_pixbuf = NULL;
+       static GdkPixbuf *low_attachments_pixbuf    = NULL;
+       static GdkPixbuf *high_pixbuf               = NULL;
+       static GdkPixbuf *low_pixbuf                = NULL;
+       
+       if (flag & TNY_HEADER_FLAG_ATTACHMENTS) {
+               if (flag & TNY_HEADER_FLAG_HIGH_PRIORITY) {
+                       if (G_UNLIKELY(!high_attachments_pixbuf))
+                               high_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_HIGH_PRIORITY);
+                       return high_attachments_pixbuf;
+               }
+               else if (flag & TNY_HEADER_FLAG_LOW_PRIORITY) {
+                       if (G_UNLIKELY(!low_attachments_pixbuf))
+                               low_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_LOW_PRIORITY);
+                       return low_attachments_pixbuf;
+               }
+               else {
+                       if (G_UNLIKELY(!normal_attachments_pixbuf))
+                               normal_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_NORM_PRIORITY);
+                       return normal_attachments_pixbuf;
+               }
+       }
+       else if (flag & TNY_HEADER_FLAG_HIGH_PRIORITY) {
+               if (G_UNLIKELY(!high_pixbuf))
+                       high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH_PRIORITY);
+               return high_pixbuf;
+       }
+       else if (flag & TNY_HEADER_FLAG_LOW_PRIORITY) {
+               if (G_UNLIKELY(!low_pixbuf))
+                       low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW_PRIORITY);
+               return low_pixbuf;
+       }
+
+       
+       return NULL;
+}
+
+static void
+set_common_flags (GtkCellRenderer *renderer, TnyHeaderFlags flags)
+{
+       g_object_set (G_OBJECT(renderer),
+                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
+                     "strikethrough",  (flags & TNY_HEADER_FLAG_DELETED) ?  TRUE:FALSE,
+                     NULL);    
+}
+
 
 void
 _modest_header_view_msgtype_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
@@ -135,6 +153,42 @@ _modest_header_view_attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer
 }
 
 void
+_modest_header_view_compact_flag_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
+                                           GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
+{
+       TnyHeaderFlags flags;
+
+       gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
+                           &flags, -1);
+
+       flags = TNY_HEADER_FLAG_ATTACHMENTS;
+       if (flags & TNY_HEADER_FLAG_ATTACHMENTS) {
+               if (flags & TNY_HEADER_FLAG_HIGH_PRIORITY) 
+                       g_object_set (G_OBJECT (renderer), "pixbuf",
+                                     get_pixbuf_for_compact_flag (flags),
+                                     NULL);
+               else if (flags & TNY_HEADER_FLAG_LOW_PRIORITY) 
+                       g_object_set (G_OBJECT (renderer), "pixbuf",
+                                     get_pixbuf_for_compact_flag (flags),                                    
+                                     NULL);
+               else  
+                       g_object_set (G_OBJECT (renderer), "pixbuf",
+                                     get_pixbuf_for_compact_flag (flags),    
+                                     NULL);
+       }
+       else {
+               if (flags & TNY_HEADER_FLAG_HIGH_PRIORITY) 
+                       g_object_set (G_OBJECT (renderer), "pixbuf",
+                                     get_pixbuf_for_compact_flag (flags),
+                                     NULL);
+               else if (flags & TNY_HEADER_FLAG_LOW_PRIORITY) 
+                       g_object_set (G_OBJECT (renderer), "pixbuf",
+                                     get_pixbuf_for_compact_flag (flags),
+                                     NULL);
+       }
+}
+
+void
 _modest_header_view_header_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                  GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
 {
@@ -142,11 +196,7 @@ _modest_header_view_header_cell_data  (GtkTreeViewColumn *column,  GtkCellRender
        
        gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
                            &flags, -1);
-
-       g_object_set (G_OBJECT(renderer),
-                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
-                     "strikethrough",  (flags & TNY_HEADER_FLAG_DELETED) ?  TRUE:FALSE,
-                     NULL);    
+       set_common_flags (renderer, flags);
 }
 
 
@@ -157,6 +207,7 @@ _modest_header_view_date_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
 {
        TnyHeaderFlags flags;
        guint date, date_col;
+       gchar *display_date = NULL, *tmp_date = NULL;
        gboolean received = GPOINTER_TO_INT(user_data);
 
        if (received)
@@ -168,13 +219,14 @@ _modest_header_view_date_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
                            TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
                            date_col, &date,
                            -1);
-       
-       g_object_set (G_OBJECT(renderer),
-                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
-                     "style",  (flags & TNY_HEADER_FLAG_DELETED) ?
-                                PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
-                     "text",    modest_text_utils_get_display_date (date),
-                     NULL);
+
+       tmp_date = modest_text_utils_get_display_date (date);
+       display_date = g_strdup_printf ("\n<small>%s</small>", tmp_date);
+       g_object_set (G_OBJECT(renderer), "markup", display_date, NULL);        
+
+       set_common_flags (renderer, flags);
+       g_free (tmp_date);
+       g_free (display_date);
 }
 
 
@@ -199,13 +251,9 @@ _modest_header_view_sender_receiver_cell_data  (GtkTreeViewColumn *column,  GtkC
        g_object_set (G_OBJECT(renderer),
                      "text",
                      modest_text_utils_get_display_address (address),
-                     "weight",
-                     (flags & TNY_HEADER_FLAG_SEEN) ? 400 : 800,
-                     "style",
-                     (flags & TNY_HEADER_FLAG_DELETED)?PANGO_STYLE_ITALIC:PANGO_STYLE_NORMAL,
                      NULL);
-
-       g_free (address);       
+       g_free (address);
+       set_common_flags (renderer, flags);
 }
 /*
  * this for both incoming and outgoing mail, depending on the the user_data
@@ -240,20 +288,21 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
                                    TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &date,   
                                    -1);
        
-       rendobj = G_OBJECT(renderer);                   
-       header = g_strdup_printf ("%s %s\n%s",
-                                 modest_text_utils_get_display_address (address),
-                                 modest_text_utils_get_display_date (date),
-                                 subject);
+       rendobj = G_OBJECT(renderer);
+       if (flags & TNY_HEADER_FLAG_SEEN)
+               header = g_strdup_printf ("<b>%s</b>\n<small>%s</small>",
+                                         subject,
+                                         modest_text_utils_get_display_address (address));
+       else
+               header = g_strdup_printf ("<i>%s</i>\n<small>%s</small>",
+                                         subject,
+                                         modest_text_utils_get_display_address (address));
        g_free (address);
        g_free (subject);
        
-       g_object_set (G_OBJECT(renderer),
-                     "text",  header,
-                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
-                     "style",  (flags & TNY_HEADER_FLAG_DELETED) ?
-                                PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
-                     NULL);    
+       g_object_set (G_OBJECT(renderer), "markup", header, NULL);      
+/*     set_common_flags (renderer, flags); */
+       
        g_free (header);
 }
 
@@ -274,12 +323,31 @@ _modest_header_view_size_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
        
        size_str = modest_text_utils_get_display_size (size);
        
-       g_object_set (G_OBJECT(renderer),
-                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
-                     "style",  (flags & TNY_HEADER_FLAG_DELETED) ?
-                     PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
-                     "text",    size_str,       
-                      NULL);
-       g_free (size_str);
+       g_object_set (G_OBJECT(renderer), "text", size_str, NULL);
+       set_common_flags (renderer, flags);
+
+       g_free (size_str);
+ }
+
+void
+_modest_header_view_status_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
+                                    GtkTreeModel *tree_model,  GtkTreeIter *iter,
+                                    gpointer user_data)
+{
+        TnyHeaderFlags flags;
+       guint status;
+       gchar *status_str;
+       
+       gtk_tree_model_get (tree_model, iter,
+                          TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
+                          TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, &status,
+                           -1);
+       
+/*     size_str = modest_text_utils_get_display_size (size); */
+       status_str = g_strdup(_("Wating ..."));
+       
+       g_object_set (G_OBJECT(renderer), "text", status_str, NULL);
+       set_common_flags (renderer, flags);
 
+       g_free (status_str);
  }