make separate view work new style

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e7c90b569a9e9f7d3c97fa6f850fd8a9fdf4d2ac..598089407ef860dc8caf7851201bac8e51f21bb2 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-01-06 [alfons]    0.6.6claws41
+
+       * src/mainwindow.c
+               adapt Hiro's separate window menu (to get rid of the funny
+               duplicate menu items), and make it work again
+
 2002-01-06 [alfons]    0.6.6claws40
 
        * tools/Makefile.am

diff --git a/configure.in b/configure.in
index 2f80bea6a617103cd6ad7fe626ef307e3eefcdc8..53ed94ca94931e03d6dc1960e2965c7161487144 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws40
+EXTRA_VERSION=claws41
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 8ac72a80fdc748d25a351ffc8d237686e2245379..6c75cec70cb90b104449be976dddba69f97afa1a 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -447,17 +447,17 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Edit/_Search folder..."),        "<control>S", search_cb, 1, NULL},
 
        {N_("/_View"),                          NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/_Folder tree"),             NULL, toggle_folder_cb, 0, "<ToggleItem>"},
-       {N_("/_View/_Message view"),            NULL, toggle_message_cb, 0, "<ToggleItem>"},
+       {N_("/_View/_Folder tree"),             NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER,  "<ToggleItem>"},
+       {N_("/_View/_Message view"),            NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
        {N_("/_View/_Toolbar"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Toolbar/Icon _and text"),  NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
        {N_("/_View/_Toolbar/_Icon"),           NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Toolbar/Icon and text"},
        {N_("/_View/_Toolbar/_Text"),           NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Toolbar/Icon and text"},
        {N_("/_View/_Toolbar/_None"),           NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"},
        {N_("/_View/Status _bar"),              NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
-       {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
+/*     {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Separate f_older tree"),    NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, "<ToggleItem>"},
-       {N_("/_View/Separate m_essage view"),   NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
+       {N_("/_View/Separate m_essage view"),   NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},*/
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Sort"),                    NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Sort/Sort by _number"),    NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
@@ -911,14 +911,14 @@ MainWindow *main_window_create(SeparateType type)
        menuitem = gtk_item_factory_get_item(ifactory, "/View/Status bar");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
                                       prefs_common.show_statusbar);
-
+#if 0 /* FIXED SEPARATE WINDOWS */
        /* Message view and Folder tree are always shown at startup
         * make that in the menu visible */
        menuitem = gtk_item_factory_get_item(ifactory, "/View/Message view");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
        menuitem = gtk_item_factory_get_item(ifactory, "/View/Folder tree");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-       
+#endif 
        /* set the check of the SEPARATE_xxx menu items. we also need the main window
         * as a property and pass the action type to the callback */
        menuitem = gtk_item_factory_get_widget_by_action(ifactory, SEPARATE_ACTION + SEPARATE_FOLDER);
@@ -1625,8 +1625,8 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                     prefs_common.mainwin_height);
                gtk_widget_show_all(vpaned);
 
-               menu_set_sensitive(ifactory, "/View/Message view", FALSE);
-               menu_set_sensitive(ifactory, "/View/Folder tree", FALSE);
+               menu_set_sensitive(ifactory, "/View/Message view", TRUE);
+               menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
                
                mainwin->win.sep_none.hpaned = hpaned;
                mainwin->win.sep_none.vpaned = vpaned;