X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=6d0e62da48c2e054d0f69be4c36a155a7e81282f;hp=2a46650a72e2a9c15fee7e69caea35ffea082543;hb=fecb964ed9e028e9f1c169b6904ad2064ea59304;hpb=62a0eb4182f618155dc493c068597be40d696001 diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c index 2a46650..6d0e62d 100644 --- a/src/modest-widget-memory.c +++ b/src/modest-widget-memory.c @@ -27,27 +27,26 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "modest-widget-memory.h" +#include +#include #include +#include #include #include #include - +#include "widgets/modest-main-window.h" #include -#define PARAM_X "x" -#define PARAM_Y "y" -#define PARAM_HEIGHT "height" -#define PARAM_WIDTH "width" -#define PARAM_POS "pos" -#define PARAM_COLUMN_WIDTH "column-width" - -static gchar* -get_keyname (ModestConf *conf, const gchar *name, const gchar *param) +gchar* +_modest_widget_memory_get_keyname (const gchar *name, const gchar *param) { gchar *esc_name, *keyname; - esc_name = modest_conf_key_escape (conf, name); + + g_return_val_if_fail (name, NULL); + g_return_val_if_fail (param, NULL); + + esc_name = modest_conf_key_escape (name); keyname = g_strdup_printf ("%s/%s/%s", MODEST_CONF_WIDGET_NAMESPACE, @@ -57,11 +56,16 @@ get_keyname (ModestConf *conf, const gchar *name, const gchar *param) } -static gchar* -get_keyname_with_type (ModestConf *conf, const gchar *name, guint type, const gchar *param) +gchar* +_modest_widget_memory_get_keyname_with_type (const gchar *name, guint type, + const gchar *param) { gchar *esc_name, *keyname; - esc_name = modest_conf_key_escape (conf, name); + + g_return_val_if_fail (name, NULL); + g_return_val_if_fail (param, NULL); + + esc_name = modest_conf_key_escape (name); keyname = g_strdup_printf ("%s/%s/%s_%d", MODEST_CONF_WIDGET_NAMESPACE, @@ -71,16 +75,37 @@ get_keyname_with_type (ModestConf *conf, const gchar *name, guint type, const gc } +gchar* +_modest_widget_memory_get_keyname_with_double_type (const gchar *name, + guint type1, guint type2, + const gchar *param) +{ + gchar *esc_name, *keyname; + + g_return_val_if_fail (name, NULL); + g_return_val_if_fail (param, NULL); + + esc_name = modest_conf_key_escape (name); + + keyname = g_strdup_printf ("%s/%s/%s_%d_%d", + MODEST_CONF_WIDGET_NAMESPACE, + esc_name, param, type1, type2); + g_free (esc_name); + return keyname; +} + + + static gboolean save_settings_widget (ModestConf *conf, GtkWidget *widget, const gchar *name) { gchar *key; - key = get_keyname (conf, name, PARAM_HEIGHT); + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_HEIGHT); modest_conf_set_int (conf, key, GTK_WIDGET(widget)->allocation.height, NULL); g_free (key); - key = get_keyname (conf, name, PARAM_WIDTH); + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_WIDTH); modest_conf_set_int (conf, key, GTK_WIDGET(widget)->allocation.width, NULL); g_free (key); @@ -94,14 +119,14 @@ restore_settings_widget (ModestConf *conf, GtkWidget *widget, const gchar *name) GtkRequisition req; gchar *key; - key = get_keyname (conf, name, PARAM_HEIGHT); + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_HEIGHT); if (modest_conf_key_exists (conf, key, NULL)) req.height = modest_conf_get_int (conf, key, NULL); g_free (key); - key = get_keyname (conf, name, PARAM_WIDTH); + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_WIDTH); if (modest_conf_key_exists (conf, key, NULL)) req.width = modest_conf_get_int (conf, key, NULL); g_free (key); @@ -123,13 +148,22 @@ save_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name) gtk_window_get_size (win, &width, &height); - key = get_keyname (conf, name, PARAM_HEIGHT); + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_HEIGHT); modest_conf_set_int (conf, key, height, NULL); g_free (key); - key = get_keyname (conf, name, PARAM_WIDTH); + 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; } @@ -141,21 +175,39 @@ restore_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name) gchar *key; int height = 0, width = 0; - key = get_keyname (conf, name, PARAM_HEIGHT); + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_HEIGHT); if (modest_conf_key_exists (conf, key, NULL)) height = modest_conf_get_int (conf, key, NULL); g_free (key); - key = get_keyname (conf, name, PARAM_WIDTH); + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_WIDTH); if (modest_conf_key_exists (conf, key, NULL)) width = modest_conf_get_int (conf, key, NULL); 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; } @@ -169,7 +221,7 @@ save_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name) pos = gtk_paned_get_position (paned); - key = get_keyname (conf, name, PARAM_POS); + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS); modest_conf_set_int (conf, key, pos, NULL); g_free (key); @@ -183,7 +235,7 @@ restore_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name) gchar *key; int pos; - key = get_keyname (conf, name, PARAM_POS); + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS); if (modest_conf_key_exists (conf, key, NULL)) { pos = modest_conf_get_int (conf, key, NULL); @@ -204,29 +256,40 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, GList *cols, *cursor; TnyFolder *folder; TnyFolderType type; + ModestHeaderViewStyle style; + gint sort_colid; folder = modest_header_view_get_folder (header_view); - if (!folder) - return TRUE; /* no folder: no settings */ + 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_folder_view_guess_folder_type (folder); - key = get_keyname_with_type (conf, name, type, PARAM_COLUMN_WIDTH); + key = _modest_widget_memory_get_keyname_with_double_type (name, type, style, + MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH); cursor = cols = modest_header_view_get_columns (header_view); 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); 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); - - g_string_append_printf (str, "%d:%d ", col_id, width); - + sort = 0; + if (sort_colid == gtk_tree_view_column_get_sort_column_id(col)) + sort = 1; + + g_string_append_printf (str, "%d:%d:%d ", col_id, width, sort); cursor = g_list_next (cursor); } @@ -235,6 +298,7 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, g_free (key); g_string_free (str, TRUE); g_list_free (cols); + g_object_unref (G_OBJECT (folder)); return TRUE; } @@ -244,51 +308,80 @@ 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) - return TRUE; /* no folder: no settings */ - - type = modest_folder_view_guess_folder_type (folder); + if (!folder || modest_header_view_is_empty (header_view)) + return TRUE; /* no non-empty folder: no settings */ - key = get_keyname_with_type (conf, name, type, PARAM_COLUMN_WIDTH); + 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, "%u:%u:%u ", &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); if (cols) { - GList *viewcolumns, *colcursor, *widthcursor; - modest_header_view_set_columns (header_view, cols); + GList *viewcolumns, *colcursor, *widthcursor, *sortablecursor, *colidcursor; + gint sort_colid = -1; + modest_header_view_set_columns (header_view, cols, type); + sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); + colidcursor = cols; widthcursor = colwidths; + sortablecursor = colsortables; colcursor = viewcolumns = gtk_tree_view_get_columns (GTK_TREE_VIEW(header_view)); - while (colcursor && widthcursor) { - gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN(colcursor->data), - GPOINTER_TO_INT(widthcursor->data)); + while (colcursor && widthcursor && sortablecursor && colidcursor) { + int width = GPOINTER_TO_INT(widthcursor->data); + int sort = GPOINTER_TO_INT(sortablecursor->data); + int colid = GPOINTER_TO_INT(colidcursor->data); + if (width > 0) + gtk_tree_view_column_set_max_width(GTK_TREE_VIEW_COLUMN(colcursor->data), + width); + if (sort > 0) { + 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), + colid, + GTK_SORT_DESCENDING); + gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE(sortable)); + } + colidcursor = g_list_next (colidcursor); 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); } } g_free (key); + g_object_unref (G_OBJECT (folder)); + return TRUE; } @@ -331,7 +424,7 @@ modest_widget_memory_save (ModestConf *conf, GObject *widget, const gchar *name) 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 save_settings_window (conf, GTK_WINDOW(widget), name); else if (GTK_IS_PANED(widget))