2007-01-19 [colin] 2.7.1cvs35

	* src/main.c
	* src/mainwindow.c
	* src/mainwindow.h
	* src/messageview.c
	* src/messageview.h
	* src/prefs_common.c
	* src/prefs_common.h
	* src/summaryview.c
	* src/summaryview.h
	* src/gtk/quicksearch.c
	* src/gtk/quicksearch.h
		Drop 'Separate Folder tree' and 'Separate
		Message View'. Put three layouts in place
		of it.

diff --git a/ChangeLog b/ChangeLog
index 4663122c37461bfdce8a52899f86d0b2bda2d059..5605105c55d74b8db47f739de12ea36de558ff5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2007-01-19 [colin]     2.7.1cvs35
+
+       * src/main.c
+       * src/mainwindow.c
+       * src/mainwindow.h
+       * src/messageview.c
+       * src/messageview.h
+       * src/prefs_common.c
+       * src/prefs_common.h
+       * src/summaryview.c
+       * src/summaryview.h
+       * src/gtk/quicksearch.c
+       * src/gtk/quicksearch.h
+               Drop 'Separate Folder tree' and 'Separate
+               Message View'. Put three layouts in place
+               of it.
+
 2007-01-19 [paul]      2.7.1cvs34
 
        * src/prefs_msg_colors.c

diff --git a/PATCHSETS b/PATCHSETS
index b08cb3d457e2cacf074aadeba12b7703cffee316..3779adcb8373d444332d5b03fb469c30ba702797 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2292,3 +2292,4 @@
 ( cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/wizard.c;  ) > 2.7.1cvs32.patchset
 ( cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/imap_gtk.c;  cvs diff -u -r 1.105.2.82 -r 1.105.2.83 src/prefs_account.c;  ) > 2.7.1cvs33.patchset
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/prefs_msg_colors.c;  ) > 2.7.1cvs34.patchset
+( cvs diff -u -r 1.115.2.127 -r 1.115.2.128 src/main.c;  cvs diff -u -r 1.274.2.165 -r 1.274.2.166 src/mainwindow.c;  cvs diff -u -r 1.39.2.29 -r 1.39.2.30 src/mainwindow.h;  cvs diff -u -r 1.94.2.119 -r 1.94.2.120 src/messageview.c;  cvs diff -u -r 1.19.2.13 -r 1.19.2.14 src/messageview.h;  cvs diff -u -r 1.204.2.119 -r 1.204.2.120 src/prefs_common.c;  cvs diff -u -r 1.103.2.75 -r 1.103.2.76 src/prefs_common.h;  cvs diff -u -r 1.395.2.278 -r 1.395.2.279 src/summaryview.c;  cvs diff -u -r 1.68.2.32 -r 1.68.2.33 src/summaryview.h;  cvs diff -u -r 1.1.2.57 -r 1.1.2.58 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/quicksearch.h;  ) > 2.7.1cvs35.patchset

diff --git a/configure.ac b/configure.ac
index 0bddc99e7670a34e1be417894130bdeb5dbda12f..190606b4289dcb484a3c4ee786e62f18656fe8fd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=34
+EXTRA_VERSION=35
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index f3aa7520d572a57ef89026071a532440fb2e386c..baf35dbe5daf129bc86ff2de6ed6c5abf9da7efe 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -463,7 +463,7 @@ QuickSearch *quicksearch_new()
        GtkWidget *clear_search;
        GtkWidget *search_condition_expression;
        GtkWidget *menuitem;
-       GtkTooltips *search_cond_expr_tip;
+       GtkTooltips *tips = gtk_tooltips_new();
 
        quicksearch = g_new0(QuickSearch, 1);
 
@@ -551,6 +551,9 @@ QuickSearch *quicksearch_new()
                           FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(clear_search), "clicked",
                         G_CALLBACK(clear_search_cb), quicksearch);
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tips),
+                            clear_search,
+                            _("Clear the current search"), NULL);
        gtk_widget_show(clear_search);
 
 #if GTK_CHECK_VERSION(2, 8, 0)
@@ -563,8 +566,7 @@ QuickSearch *quicksearch_new()
        g_signal_connect(G_OBJECT (search_condition_expression), "clicked",
                         G_CALLBACK(search_condition_expr),
                         quicksearch);
-       search_cond_expr_tip = gtk_tooltips_new();
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(search_cond_expr_tip),
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tips),
                             search_condition_expression,
                             _("Edit search criteria"), NULL);
        gtk_widget_show(search_condition_expression);
@@ -578,6 +580,9 @@ QuickSearch *quicksearch_new()
                           FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(search_description), "clicked",
                         G_CALLBACK(search_description_cb), NULL);
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tips),
+                            search_description,
+                            _("Information about extended symbols"), NULL);
        gtk_widget_show(search_description);
 
        gtk_box_pack_start(GTK_BOX(hbox_search), search_hbox, FALSE, FALSE, 2);
@@ -620,6 +625,38 @@ QuickSearch *quicksearch_new()
        return quicksearch;
 }
 
+void quicksearch_relayout(QuickSearch *quicksearch)
+{
+       if (prefs_common.layout_mode != VERTICAL_LAYOUT) {
+#if GTK_CHECK_VERSION(2, 8, 0)
+               gtk_button_set_label(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO);
+               gtk_button_set_label(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT);
+               gtk_button_set_label(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR);
+#else
+               gtk_button_set_label(GTK_BUTTON(quicksearch->search_description), _(" Extended Symbols... "));
+               gtk_button_set_label(GTK_BUTTON(quicksearch->search_condition_expression), " ... ");
+               gtk_button_set_label(GTK_BUTTON(quicksearch->clear_search), _(" Clear "));
+#endif
+       } else {
+#if GTK_CHECK_VERSION(2, 8, 0)
+               gtk_button_set_label(GTK_BUTTON(quicksearch->search_description), "");
+               gtk_button_set_label(GTK_BUTTON(quicksearch->search_condition_expression), "");
+               gtk_button_set_label(GTK_BUTTON(quicksearch->clear_search), "");
+
+               gtk_button_set_image(GTK_BUTTON(quicksearch->search_description),
+                       gtk_image_new_from_stock(GTK_STOCK_INFO, GTK_ICON_SIZE_BUTTON));
+               gtk_button_set_image(GTK_BUTTON(quicksearch->search_condition_expression),
+                       gtk_image_new_from_stock(GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON));
+               gtk_button_set_image(GTK_BUTTON(quicksearch->clear_search),
+                       gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_BUTTON));
+#else
+               gtk_button_set_label(GTK_BUTTON(quicksearch->search_description), _("Info"));
+               gtk_button_set_label(GTK_BUTTON(quicksearch->search_condition_expression), "...");
+               gtk_button_set_label(GTK_BUTTON(quicksearch->clear_search), _("Clear"));
+#endif
+       }
+}
+
 GtkWidget *quicksearch_get_widget(QuickSearch *quicksearch)
 {
        return quicksearch->hbox_search;

diff --git a/src/gtk/quicksearch.h b/src/gtk/quicksearch.h
index 9aadd869df95c1a7f7d09e28b528317e3e225d7c..54c5b9904118a75450950083663f066ed5243c1c 100644 (file)
--- a/src/gtk/quicksearch.h
+++ b/src/gtk/quicksearch.h
@@ -53,5 +53,5 @@ void quicksearch_search_subfolders(QuickSearch *quicksearch,
                                   FolderItem  *folder_item);
 gboolean quicksearch_is_fast(QuickSearch *quicksearch);
 gboolean quicksearch_is_in_typing(QuickSearch *quicksearch);
-
+void quicksearch_relayout(QuickSearch *quicksearch);
 #endif /* QUICKSEARCH_H */

diff --git a/src/main.c b/src/main.c
index f0d7dd4b32ae192f4e0181460b41b2b228e82600..f217dd05d1f55f7472f8166d135c31a8a85bfa62 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -764,8 +764,7 @@ int main(int argc, char *argv[])
        imap_gtk_init();
        news_gtk_init();
 
-       mainwin = main_window_create
-               (prefs_common.sep_folder | prefs_common.sep_msg << 1);
+       mainwin = main_window_create();
 
        manage_window_focus_in(mainwin->window, NULL, NULL);
        folderview = mainwin->folderview;

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 2bf26160df297928d5dd184a081c2bfd4fafd790..824fc3f96cac80e837c8f8c0edd2b941e798fedb 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -111,8 +111,11 @@ static void main_window_menu_callback_unblock      (MainWindow     *mainwin);
 
 static void main_window_show_cur_account       (MainWindow     *mainwin);
 
+static void main_window_separation_change      (MainWindow     *mainwin,
+                                                LayoutType      layout_mode);
+
 static void main_window_set_widgets            (MainWindow     *mainwin,
-                                                SeparateType    type);
+                                                LayoutType      layout_mode);
 
 static void toolbar_child_attached             (GtkWidget      *widget,
                                                 GtkWidget      *child,
@@ -128,12 +131,6 @@ static gboolean ac_label_button_pressed            (GtkWidget      *widget,
 static gint main_window_close_cb               (GtkWidget      *widget,
                                                 GdkEventAny    *event,
                                                 gpointer        data);
-static gint folder_window_close_cb             (GtkWidget      *widget,
-                                                GdkEventAny    *event,
-                                                gpointer        data);
-static gint message_window_close_cb            (GtkWidget      *widget,
-                                                GdkEventAny    *event,
-                                                gpointer        data);
 
 static void main_window_size_allocate_cb       (GtkWidget      *widget,
                                                 GtkAllocation  *allocation,
@@ -181,9 +178,6 @@ static void search_cb                (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 
-static void toggle_folder_cb    (MainWindow    *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
 static void toggle_message_cb   (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -193,7 +187,7 @@ static void toggle_toolbar_cb        (MainWindow    *mainwin,
 static void toggle_statusbar_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void separate_widget_cb  (MainWindow    *mainwin,
+static void set_layout_cb       (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 
@@ -531,8 +525,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Edit/_Quick search"),            "slash", mainwindow_quicksearch, 0, NULL},
        {N_("/_View"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Show or hi_de"),            NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/Show or hi_de/_Folder tree"),
-                                               NULL, toggle_folder_cb, 0, "<ToggleItem>"},
        {N_("/_View/Show or hi_de/_Message view"),
                                                "V", toggle_message_cb, 0, "<ToggleItem>"},
        {N_("/_View/Show or hi_de/_Toolbar"),
@@ -554,8 +546,10 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/Set displayed _columns/in _Message list..."),NULL, set_summary_display_item_cb, 0, NULL},
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_View/Separate f_older tree"),    NULL, separate_widget_cb, SEPARATE_FOLDER, "<ToggleItem>"},
-       {N_("/_View/Separate _message view"),   NULL, separate_widget_cb, SEPARATE_MESSAGE, "<ToggleItem>"},
+       {N_("/_View/La_yout"),                  NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Layout/_Normal"),           NULL, set_layout_cb, NORMAL_LAYOUT, "<RadioItem>"},
+       {N_("/_View/Layout/_Vertical"),         NULL, set_layout_cb, VERTICAL_LAYOUT, "/View/Layout/Normal"},
+       {N_("/_View/Layout/_Wide"),             NULL, set_layout_cb, WIDE_LAYOUT, "/View/Layout/Normal"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Sort"),                    NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Sort/by _number"),         NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
@@ -1089,7 +1083,7 @@ void mainwindow_clear_error(MainWindow *mainwin)
        gtk_widget_hide(mainwin->warning_btn);
 }
 
-MainWindow *main_window_create(SeparateType type)
+MainWindow *main_window_create()
 {
        MainWindow *mainwin;
        GtkWidget *window;
@@ -1356,7 +1350,7 @@ MainWindow *main_window_create(SeparateType type)
 
        messageview->visible = prefs_common.msgview_visible;
 
-       main_window_set_widgets(mainwin, type);
+       main_window_set_widgets(mainwin, prefs_common.layout_mode);
 
        g_signal_connect(G_OBJECT(window), "size_allocate",
                         G_CALLBACK(main_window_size_allocate_cb),
@@ -1428,6 +1422,9 @@ MainWindow *main_window_create(SeparateType type)
 
        gtk_window_iconify(GTK_WINDOW(mainwin->window));
 
+       if (prefs_common.layout_mode == VERTICAL_LAYOUT)
+               summary_relayout(mainwin->summaryview); 
+
        gtk_widget_show(mainwin->window);
 
        /* initialize views */
@@ -1456,7 +1453,7 @@ MainWindow *main_window_create(SeparateType type)
                online_switch_clicked (GTK_BUTTON(online_switch), mainwin);
 
        mainwindow_colorlabel_menu_create(mainwin, FALSE);
-
+       
        return mainwin;
 }
 
@@ -1835,41 +1832,17 @@ static void main_window_show_cur_account(MainWindow *mainwin)
        g_free(ac_name);
 }
 
-GtkWidget *main_window_get_folder_window(MainWindow *mainwin)
-{
-       switch (mainwin->type) {
-       case SEPARATE_FOLDER:
-               return mainwin->win.sep_folder.folderwin;
-       case SEPARATE_BOTH:
-               return mainwin->win.sep_both.folderwin;
-       default:
-               return NULL;
-       }
-}
-
-GtkWidget *main_window_get_message_window(MainWindow *mainwin)
-{
-       switch (mainwin->type) {
-       case SEPARATE_MESSAGE:
-               return mainwin->win.sep_message.messagewin;
-       case SEPARATE_BOTH:
-               return mainwin->win.sep_both.messagewin;
-       default:
-               return NULL;
-       }
-}
-
-void main_window_separation_change(MainWindow *mainwin, SeparateType type)
+static void main_window_separation_change(MainWindow *mainwin, LayoutType layout_mode)
 {
        GtkWidget *folder_wid  = GTK_WIDGET_PTR(mainwin->folderview);
        GtkWidget *summary_wid = GTK_WIDGET_PTR(mainwin->summaryview);
-       /* GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview); */
        GtkWidget *message_wid = mainwin->messageview->vbox;
 
-       debug_print("Changing window separation type from %d to %d\n",
-                   mainwin->type, type);
+       if (layout_mode == prefs_common.layout_mode) 
+               return;
 
-       if (mainwin->type == type) return;
+       debug_print("Changing window separation type from %d to %d\n",
+                   prefs_common.layout_mode, layout_mode);
 
        /* remove widgets from those containers */
        gtk_widget_ref(folder_wid);
@@ -1882,27 +1855,8 @@ void main_window_separation_change(MainWindow *mainwin, SeparateType type)
        gtkut_container_remove
                (GTK_CONTAINER(message_wid->parent), message_wid);
 
-       /* clean containers */
-       switch (mainwin->type) {
-       case SEPARATE_NONE:
-               gtk_widget_destroy(mainwin->win.sep_none.hpaned);
-               break;
-       case SEPARATE_FOLDER:
-               gtk_widget_destroy(mainwin->win.sep_folder.vpaned);
-               gtk_widget_destroy(mainwin->win.sep_folder.folderwin);
-               break;
-       case SEPARATE_MESSAGE:
-               gtk_widget_destroy(mainwin->win.sep_message.hpaned);
-               gtk_widget_destroy(mainwin->win.sep_message.messagewin);
-               break;
-       case SEPARATE_BOTH:
-               gtk_widget_destroy(mainwin->win.sep_both.messagewin);
-               gtk_widget_destroy(mainwin->win.sep_both.folderwin);
-               break;
-       }
-
        gtk_widget_hide(mainwin->window);
-       main_window_set_widgets(mainwin, type);
+       main_window_set_widgets(mainwin, layout_mode);
        gtk_widget_show(mainwin->window);
 
        gtk_widget_unref(folder_wid);
@@ -1910,51 +1864,54 @@ void main_window_separation_change(MainWindow *mainwin, SeparateType type)
        gtk_widget_unref(message_wid);
 }
 
+static void mainwin_reset_paned(GtkPaned *paned)
+{
+               gint min, max, mid;
+               g_object_get (G_OBJECT(paned),
+                               "min-position",
+                               &min, NULL);
+               g_object_get (G_OBJECT(paned),
+                               "max-position",
+                               &max, NULL);
+               mid = (min+max)/2;
+
+               gtk_paned_set_position(GTK_PANED(paned), mid);
+}
+
 void main_window_toggle_message_view(MainWindow *mainwin)
 {
        SummaryView *summaryview = mainwin->summaryview;
-       union CompositeWin *cwin = &mainwin->win;
-       GtkWidget *vpaned = NULL;
+       GtkWidget *ppaned = NULL;
        GtkWidget *container = NULL;
-       GtkWidget *msgwin = NULL;
-
-       switch (mainwin->type) {
-       case SEPARATE_NONE:
-               vpaned = cwin->sep_none.vpaned;
-               container = cwin->sep_none.hpaned;
-               break;
-       case SEPARATE_FOLDER:
-               vpaned = cwin->sep_folder.vpaned;
-               container = mainwin->vbox_body;
-               break;
-       case SEPARATE_MESSAGE:
-               msgwin = mainwin->win.sep_message.messagewin;
-               break;
-       case SEPARATE_BOTH:
-               msgwin = mainwin->win.sep_both.messagewin;
-               break;
-       }
-
-       if (msgwin) {
-               if (GTK_WIDGET_VISIBLE(msgwin)) {
-                       gtk_widget_hide(msgwin);
+       
+       if (prefs_common.layout_mode != WIDE_LAYOUT) {
+               ppaned = mainwin->vpaned;
+               container = mainwin->hpaned;
+               if (ppaned->parent != NULL) {
                        mainwin->messageview->visible = FALSE;
                        summaryview->displayed = NULL;
+                       gtk_widget_ref(ppaned);
+                       gtkut_container_remove(GTK_CONTAINER(container), ppaned);
+                       gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
                } else {
-                       gtk_widget_show(msgwin);
                        mainwin->messageview->visible = TRUE;
+                       gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), ppaned);
+                       gtk_container_add(GTK_CONTAINER(container), ppaned);
+                       gtk_widget_unref(ppaned);
                }
-       } else if (vpaned->parent != NULL) {
-               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);
        } else {
-               mainwin->messageview->visible = TRUE;
-               gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), vpaned);
-               gtk_container_add(GTK_CONTAINER(container), vpaned);
-               gtk_widget_unref(vpaned);
+               ppaned = mainwin->hpaned;
+               container = mainwin->vpaned;
+               if (mainwin->messageview->vbox->parent != NULL) {
+                       mainwin->messageview->visible = FALSE;
+                       summaryview->displayed = NULL;
+                       gtk_widget_ref(mainwin->messageview->vbox);
+                       gtkut_container_remove(GTK_CONTAINER(container), mainwin->messageview->vbox);
+               } else {
+                       mainwin->messageview->visible = TRUE;
+                       gtk_container_add(GTK_CONTAINER(container), mainwin->messageview->vbox);
+                       gtk_widget_unref(mainwin->messageview->vbox);
+               }
        }
 
        if (messageview_is_visible(mainwin->messageview))
@@ -1971,6 +1928,10 @@ void main_window_toggle_message_view(MainWindow *mainwin)
 
        prefs_common.msgview_visible = mainwin->messageview->visible;
 
+       if (messageview_is_visible(mainwin->messageview)) {
+               gtk_widget_queue_resize(mainwin->hpaned);
+               gtk_widget_queue_resize(mainwin->vpaned);
+       }
        summary_grab_focus(summaryview);
 }
 
@@ -1989,9 +1950,7 @@ void main_window_get_size(MainWindow *mainwin)
        if (allocation->width > 1 && allocation->height > 1) {
                prefs_common.summaryview_width = allocation->width;
 
-               if ((mainwin->type == SEPARATE_NONE ||
-                    mainwin->type == SEPARATE_FOLDER) &&
-                   messageview_is_visible(mainwin->messageview))
+               if (messageview_is_visible(mainwin->messageview))
                        prefs_common.summaryview_height = allocation->height;
 
                prefs_common.mainview_width = allocation->width;
@@ -2030,7 +1989,6 @@ void main_window_get_size(MainWindow *mainwin)
 void main_window_get_position(MainWindow *mainwin)
 {
        gint x, y;
-       GtkWidget *window;
 
        gtkut_widget_get_uposition(mainwin->window, &x, &y);
 
@@ -2040,21 +1998,6 @@ void main_window_get_position(MainWindow *mainwin)
        prefs_common.mainwin_y = y;
 
        debug_print("main window position: %d, %d\n", x, y);
-
-       window = main_window_get_folder_window(mainwin);
-       if (window) {
-               gtkut_widget_get_uposition(window, &x, &y);
-               prefs_common.folderwin_x = x;
-               prefs_common.folderwin_y = y;
-               debug_print("folder window position: %d, %d\n", x, y);
-       }
-       window = main_window_get_message_window(mainwin);
-       if (window) {
-               gtkut_widget_get_uposition(window, &x, &y);
-               prefs_common.main_msgwin_x = x;
-               prefs_common.main_msgwin_y = y;
-               debug_print("message window position: %d, %d\n", x, y);
-       }
 }
 
 void main_window_progress_on(MainWindow *mainwin)
@@ -2610,21 +2553,6 @@ void main_window_popup(MainWindow *mainwin)
                main_window_show(mainwin);
 
        gtkut_window_popup(mainwin->window);
-
-       switch (mainwin->type) {
-       case SEPARATE_FOLDER:
-               gtkut_window_popup(mainwin->win.sep_folder.folderwin);
-               break;
-       case SEPARATE_MESSAGE:
-               gtkut_window_popup(mainwin->win.sep_message.messagewin);
-               break;
-       case SEPARATE_BOTH:
-               gtkut_window_popup(mainwin->win.sep_both.folderwin);
-               gtkut_window_popup(mainwin->win.sep_both.messagewin);
-               break;
-       default:
-               break;
-       }
 }
 
 void main_window_show(MainWindow *mainwin)
@@ -2645,24 +2573,6 @@ void main_window_show(MainWindow *mainwin)
        gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->messageview),
                             prefs_common.msgview_width,
                             prefs_common.msgview_height);
-
-       if (mainwin->type & SEPARATE_FOLDER) {
-               GtkWidget *folderwin;
-
-               folderwin = main_window_get_folder_window(mainwin);
-               gtk_widget_show(folderwin);
-               gtk_widget_set_uposition(folderwin, prefs_common.folderwin_x,
-                                         prefs_common.folderwin_y);
-       }
-
-       if (mainwin->type & SEPARATE_MESSAGE) {
-               GtkWidget *messagewin;
-
-               messagewin = main_window_get_message_window(mainwin);
-               gtk_widget_show(messagewin);
-               gtk_widget_set_uposition(messagewin, prefs_common.main_msgwin_x,
-                                         prefs_common.main_msgwin_y);
-       }
 }
 
 void main_window_hide(MainWindow *mainwin)
@@ -2672,17 +2582,9 @@ void main_window_hide(MainWindow *mainwin)
 
        gtk_widget_hide(mainwin->window);
        gtk_widget_hide(mainwin->vbox_body);
-
-       if (mainwin->type & SEPARATE_FOLDER) {
-               gtk_widget_hide(mainwin->win.sep_folder.folderwin);
-       }
-
-       if (mainwin->type & SEPARATE_MESSAGE) {
-               gtk_widget_hide(mainwin->win.sep_message.messagewin);
-       }
 }
 
-static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
+static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
 {
        GtkWidget *folderwin = NULL;
        GtkWidget *messagewin = NULL;
@@ -2691,7 +2593,6 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        GtkWidget *vbox_body = mainwin->vbox_body;
        GtkItemFactory *ifactory = mainwin->menu_factory;
        GtkWidget *menuitem;
-       GtkItemFactory *msgview_ifactory;
 
        debug_print("Setting widgets... ");
 
@@ -2705,87 +2606,28 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                    prefs_common.msgview_width,
                                    prefs_common.msgview_height);
 
-       /* create separated window(s) if needed */
-       if (type & SEPARATE_FOLDER) {
-               static GdkGeometry folderwin_geometry;
-               
-               folderwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-               gtk_window_set_title(GTK_WINDOW(folderwin),
-                                    _("Claws Mail - Folder View"));
-
-               gtk_window_move(GTK_WINDOW(folderwin),
-                               prefs_common.folderwin_x,
-                               prefs_common.folderwin_y);
-
-               if (!folderwin_geometry.min_height) {
-                       folderwin_geometry.min_width = 320;
-                       folderwin_geometry.min_height = 200;
-               }
-               gtk_window_set_geometry_hints(GTK_WINDOW(folderwin), NULL,
-                                             &folderwin_geometry, GDK_HINT_MIN_SIZE);
-                               
-               gtk_widget_set_size_request(folderwin,
-                                           prefs_common.folderview_width,
-                                           prefs_common.folderview_height);
-
-               gtk_container_set_border_width(GTK_CONTAINER(folderwin),
-                                              BORDER_WIDTH);
-
-               g_signal_connect(G_OBJECT(folderwin), "delete_event",
-                                G_CALLBACK(folder_window_close_cb),
-                                  mainwin);
-               gtk_container_add(GTK_CONTAINER(folderwin),
-                                 GTK_WIDGET_PTR(mainwin->folderview));
-               gtk_widget_realize(folderwin);
-
-               if (prefs_common.folderview_visible)
-                       gtk_widget_show(folderwin);
-       }
+       mainwin->messageview->statusbar = mainwin->statusbar;
+       mainwin->messageview->statusbar_cid = mainwin->messageview_cid;
 
-       if (type & SEPARATE_MESSAGE) {
-               static GdkGeometry msgwin_geometry;
-               
-               messagewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-               gtk_window_set_title(GTK_WINDOW(messagewin),
-                                    _("Claws Mail - Message View"));
-                                    
-               gtk_window_move(GTK_WINDOW(messagewin), 
-                               prefs_common.main_msgwin_x,
-                               prefs_common.main_msgwin_y);
-
-               if (!msgwin_geometry.min_height) {
-                       msgwin_geometry.min_width = 320;
-                       msgwin_geometry.min_height = 200;
-               }
-               gtk_window_set_geometry_hints(GTK_WINDOW(messagewin), NULL,
-                                             &msgwin_geometry, GDK_HINT_MIN_SIZE);
-               
-               gtk_widget_set_size_request(messagewin, 
-                                           prefs_common.msgwin_width,
-                                           prefs_common.msgwin_height);
-
-               gtk_container_set_border_width(GTK_CONTAINER(messagewin),
-                                              BORDER_WIDTH);
-               g_signal_connect(G_OBJECT(messagewin), "delete_event",
-                                G_CALLBACK(message_window_close_cb),
-                                mainwin);
-               if (messageview_is_visible(mainwin->messageview))
-                       gtk_widget_show(messagewin);
-       } else {
-               mainwin->messageview->statusbar = mainwin->statusbar;
-               mainwin->messageview->statusbar_cid = mainwin->messageview_cid;
+       /* clean top-most container */
+       if (mainwin->hpaned) {
+               if (mainwin->hpaned->parent == mainwin->vpaned)
+                       gtk_widget_destroy(mainwin->vpaned);
+               else
+                       gtk_widget_destroy(mainwin->hpaned);
        }
-
-       switch (type) {
-       case SEPARATE_NONE:
+       if (layout_mode != WIDE_LAYOUT) {
                hpaned = gtk_hpaned_new();
+               if (layout_mode == VERTICAL_LAYOUT)
+                       vpaned = gtk_hpaned_new();
+               else
+                       vpaned = gtk_vpaned_new();
                gtk_box_pack_start(GTK_BOX(vbox_body), hpaned, TRUE, TRUE, 0);
                gtk_paned_add1(GTK_PANED(hpaned),
                               GTK_WIDGET_PTR(mainwin->folderview));
                gtk_widget_show(hpaned);
                gtk_widget_queue_resize(hpaned);
 
-               vpaned = gtk_vpaned_new();
                if (messageview_is_visible(mainwin->messageview)) {
                        gtk_paned_add2(GTK_PANED(hpaned), vpaned);
                        gtk_paned_add1(GTK_PANED(vpaned),
@@ -2799,93 +2641,36 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                               GTK_WIDGET_PTR(mainwin->messageview));
                gtk_widget_show(vpaned);
                gtk_widget_queue_resize(vpaned);
-
-               mainwin->win.sep_none.hpaned = hpaned;
-               mainwin->win.sep_none.vpaned = vpaned;
-               
-               /* remove headerview if not in prefs */
-               headerview_set_visibility(mainwin->messageview->headerview,
-                                         prefs_common.display_header_pane);
-               break;
-       case SEPARATE_FOLDER:
+       } else {
                vpaned = gtk_vpaned_new();
-               if (messageview_is_visible(mainwin->messageview)) {
-                       gtk_box_pack_start(GTK_BOX(vbox_body), vpaned,
-                                          TRUE, TRUE, 0);
-                       gtk_paned_add1(GTK_PANED(vpaned),
-                                      GTK_WIDGET_PTR(mainwin->summaryview));
-               } else {
-                       gtk_box_pack_start(GTK_BOX(vbox_body),
-                                          GTK_WIDGET_PTR(mainwin->summaryview),
-                                          TRUE, TRUE, 0);
-                       gtk_widget_ref(vpaned);
-               }
-               gtk_paned_add2(GTK_PANED(vpaned),
-                              GTK_WIDGET_PTR(mainwin->messageview));
-               gtk_widget_show(vpaned);
-               gtk_widget_queue_resize(vpaned);
-
-               mainwin->win.sep_folder.folderwin = folderwin;
-               mainwin->win.sep_folder.vpaned    = vpaned;
-
-               /* remove headerview if not in prefs */
-               headerview_set_visibility(mainwin->messageview->headerview,
-                                         prefs_common.display_header_pane);
-               
-               break;
-       case SEPARATE_MESSAGE:
                hpaned = gtk_hpaned_new();
-               gtk_box_pack_start(GTK_BOX(vbox_body), hpaned, TRUE, TRUE, 0);
+               gtk_box_pack_start(GTK_BOX(vbox_body), vpaned, TRUE, TRUE, 0);
+               gtk_paned_add1(GTK_PANED(vpaned), hpaned);
+
                gtk_paned_add1(GTK_PANED(hpaned),
                               GTK_WIDGET_PTR(mainwin->folderview));
                gtk_paned_add2(GTK_PANED(hpaned),
                               GTK_WIDGET_PTR(mainwin->summaryview));
+
                gtk_widget_show(hpaned);
                gtk_widget_queue_resize(hpaned);
-               messageview_add_toolbar(mainwin->messageview, messagewin);
-               msgview_ifactory = gtk_item_factory_from_widget(mainwin->messageview->menubar);
-               menu_set_sensitive(msgview_ifactory, "/File/Close", FALSE);
-
-               mainwin->win.sep_message.messagewin = messagewin;
-               mainwin->win.sep_message.hpaned     = hpaned;
-
-               gtk_widget_realize(messagewin);
-               gtk_widget_show_all(GTK_WIDGET_PTR(mainwin->messageview));
-               gtk_widget_show_all(messagewin);
-               toolbar_set_style(mainwin->messageview->toolbar->toolbar, 
-                                 mainwin->messageview->handlebox, 
-                                 prefs_common.toolbar_style);
 
-               /* remove headerview if not in prefs */
-               headerview_set_visibility(mainwin->messageview->headerview,
-                                         prefs_common.display_header_pane);
+               if (messageview_is_visible(mainwin->messageview)) {
+                       gtk_paned_add2(GTK_PANED(vpaned),
+                              GTK_WIDGET_PTR(mainwin->messageview));   
+               } else {
+                       gtk_widget_ref(GTK_WIDGET_PTR(mainwin->messageview));
+               }
+               gtk_widget_show(vpaned);
+               gtk_widget_queue_resize(vpaned);
+       }
 
-               break;
-       case SEPARATE_BOTH:
-               messageview_add_toolbar(mainwin->messageview, messagewin);
-               msgview_ifactory = gtk_item_factory_from_widget(mainwin->messageview->menubar);
-               menu_set_sensitive(msgview_ifactory, "/File/Close", FALSE);
-
-               gtk_box_pack_start(GTK_BOX(vbox_body),
-                                  GTK_WIDGET_PTR(mainwin->summaryview),
-                                  TRUE, TRUE, 0);
-               
-               mainwin->win.sep_both.folderwin = folderwin;
-               mainwin->win.sep_both.messagewin = messagewin;
-               
-               gtk_widget_realize(messagewin);
-               gtk_widget_show_all(GTK_WIDGET_PTR(mainwin->messageview));
-               gtk_widget_show_all(messagewin);
-               toolbar_set_style(mainwin->messageview->toolbar->toolbar, 
-                                 mainwin->messageview->handlebox, 
-                                 prefs_common.toolbar_style);          
-
-               /* remove headerview if not in prefs */
-               headerview_set_visibility(mainwin->messageview->headerview,
-                                         prefs_common.display_header_pane);
+       mainwin->hpaned = hpaned;
+       mainwin->vpaned = vpaned;
 
-               break;
-       }
+       /* remove headerview if not in prefs */
+       headerview_set_visibility(mainwin->messageview->headerview,
+                                 prefs_common.display_header_pane);
 
        if (messageview_is_visible(mainwin->messageview))
                gtk_arrow_set(GTK_ARROW(mainwin->summaryview->toggle_arrow),
@@ -2912,30 +2697,28 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        else 
                gtk_widget_hide(mainwin->messageview->mimeview->ctree_mainbox);
 
-       mainwin->type = type;
+       prefs_common.layout_mode = layout_mode;
 
-
-       /* toggle menu state */
-       menuitem = gtk_item_factory_get_item
-               (ifactory, "/View/Show or hide/Folder tree");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
-                                      (type & SEPARATE_FOLDER) == 0 ? TRUE :
-                                      prefs_common.folderview_visible);
-       gtk_widget_set_sensitive(menuitem, ((type & SEPARATE_FOLDER) != 0));
        menuitem = gtk_item_factory_get_item
                (ifactory, "/View/Show or hide/Message view");
        gtk_check_menu_item_set_active
                (GTK_CHECK_MENU_ITEM(menuitem),
                 messageview_is_visible(mainwin->messageview));
 
-       menuitem = gtk_item_factory_get_item
-               (ifactory, "/View/Separate folder tree");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
-                                      ((type & SEPARATE_FOLDER) != 0));
-       menuitem = gtk_item_factory_get_item
-               (ifactory, "/View/Separate message view");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
-                                      ((type & SEPARATE_MESSAGE) != 0));
+#define SET_CHECK_MENU_ACTIVE(path, active) \
+{ \
+       menuitem = gtk_item_factory_get_widget(ifactory, path); \
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
+}
+
+       if (prefs_common.layout_mode == NORMAL_LAYOUT) {
+               SET_CHECK_MENU_ACTIVE("/View/Layout/Normal", TRUE);
+       } else if (prefs_common.layout_mode == VERTICAL_LAYOUT) {
+               SET_CHECK_MENU_ACTIVE("/View/Layout/Vertical", TRUE);
+       } else if (prefs_common.layout_mode == WIDE_LAYOUT) {
+               SET_CHECK_MENU_ACTIVE("/View/Layout/Wide", TRUE);
+       }
+#undef SET_CHECK_MENU_ACTIVE
 
        if (folderwin) {
                g_signal_connect
@@ -3017,35 +2800,6 @@ static gint main_window_close_cb(GtkWidget *widget, GdkEventAny *event,
        return TRUE;
 }
 
-static gint folder_window_close_cb(GtkWidget *widget, GdkEventAny *event,
-                                  gpointer data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-       GtkWidget *menuitem;
-
-       menuitem = gtk_item_factory_get_item
-               (mainwin->menu_factory, "/View/Show or hide/Folder tree");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-
-       return TRUE;
-}
-
-static gint message_window_close_cb(GtkWidget *widget, GdkEventAny *event,
-                                   gpointer data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-       GtkWidget *menuitem;
-
-       menuitem = gtk_item_factory_get_item
-               (mainwin->menu_factory, "/View/Show or hide/Message view");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-
-       mainwin->messageview->statusbar = mainwin->statusbar;
-       mainwin->messageview->statusbar_cid = mainwin->messageview_cid;
-
-       return TRUE;
-}
-
 static void main_window_size_allocate_cb(GtkWidget *widget,
                                         GtkAllocation *allocation,
                                         gpointer data)
@@ -3161,35 +2915,6 @@ static void mainwindow_quicksearch(MainWindow *mainwin, guint action, GtkWidget
        summaryview_activate_quicksearch(mainwin->summaryview, TRUE);
 }
 
-static void toggle_folder_cb(MainWindow *mainwin, guint action,
-                            GtkWidget *widget)
-{
-       gboolean active;
-
-       active = GTK_CHECK_MENU_ITEM(widget)->active;
-
-       switch (mainwin->type) {
-       case SEPARATE_NONE:
-       case SEPARATE_MESSAGE:
-               break;
-       case SEPARATE_FOLDER:
-               debug_print("separate folder\n");
-               if (active)
-                       gtk_widget_show(mainwin->win.sep_folder.folderwin);
-               else
-                       gtk_widget_hide(mainwin->win.sep_folder.folderwin);
-               break;
-       case SEPARATE_BOTH:
-               if (active)
-                       gtk_widget_show(mainwin->win.sep_both.folderwin);
-               else
-                       gtk_widget_hide(mainwin->win.sep_both.folderwin);
-               break;
-       }
-
-       prefs_common.folderview_visible = active;
-}
-
 static void toggle_message_cb(MainWindow *mainwin, guint action,
                              GtkWidget *widget)
 {
@@ -3234,20 +2959,29 @@ static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
        }
 }
 
-static void separate_widget_cb(MainWindow *mainwin, guint action,
+static void set_layout_cb(MainWindow *mainwin, guint action,
                               GtkWidget *widget)
 {
-       SeparateType type;
+       LayoutType layout_mode = action;
 
-       if (GTK_CHECK_MENU_ITEM(widget)->active)
-               type = mainwin->type | action;
-       else
-               type = mainwin->type & ~action;
+       if (mainwin->menu_lock_count) {
+               return;
+       }
+       if (!GTK_CHECK_MENU_ITEM(widget)->active) {
+               return;
+       }
+       
+       if (layout_mode == prefs_common.layout_mode) {
+               return;
+       }
+       
+       if (!mainwin->messageview->visible)
+               main_window_toggle_message_view(mainwin);
 
-       main_window_separation_change(mainwin, type);
+       main_window_separation_change(mainwin, layout_mode);
 
-       prefs_common.sep_folder = (type & SEPARATE_FOLDER)  != 0;
-       prefs_common.sep_msg    = (type & SEPARATE_MESSAGE) != 0;
+       mainwin_reset_paned(GTK_PANED(mainwin->vpaned));
+       summary_relayout(mainwin->summaryview); 
 }
 
 void main_window_toggle_work_offline (MainWindow *mainwin, gboolean offline,

diff --git a/src/mainwindow.h b/src/mainwindow.h
index f0812c70e52fd29180d6cd7fbed3cbde1acad87b..82b0aa13b85bf25d0271f30c9b510779ea5825f5 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -60,14 +60,13 @@ typedef enum
 
 typedef enum
 {
-       SEPARATE_NONE    = 0,
-       SEPARATE_FOLDER  = 1 << 0,
-       SEPARATE_MESSAGE = 1 << 1,
-       SEPARATE_BOTH    = (SEPARATE_FOLDER | SEPARATE_MESSAGE)
-} SeparateType;
+       NORMAL_LAYOUT    = 0,
+       VERTICAL_LAYOUT  = 1 << 0,
+       WIDE_LAYOUT = 1 << 1
+} LayoutType;
 
 typedef enum
-{
+{      
        TOOLBAR_NONE            = 0,
        TOOLBAR_ICON            = 1,
        TOOLBAR_TEXT            = 2,
@@ -77,27 +76,8 @@ typedef enum
 
 struct _MainWindow
 {
-       SeparateType type;
-
-       union CompositeWin {
-               struct 
-               {
-                       GtkWidget *hpaned;
-                       GtkWidget *vpaned;
-               } sep_none;
-               struct {
-                       GtkWidget *folderwin;
-                       GtkWidget *vpaned;
-               } sep_folder;
-               struct {
-                       GtkWidget *messagewin;
-                       GtkWidget *hpaned;
-               } sep_message;
-               struct {
-                       GtkWidget *folderwin;
-                       GtkWidget *messagewin;
-               } sep_both;
-       } win;
+       GtkWidget *hpaned;
+       GtkWidget *vpaned;
 
        GtkWidget *window;
        GtkWidget *vbox;
@@ -150,7 +130,7 @@ struct _MainWindow
 #endif
 };
 
-MainWindow *main_window_create         (SeparateType    type);
+MainWindow *main_window_create         (void);
 
 void main_window_destroy                (MainWindow *mainwin);
 
@@ -171,16 +151,10 @@ void main_window_set_folder_column        (void);
 void main_window_set_account_menu      (GList          *account_list);
 void main_window_set_account_menu_only_toolbar (GList          *account_list);
 
-GtkWidget *main_window_get_folder_window       (MainWindow     *mainwin);
-GtkWidget *main_window_get_message_window      (MainWindow     *mainwin);
-
 /* Mailing list support */
 void main_create_mailing_list_menu     (MainWindow *mainwin, MsgInfo *msginfo);
 gint mailing_list_get_list_post_mailto         (gchar **url, gchar *mailto, gint maxlen);
 
-void main_window_separation_change     (MainWindow     *mainwin,
-                                        SeparateType    type);
-
 void main_window_toggle_message_view   (MainWindow *mainwin);
 
 void main_window_get_size              (MainWindow     *mainwin);

diff --git a/src/messageview.c b/src/messageview.c
index 732d2fc5b024caa6df1c90d0868b49e21cbeeb33..d79b5110ab75c6c2d5d37e596e3f4edbef740aee 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1195,28 +1195,6 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
        return FALSE;
 }
 
-void messageview_toggle_view_real(MessageView *messageview)
-{
-       MainWindow *mainwin = messageview->mainwin;
-       union CompositeWin *cwin = &mainwin->win;
-       GtkWidget *vpaned = NULL;
-       GtkWidget *container = NULL;
-       
-       switch (mainwin->type) {
-       case SEPARATE_NONE:
-               vpaned = cwin->sep_none.vpaned;
-               container = cwin->sep_none.hpaned;
-               break;
-       case SEPARATE_FOLDER:
-               vpaned = cwin->sep_folder.vpaned;
-               container = mainwin->vbox_body;
-               break;
-       case SEPARATE_MESSAGE:
-       case SEPARATE_BOTH:
-               return;
-       }
-}
-
 static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
 {
        gchar *addr = NULL;
@@ -1777,12 +1755,7 @@ void messageview_set_menu_sensitive(MessageView *messageview)
        if (!messageview->menubar) return;
        ifactory = gtk_item_factory_from_widget(messageview->menubar);
        if (!ifactory) return;
-       if (messageview->mainwin->type == SEPARATE_MESSAGE) {
-               menuitem = gtk_item_factory_get_widget(ifactory, "/View/All headers");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem),
-                        messageview->mimeview->textview->show_all_headers);
-       }
+
        if (prefs_common.hide_quotes) {
                menuitem = NULL;
                if (prefs_common.hide_quotes == 1)

diff --git a/src/messageview.h b/src/messageview.h
index a32cbf5024da6d85eecc96947983ddfd44966f41..0cd238903776fc0c1b789813b9787702110ecc35 100644 (file)
--- a/src/messageview.h
+++ b/src/messageview.h
@@ -96,7 +96,6 @@ void messageview_copy_clipboard                       (MessageView    *messageview);
 void messageview_select_all                    (MessageView    *messageview);
 void messageview_set_position                  (MessageView    *messageview,
                                                 gint            pos);
-void messageview_toggle_view_real              (MessageView    *messageview);
 GList *messageview_get_msgview_list            (void);
 void messageview_delete                                (MessageView    *messageview);
 gboolean messageview_search_string             (MessageView    *messageview,

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 7e2394f02c790fe408503fa8890ad004ed4c1636..eb5ab507283a8f2f299e088f5bb4059df7b62f93 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -606,9 +606,7 @@ static PrefParam param[] = {
         &SPECIFIC_PREFS.mime_open_cmd,     P_STRING, NULL, NULL, NULL},
 
        /* Interface */
-       {"separate_folder", "FALSE", &prefs_common.sep_folder, P_BOOL,
-        NULL, NULL, NULL},
-       {"separate_message", "FALSE", &prefs_common.sep_msg, P_BOOL,
+       {"layout_mode", "0", &prefs_common.layout_mode, P_INT,
         NULL, NULL, NULL},
 
        /* {"emulate_emacs", "FALSE", &prefs_common.emulate_emacs, P_BOOL,

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 939c81ac204c63553f9f6b6fa178846718f7deaf..36edddea4acdbfc05621178712c5e9fcc413f87f 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -314,8 +314,8 @@ struct _PrefsCommon
        gint addressbook_vpaned_pos;
 
        /* Interface */
-       gboolean sep_folder;
-       gboolean sep_msg;
+       gboolean layout_mode;
+
        gint statusbar_update_step;
        gboolean emulate_emacs;
        gboolean always_show_msg;

diff --git a/src/summaryview.c b/src/summaryview.c
index 2565139d5e349582bdf081173487a977cabc6389..5361b2aaefd595a092d9a38e1b3266a65d0db516 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -551,6 +551,9 @@ SummaryView *summary_create(void)
        GtkWidget *ctree;
        GtkWidget *hbox;
        GtkWidget *hbox_l;
+       GtkWidget *stat_box;
+       GtkWidget *stat_box2;
+       GtkWidget *stat_vbox;
        GtkWidget *statlabel_folder;
        GtkWidget *statlabel_select;
        GtkWidget *statlabel_msgs;
@@ -574,6 +577,15 @@ SummaryView *summary_create(void)
        hbox = gtk_hbox_new(FALSE, 0);
        gtk_widget_show(hbox);
 
+       stat_vbox = gtk_vbox_new(FALSE, 0);
+       gtk_widget_show(stat_vbox);
+
+       stat_box = gtk_hbox_new(FALSE, 0);
+       gtk_widget_show(stat_box);
+       
+       stat_box2 = gtk_hbox_new(FALSE, 0);
+       gtk_widget_show(stat_box2);
+       
        search_tip = gtk_tooltips_new();
        toggle_search = gtk_toggle_button_new();
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_search),
@@ -586,9 +598,13 @@ SummaryView *summary_create(void)
        
        gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);      
 
+       gtk_box_pack_start(GTK_BOX(hbox), stat_vbox, TRUE, TRUE, 0);    
+       gtk_box_pack_start(GTK_BOX(stat_vbox), stat_box, TRUE, TRUE, 0);        
+       gtk_box_pack_start(GTK_BOX(stat_vbox), stat_box2, TRUE, TRUE, 0);       
+
        hbox_l = gtk_hbox_new(FALSE, 0);
        gtk_widget_show(hbox_l);
-       gtk_box_pack_start(GTK_BOX(hbox), hbox_l, TRUE, TRUE, 0);
+       gtk_box_pack_start(GTK_BOX(stat_box), hbox_l, TRUE, TRUE, 0);
  
        statlabel_folder = gtk_label_new("");
        gtk_widget_show(statlabel_folder);
@@ -611,7 +627,7 @@ SummaryView *summary_create(void)
        
        statlabel_msgs = gtk_label_new("");
        gtk_widget_show(statlabel_msgs);
-       gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
+       gtk_box_pack_end(GTK_BOX(stat_box), statlabel_msgs, FALSE, FALSE, 4);
 
        hbox_spc = gtk_hbox_new(FALSE, 0);
        gtk_widget_show(hbox_spc);
@@ -637,6 +653,7 @@ SummaryView *summary_create(void)
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
 
        /* status label */
+       gtk_widget_show_all(stat_vbox);
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
        /* quick search */
@@ -660,6 +677,9 @@ SummaryView *summary_create(void)
        summaryview->ctree = ctree;
        summaryview->hbox = hbox;
        summaryview->hbox_l = hbox_l;
+       summaryview->hbox_spc = hbox_spc;
+       summaryview->stat_box = stat_box;
+       summaryview->stat_box2 = stat_box2;
        summaryview->statlabel_folder = statlabel_folder;
        summaryview->statlabel_select = statlabel_select;
        summaryview->statlabel_msgs = statlabel_msgs;
@@ -696,6 +716,32 @@ SummaryView *summary_create(void)
        return summaryview;
 }
 
+void summary_relayout(SummaryView *summaryview)
+{
+       gtk_widget_realize(summaryview->stat_box);
+
+       gtk_widget_ref(summaryview->hbox_l);
+       gtk_widget_ref(summaryview->statlabel_msgs);
+       
+       gtkut_container_remove(GTK_CONTAINER(summaryview->hbox_l->parent), summaryview->hbox_l);
+       gtkut_container_remove(GTK_CONTAINER(summaryview->statlabel_msgs->parent), summaryview->statlabel_msgs);
+
+       if (prefs_common.layout_mode != VERTICAL_LAYOUT) {
+               gtk_box_pack_start(GTK_BOX(summaryview->stat_box), summaryview->hbox_l, TRUE, TRUE, 0);
+               gtk_box_pack_end(GTK_BOX(summaryview->stat_box), summaryview->statlabel_msgs, FALSE, FALSE, 4);
+               gtk_widget_show_all(summaryview->stat_box);
+               gtk_widget_show_all(summaryview->stat_box2);
+       } else {
+               gtk_box_pack_start(GTK_BOX(summaryview->stat_box), summaryview->hbox_l, TRUE, TRUE, 0);
+               gtk_box_pack_start(GTK_BOX(summaryview->stat_box2), summaryview->statlabel_msgs, FALSE, FALSE, 4);
+               gtk_widget_show_all(summaryview->stat_box);
+               gtk_widget_show_all(summaryview->stat_box2);
+       }
+       gtk_widget_unref(summaryview->hbox_l);
+       gtk_widget_unref(summaryview->statlabel_msgs);
+       quicksearch_relayout(summaryview->quicksearch);
+}
+
 static void summary_set_fonts(SummaryView *summaryview)
 {
        PangoFontDescription *font_desc;
@@ -3046,9 +3092,8 @@ void summary_open_msg(SummaryView *summaryview)
        
        /* CLAWS: if separate message view, don't open a new window
         * but rather use the current separated message view */
-       summary_display_msg_full(summaryview, summaryview->selected,
-                                prefs_common.sep_msg ? FALSE : TRUE, 
-                                FALSE);
+       summary_display_msg_full(summaryview, summaryview->selected, 
+                                TRUE, FALSE);
 }
 
 void summary_view_source(SummaryView * summaryview)

diff --git a/src/summaryview.h b/src/summaryview.h
index 8cde245c90e592d336c4b033337d6f6489642731..f99792d6dd76e1d889002f4db6938dfc69fff493 100644 (file)
--- a/src/summaryview.h
+++ b/src/summaryview.h
@@ -91,6 +91,9 @@ struct _SummaryView
        GtkWidget *ctree;
        GtkWidget *hbox;
        GtkWidget *hbox_l;
+       GtkWidget *hbox_spc;
+       GtkWidget *stat_box;
+       GtkWidget *stat_box2;
        GtkWidget *folder_pixmap;
        GtkWidget *statlabel_folder;
        GtkWidget *statlabel_select;
@@ -302,4 +305,5 @@ void summaryview_unlock(SummaryView *summaryview, FolderItem *item);
 void summary_reflect_prefs(void);
 void summaryview_activate_quicksearch(SummaryView *summaryview, gboolean show);
 void summary_set_menu_sensitive        (SummaryView            *summaryview);
+void summary_relayout(SummaryView *summaryview);
 #endif /* __SUMMARY_H__ */