* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "modest-widget-memory.h"
+#include <modest-widget-memory.h>
+#include <modest-widget-memory-priv.h>
+
+#include <modest-tny-platform-factory.h>
+#include <modest-tny-folder.h>
#include <widgets/modest-header-view.h>
+#include <widgets/modest-msg-view.h>
+#include <widgets/modest-folder-view.h>
+#include "widgets/modest-main-window.h"
#include <string.h>
-#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,
}
+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",
+ MODEST_CONF_WIDGET_NAMESPACE,
+ esc_name, param, type);
+ g_free (esc_name);
+ return keyname;
+}
+
+
+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);
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);
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;
}
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);
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;
}
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);
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);
gchar *key;
GString *str;
GList *cols, *cursor;
+ TnyFolder *folder;
+ TnyFolderType type;
+ ModestHeaderViewStyle style;
+
+ 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 */
+
+ 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;
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);
}
- key = get_keyname (conf, name, PARAM_COLUMN_WIDTH);
modest_conf_set_string (conf, key, str->str, NULL);
-
+
+ g_free (key);
g_string_free (str, TRUE);
g_list_free (cols);
+ g_object_unref (G_OBJECT (folder));
return TRUE;
}
-
static gboolean
restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
const gchar *name)
{
- gchar *key;
- key = get_keyname (conf, name, PARAM_COLUMN_WIDTH);
+ gchar *key;
+ TnyFolder *folder;
+ TnyFolderType type;
+ ModestHeaderViewStyle style;
+
+ 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 (modest_conf_key_exists (conf, key, NULL)) {
+ 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;
-
+
cursor = data = modest_conf_get_string (conf, key, NULL);
while (cursor && sscanf (cursor, "%u:%u ", &col, &width) == 2) {
cols = g_list_append (cols, GINT_TO_POINTER(col));
widthcursor = colwidths;
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));
+ int width = GPOINTER_TO_INT(widthcursor->data);
+ if (width > 0)
+ gtk_tree_view_column_set_max_width(GTK_TREE_VIEW_COLUMN(colcursor->data),
+ width);
colcursor = g_list_next (colcursor);
widthcursor = g_list_next (widthcursor);
}
}
g_free (key);
+ g_object_unref (G_OBJECT (folder));
+
return TRUE;
}
+
+static gboolean
+save_settings_folder_view (ModestConf *conf, ModestFolderView *folder_view,
+ const gchar *name)
+{
+ return TRUE; /* FIXME: implement this */
+}
+
+static gboolean
+restore_settings_folder_view (ModestConf *conf, ModestFolderView *folder_view,
+ const gchar *name)
+{
+ return TRUE; /* FIXME: implement this */
+}
+
+
+static gboolean
+save_settings_msg_view (ModestConf *conf, ModestMsgView *msg_view,
+ const gchar *name)
+{
+ return TRUE; /* FIXME: implement this */
+}
+
+static gboolean
+restore_settings_msg_view (ModestConf *conf, ModestMsgView *msg_view,
+ const gchar *name)
+{
+ return TRUE; /* FIXME: implement this */
+}
+
+
+
gboolean
-modest_widget_memory_save_settings (ModestConf *conf, GtkWidget *widget,
- const gchar *name)
+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))
return save_settings_paned (conf, GTK_PANED(widget), name);
else if (MODEST_IS_HEADER_VIEW(widget))
return save_settings_header_view (conf, MODEST_HEADER_VIEW(widget), name);
+ else if (MODEST_IS_FOLDER_VIEW(widget))
+ return save_settings_folder_view (conf, MODEST_FOLDER_VIEW(widget), name);
+ else if (MODEST_IS_MSG_VIEW(widget))
+ return save_settings_msg_view (conf, MODEST_MSG_VIEW(widget), name);
else if (GTK_IS_WIDGET(widget))
- return save_settings_widget (conf, widget, name);
+ return save_settings_widget (conf, GTK_WIDGET(widget), name);
- g_printerr ("modest: %p is not a known widget\n", widget);
+ g_printerr ("modest: %p (%s) is not a known widget\n", widget, name);
return FALSE;
}
gboolean
-modest_widget_memory_restore_settings (ModestConf *conf, GtkWidget *widget,
- const gchar *name)
+modest_widget_memory_restore (ModestConf *conf, GObject *widget, const gchar *name)
{
g_return_val_if_fail (conf, FALSE);
g_return_val_if_fail (widget, FALSE);
return restore_settings_paned (conf, GTK_PANED(widget), name);
else if (MODEST_IS_HEADER_VIEW(widget))
return restore_settings_header_view (conf, MODEST_HEADER_VIEW(widget), name);
+ else if (MODEST_IS_FOLDER_VIEW(widget))
+ return restore_settings_folder_view (conf, MODEST_FOLDER_VIEW(widget), name);
+ else if (MODEST_IS_MSG_VIEW(widget))
+ return restore_settings_msg_view (conf, MODEST_MSG_VIEW(widget), name);
else if (GTK_IS_WIDGET(widget))
- return restore_settings_widget (conf, widget, name);
+ return restore_settings_widget (conf, GTK_WIDGET(widget), name);
- g_printerr ("modest: %p is not a known widget\n", widget);
+ g_printerr ("modest: %p (%s) is not a known widget\n", widget, name);
return FALSE;
}
projects / modest / blobdiff