diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libsylph/prefs_common.c | 1 | ||||
| -rw-r--r-- | libsylph/prefs_common.h | 2 | ||||
| -rw-r--r-- | src/messageview.c | 16 |
4 files changed, 23 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2012-06-20 + + * libsylph/prefs_common.[ch] + src/messageview.c: added "show_attach_tab" option (no UI) which + toggles the Attachment tab and toggle button. + 2012-06-19 * src/inc.c: fixed 'Stop' button didn't become inactive after POP3 diff --git a/libsylph/prefs_common.c b/libsylph/prefs_common.c index f696fba0..c27122fe 100644 --- a/libsylph/prefs_common.c +++ b/libsylph/prefs_common.c @@ -328,6 +328,7 @@ static PrefParam param[] = { {"convert_mb_alnum", "FALSE", &prefs_common.conv_mb_alnum, P_BOOL}, {"display_header_pane", "TRUE", &prefs_common.display_header_pane, P_BOOL}, + {"show_attach_tab", "FALSE", &prefs_common.show_attach_tab, P_BOOL}, {"display_header", "TRUE", &prefs_common.display_header, P_BOOL}, {"render_html", "TRUE", &prefs_common.render_html, P_BOOL}, {"html_only_as_attach", "FALSE", &prefs_common.html_only_as_attach, diff --git a/libsylph/prefs_common.h b/libsylph/prefs_common.h index 31f65b46..47f1c16d 100644 --- a/libsylph/prefs_common.h +++ b/libsylph/prefs_common.h @@ -337,6 +337,8 @@ struct _PrefsCommon gboolean enable_newmsg_notify_sound; /* Receive */ gchar *newmsg_notify_sound; /* Receive */ + + gboolean show_attach_tab; /* Message */ }; extern PrefsCommon prefs_common; diff --git a/src/messageview.c b/src/messageview.c index a429ae2e..bfae451a 100644 --- a/src/messageview.c +++ b/src/messageview.c @@ -631,7 +631,12 @@ static void messageview_change_view_type(MessageView *messageview, if (messageview->type == type) return; if (type == MVIEW_MIME) { - gtk_widget_show(messageview->toolbar_vbox); + if (prefs_common.show_attach_tab) + gtk_widget_hide(messageview->toolbar_vbox); + else + gtk_widget_show(messageview->toolbar_vbox); + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), + prefs_common.show_attach_tab); gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), messageview->current_page); if (messageview->current_page == 0) @@ -642,6 +647,7 @@ static void messageview_change_view_type(MessageView *messageview, gint current_page = messageview->current_page; gtk_widget_hide(messageview->toolbar_vbox); + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE); gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0); messageview->current_page = current_page; mimeview_clear(messageview->mimeview); @@ -937,7 +943,13 @@ static void messageview_switch_page_cb(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, MessageView *messageview) { - messageview->current_page = page_num; + if (messageview->current_page != page_num) { + messageview->current_page = page_num; + if (page_num == 0) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(messageview->mime_toggle_btn), FALSE); + else + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(messageview->mime_toggle_btn), TRUE); + } } static gint messageview_menu_tool_btn_pressed(GtkWidget *widget, |