From 88add95ac772a31df8d315292ac5b173ebc094b6 Mon Sep 17 00:00:00 2001 From: hiro Date: Mon, 14 Nov 2005 07:13:28 +0000 Subject: added separator between the summary status and the header pane. git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@741 ee746299-78ed-0310-b773-934348b2243d --- src/mainwindow.c | 11 +++++++++++ src/summaryview.c | 9 +++++++-- src/summaryview.h | 1 + src/textview.c | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/mainwindow.c b/src/mainwindow.c index ba1c5897..19afdda3 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -1391,6 +1391,7 @@ void main_window_toggle_message_view(MainWindow *mainwin) } if (msgwin) { + /* separate message view */ if (GTK_WIDGET_VISIBLE(msgwin)) { gtk_widget_hide(msgwin); mainwin->messageview->visible = FALSE; @@ -1400,16 +1401,20 @@ void main_window_toggle_message_view(MainWindow *mainwin) mainwin->messageview->visible = TRUE; } } else if (vpaned->parent != NULL) { + /* hide message view */ mainwin->messageview->visible = FALSE; summaryview->displayed = NULL; gtk_widget_ref(vpaned); gtkut_container_remove(GTK_CONTAINER(container), vpaned); gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container); + gtk_widget_hide(summaryview->hseparator); } else { + /* show message view */ mainwin->messageview->visible = TRUE; gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), vpaned); gtk_container_add(GTK_CONTAINER(container), vpaned); gtk_widget_unref(vpaned); + gtk_widget_show(summaryview->hseparator); } if (messageview_is_visible(mainwin->messageview)) @@ -2060,10 +2065,12 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type) gtk_paned_add2(GTK_PANED(hpaned), vpaned); gtk_paned_add1(GTK_PANED(vpaned), GTK_WIDGET_PTR(mainwin->summaryview)); + gtk_widget_show(mainwin->summaryview->hseparator); } else { gtk_paned_add2(GTK_PANED(hpaned), GTK_WIDGET_PTR(mainwin->summaryview)); gtk_widget_ref(vpaned); + gtk_widget_hide(mainwin->summaryview->hseparator); } gtk_paned_add2(GTK_PANED(vpaned), GTK_WIDGET_PTR(mainwin->messageview)); @@ -2080,11 +2087,13 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type) TRUE, TRUE, 0); gtk_paned_add1(GTK_PANED(vpaned), GTK_WIDGET_PTR(mainwin->summaryview)); + gtk_widget_show(mainwin->summaryview->hseparator); } else { gtk_box_pack_start(GTK_BOX(vbox_body), GTK_WIDGET_PTR(mainwin->summaryview), TRUE, TRUE, 0); gtk_widget_ref(vpaned); + gtk_widget_hide(mainwin->summaryview->hseparator); } gtk_paned_add2(GTK_PANED(vpaned), GTK_WIDGET_PTR(mainwin->messageview)); @@ -2102,6 +2111,7 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type) GTK_WIDGET_PTR(mainwin->folderview)); gtk_paned_add2(GTK_PANED(hpaned), GTK_WIDGET_PTR(mainwin->summaryview)); + gtk_widget_hide(mainwin->summaryview->hseparator); gtk_widget_show(hpaned); gtk_widget_queue_resize(hpaned); @@ -2113,6 +2123,7 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type) gtk_box_pack_start(GTK_BOX(vbox_body), GTK_WIDGET_PTR(mainwin->summaryview), TRUE, TRUE, 0); + gtk_widget_hide(mainwin->summaryview->hseparator); mainwin->win.sep_both.folderwin = folderwin; mainwin->win.sep_both.messagewin = messagewin; diff --git a/src/summaryview.c b/src/summaryview.c index bbd2d078..8f6743e3 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -425,7 +426,6 @@ static GtkItemFactoryEntry summary_popup_entries[] = {N_("/_Print..."), NULL, summary_print, 0, NULL} }; - SummaryView *summary_create(void) { SummaryView *summaryview; @@ -434,6 +434,7 @@ SummaryView *summary_create(void) GtkWidget *treeview; GtkTreeStore *store; GtkTreeSelection *selection; + GtkWidget *hseparator; GtkWidget *hbox; GtkWidget *hbox_l; GtkWidget *statlabel_folder; @@ -450,7 +451,7 @@ SummaryView *summary_create(void) debug_print(_("Creating summary view...\n")); summaryview = g_new0(SummaryView, 1); - vbox = gtk_vbox_new(FALSE, 2); + vbox = gtk_vbox_new(FALSE, 1); scrolledwin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin), @@ -471,6 +472,9 @@ SummaryView *summary_create(void) selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); /* create status label */ + hseparator = gtk_hseparator_new(); + gtk_box_pack_end(GTK_BOX(vbox), hseparator, FALSE, FALSE, 0); + hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); @@ -508,6 +512,7 @@ SummaryView *summary_create(void) summaryview->treeview = treeview; summaryview->store = store; summaryview->selection = selection; + summaryview->hseparator = hseparator; summaryview->hbox = hbox; summaryview->hbox_l = hbox_l; summaryview->statlabel_folder = statlabel_folder; diff --git a/src/summaryview.h b/src/summaryview.h index 1711c704..3742f793 100644 --- a/src/summaryview.h +++ b/src/summaryview.h @@ -64,6 +64,7 @@ struct _SummaryView GtkTreeSelection *selection; GtkTreeViewColumn *columns[N_SUMMARY_VISIBLE_COLS]; + GtkWidget *hseparator; GtkWidget *hbox; GtkWidget *hbox_l; GtkWidget *statlabel_folder; diff --git a/src/textview.c b/src/textview.c index 94ca2253..a2a31802 100644 --- a/src/textview.c +++ b/src/textview.c @@ -252,7 +252,7 @@ TextView *textview_create(void) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin), - GTK_SHADOW_IN); + GTK_SHADOW_ETCHED_IN); gtk_widget_set_size_request (scrolledwin, prefs_common.mainview_width, -1); -- cgit v1.2.3