Changeset 47

Timestamp:

11/06/07 17:48:45

Author:

pvanhoof

Message:

2007-11-06 Philip Van Hoof <pvanhoof@gnome.org>

• • • • The rows of the TMutFolderView are now a bit more nice. Code reused
        

from the Modest project.

• • • • The date-to-string function now takes into account today, and
        

displays just the time if we're trying to display a date/time of today.

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/configure.ac (modified) (1 diff)
• trunk/src/Makefile.am (modified) (2 diffs)
• trunk/src/modest-widgets (added)
• trunk/src/modest-widgets/Makefile.am (added)
• trunk/src/modest-widgets/README (added)
• trunk/src/modest-widgets/modest-hbox-cell-renderer.c (added)
• trunk/src/modest-widgets/modest-hbox-cell-renderer.h (added)
• trunk/src/modest-widgets/modest-vbox-cell-renderer.c (added)
• trunk/src/modest-widgets/modest-vbox-cell-renderer.h (added)
• trunk/src/tmut-folder-view.c (modified) (5 diffs)
• trunk/src/tmut-main.c (modified) (1 diff)
• trunk/src/tmut-msg-creator.c (modified) (1 diff)
• trunk/src/tmut-shared.h (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2007-11-06  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * The rows of the TMutFolderView are now a bit more nice. Code reused
+        from the Modest project.
+        * The date-to-string function now takes into account today, and
+        displays just the time if we're trying to display a date/time of today.
+
-2007-11-05  Philip Van Hoof  <pvanhoof@gnome.org>
-

trunk/configure.ac

@@ -39 +39 @@
-po/Makefile.in
-src/Makefile
+src/modest-widgets/Makefile
-])
-

trunk/src/Makefile.am

@@ -1 @@
-
+
+
+
-
-bin_PROGRAMS = tmut
@@ -28 +30 @@
-         
-
-
+
+
-

trunk/src/tmut-folder-view.c

@@ -35 +35 @@
-#include <tny-simple-list.h>
-
+#include <modest-vbox-cell-renderer.h>
+#include <modest-hbox-cell-renderer.h>
+
+#include <string.h>
+
-static GObjectClass *parent_class = NULL;
-
@@ -396 +401 @@
-
-
+static void
+header_view_compact_header_cell_data (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
+                        GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
+{
+        TnyHeaderFlags flags = 0;
+        gchar *address = NULL;
+        gchar *subject = NULL;
+        gchar *header = NULL;
+        time_t date;
+        GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
+                *recipient_box, *subject_box = NULL;
+        TnyHeader *msg_header = NULL;
+        gchar *display_date = NULL, *tmp_date = NULL;
+        TnyHeaderFlags prio = 0;
+
+        recipient_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "recpt-box-renderer"));
+        subject_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "subject-box-renderer"));
+        subject_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (subject_box), "subject-renderer"));
+        recipient_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "recipient-renderer"));
+        date_or_status_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "date-renderer"));
+
+        gtk_tree_model_get (tree_model, iter,
+                        TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
+                        TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN,  &address,
+                        TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject,
+                        TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &date,
+                        TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &msg_header,
+                        -1);
+
+        if (subject && strlen (subject)) {
+                gchar* escaped_subject = g_markup_escape_text (subject, -1);
+                g_object_set (G_OBJECT (subject_cell), "markup",
+                        escaped_subject, NULL);
+                g_free (escaped_subject);
+        } else 
+                g_object_set (G_OBJECT (subject_cell), "markup",
+                        _("No subject"), NULL);
+
+        g_free (subject);
+
+        header = g_markup_printf_escaped ("<span size='small' foreground='#666666'>%s</span>",
+                        address);
+        g_free (address);
+
+        g_object_set (G_OBJECT (recipient_cell),
+                        "markup", header, NULL);
+        g_free (header);
+
+        header = NULL;
+        display_date = g_strdup_printf ("<span size='small' foreground='#666666'>%s</span>",
+                                        date ? _get_readable_date (date) : "");
+        g_object_set (G_OBJECT (date_or_status_cell),
+                      "markup", display_date,
+                      NULL);
+        g_free (tmp_date);
+        tmp_date = NULL;
+        g_free (display_date);
+        display_date = NULL;
+
+        if (msg_header != NULL)
+                g_object_unref (msg_header);
+}
-
-static void
@@ -406 +473 @@
-        GtkTreeSelection *select;
-        GtkWidget *widget, *sw;
+
+        GtkCellRenderer *renderer_compact_header, *renderer_recpt_box, 
+                *renderer_subject, *renderer_subject_box, *renderer_recpt,
+                *renderer_compact_date_or_status;
-
-        priv->account_store = NULL;
@@ -426 +497 @@
-
-        gtk_tree_view_set_headers_visible (priv->headers_treeview, FALSE);
+        gtk_tree_view_set_show_expanders (priv->headers_treeview, FALSE);
+
-        gtk_tree_view_set_rules_hint (priv->headers_treeview, TRUE);
-        gtk_tree_view_set_fixed_height_mode (priv->headers_treeview, TRUE);
@@ -431 +504 @@
-        gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (priv->headers_treeview));
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
+        gtk_tree_view_column_set_resizable (column, FALSE);
+
-        gtk_tree_view_append_column (GTK_TREE_VIEW(priv->headers_treeview), column);
-

trunk/src/tmut-main.c

@@ -76 +76 @@
-        return 0;
-}
+
+
+gchar *
+_get_readable_date (time_t mtime)
+{
+        time_t now;
+        struct tm file_time;
+
+        /** 
+         * We reuse a static char. Now hold your breath and listen. This is not
+         * wrong and I'll explain why: each component that uses this function
+         * is called from the Gtk+ context. The Gtk+ context can never run in
+         * parallel with another context because Gtk+ is locked using its
+         * gdk_threads_enter/leave lock. This means that there's always at most
+         * one thread doing Gtk+ things. This means that this function does not
+         * have to be thread safe. And that means that we can have a static 
+         * buffer that we'll play with. Else we could also do a pthread_once 
+         * or something. 
+         *
+         * I here the children cry things like: waaayyyy?? Well the reason is to
+         * avoid a malloc(). This stuff happens quite often. If we can reuse one
+         * buffer each time, that's fine! The GtkTreeView (if this time that is
+         * consumer)  makes its own copy. Same for any other Gtk+ component that
+         * accepts strings (like a GtkEntry or a GtkLabel). It will make its own
+         * copy anyway! If we are going to copy here, that's two copies rather 
+         * than just the one copy in Gtk+ that we have no control over.
+         **/
+
+        static gchar readable_date[64];
+
+        gsize readable_date_size;
+        int days_now, days_then;
+
+        gmtime_r (&mtime, &file_time);
+        now = time (NULL); 
+
+        /* The idea is that if the amount of days is not the same, we display
+         * the full date. Else we just display the time. Note that there's a
+         * hidden bug in this: days_then is the remote timezone, days_now is the
+         * local timezone. At some point we should fix this! */
+
+        days_now = now / (24*60*60);
+        days_then = mtime / (24*60*60);
+
+        /* I think we can fix this using localtime_r */
+
+        if (days_now == days_then) { 
+                /* Translator: this date-format is the date format for when creating a
+                 * reply of a message if the date is today */
+                readable_date_size = strftime (readable_date, 63, _("%X"), &file_time);
+        } else { 
+                /* Translator: this date-format is the date format for when creating a
+                 * reply of a message if the date is not today */
+                readable_date_size = strftime (readable_date, 63, _("%x"), &file_time);
+        }
+
+        if (readable_date_size > 0)
+                return readable_date;
+
+        return NULL;
+}

trunk/src/tmut-msg-creator.c

@@ -283 +283 @@
-
-
-static gchar *
-_get_readable_date (time_t file_time_raw)
-{
-        struct tm file_time;
-        static gchar readable_date[64];
-        gsize readable_date_size;
-
-        gmtime_r (&file_time_raw, &file_time);
-
-        /* Translator: this date-format is the date format for when creating a
-         * reply of a message. */
-        readable_date_size = strftime (readable_date, 63, _("%Y-%m-%d, %-I:%M %p"), &file_time);
-
-        if (readable_date_size > 0)
-                return readable_date;
-
-        return NULL;
-}
-
-void 
-tmut_msg_creator_add_attachment (TMutMsgCreator *self, TnyMimePart *part)

trunk/src/tmut-shared.h

@@ -12 +12 @@
-extern GHashTable *send_queues;
-
+gchar *_get_readable_date (time_t mtime);
+
-#endif