Commit 11e1482b authored by David Bordoley's avatar David Bordoley Committed by Dave Bordoley

Change "close all parents" to be "close parent folders" and change the

2003-12-01  David Bordoley  <bordoley@msu.edu>

	* src/nautilus-application.c: (nautilus_application_close_parent_windows):
	* src/nautilus-application.h:
	* src/nautilus-spatial-window-ui.xml:
	* src/nautilus-spatial-window.c: (file_menu_close_parent_windows_callback),
	(real_merge_menus):
	Change "close all parents" to be "close parent folders"
	and change the behavior to match the label.
parent aa5e7ce6
2003-12-01 David Bordoley <bordoley@msu.edu>
* src/nautilus-application.c: (nautilus_application_close_parent_windows):
* src/nautilus-application.h:
* src/nautilus-spatial-window-ui.xml:
* src/nautilus-spatial-window.c: (file_menu_close_parent_windows_callback),
(real_merge_menus):
Change "close all parents" to be "close parent folders"
and change the behavior to match the label.
2003-12-01 Sivaiah Nallagatla <snallagatla@novell.com>
* src/nautilus-navigation-window.c (real_get_default_size) (nautilus_navigation_window_class_init)
......
......@@ -879,20 +879,20 @@ find_parent_spatial_window (NautilusSpatialWindow *window)
}
void
nautilus_application_close_with_parent_windows (NautilusSpatialWindow *window)
nautilus_application_close_parent_windows (NautilusSpatialWindow *window)
{
NautilusSpatialWindow *parent_window;
NautilusSpatialWindow *new_parent_window;
g_return_if_fail (NAUTILUS_IS_SPATIAL_WINDOW (window));
parent_window = find_parent_spatial_window (window);
nautilus_window_close (NAUTILUS_WINDOW (window));
window = parent_window;
while (parent_window) {
parent_window = find_parent_spatial_window (window);
nautilus_window_close (NAUTILUS_WINDOW (window));
window = parent_window;
new_parent_window = find_parent_spatial_window (parent_window);
nautilus_window_close (NAUTILUS_WINDOW (parent_window));
parent_window = new_parent_window;
}
}
......
......@@ -78,7 +78,7 @@ NautilusWindow * nautilus_application_present_spatial_window (NautilusAp
NautilusWindow * nautilus_application_create_navigation_window (NautilusApplication *application,
GdkScreen *screen);
void nautilus_application_close_all_navigation_windows (void);
void nautilus_application_close_with_parent_windows (NautilusSpatialWindow *window);
void nautilus_application_close_parent_windows (NautilusSpatialWindow *window);
void nautilus_application_open_desktop (NautilusApplication *application);
void nautilus_application_close_desktop (void);
......
......@@ -23,10 +23,10 @@
</placeholder>
<placeholder name="Close Items Placeholder">
<menuitem name="Close With Parents"
_label="Close _All Parents"
_tip="Close all Navigation windows"
_label="Close P_arent Folders"
_tip="Close this folder's parents"
accel="*Control**Shift*w"
verb="Close With Parents"/>
verb="Close Parent Folders"/>
</placeholder>
</submenu>
......
......@@ -239,11 +239,11 @@ nautilus_spatial_window_show (GtkWidget *widget)
}
static void
file_menu_close_with_parent_windows_callback (BonoboUIComponent *component,
file_menu_close_parent_windows_callback (BonoboUIComponent *component,
gpointer user_data,
const char *verb)
{
nautilus_application_close_with_parent_windows (NAUTILUS_SPATIAL_WINDOW (user_data));
nautilus_application_close_parent_windows (NAUTILUS_SPATIAL_WINDOW (user_data));
}
static void
......@@ -275,7 +275,7 @@ real_merge_menus (NautilusWindow *nautilus_window)
{
NautilusSpatialWindow *window;
BonoboUIVerb verbs [] = {
BONOBO_UI_VERB ("Close With Parents", file_menu_close_with_parent_windows_callback),
BONOBO_UI_VERB ("Close Parent Folders", file_menu_close_parent_windows_callback),
BONOBO_UI_VERB_END
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment