nautilus r14401 - in trunk: . src

[cneumair svn gnome org]

Author: cneumair
Date: Mon Jul 21 19:53:38 2008
New Revision: 14401
URL: http://svn.gnome.org/viewvc/nautilus?rev=14401&view=rev

Log:
2008-07-21  Christian Neumair  <cneumair gnome org>

	* src/nautilus-places-sidebar.c (enable_tabs_changed_callback),
	(bookmarks_check_popup_sensitivity), (bookmarks_build_popup_menu),
	(nautilus_places_sidebar_init):
	Add separator after "Open in ..." popup menu items.

	Only show "Open in New Tab" menu item if the preference is enabled.
	Update popup menu sensitivity when tabs preference changes.



Modified:
   trunk/ChangeLog
   trunk/src/nautilus-places-sidebar.c

Modified: trunk/src/nautilus-places-sidebar.c
==============================================================================
--- trunk/src/nautilus-places-sidebar.c	(original)
+++ trunk/src/nautilus-places-sidebar.c	Mon Jul 21 19:53:38 2008
@@ -79,6 +79,7 @@
 	gboolean  drop_occured;
 
 	GtkWidget *popup_menu;
+	GtkWidget *popup_menu_open_in_new_tab_item;
 	GtkWidget *popup_menu_remove_item;
 	GtkWidget *popup_menu_rename_item;
 	GtkWidget *popup_menu_separator_item;
@@ -149,6 +150,8 @@
 							gboolean *show_unmount,
 							gboolean *show_eject);
 
+static void bookmarks_check_popup_sensitivity          (NautilusPlacesSidebar *sidebar);
+
 /* Identifiers for target types */
 enum {
   GTK_TREE_MODEL_ROW,
@@ -684,6 +687,16 @@
 }
 
 static void
+enable_tabs_changed_callback (gpointer user_data)
+{
+	NautilusPlacesSidebar *sidebar;
+
+	sidebar = NAUTILUS_PLACES_SIDEBAR (user_data);
+
+	bookmarks_check_popup_sensitivity (sidebar);
+}
+
+static void
 loading_uri_callback (NautilusWindowInfo *window,
 		      char *location,
 		      NautilusPlacesSidebar *sidebar)
@@ -1344,6 +1357,12 @@
 				    -1);
 	}
 
+	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_ENABLE_TABS)) {
+		gtk_widget_show (sidebar->popup_menu_open_in_new_tab_item);
+	} else {
+		gtk_widget_hide (sidebar->popup_menu_open_in_new_tab_item);
+	}
+
 	gtk_widget_set_sensitive (sidebar->popup_menu_remove_item, (type == PLACES_BOOKMARK));
 	gtk_widget_set_sensitive (sidebar->popup_menu_rename_item, (type == PLACES_BOOKMARK));
 	gtk_widget_set_sensitive (sidebar->popup_menu_empty_trash_item, !nautilus_trash_monitor_is_empty ());
@@ -1941,6 +1960,7 @@
 	gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
 
 	item = gtk_menu_item_new_with_mnemonic (_("Open in New _Tab"));
+	sidebar->popup_menu_open_in_new_tab_item = item;
 	g_signal_connect (item, "activate",
 			  G_CALLBACK (open_shortcut_in_new_tab_cb), sidebar);
 	gtk_widget_show (item);
@@ -1952,6 +1972,8 @@
 	gtk_widget_show (item);
 	gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
 
+	eel_gtk_menu_append_separator (GTK_MENU (sidebar->popup_menu));
+
 	item = gtk_image_menu_item_new_with_label (_("Remove"));
 	sidebar->popup_menu_remove_item = item;
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
@@ -2301,6 +2323,11 @@
 						  sidebar,
 						  G_OBJECT (sidebar));
 
+	eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ENABLE_TABS,
+						  enable_tabs_changed_callback,
+						  sidebar,
+						  G_OBJECT (sidebar));
+
 	g_signal_connect_object (nautilus_trash_monitor_get (),
 				 "trash_state_changed",
 				 G_CALLBACK (trash_state_changed_cb),