nautilus r14304 - in branches/multiview: . src

[cneumair svn gnome org]

Author: cneumair
Date: Sun Jun 29 11:48:44 2008
New Revision: 14304
URL: http://svn.gnome.org/viewvc/nautilus?rev=14304&view=rev

Log:
2008-06-29  Christian Neumair  <cneumair gnome org>

	* 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.


Modified:
   branches/multiview/ChangeLog
   branches/multiview/src/nautilus-navigation-window.c
   branches/multiview/src/nautilus-window-slot.c
   branches/multiview/src/nautilus-window-slot.h

Modified: branches/multiview/src/nautilus-navigation-window.c
==============================================================================
--- branches/multiview/src/nautilus-navigation-window.c	(original)
+++ branches/multiview/src/nautilus-navigation-window.c	Sun Jun 29 11:48:44 2008
@@ -1745,11 +1745,6 @@
 	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 ?

Modified: branches/multiview/src/nautilus-window-slot.c
==============================================================================
--- branches/multiview/src/nautilus-window-slot.c	(original)
+++ branches/multiview/src/nautilus-window-slot.c	Sun Jun 29 11:48:44 2008
@@ -173,14 +173,15 @@
 	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 @@
 	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 @@
 {
 	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

Modified: branches/multiview/src/nautilus-window-slot.h
==============================================================================
--- branches/multiview/src/nautilus-window-slot.h	(original)
+++ branches/multiview/src/nautilus-window-slot.h	Sun Jun 29 11:48:44 2008
@@ -71,6 +71,7 @@
  	 *  2) the view box for the content view
  	 */
 	GtkWidget *content_box;
+	GtkWidget *extra_location_event_box;
 	GtkWidget *extra_location_widgets;
 	GtkWidget *view_box;