Commit 6f6171a1 authored by Cosimo Cecchi's avatar Cosimo Cecchi

actions: cleanup unused actions from the action group

And ensure name defines are used instead of plain strings, where
possible.
parent 68c60072
......@@ -92,7 +92,6 @@
#define NAUTILUS_ACTION_LOCATION_DELETE "LocationDelete"
#define NAUTILUS_ACTION_RESTORE_FROM_TRASH "Restore From Trash"
#define NAUTILUS_ACTION_LOCATION_RESTORE_FROM_TRASH "LocationRestoreFromTrash"
#define NAUTILUS_ACTION_SHOW_HIDDEN_FILES "Show Hidden Files"
#define NAUTILUS_ACTION_CONNECT_TO_SERVER "Connect to Server"
#define NAUTILUS_ACTION_CONNECT_TO_SERVER_LINK "Connect To Server Link"
#define NAUTILUS_ACTION_MOUNT_VOLUME "Mount Volume"
......
......@@ -438,11 +438,8 @@ action_tab_change_action_activate_callback (GtkAction *action,
}
static const GtkActionEntry main_entries[] = {
/* name, stock id, label */ { "File", NULL, N_("_File") },
/* name, stock id, label */ { "Edit", NULL, N_("_Edit") },
/* name, stock id, label */ { "View", NULL, N_("_View") },
/* name, stock id, label */ { "Help", NULL, N_("_Help") },
/* name, stock id */ { "Close", GTK_STOCK_CLOSE,
/* name, stock id */ { NAUTILUS_ACTION_CLOSE, GTK_STOCK_CLOSE,
/* label, accelerator */ N_("_Close"), "<control>W",
/* tooltip */ N_("Close this folder"),
G_CALLBACK (action_close_window_slot_callback) },
......@@ -453,11 +450,11 @@ static const GtkActionEntry main_entries[] = {
/* name, stock id, label */ { NAUTILUS_ACTION_UP, GTK_STOCK_GO_UP, N_("Open _Parent"),
"<alt>Up", N_("Open the parent folder"),
G_CALLBACK (action_up_callback) },
/* name, stock id */ { "Stop", GTK_STOCK_STOP,
/* name, stock id */ { NAUTILUS_ACTION_STOP, GTK_STOCK_STOP,
/* label, accelerator */ N_("_Stop"), NULL,
/* tooltip */ N_("Stop loading the current location"),
G_CALLBACK (action_stop_callback) },
/* name, stock id */ { "Reload", GTK_STOCK_REFRESH,
/* name, stock id */ { NAUTILUS_ACTION_RELOAD, GTK_STOCK_REFRESH,
/* label, accelerator */ N_("_Reload"), "<control>R",
/* tooltip */ N_("Reload the current location"),
G_CALLBACK (action_reload_callback) },
......@@ -485,7 +482,7 @@ static const GtkActionEntry main_entries[] = {
/* label, accelerator */ N_("_About"), NULL,
/* tooltip */ N_("Display credits for the creators of Nautilus"),
G_CALLBACK (action_about_nautilus_callback) },
/* name, stock id */ { "Zoom In", GTK_STOCK_ZOOM_IN,
/* name, stock id */ { NAUTILUS_ACTION_ZOOM_IN, GTK_STOCK_ZOOM_IN,
/* label, accelerator */ N_("Zoom _In"), "<control>plus",
/* tooltip */ N_("Increase the view size"),
G_CALLBACK (action_zoom_in_callback) },
......@@ -497,7 +494,7 @@ static const GtkActionEntry main_entries[] = {
/* label, accelerator */ "ZoomInAccel2", "<control>KP_Add",
/* tooltip */ NULL,
G_CALLBACK (action_zoom_in_callback) },
/* name, stock id */ { "Zoom Out", GTK_STOCK_ZOOM_OUT,
/* name, stock id */ { NAUTILUS_ACTION_ZOOM_OUT, GTK_STOCK_ZOOM_OUT,
/* label, accelerator */ N_("Zoom _Out"), "<control>minus",
/* tooltip */ N_("Decrease the view size"),
G_CALLBACK (action_zoom_out_callback) },
......@@ -505,7 +502,7 @@ static const GtkActionEntry main_entries[] = {
/* label, accelerator */ "ZoomOutAccel", "<control>KP_Subtract",
/* tooltip */ NULL,
G_CALLBACK (action_zoom_out_callback) },
/* name, stock id */ { "Zoom Normal", GTK_STOCK_ZOOM_100,
/* name, stock id */ { NAUTILUS_ACTION_ZOOM_NORMAL, GTK_STOCK_ZOOM_100,
/* label, accelerator */ N_("Normal Si_ze"), "<control>0",
/* tooltip */ N_("Use the normal view size"),
G_CALLBACK (action_zoom_normal_callback) },
......@@ -513,17 +510,14 @@ static const GtkActionEntry main_entries[] = {
/* label, accelerator */ N_("Connect to _Server..."), NULL,
/* tooltip */ N_("Connect to a remote computer or shared disk"),
G_CALLBACK (action_connect_to_server_callback) },
/* name, stock id */ { "Home", NAUTILUS_ICON_HOME,
/* name, stock id */ { NAUTILUS_ACTION_GO_HOME, NAUTILUS_ICON_HOME,
/* label, accelerator */ N_("_Home"), "<alt>Home",
/* tooltip */ N_("Open your personal folder"),
G_CALLBACK (action_home_callback) },
/* name, stock id, label */ { "Go", NULL, N_("_Go") },
/* name, stock id, label */ { "Bookmarks", NULL, N_("_Bookmarks") },
/* name, stock id, label */ { "Tabs", NULL, N_("_Tabs") },
/* name, stock id, label */ { NAUTILUS_ACTION_NEW_WINDOW, "window-new", N_("New _Window"),
"<control>N", N_("Open another Nautilus window for the displayed location"),
G_CALLBACK (action_new_window_callback) },
/* name, stock id, label */ { "New Tab", "tab-new", N_("New _Tab"),
/* name, stock id, label */ { NAUTILUS_ACTION_NEW_TAB, "tab-new", N_("New _Tab"),
"<control>T", N_("Open another tab for the displayed location"),
G_CALLBACK (action_new_tab_callback) },
/* name, stock id, label */ { NAUTILUS_ACTION_CLOSE_ALL_WINDOWS, NULL, N_("Close _All Windows"),
......@@ -555,22 +549,21 @@ static const GtkActionEntry main_entries[] = {
G_CALLBACK (action_tabs_move_left_callback) },
{ "TabsMoveRight", NULL, N_("Move Tab _Right"), "<shift><control>Page_Down",
N_("Move current tab to right"),
G_CALLBACK (action_tabs_move_right_callback) },
{ "Sidebar List", NULL, N_("Sidebar") }
G_CALLBACK (action_tabs_move_right_callback) }
};
static const GtkToggleActionEntry main_toggle_entries[] = {
/* name, stock id */ { "Show Hidden Files", NULL,
/* name, stock id */ { NAUTILUS_ACTION_SHOW_HIDDEN_FILES, NULL,
/* label, accelerator */ N_("Show _Hidden Files"), "<control>H",
/* tooltip */ N_("Toggle the display of hidden files in the current window"),
G_CALLBACK (action_show_hidden_files_callback),
TRUE },
/* name, stock id */ { "Show Hide Sidebar", NULL,
/* name, stock id */ { NAUTILUS_ACTION_SHOW_HIDE_SIDEBAR, NULL,
/* label, accelerator */ N_("_Show Sidebar"), "F9",
/* tooltip */ N_("Change the visibility of this window's side pane"),
G_CALLBACK (action_show_hide_sidebar_callback),
/* is_active */ TRUE },
/* name, stock id */ { "Search", "edit-find-symbolic",
/* name, stock id */ { NAUTILUS_ACTION_SEARCH, "edit-find-symbolic",
/* label, accelerator */ N_("_Search for Files..."), "<control>f",
/* tooltip */ N_("Search documents and folders by name"),
NULL,
......
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