From f6ceb8f41abc9393fe7a7d6e57aa13819ef611d3 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Thu, 20 Jul 2006 14:13:00 +0000 Subject: [PATCH] * some name changes in the conf keys, and updates to dependent platforms/backends pmo-trunk-r392 --- src/gtk/modest-ui-main-view.c | 4 +-- src/gtk/modest-ui-message-editor.c | 4 +-- src/gtk/modest-ui-message-viewer.c | 4 +-- src/hildon/modest-ui-main-view.c | 20 +++----------- src/hildon/modest-ui-message-viewer.c | 4 +-- src/modest-conf-keys.h | 49 +++++++++++++++++++++++++-------- 6 files changed, 49 insertions(+), 36 deletions(-) diff --git a/src/gtk/modest-ui-main-view.c b/src/gtk/modest-ui-main-view.c index 68d9119..b4a8a0a 100644 --- a/src/gtk/modest-ui-main-view.c +++ b/src/gtk/modest-ui-main-view.c @@ -136,9 +136,9 @@ modest_ui_show_main_window (ModestUI *modest_ui) priv = MODEST_UI_GET_PRIVATE(modest_ui); height = modest_conf_get_int (priv->modest_conf, - MODEST_CONF_MAIN_WINDOW_HEIGHT,NULL); + MODEST_MAIN_WINDOW_HEIGHT,NULL); width = modest_conf_get_int (priv->modest_conf, - MODEST_CONF_MAIN_WINDOW_WIDTH,NULL); + MODEST_MAIN_WINDOW_WIDTH,NULL); win = glade_xml_get_widget (priv->glade_xml, "main"); if (!win) { diff --git a/src/gtk/modest-ui-message-editor.c b/src/gtk/modest-ui-message-editor.c index 9a8551a..015b2b1 100644 --- a/src/gtk/modest-ui-message-editor.c +++ b/src/gtk/modest-ui-message-editor.c @@ -328,9 +328,9 @@ new_editor_with_presets (ModestUI *modest_ui, const gchar *to_header, priv = MODEST_UI_GET_PRIVATE(modest_ui); height = modest_conf_get_int (priv->modest_conf, - MODEST_CONF_EDIT_WINDOW_HEIGHT, NULL); + MODEST_EDIT_WINDOW_HEIGHT, NULL); width = modest_conf_get_int (priv->modest_conf, - MODEST_CONF_EDIT_WINDOW_WIDTH, NULL); + MODEST_EDIT_WINDOW_WIDTH, NULL); // g_message("new editor win@%dx%d", width, height); diff --git a/src/gtk/modest-ui-message-viewer.c b/src/gtk/modest-ui-message-viewer.c index 1a30819..d778daf 100644 --- a/src/gtk/modest-ui-message-viewer.c +++ b/src/gtk/modest-ui-message-viewer.c @@ -145,8 +145,8 @@ open_message_viewer_window(ModestUI *modest_ui) priv = MODEST_UI_GET_PRIVATE(modest_ui); /* FIXME: maybe use seperate viewer defaults? */ - height = modest_conf_get_int (priv->modest_conf, MODEST_CONF_EDIT_WINDOW_HEIGHT, NULL); - width = modest_conf_get_int (priv->modest_conf, MODEST_CONF_EDIT_WINDOW_WIDTH, NULL); + height = modest_conf_get_int (priv->modest_conf, MODEST_EDIT_WINDOW_HEIGHT, NULL); + width = modest_conf_get_int (priv->modest_conf, MODEST_EDIT_WINDOW_WIDTH, NULL); paned = glade_xml_get_widget (priv->glade_xml,"mail_paned"); g_return_if_fail (paned); diff --git a/src/hildon/modest-ui-main-view.c b/src/hildon/modest-ui-main-view.c index 9966713..9be32f3 100644 --- a/src/hildon/modest-ui-main-view.c +++ b/src/hildon/modest-ui-main-view.c @@ -147,9 +147,9 @@ modest_ui_show_main_window (ModestUI *modest_ui) priv = MODEST_UI_GET_PRIVATE(modest_ui); height = modest_conf_get_int (priv->modest_conf, - MODEST_CONF_MAIN_WINDOW_HEIGHT,NULL); + MODEST_MAIN_WINDOW_HEIGHT,NULL); width = modest_conf_get_int (priv->modest_conf, - MODEST_CONF_MAIN_WINDOW_WIDTH,NULL); + MODEST_MAIN_WINDOW_WIDTH,NULL); program = HILDON_PROGRAM (hildon_program_get_instance ()); priv->program = program; @@ -183,10 +183,8 @@ modest_ui_show_main_window (ModestUI *modest_ui) g_signal_connect (G_OBJECT(folder_view), "folder_selected", G_CALLBACK(on_folder_clicked), modest_ui); - show_attachments_inline = modest_conf_get_bool(priv->modest_conf, - MODEST_CONF_MSG_VIEW_SHOW_ATTACHMENTS_INLINE, - NULL); - + show_attachments_inline = FALSE; + message_view = GTK_WIDGET(modest_tny_msg_view_new (NULL)); priv->message_view = message_view; if (!message_view) { @@ -258,11 +256,6 @@ modest_ui_show_main_window (ModestUI *modest_ui) g_signal_connect (forward_attached_menu_item, "activate", G_CALLBACK(on_forward_attached_activated), modest_ui); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(view_attachments_item), - modest_conf_get_bool(priv->modest_conf, - MODEST_CONF_MSG_VIEW_SHOW_ATTACHMENTS_INLINE, - NULL)); - g_signal_connect (view_attachments_item, "toggled", G_CALLBACK(on_view_attachments_toggled), modest_ui); @@ -531,11 +524,6 @@ on_view_attachments_toggled(GtkWidget *widget, gpointer user_data) view_attachments_inline = gtk_check_menu_item_get_active( GTK_CHECK_MENU_ITEM(view_attachments_item)); - - modest_conf_set_bool(priv->modest_conf, - MODEST_CONF_MSG_VIEW_SHOW_ATTACHMENTS_INLINE, - view_attachments_inline, - NULL); } diff --git a/src/hildon/modest-ui-message-viewer.c b/src/hildon/modest-ui-message-viewer.c index 1a30819..d778daf 100644 --- a/src/hildon/modest-ui-message-viewer.c +++ b/src/hildon/modest-ui-message-viewer.c @@ -145,8 +145,8 @@ open_message_viewer_window(ModestUI *modest_ui) priv = MODEST_UI_GET_PRIVATE(modest_ui); /* FIXME: maybe use seperate viewer defaults? */ - height = modest_conf_get_int (priv->modest_conf, MODEST_CONF_EDIT_WINDOW_HEIGHT, NULL); - width = modest_conf_get_int (priv->modest_conf, MODEST_CONF_EDIT_WINDOW_WIDTH, NULL); + height = modest_conf_get_int (priv->modest_conf, MODEST_EDIT_WINDOW_HEIGHT, NULL); + width = modest_conf_get_int (priv->modest_conf, MODEST_EDIT_WINDOW_WIDTH, NULL); paned = glade_xml_get_widget (priv->glade_xml,"mail_paned"); g_return_if_fail (paned); diff --git a/src/modest-conf-keys.h b/src/modest-conf-keys.h index 31ed7f3..7c070dc 100644 --- a/src/modest-conf-keys.h +++ b/src/modest-conf-keys.h @@ -34,24 +34,49 @@ /* configuration key definitions for modest */ #define MODEST_CONF_NAMESPACE "/apps/modest" -#define MODEST_CONF_USE_EXT_EDITOR MODEST_CONF_NAMESPACE "/use_ext_editor" /* boolean */ -#define MODEST_CONF_EXT_EDITOR MODEST_CONF_NAMESPACE "/ext_editor" /* string */ -#define MODEST_CONF_MAIN_WINDOW_HEIGHT MODEST_CONF_NAMESPACE "/main_window_height" /* int */ -#define MODEST_CONF_MAIN_WINDOW_HEIGHT_DEFAULT 480 /* int */ +/* + * the main window + */ +#define MODEST_MAIN_WINDOW_HEIGHT MODEST_CONF_NAMESPACE "/main_window_height" /* int */ +#define MODEST_MAIN_WINDOW_HEIGHT_DEFAULT 480 /* int */ + +#define MODEST_MAIN_WINDOW_WIDTH MODEST_CONF_NAMESPACE "/main_window_width" /* int */ +#define MODEST_MAIN_WINDOW_WIDTH_DEFAULT 800 + + +/* the folders / favorites (on the left) */ +#define MODEST_FOLDER_PANED_WIDTH MODEST_CONF_NAMESPACE "/folder_paned_width" +#define MODEST_FOLDER_PANED_WIDTH_DEFAULT 150 +/* percentage the of the height of the favorites folders */ +#define MODEST_FOLDER_PANED_DIVIDER_POS MODEST_CONF_NAMESPACE "/folder_paned_divider_pos" +#define MODEST_FOLDER_PANED_DIVIDER_POS_DEFAULT 20 + +/* the messages / headers (on the right) */ +#define MODEST_MSG_PANED_WIDTH MODEST_CONF_NAMESPACE "/msg_paned_width" +#define MODEST_MSG_PANED_WIDTH_DEFAULT 600 + +/* percentage the of the height of the headers */ +#define MODEST_MSG_PANED_DIVIDER_POS MODEST_CONF_NAMESPACE "/msg_paned_divider_pos" +#define MODEST_MSG_PANED_DIVIDER_POS_DEFAULT 40 + + +/* + * the account view window + */ +#define MODEST_ACCOUNT_VIEW_WINDOW_HEIGHT_DEFAULT 500 +#define MODEST_ACCOUNT_VIEW_WINDOW_WIDTH_DEFAULT 300 -#define MODEST_CONF_MAIN_WINDOW_WIDTH MODEST_CONF_NAMESPACE "/main_window_width" /* int */ -#define MODEST_CONF_MAIN_WINDOW_WIDTH_DEFAULT 800 -#define MODEST_CONF_EDIT_WINDOW_HEIGHT MODEST_CONF_NAMESPACE "/edit_window_height" /* int */ -#define MODEST_CONF_EDIT_WINDOW_HEIGHT_DEFAULT 480 /* int */ +#define MODEST_EDIT_WINDOW_HEIGHT MODEST_CONF_NAMESPACE "/edit_window_height" /* int */ +#define MODEST_EDIT_WINDOW_HEIGHT_DEFAULT 480 /* int */ -#define MODEST_CONF_EDIT_WINDOW_WIDTH MODEST_CONF_NAMESPACE "/edit_window_width" /* int */ -#define MODEST_CONF_EDIT_WINDOW_WIDTH_DEFAULT 800 +#define MODEST_EDIT_WINDOW_WIDTH MODEST_CONF_NAMESPACE "/edit_window_width" /* int */ +#define MODEST_EDIT_WINDOW_WIDTH_DEFAULT 800 -#define MODEST_CONF_MSG_VIEW_NAMESPACE MODEST_CONF_NAMESPACE "/view" +#define MODEST_MSG_VIEW_NAMESPACE MODEST_NAMESPACE "/view" -#define MODEST_CONF_MSG_VIEW_SHOW_ATTACHMENTS_INLINE MODEST_CONF_MSG_VIEW_NAMESPACE "/show_attachments_inline" /* boolean */ +#define MODEST_MSG_VIEW_SHOW_ATTACHMENTS_INLINE MODEST_MSG_VIEW_NAMESPACE "/show_attachments_inline" /* boolean */ #endif /*__MODEST_CONF_KEYS_H__*/ -- 1.7.9.5