* Add two new columns to show compact Sent/Received date. This change

[modest] / src / modest-runtime.c

diff --git a/src/modest-runtime.c b/src/modest-runtime.c
index 5ed7526..9c6d626 100644 (file)
--- a/src/modest-runtime.c
+++ b/src/modest-runtime.c
@@ -75,26 +75,41 @@ static const FolderCols INBOX_COLUMNS_DETAILS[] = {
        {MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE, 60},
        {MODEST_HEADER_VIEW_COLUMN_SIZE, 50}
 };
+
 static const FolderCols INBOX_COLUMNS_TWOLINES[] = {
-       {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40},
-       {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40},
-       {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN, 200}
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40},
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN, 180},
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE, 240}
 };
 
 static const FolderCols OUTBOX_COLUMNS_DETAILS[] = {
-        {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40},
-        {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40},
-        {MODEST_HEADER_VIEW_COLUMN_TO,    80},
-        {MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80},
-        {MODEST_HEADER_VIEW_COLUMN_SENT_DATE, 80},
-        {MODEST_HEADER_VIEW_COLUMN_SIZE, 50}
+       {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40},
+       {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40},
+       {MODEST_HEADER_VIEW_COLUMN_TO,    80},
+       {MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80},
+       {MODEST_HEADER_VIEW_COLUMN_SENT_DATE, 80},
+       {MODEST_HEADER_VIEW_COLUMN_SIZE, 50}
 };
+
 static const FolderCols OUTBOX_COLUMNS_TWOLINES[] = {
-        {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40},
-        {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40},
-        {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,200},
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40},
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180},
+       {MODEST_HEADER_VIEW_COLUMN_STATUS, 240}
 };
-        
+
+static const FolderCols SENT_COLUMNS_TWOLINES[] = {
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40},
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180},
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE, 240}
+};
+
+#ifdef MODEST_PLATFORM_MAEMO
+static const TnyFolderType LOCAL_FOLDERS[] = {
+       TNY_FOLDER_TYPE_OUTBOX,
+       TNY_FOLDER_TYPE_DRAFTS,
+       TNY_FOLDER_TYPE_SENT
+};
+#else
 static const TnyFolderType LOCAL_FOLDERS[] = {
        TNY_FOLDER_TYPE_OUTBOX,
        TNY_FOLDER_TYPE_DRAFTS,
@@ -102,6 +117,8 @@ static const TnyFolderType LOCAL_FOLDERS[] = {
        TNY_FOLDER_TYPE_TRASH,
        TNY_FOLDER_TYPE_ARCHIVE 
 };
+#endif /* MODEST_PLATFORM_MAEMO */
+
 
 
 gboolean
@@ -122,6 +139,9 @@ modest_runtime_init (void)
        g_thread_init(NULL);
        gdk_threads_init ();
 
+       /* Set application name */
+       g_set_application_name (_("FIXME Modest"));
+
        my_singletons = modest_singletons_new ();
        if (!my_singletons) {
                g_printerr ("modest: failed to initialize singletons\n");
@@ -251,9 +271,6 @@ modest_runtime_get_platform_factory  (void)
        return modest_singletons_get_platform_factory (_singletons);
 }
 
-
-
-
 ModestTnySendQueue*
 modest_runtime_get_send_queue  (TnyTransportAccount *account)
 {
@@ -276,8 +293,12 @@ modest_runtime_get_send_queue  (TnyTransportAccount *account)
        return MODEST_TNY_SEND_QUEUE(send_queue);
 }
 
-
-
+ModestWindowMgr *
+modest_runtime_get_window_mgr (void)
+{
+       g_return_val_if_fail (_singletons, NULL);
+       return modest_singletons_get_window_mgr (_singletons);
+}
 
 /* http://primates.ximian.com/~federico/news-2006-04.html#memory-debugging-infrastructure*/
 ModestRuntimeDebugFlags
@@ -367,7 +388,6 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
             folder_type <= TNY_FOLDER_TYPE_CALENDAR; ++folder_type) {          
                
                switch (folder_type) {
-               case TNY_FOLDER_TYPE_OUTBOX:
                case TNY_FOLDER_TYPE_SENT:
                case TNY_FOLDER_TYPE_DRAFTS:
                save_header_settings (conf, folder_type,
@@ -377,6 +397,13 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
                                      overwrite);
                save_header_settings (conf, folder_type,
                                      MODEST_HEADER_VIEW_STYLE_TWOLINES,
+                                     SENT_COLUMNS_TWOLINES,
+                                     G_N_ELEMENTS(SENT_COLUMNS_TWOLINES),
+                                     overwrite);
+               break;
+               case TNY_FOLDER_TYPE_OUTBOX:
+               save_header_settings (conf, folder_type,
+                                     MODEST_HEADER_VIEW_STYLE_TWOLINES,
                                      OUTBOX_COLUMNS_TWOLINES,
                                      G_N_ELEMENTS(OUTBOX_COLUMNS_TWOLINES),
                                      overwrite);
@@ -524,10 +551,11 @@ init_debug_logging (void)
 static void
 init_i18n (void)
 {
-       bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALEDIR);
+       /* Setup gettext, to use our .po files: */
+       /* GETTEXT_PACKAGE and MODEST_LOCALE_DIR are defined in config.h */
+       bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
-
 }
 
 
@@ -547,11 +575,11 @@ init_stock_icons (void)
                gint i;
 
                static GtkStockItem items[] = {
-#if MODEST_PLATFORM_ID==2
+#ifdef MODEST_PLATFORM_MAEMO
                        { MODEST_STOCK_SPLIT_VIEW, "split view", 0, 0, NULL },
                        { MODEST_STOCK_SORT, "sort mail", 0, 0, NULL },
                        { MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL },
-#endif
+#endif /*MODEST_PLATFORM_MAEMO*/
                        { MODEST_STOCK_MAIL_SEND, "send mail", 0, 0, NULL },
                        { MODEST_STOCK_NEW_MAIL, "new mail", 0, 0, NULL },
 /*                     { MODEST_STOCK_SEND_RECEIVE, "send receive", 0, 0, NULL },  */
@@ -565,11 +593,11 @@ init_stock_icons (void)
                };
       
                static gchar *items_names [] = {
-#if MODEST_PLATFORM_ID==2
+#ifdef MODEST_PLATFORM_MAEMO
                        MODEST_TOOLBAR_ICON_SPLIT_VIEW,
                        MODEST_TOOLBAR_ICON_SORT,
                        MODEST_TOOLBAR_ICON_REFRESH,
-#endif
+#endif /*MODEST_PLATFORM_MAEMO*/
                        MODEST_TOOLBAR_ICON_MAIL_SEND,
                        MODEST_TOOLBAR_ICON_NEW_MAIL,
 /*                     MODEST_TOOLBAR_ICON_SEND_RECEIVE,  */
@@ -597,15 +625,16 @@ init_stock_icons (void)
                /* Register icons to accompany stock items */
                for (i = 0; i < G_N_ELEMENTS (items); i++) {
 
-#if MODEST_PLATFORM_ID==1  /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ 
-                       pixbuf = gdk_pixbuf_new_from_file (items_names[i], NULL);
-#else
+#ifdef MODEST_PLATFORM_MAEMO  /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ 
                        pixbuf = gtk_icon_theme_load_icon (current_theme,
                                                           items_names[i],
                                                           26,
                                                           GTK_ICON_LOOKUP_NO_SVG,
                                                           NULL);
+#else
+                       pixbuf = gdk_pixbuf_new_from_file (items_names[i], NULL);
 #endif
+
                        if (pixbuf != NULL) {
                                GtkIconSet *icon_set;
                                GdkPixbuf *transparent;
@@ -668,6 +697,9 @@ init_default_settings (ModestConf *conf)
 {
        if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_TOOLBAR, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR, TRUE, NULL);
+
+       if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL);
        
        if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, TRUE, NULL);