X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=9044e1e89f7a6ad462a1f8cb6d9519197abd1657;hb=bc9bbede5d63979b331c72fbc291379be01df0ad;hp=c889f3f5b5e2be874bb11f0dc9afbd5cc89cb7a7;hpb=9f72f1fcd36f8f195b27530f7544dc8e3ff61084;p=modest diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c index c889f3f..9044e1e 100644 --- a/src/modest-widget-memory.c +++ b/src/modest-widget-memory.c @@ -27,26 +27,25 @@ * 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; + + 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", @@ -57,10 +56,15 @@ 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; + + 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", @@ -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,14 +175,14 @@ 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); @@ -157,6 +191,18 @@ restore_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name) if (height && width) gtk_window_set_default_size (win, width, height); + /* 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); + g_free (key); + + modest_main_window_set_style (MODEST_MAIN_WINDOW (win), style); + } + return TRUE; } @@ -169,7 +215,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 +229,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,20 +250,24 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, GList *cols, *cursor; TnyFolder *folder; TnyFolderType type; - - if (modest_header_view_is_empty (header_view)) - return TRUE; /* don't save the settings in the empty case */ + ModestHeaderViewStyle style; 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_folder_view_guess_folder_type (folder); - 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); 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. + */ while (cursor) { int col_id, width; @@ -228,8 +278,7 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, MODEST_HEADER_VIEW_COLUMN)); width = gtk_tree_view_column_get_width (col); - g_string_append_printf (str, "%d:%d ", col_id, width); - + g_string_append_printf (str, "%d:%d ", col_id, width); cursor = g_list_next (cursor); } @@ -238,6 +287,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; } @@ -250,14 +300,17 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, 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; @@ -282,8 +335,8 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, while (colcursor && widthcursor) { int width = GPOINTER_TO_INT(widthcursor->data); if (width > 0) - gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN(colcursor->data), - width); + gtk_tree_view_column_set_max_width(GTK_TREE_VIEW_COLUMN(colcursor->data), + width); colcursor = g_list_next (colcursor); widthcursor = g_list_next (widthcursor); } @@ -294,6 +347,8 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view, } g_free (key); + g_object_unref (G_OBJECT (folder)); + return TRUE; } @@ -336,7 +391,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))