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
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;
}
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);
}
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,
- 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));
TnyFolderType type;
ModestHeaderViewStyle style;
gint sort_flag_id = 0;
- gint sort_colid = -1, sort_type;
+ 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)) {
- if (folder)
- g_object_unref (folder);
- return TRUE; /* no non-empty folder: no settings */
- }
+ if (!folder)
+ return TRUE; /* no 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);
+ 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)) {
}
if (sort_colid >= 0) {
- GtkTreeModel *sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+ 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),
}
g_free (key);
+ g_free (sort_key);
+
g_object_unref (G_OBJECT (folder));
return TRUE;
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;
}
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;
}
projects / modest / blobdiff