X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=faf0cd8c9468917cd7aefefcebc27319e32fc00d;hb=d7ce86e033eff36959cc7754cccc8fadb686f226;hp=e09e0a219243a237e72b663f6653d819917d3cfd;hpb=c2cd914e7d3448a26ba9e26ba1557be02e942cee;p=modest diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c index e09e0a2..faf0cd8 100644 --- a/src/modest-widget-memory.c +++ b/src/modest-widget-memory.c @@ -29,7 +29,8 @@ #include #include - +#include +#include #include #include #include @@ -258,7 +259,8 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, 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 */ @@ -276,6 +278,7 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, * 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, sort; @@ -286,9 +289,8 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, MODEST_HEADER_VIEW_COLUMN)); width = gtk_tree_view_column_get_width (col); sort = 0; -/* if (sort_colid == gtk_tree_view_column_get_sort_column_id(col)) */ if (sort_colid == col_id) - sort = 1; + sort = (sort_type == GTK_SORT_ASCENDING) ? 1:-1; g_string_append_printf (str, "%d:%d:%d ", col_id, width, sort); cursor = g_list_next (cursor); @@ -334,7 +336,7 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, GtkTreeModel *sortable; cursor = data = modest_conf_get_string (conf, key, NULL); - while (cursor && sscanf (cursor, "%u:%u:%u ", &col, &width, &sort) == 3) { + 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)); @@ -344,7 +346,6 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, if (cols) { GList *viewcolumns, *colcursor, *widthcursor, *sortablecursor; -/* gint sort_colid = -1; */ modest_header_view_set_columns (header_view, cols, type); sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); @@ -357,17 +358,13 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, if (width > 0) gtk_tree_view_column_set_max_width(GTK_TREE_VIEW_COLUMN(colcursor->data), width); - if (sort > 0) { + if (sort != 0) { int colid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(colcursor->data), MODEST_HEADER_VIEW_COLUMN)); - modest_header_view_set_sort_column_id (header_view, colid, type); -/* sort_colid = gtk_tree_view_column_get_sort_column_id (GTK_TREE_VIEW_COLUMN(colcursor->data)); */ -/* modest_header_view_set_sort_column_id (header_view, sort_colid, type); */ -/* gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), */ -/* sort_colid, */ -/* GTK_SORT_DESCENDING); */ + 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, - GTK_SORT_DESCENDING); + sort_type); gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE(sortable)); } colcursor = g_list_next (colcursor); @@ -394,20 +391,103 @@ 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; + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + + /* 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); + g_free (key); + + /* Save the last selected folder */ + key = _modest_widget_memory_get_keyname (name, "last_selected_path"); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); + if (gtk_tree_selection_get_selected (selection, &model, &iter)) { + gchar *str; + GtkTreePath *path = gtk_tree_model_get_path (model, &iter); + str = gtk_tree_path_to_string (path); + modest_conf_set_string (conf, key, str, NULL); + g_free (str); + gtk_tree_path_free (path); + } + 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, *str; + + /* 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); + + /* Restore the last selected folder. Check first that the model is not NULL */ + if (gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view))) { + key = _modest_widget_memory_get_keyname (name, "last_selected_path"); + if (modest_conf_key_exists (conf, key, NULL)) { + GtkTreePath *path; + GtkTreeSelection *selection; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); + str = modest_conf_get_string (conf, key, NULL); + path = gtk_tree_path_new_from_string ((const gchar *) str); + gtk_tree_view_expand_to_path (GTK_TREE_VIEW (folder_view), path); + gtk_tree_selection_select_path (selection, path); + g_free (str); + gtk_tree_path_free (path); + } + 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 */ }