Commit 5846b33c authored by Marcus Husar's avatar Marcus Husar Committed by Cosimo Cecchi

Clean context menu and "File" menu (#618469)

Also use "Create New Folder/Document".

Part of https://bugzilla.gnome.org/show_bug.cgi?id=618469
parent 0ff4fdb4
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
#define FM_ACTION_LOCATION_POLL "Location Poll" #define FM_ACTION_LOCATION_POLL "Location Poll"
#define FM_ACTION_SCRIPTS "Scripts" #define FM_ACTION_SCRIPTS "Scripts"
#define FM_ACTION_NEW_DOCUMENTS "New Documents" #define FM_ACTION_NEW_DOCUMENTS "New Documents"
#define FM_ACTION_NEW_EMPTY_FILE "New Empty File" #define FM_ACTION_NEW_EMPTY_DOCUMENT "New Empty Document"
#define FM_ACTION_EMPTY_TRASH_CONDITIONAL "Empty Trash Conditional" #define FM_ACTION_EMPTY_TRASH_CONDITIONAL "Empty Trash Conditional"
#define FM_ACTION_MANUAL_LAYOUT "Manual Layout" #define FM_ACTION_MANUAL_LAYOUT "Manual Layout"
#define FM_ACTION_TIGHTER_LAYOUT "Tighter Layout" #define FM_ACTION_TIGHTER_LAYOUT "Tighter Layout"
......
...@@ -5431,7 +5431,7 @@ add_template_to_templates_menus (FMDirectoryView *directory_view, ...@@ -5431,7 +5431,7 @@ add_template_to_templates_menus (FMDirectoryView *directory_view,
g_free (tmp); g_free (tmp);
uri = nautilus_file_get_uri (file); uri = nautilus_file_get_uri (file);
tip = g_strdup_printf (_("Create Document from template \"%s\""), name); tip = g_strdup_printf (_("Create a new document from template \"%s\""), name);
action_name = escape_action_name (uri, "template_"); action_name = escape_action_name (uri, "template_");
escaped_label = eel_str_double_underscores (name); escaped_label = eel_str_double_underscores (name);
...@@ -7027,7 +7027,7 @@ fm_directory_view_init_show_hidden_files (FMDirectoryView *view) ...@@ -7027,7 +7027,7 @@ fm_directory_view_init_show_hidden_files (FMDirectoryView *view)
} }
static const GtkActionEntry directory_view_entries[] = { static const GtkActionEntry directory_view_entries[] = {
/* name, stock id, label */ { "New Documents", "document-new", N_("Create _Document") }, /* name, stock id, label */ { "New Documents", "document-new", N_("Create New _Document") },
/* name, stock id, label */ { "Open With", NULL, N_("Open Wit_h"), /* name, stock id, label */ { "Open With", NULL, N_("Open Wit_h"),
NULL, N_("Choose a program with which to open the selected item") }, NULL, N_("Choose a program with which to open the selected item") },
/* name, stock id */ { "Properties", GTK_STOCK_PROPERTIES, /* name, stock id */ { "Properties", GTK_STOCK_PROPERTIES,
...@@ -7039,14 +7039,14 @@ static const GtkActionEntry directory_view_entries[] = { ...@@ -7039,14 +7039,14 @@ static const GtkActionEntry directory_view_entries[] = {
/* tooltip */ NULL, /* tooltip */ NULL,
G_CALLBACK (action_properties_callback) }, G_CALLBACK (action_properties_callback) },
/* name, stock id */ { "New Folder", "folder-new", /* name, stock id */ { "New Folder", "folder-new",
/* label, accelerator */ N_("Create _Folder"), "<control><shift>N", /* label, accelerator */ N_("Create New _Folder"), "<control><shift>N",
/* tooltip */ N_("Create a new empty folder inside this folder"), /* tooltip */ N_("Create a new empty folder inside this folder"),
G_CALLBACK (action_new_folder_callback) }, G_CALLBACK (action_new_folder_callback) },
/* name, stock id, label */ { "No Templates", NULL, N_("No templates installed") }, /* name, stock id, label */ { "No Templates", NULL, N_("No templates installed") },
/* name, stock id */ { "New Empty File", NULL, /* name, stock id */ { "New Empty Document", NULL,
/* translators: this is used to indicate that a file doesn't contain anything */ /* translators: this is used to indicate that a document doesn't contain anything */
/* label, accelerator */ N_("_Empty File"), NULL, /* label, accelerator */ N_("_Empty Document"), NULL,
/* tooltip */ N_("Create a new empty file inside this folder"), /* tooltip */ N_("Create a new empty document inside this folder"),
G_CALLBACK (action_new_empty_file_callback) }, G_CALLBACK (action_new_empty_file_callback) },
/* name, stock id */ { "New Launcher", NULL, /* name, stock id */ { "New Launcher", NULL,
/* label, accelerator */ N_("Create L_auncher..."), NULL, /* label, accelerator */ N_("Create L_auncher..."), NULL,
...@@ -7338,7 +7338,7 @@ connect_proxy (FMDirectoryView *view, ...@@ -7338,7 +7338,7 @@ connect_proxy (FMDirectoryView *view,
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
GtkWidget *image; GtkWidget *image;
if (strcmp (gtk_action_get_name (action), FM_ACTION_NEW_EMPTY_FILE) == 0 && if (strcmp (gtk_action_get_name (action), FM_ACTION_NEW_EMPTY_DOCUMENT) == 0 &&
GTK_IS_IMAGE_MENU_ITEM (proxy)) { GTK_IS_IMAGE_MENU_ITEM (proxy)) {
pixbuf = get_menu_icon ("text-x-generic"); pixbuf = get_menu_icon ("text-x-generic");
if (pixbuf != NULL) { if (pixbuf != NULL) {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<menuitem name="No Templates" action="No Templates"/> <menuitem name="No Templates" action="No Templates"/>
<placeholder name="New Documents Placeholder"/> <placeholder name="New Documents Placeholder"/>
<separator name="After New Documents"/> <separator name="After New Documents"/>
<menuitem name="New Empty File" action="New Empty File"/> <menuitem name="New Empty Document" action="New Empty Document"/>
</menu> </menu>
<menuitem name="New Launcher" action="New Launcher"/> <menuitem name="New Launcher" action="New Launcher"/>
</placeholder> </placeholder>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<menuitem name="No Templates" action="No Templates"/> <menuitem name="No Templates" action="No Templates"/>
<placeholder name="New Documents Placeholder"/> <placeholder name="New Documents Placeholder"/>
<separator name="After New Documents"/> <separator name="After New Documents"/>
<menuitem name="New Empty File" action="New Empty File"/> <menuitem name="New Empty Document" action="New Empty Document"/>
</menu> </menu>
<menu action="Scripts"> <menu action="Scripts">
<placeholder name="Scripts Placeholder"/> <placeholder name="Scripts Placeholder"/>
......
...@@ -1173,8 +1173,8 @@ create_popup_menu (FMTreeView *view) ...@@ -1173,8 +1173,8 @@ create_popup_menu (FMTreeView *view)
eel_gtk_menu_append_separator (GTK_MENU (popup)); eel_gtk_menu_append_separator (GTK_MENU (popup));
/* add the "create folder" menu item */ /* add the "create new folder" menu item */
menu_item = gtk_image_menu_item_new_with_mnemonic (_("Create _Folder")); menu_item = gtk_image_menu_item_new_with_mnemonic (_("Create New _Folder"));
g_signal_connect (menu_item, "activate", g_signal_connect (menu_item, "activate",
G_CALLBACK (fm_tree_view_create_folder_cb), G_CALLBACK (fm_tree_view_create_folder_cb),
view); view);
......
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