X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=1409a974f75bc6aee36be7f5f5f807c899e56102;hp=55d31c20e78b02a7e84b9accaf85e77b4de682b3;hb=e45958deaf9701399c552ea0d84c2447efacd4ca;hpb=6f79548d2c283f86df1b10b41862d10a927fdcf2 diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c index 55d31c2..1409a97 100644 --- a/src/modest-widget-memory.c +++ b/src/modest-widget-memory.c @@ -194,7 +194,7 @@ restore_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name) gtk_window_set_default_size() makes "drag-motion" signal report bad coordinates, so drag-and-drop do not work properly */ -#ifdef MODEST_PLATFORM_GNOME +#ifdef MODEST_TOOLKIT_GTK if (height && width) gtk_window_set_default_size (win, width, height); #endif @@ -219,13 +219,19 @@ static gboolean save_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name) { gchar *key; - int pos; + gint pos; + gdouble percent; - 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_REALIZED (GTK_WIDGET (paned))) { + pos = gtk_paned_get_position (paned); + percent = (gdouble) (pos * 100) / (gdouble) GTK_WIDGET (paned)->allocation.width; + + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS); + modest_conf_set_float (conf, key, percent, NULL); + g_free (key); + } return TRUE; } @@ -235,16 +241,15 @@ static gboolean restore_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name) { gchar *key; - int pos; + gdouble percent; + gint pos; - key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS); + key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS); + percent = modest_conf_get_float (conf, key, NULL); - if (modest_conf_key_exists (conf, key, NULL)) { - pos = modest_conf_get_int (conf, key, NULL); + if (GTK_WIDGET_VISIBLE (GTK_WIDGET (paned)) && GTK_WIDGET_REALIZED (GTK_WIDGET (paned))) { + pos = GTK_WIDGET (paned)->allocation.width * percent /100; 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); @@ -257,6 +262,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; @@ -264,16 +271,25 @@ 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); + if (type == TNY_FOLDER_TYPE_INVALID) + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + 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) { @@ -288,10 +304,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), @@ -300,12 +318,15 @@ 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); } - if (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); @@ -313,7 +334,17 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, else modest_conf_set_string (conf, key, str->str, NULL); - g_free (key); + /* 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 (sort_key); g_string_free (str, TRUE); g_list_free (cols); g_object_unref (G_OBJECT (folder)); @@ -329,18 +360,34 @@ 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 = GTK_SORT_DESCENDING; 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); + if (type == TNY_FOLDER_TYPE_INVALID) + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + + 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); + g_free (value); + } + if (modest_conf_key_exists (conf, key, NULL)) { gchar *data, *cursor; @@ -372,31 +419,27 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, 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); @@ -406,7 +449,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; @@ -418,19 +476,6 @@ static gboolean save_settings_folder_view (ModestConf *conf, ModestFolderView *folder_view, const gchar *name) { - 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; } @@ -439,41 +484,26 @@ restore_settings_folder_view (ModestConf *conf, ModestFolderView *folder_view, const gchar *name) { - 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); - } + ModestAccountMgr *mgr; + gchar *default_acc; + + /* Always show the default account as visible server account */ + mgr = modest_runtime_get_account_mgr (); + default_acc = modest_account_mgr_get_default_account (mgr); + if (default_acc) { + ModestAccountSettings *settings; + ModestServerAccountSettings *store_settings; + const gchar *server_acc_id; + + settings = modest_account_mgr_load_account_settings (mgr, (const gchar*) default_acc); + store_settings = modest_account_settings_get_store_settings (settings); + server_acc_id = modest_server_account_settings_get_account_name (store_settings); + + modest_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_id); + g_object_unref (store_settings); + g_object_unref (settings); + g_free (default_acc); } - - g_free (key); - return TRUE; } @@ -527,7 +557,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))