X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=59085d68c6e094c2c72d54f1c46b332ca443de75;hp=1607ab79c5ac137f1262ea08f943bcb1997d8c91;hb=40a8f5cbe03bd040fe3403dbfa6806df4fb6bc8a;hpb=08ba7e3f4d74446dd19e8562e881d4fe4257722c diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c index 1607ab7..59085d6 100644 --- a/src/modest-widget-memory.c +++ b/src/modest-widget-memory.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -220,11 +221,15 @@ save_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name) gchar *key; int pos; - pos = gtk_paned_get_position (paned); - - key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS); - modest_conf_set_int (conf, key, pos, NULL); - g_free (key); + /* Don't save the paned position if it's not visible, + * because it could not be correct: */ + if (GTK_WIDGET_VISIBLE (GTK_WIDGET (paned)) && GTK_WIDGET_REALIZED (GTK_WIDGET (paned))) { + pos = gtk_paned_get_position (paned); + + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS); + modest_conf_set_int (conf, key, pos, NULL); + g_free (key); + } return TRUE; } @@ -240,6 +245,16 @@ 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); + + /* TODO: Remove this hack so that paned positions can really be used. + * The paned position is incorrectly saved somehow before its even visible, + * when we show the main window only some time after creating it, + * so this prevents a wrong value from being used. */ + const gint max = (GTK_WIDGET(paned)->requisition.width)/3; + if (pos > max) + pos = max; + + gtk_paned_set_position (paned, pos); } else { /* The initial position must follow the 30/70 rule */ @@ -256,6 +271,8 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, const gchar *name) { gchar *key; + gchar *sort_key; + gchar *sort_value; GString *str; GList *cols, *cursor; TnyFolder *folder; @@ -263,18 +280,29 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, ModestHeaderViewStyle style; gint sort_colid; GtkSortType sort_type; + gint sort_flag_id = 0; folder = modest_header_view_get_folder (header_view); - if (!folder || modest_header_view_is_empty (header_view)) + if (!folder || modest_header_view_is_empty (header_view)) { + if (folder) + g_object_unref (folder); return TRUE; /* no non-empty folder: no settings */ + } 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); + sort_key = _modest_widget_memory_get_keyname_with_double_type (name, type, style, + MODEST_WIDGET_MEMORY_PARAM_COLUMN_SORT); 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 @@ -282,10 +310,12 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, */ 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; GtkTreeViewColumn *col; + int column_sort_flag; col = GTK_TREE_VIEW_COLUMN (cursor->data); col_id = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(col), @@ -294,14 +324,33 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, sort = 0; if (sort_colid == col_id) sort = (sort_type == GTK_SORT_ASCENDING) ? 1:0; + column_sort_flag = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (col), MODEST_HEADER_VIEW_FLAG_SORT)); + if (column_sort_flag != 0) + sort_flag_id = column_sort_flag; 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); + + /* store current sort column for compact view */ + if (sort_colid >= 0) { + sort_value = g_strdup_printf("%d:%d:%d", sort_colid, sort_type, sort_flag_id); + modest_conf_set_string (conf, sort_key, sort_value, NULL); + g_free (sort_value); + } + - g_free (key); + + g_free (key); + g_free (sort_key); g_string_free (str, TRUE); g_list_free (cols); g_object_unref (G_OBJECT (folder)); @@ -317,18 +366,30 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, guint col, width; gint sort; gchar *key; + gchar *sort_key; TnyFolder *folder; TnyFolderType type; ModestHeaderViewStyle style; + gint sort_flag_id = 0; + gint sort_colid = -1, 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 */ + if (!folder) + return TRUE; /* no 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); + sort_key = _modest_widget_memory_get_keyname_with_double_type (name, type, style, + MODEST_WIDGET_MEMORY_PARAM_COLUMN_SORT); + + if (modest_conf_key_exists (conf, sort_key, NULL)) { + gchar *value = modest_conf_get_string (conf, sort_key, NULL); + sscanf (value, "%d:%d:%d", &sort_colid, &sort_type, &sort_flag_id); + } + if (modest_conf_key_exists (conf, key, NULL)) { gchar *data, *cursor; @@ -347,32 +408,40 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, } 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, *sortablecursor; + GList *viewcolumns, *colcursor, *widthcursor; 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 && sortablecursor) { + while (colcursor && widthcursor) { int width = GPOINTER_TO_INT(widthcursor->data); - int sort = GPOINTER_TO_INT(sortablecursor->data); + int view_column_id = GPOINTER_TO_INT (g_object_get_data ( + G_OBJECT (colcursor->data), + MODEST_HEADER_VIEW_COLUMN)); 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)); - } + if (((view_column_id == MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN) || + (view_column_id == MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT)) && + (sort_flag_id != 0)) + g_object_set_data (G_OBJECT (colcursor->data), + MODEST_HEADER_VIEW_FLAG_SORT, GINT_TO_POINTER (sort_flag_id)); colcursor = g_list_next (colcursor); widthcursor = g_list_next (widthcursor); - sortablecursor = g_list_next (sortablecursor); } g_list_free (cols); @@ -382,7 +451,22 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, } } + if (sort_colid >= 0) { + GtkTreeModel *sortable = + gtk_tree_model_filter_get_model ( + GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)))); + if (sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) + modest_header_view_sort_by_column_id (header_view, 0, sort_type); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), + sort_colid, + sort_type); + modest_header_view_sort_by_column_id (header_view, sort_colid, sort_type); + gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE(sortable)); + } + g_free (key); + g_free (sort_key); + g_object_unref (G_OBJECT (folder)); return TRUE; @@ -450,9 +534,6 @@ restore_settings_folder_view (ModestConf *conf, g_free (key); - /* Select the first INBOX folder */ - modest_folder_view_select_first_inbox_or_local (folder_view); - return TRUE; } @@ -506,7 +587,7 @@ modest_widget_memory_restore (ModestConf *conf, GObject *widget, const gchar *na g_return_val_if_fail (conf, FALSE); g_return_val_if_fail (widget, FALSE); g_return_val_if_fail (name, FALSE); - + if (GTK_IS_WINDOW(widget)) return restore_settings_window (conf, GTK_WINDOW(widget), name); else if (GTK_IS_PANED(widget))