Bug 334091 - 1) Expose Accel+H/Accel+Shift+H in the History menu 2) Restore support for Accel+Shift+H (search history) on OS X. r=annie, sr=ben.
git-svn-id: svn://10.0.0.236/trunk@194587 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
8ccada4c5d
commit
8ac9a7c677
@ -357,7 +357,8 @@
|
||||
key="historyHome"/>
|
||||
<menuseparator/>
|
||||
<menuitem label="&historySearchCmd.label;"
|
||||
command="Browser:SearchHistory"/>
|
||||
command="Browser:SearchHistory"
|
||||
key="searchHistoryKb"/>
|
||||
<menuitem label="&historyShowCmd.label;"
|
||||
command="Browser:ShowHistory"/>
|
||||
<menuseparator id="startTabHistorySeparator"/>
|
||||
|
||||
@ -346,22 +346,27 @@
|
||||
<key id="key_stop" keycode="VK_ESCAPE" oncommand="BrowserStop();"/>
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
|
||||
<key id="key_stop_mac" modifiers="accel" key="&stopCmd.macCommandKey;" oncommand="BrowserStop();"/>
|
||||
#ifdef MOZ_PLACES
|
||||
<key id="key_gotoHistory" key="&historySidebarCmd.commandKey;" command="viewHistorySidebar" modifiers="accel,shift"/>
|
||||
#else
|
||||
<key id="key_gotoHistory" key="&historySidebarCmd.commandKey;" command="viewHistoryPlaces" modifiers="accel,shift"/>
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
#ifdef MOZ_PLACES
|
||||
<key id="key_gotoHistory" key="&historySidebarCmd.commandKey;" command="viewHistoryPlaces" modifiers="accel"/>
|
||||
<key id="searchHistoryKb"
|
||||
key="&historySidebarCmd.commandKey;"
|
||||
#ifdef XP_MACOSX
|
||||
modifiers="accel,shift"
|
||||
#else
|
||||
<key id="key_gotoHistory" key="&historySidebarCmd.commandKey;" command="viewHistorySidebar" modifiers="accel"/>
|
||||
modifiers="accel"
|
||||
#endif
|
||||
|
||||
command="viewHistoryPlaces"/>
|
||||
#else
|
||||
<key id="key_gotoHistory"
|
||||
key="&historySidebarCmd.commandKey;"
|
||||
#ifdef XP_MACOSX
|
||||
modifiers="accel,shift"
|
||||
#else
|
||||
modifiers="accel"
|
||||
#endif
|
||||
command="viewHistorySidebar"/>
|
||||
#endif
|
||||
|
||||
<key id="key_textZoomReduce" key="&textZoomReduceCmd.commandkey;" command="cmd_textZoomReduce" modifiers="accel"/>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user