Commit 30af8f6b authored by Clint Rogers's avatar Clint Rogers

Corrects an issue where some context menus inappropriately used the same key...

Corrects an issue where some context menus  inappropriately used the same key as a mnemonic more than once; closes #5197.
parent 7ce2f47e
......@@ -273,11 +273,18 @@ public abstract class MediaPage : CheckerboardPage {
TRANSLATABLE, on_export };
export.label = Resources.EXPORT_MENU;
actions += export;
Gtk.ActionEntry send_to = { "SendTo", "document-send", TRANSLATABLE, null,
TRANSLATABLE, on_send_to };
send_to.label = Resources.SEND_TO_MENU;
actions += send_to;
// This is identical to the above action, except that it has different
// mnemonics and is _only_ for use in the context menu.
Gtk.ActionEntry send_to_context_menu = { "SendToContextMenu", "document-send", TRANSLATABLE, null,
TRANSLATABLE, on_send_to };
send_to_context_menu.label = Resources.SEND_TO_CONTEXT_MENU;
actions += send_to_context_menu;
Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Gtk.Stock.REMOVE, TRANSLATABLE,
"<Shift>Delete", TRANSLATABLE, on_remove_from_library };
......@@ -293,12 +300,19 @@ public abstract class MediaPage : CheckerboardPage {
TRANSLATABLE, on_new_event };
new_event.label = Resources.NEW_EVENT_MENU;
actions += new_event;
Gtk.ActionEntry add_tags = { "AddTags", null, TRANSLATABLE, "<Ctrl>T", TRANSLATABLE,
on_add_tags };
add_tags.label = Resources.ADD_TAGS_MENU;
actions += add_tags;
// This is identical to the above action, except that it has different
// mnemonics and is _only_ for use in the context menu.
Gtk.ActionEntry add_tags_context_menu = { "AddTagsContextMenu", null, TRANSLATABLE, "<Ctrl>A", TRANSLATABLE,
on_add_tags };
add_tags_context_menu.label = Resources.ADD_TAGS_CONTEXT_MENU;
actions += add_tags_context_menu;
Gtk.ActionEntry modify_tags = { "ModifyTags", null, TRANSLATABLE, "<Ctrl>M", TRANSLATABLE,
on_modify_tags };
modify_tags.label = Resources.MODIFY_TAGS_MENU;
......
......@@ -2557,7 +2557,19 @@ public class LibraryPhotoPage : EditingHostPage {
Gtk.ActionEntry raw_developer = { "RawDeveloper", null, TRANSLATABLE, null, null, null };
raw_developer.label = _("_Developer");
actions += raw_developer;
// These are identical to add_tags and send_to, except that they have
// different mnemonics and are _only_ for use in the context menu.
Gtk.ActionEntry send_to_context_menu = { "SendToContextMenu", "document-send", TRANSLATABLE, null,
TRANSLATABLE, on_send_to };
send_to_context_menu.label = Resources.SEND_TO_CONTEXT_MENU;
actions += send_to_context_menu;
Gtk.ActionEntry add_tags_context_menu = { "AddTagsContextMenu", null, TRANSLATABLE, "<Ctrl>A", TRANSLATABLE,
on_add_tags };
add_tags_context_menu.label = Resources.ADD_TAGS_CONTEXT_MENU;
actions += add_tags_context_menu;
return actions;
}
......
......@@ -255,6 +255,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string ADJUST_DATE_TIME_LABEL = _("Adjust Date and Time");
public const string ADD_TAGS_MENU = _("Add _Tags...");
public const string ADD_TAGS_CONTEXT_MENU = _("_Add Tags...");
public const string ADD_TAGS_TITLE = _("Add Tags");
public const string PREFERENCES_MENU = _("_Preferences");
......@@ -264,6 +265,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string EXTERNAL_EDIT_RAW_MENU = _("Open With RA_W Editor");
public const string SEND_TO_MENU = _("Send _To...");
public const string SEND_TO_CONTEXT_MENU = _("Send T_o...");
public const string FIND_MENU = _("_Find...");
public const string FIND_LABEL = _("Find");
......
......@@ -3,7 +3,7 @@
<menuitem name="ContextEnhance" action="Enhance" />
<menuitem name="ContextRevert" action="Revert" />
<separator />
<menuitem name="ContextAddTags" action="AddTags" />
<menuitem name="ContextAddTags" action="AddTagsContextMenu" />
<menuitem name="ContextModifyTags" action="ModifyTags" />
<placeholder name="ContextTagsPlaceholder" />
<separator />
......@@ -29,7 +29,7 @@
<separator />
<menuitem name="ContextJumpToEvent" action="CommonJumpToEvent" />
<menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
<menuitem name="ContextSendTo" action="SendTo" />
<menuitem name="ContextSendTo" action="SendToContextMenu" />
<separator />
<menuitem name="ContextMoveToTrash" action="MoveToTrash" />
</popup>
......
......@@ -3,7 +3,7 @@
<menuitem name="ContextEnhance" action="Enhance" />
<menuitem name="ContextRevert" action="Revert" />
<separator />
<menuitem name="ContextAddTags" action="AddTags" />
<menuitem name="ContextAddTags" action="AddTagsContextMenu" />
<menuitem name="ContextModifyTags" action="ModifyTags" />
<placeholder name="ContextTagsPlaceholder" />
<separator />
......@@ -26,7 +26,7 @@
<menuitem name="ContextExternalEditRAW" action="ExternalEditRAW" />
<separator />
<placeholder name="ContextJumpPlaceholder" />
<menuitem name="ContextSendTo" action="SendTo" />
<menuitem name="ContextSendTo" action="SendToContextMenu" />
<separator />
<menuitem name="ContextMoveToTrash" action="MoveToTrash" />
</popup>
......
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