From b0adaa22880e4e9edce6ec6284190b54884adf7c Mon Sep 17 00:00:00 2001 From: Christian Neumair Date: Sun, 29 Jun 2008 11:48:44 +0000 Subject: Remove obsolete multiview-TODO. 2008-06-29 Christian Neumair * src/nautilus-navigation-window.c (real_open_slot): Remove obsolete multiview-TODO. * src/nautilus-window-slot.c (nautilus_window_slot_init), (nautilus_window_slot_remove_extra_location_widgets), (nautilus_window_slot_add_extra_location_widget): * src/nautilus-window-slot.h: Show/hide event box rather than extra widget container. Removes 1 px blue stripe displayed on top of newly-opened tab, before the view has been packed. svn path=/branches/multiview/; revision=14304 --- ChangeLog | 13 +++++++++++++ src/nautilus-navigation-window.c | 5 ----- src/nautilus-window-slot.c | 7 ++++--- src/nautilus-window-slot.h | 1 + 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 141a90d9d..a3b80af9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-06-29 Christian Neumair + + * src/nautilus-navigation-window.c (real_open_slot): + Remove obsolete multiview-TODO. + + * src/nautilus-window-slot.c (nautilus_window_slot_init), + (nautilus_window_slot_remove_extra_location_widgets), + (nautilus_window_slot_add_extra_location_widget): + * src/nautilus-window-slot.h: + Show/hide event box rather than extra widget container. Removes 1 px + blue stripe displayed on top of newly-opened tab, before the view has + been packed. + 2008-06-29 Christian Neumair * src/nautilus-application.c (save_session_to_file), diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index 6809986c0..cfdbe170e 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -1745,11 +1745,6 @@ real_open_slot (NautilusWindow *window, g_signal_handlers_block_by_func (notebook, G_CALLBACK (notebook_switch_page_cb), window); - /* multiview-TODO add some way to influence the position. - * We need - * + "behind active tab" [for views] - * + "at the end" [for loading sessions] - */ nautilus_notebook_add_tab (notebook, slot, (flags & NAUTILUS_WINDOW_OPEN_SLOT_APPEND) != 0 ? diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c index d1e989c8a..81eedf4c2 100644 --- a/src/nautilus-window-slot.c +++ b/src/nautilus-window-slot.c @@ -173,14 +173,15 @@ nautilus_window_slot_init (NautilusWindowSlot *slot) gtk_widget_show (content_box); eventbox = gtk_event_box_new (); + slot->extra_location_event_box = eventbox; gtk_widget_set_name (eventbox, "nautilus-extra-view-widget"); gtk_box_pack_start (GTK_BOX (content_box), eventbox, FALSE, FALSE, 0); - gtk_widget_show (eventbox); extras_vbox = gtk_vbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (extras_vbox), 6); slot->extra_location_widgets = extras_vbox; gtk_container_add (GTK_CONTAINER (eventbox), extras_vbox); + gtk_widget_show (extras_vbox); slot->view_box = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (content_box), slot->view_box, TRUE, TRUE, 0); @@ -393,7 +394,7 @@ nautilus_window_slot_remove_extra_location_widgets (NautilusWindowSlot *slot) gtk_container_foreach (GTK_CONTAINER (slot->extra_location_widgets), remove_all, slot->extra_location_widgets); - gtk_widget_hide (slot->extra_location_widgets); + gtk_widget_hide (slot->extra_location_event_box); } void @@ -402,7 +403,7 @@ nautilus_window_slot_add_extra_location_widget (NautilusWindowSlot *slot, { gtk_box_pack_start (GTK_BOX (slot->extra_location_widgets), widget, TRUE, TRUE, 0); - gtk_widget_show (slot->extra_location_widgets); + gtk_widget_show (slot->extra_location_event_box); } void diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h index 9c551e645..0ae84e483 100644 --- a/src/nautilus-window-slot.h +++ b/src/nautilus-window-slot.h @@ -71,6 +71,7 @@ struct NautilusWindowSlot { * 2) the view box for the content view */ GtkWidget *content_box; + GtkWidget *extra_location_event_box; GtkWidget *extra_location_widgets; GtkWidget *view_box; -- cgit v1.2.1