X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=192095387cee395559ad8c8766985badbd7ead2c;hb=6e03d4d0a109edfd20fe02d50b2f56e7f31d3cf8;hp=323bf6d006d2a8df2c3c62fd88d949f84c19d8c8;hpb=d5b5c23f5bf5600e6514c482d423674fd9370d0c;p=modest diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c index 323bf6d..1920953 100644 --- a/src/modest-widget-memory.c +++ b/src/modest-widget-memory.c @@ -29,12 +29,15 @@ #include #include - +#include +#include #include #include +#include #include #include #include +#include "widgets/modest-main-window.h" #include gchar* @@ -154,6 +157,15 @@ save_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name) key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_WIDTH); modest_conf_set_int (conf, key, width, NULL); g_free (key); + + /* Save also the main window style */ + if (MODEST_IS_MAIN_WINDOW (win)) { + ModestMainWindowStyle style = modest_main_window_get_style (MODEST_MAIN_WINDOW (win)); + + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_WINDOW_STYLE); + modest_conf_set_int (conf, key, style, NULL); + g_free (key); + } return TRUE; } @@ -178,8 +190,26 @@ restore_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name) g_free (key); + /* Added this ugly ifdef, because in Maemo the + gtk_window_set_default_size() makes "drag-motion" signal + report bad coordinates, so drag-and-drop do not work + properly */ +#ifdef MODEST_PLATFORM_GNOME if (height && width) gtk_window_set_default_size (win, width, height); +#endif + + /* Restore also the main window style */ + if (MODEST_IS_MAIN_WINDOW (win)) { + ModestMainWindowStyle style; + + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_WINDOW_STYLE); + if (modest_conf_key_exists (conf, key, NULL)) { + style = (ModestMainWindowStyle) modest_conf_get_int (conf, key, NULL); + modest_main_window_set_style (MODEST_MAIN_WINDOW (win), style); + g_free (key); + } + } return TRUE; } @@ -212,6 +242,9 @@ restore_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name) if (modest_conf_key_exists (conf, key, NULL)) { pos = modest_conf_get_int (conf, key, NULL); gtk_paned_set_position (paned, pos); + } else { + /* The initial position must follow the 30/70 rule */ + gtk_paned_set_position (paned, GTK_WIDGET(paned)->requisition.width/3); } g_free (key); @@ -229,7 +262,9 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, TnyFolder *folder; TnyFolderType type; ModestHeaderViewStyle style; - + gint sort_colid; + GtkSortType sort_type; + folder = modest_header_view_get_folder (header_view); if (!folder || modest_header_view_is_empty (header_view)) return TRUE; /* no non-empty folder: no settings */ @@ -241,26 +276,42 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH); cursor = cols = modest_header_view_get_columns (header_view); + if (!cols) { + g_warning ("DEBUG: %s: modest_header_view_get_columns() returned NULL.", + __FUNCTION__); + } + str = g_string_new (NULL); /* NOTE: the exact details of this format are important, as they * are also used in modest-init. */ + sort_colid = modest_header_view_get_sort_column_id (header_view, type); + sort_type = modest_header_view_get_sort_type (header_view, type); while (cursor) { - int col_id, width; + int col_id, width, sort; GtkTreeViewColumn *col; col = GTK_TREE_VIEW_COLUMN (cursor->data); col_id = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(col), MODEST_HEADER_VIEW_COLUMN)); width = gtk_tree_view_column_get_width (col); + sort = 0; + if (sort_colid == col_id) + sort = (sort_type == GTK_SORT_ASCENDING) ? 1:0; - g_string_append_printf (str, "%d:%d ", col_id, width); + g_string_append_printf (str, "%d:%d:%d ", col_id, width, sort); cursor = g_list_next (cursor); } - modest_conf_set_string (conf, key, str->str, NULL); + if ((str->str == NULL) || (strlen(str->str) == 0)) { + /* TODO: Find out why this happens sometimes. */ + g_warning ("DEBUG: %s: Attempting to write an empty value to " + "gconf key %s. Preventing.", __FUNCTION__, key); + } + else + modest_conf_set_string (conf, key, str->str, NULL); g_free (key); g_string_free (str, TRUE); @@ -275,51 +326,82 @@ static gboolean restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, const gchar *name) { + guint col, width; + gint sort; gchar *key; TnyFolder *folder; TnyFolderType type; ModestHeaderViewStyle style; - + folder = modest_header_view_get_folder (header_view); if (!folder || modest_header_view_is_empty (header_view)) return TRUE; /* no non-empty folder: no settings */ - type = modest_tny_folder_guess_folder_type (folder); - style = modest_header_view_get_style (header_view); + type = modest_tny_folder_guess_folder_type (folder); style = modest_header_view_get_style (header_view); key = _modest_widget_memory_get_keyname_with_double_type (name, type, style, MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH); if (modest_conf_key_exists (conf, key, NULL)) { gchar *data, *cursor; - guint col, width; GList *cols = NULL; GList *colwidths = NULL; - + GList *colsortables = NULL; + GtkTreeModel *sortable; + cursor = data = modest_conf_get_string (conf, key, NULL); - while (cursor && sscanf (cursor, "%u:%u ", &col, &width) == 2) { + while (cursor && sscanf (cursor, "%d:%d:%d ", &col, &width, &sort) == 3) { + cols = g_list_append (cols, GINT_TO_POINTER(col)); colwidths = g_list_append (colwidths, GINT_TO_POINTER(width)); + colsortables = g_list_append (colsortables, GINT_TO_POINTER(sort)); cursor = strchr (cursor + 1, ' '); } g_free (data); + /* Use defaults if gconf has no, or empty information: */ + /* We don't know why the value is empty sometimes. */ + if (g_list_length(cols) == 0) { + g_warning("%s: gconf key %s was empty. Using default column IDs.\n", + __FUNCTION__, key); + g_list_free (cols); + cols = NULL; + } + + if (!cols) + cols = modest_init_get_default_header_view_column_ids (type, style); + if (cols) { - GList *viewcolumns, *colcursor, *widthcursor; - modest_header_view_set_columns (header_view, cols); + GList *viewcolumns, *colcursor, *widthcursor, *sortablecursor; + modest_header_view_set_columns (header_view, cols, type); + sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); widthcursor = colwidths; + sortablecursor = colsortables; colcursor = viewcolumns = gtk_tree_view_get_columns (GTK_TREE_VIEW(header_view)); - while (colcursor && widthcursor) { + while (colcursor && widthcursor && sortablecursor) { int width = GPOINTER_TO_INT(widthcursor->data); + int sort = GPOINTER_TO_INT(sortablecursor->data); if (width > 0) gtk_tree_view_column_set_max_width(GTK_TREE_VIEW_COLUMN(colcursor->data), width); + if (sort != 0) { + int colid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(colcursor->data), MODEST_HEADER_VIEW_COLUMN)); + GtkSortType sort_type = (sort == 1) ? GTK_SORT_ASCENDING : GTK_SORT_DESCENDING; + modest_header_view_set_sort_params (header_view, colid, sort_type, type); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), + colid, + sort_type); + gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE(sortable)); + } colcursor = g_list_next (colcursor); widthcursor = g_list_next (widthcursor); + sortablecursor = g_list_next (sortablecursor); } + g_list_free (cols); g_list_free (colwidths); + g_list_free (colsortables); g_list_free (viewcolumns); } } @@ -336,20 +418,70 @@ static gboolean save_settings_folder_view (ModestConf *conf, ModestFolderView *folder_view, const gchar *name) { - return TRUE; /* FIXME: implement this */ + gchar *key; + const gchar* account_id; + + /* Save the visible account */ + key = _modest_widget_memory_get_keyname (name, "visible_server_account_id"); + + account_id = modest_folder_view_get_account_id_of_visible_server_account (folder_view); + if (account_id) + modest_conf_set_string (conf, key, account_id, NULL); + else + modest_conf_remove_key (conf, key, NULL); + g_free (key); + + return TRUE; } static gboolean -restore_settings_folder_view (ModestConf *conf, ModestFolderView *folder_view, +restore_settings_folder_view (ModestConf *conf, + ModestFolderView *folder_view, const gchar *name) { - return TRUE; /* FIXME: implement this */ + gchar *key, *account_id; + + /* Restore the visible account */ + key = _modest_widget_memory_get_keyname (name, "visible_server_account_id"); + + if (modest_conf_key_exists (conf, key, NULL)) { + account_id = modest_conf_get_string (conf, key, NULL); + modest_folder_view_set_account_id_of_visible_server_account (folder_view, + (const gchar *) account_id); + g_free (account_id); + } else { + ModestAccountMgr *mgr; + gchar *default_acc; + + /* If there is no visible account id in the + configuration then pick the default account as + visible account */ + mgr = modest_runtime_get_account_mgr (); + default_acc = modest_account_mgr_get_default_account (mgr); + if (default_acc) { + ModestAccountData *acc_data; + const gchar *server_acc_id; + + acc_data = modest_account_mgr_get_account_data (mgr, (const gchar*) default_acc); + server_acc_id = (const gchar *) acc_data->store_account->account_name; + + modest_conf_set_string (conf, key, server_acc_id, NULL); + modest_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_id); + + g_free (default_acc); + } + } + + g_free (key); + + return TRUE; } static gboolean -save_settings_msg_view (ModestConf *conf, ModestMsgView *msg_view, - const gchar *name) +save_settings_msg_view (ModestConf *conf, + ModestMsgView *msg_view, + const gchar *name) { return TRUE; /* FIXME: implement this */ }