fix 242864 delete key on mac doesn't delete messages, patch by tmeader@gmail.com, sr=bienvenu

This commit is contained in:
bienvenu%nventure.com 2006-09-12 23:36:42 +00:00
parent 13ab0d10de
commit 31b5d1e859
7 changed files with 26 additions and 11 deletions

View File

@ -82,6 +82,7 @@
<command id="saveas_vf_button" oncommand="goDoCommand('saveas_vf_button')" disabled="false"/>
<command id="file_message_button"/>
<command id="cmd_delete"/>
<command id="cmd_shiftDelete" oncommand="goDoCommand('cmd_shiftDelete');"/>
</commandset>
</commands>
@ -90,7 +91,9 @@
<key key="&closeCmd.key;" modifiers="accel" oncommand="onSearchStop(); closeWindow(true);"/>
<key keycode="VK_ESCAPE" xulkey="false" oncommand="onSearchStop(); closeWindow(true);"/>
#ifdef XP_MACOSX
<key id="key_delete2" oncommand="goDoCommand('cmd_delete');"/>
<key id="cmd_shiftDelete" keycode="VK_BACK" xulkey="false" oncommand="goDoCommand('cmd_shiftDelete');" modifiers="shift"/>
<key id="cmd_shiftDelete2" keycode="VK_DELETE" xulkey="false" oncommand="goDoCommand('cmd_shiftDelete');" modifiers="shift"/>
#else
<key id="cmd_shiftDelete" keycode="VK_DELETE" xulkey="false" oncommand="goDoCommand('cmd_shiftDelete');" modifiers="shift"/>
#endif

View File

@ -252,6 +252,7 @@
<command id="button_goForward"/>
<command id="button_file"/>
<command id="cmd_delete"/>
<command id="cmd_shiftDelete" oncommand="goDoCommand('cmd_shiftDelete');"/>
<command id="button_junk"/>
</commandset>
@ -315,11 +316,11 @@
<key id="key_cut"/>
<key id="key_copy"/>
<key id="key_paste"/>
<key id="key_delete" oncommand="goDoCommand('cmd_delete');" shift="false"/>
<key id="key_delete"/>
<key id="cmd_shiftDelete"/>
#ifdef XP_MACOSX
<key id="cmd_shiftDelete" keycode="VK_BACK" xulkey="false" oncommand="goDoCommand('cmd_shiftDelete');" modifiers="shift"/>
#else
<key id="cmd_shiftDelete" keycode="VK_DELETE" xulkey="false" oncommand="goDoCommand('cmd_shiftDelete');" modifiers="shift"/>
<key id="key_delete2"/>
<key id="cmd_shiftDelete2"/>
#endif
<key id="key_selectAll"/>
<key id="key_selectThread" key="&selectThreadCmd.key;" oncommand="goDoCommand('cmd_selectThread');" modifiers="accel, shift"/>

View File

@ -5,7 +5,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<!-- Delete Key -->
<key id="cmd_shiftDelete" keycode="VK_DELETE" xulkey="false" modifiers="shift"/>
<key id="key_shiftDelete" keycode="VK_DELETE" modifiers="shift" command="cmd_shiftDelete"/>
</overlay>

View File

@ -70,6 +70,7 @@
<key id="key_closeWindow" key="&closeCmd.key;" command="cmd_closeWindow" modifiers="accel,shift"/>
#ifdef XP_MACOSX
<key id="key_delete" keycode="VK_BACK" command="cmd_delete"/>
<key id="key_delete2" keycode="VK_DELETE" command="cmd_delete"/>
#else
<key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
#endif

View File

@ -5,6 +5,6 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<!-- Delete Key -->
<key id="cmd_shiftDelete" keycode="VK_DELETE" xulkey="false" modifiers="shift"/>
<key id="key_shiftDelete" keycode="VK_DELETE" modifiers="shift" command="cmd_shiftDelete"/>
</overlay>

View File

@ -134,12 +134,11 @@
<keyset id="tasksKeys">
<!-- File Menu -->
#ifdef XP_MACOSX
<key id="key_newMessage" key="&newMessageCmd.key;" modifiers="accel,shift" oncommand="AbNewMessage()"/>
<key id="key_newCard" key="&newCard.key;" modifiers="accel" oncommand="AbNewCard();"/>
<key id="key_newMessage" key="&newMessageCmd.key;" modifiers="accel,shift" oncommand="AbNewMessage()"/>
#else
<key id="key_newMessage" key="&newMessageCmd.key;" modifiers="accel" oncommand="AbNewMessage()"/>
<key id="key_newCard" key="&newCard.key;" modifiers="accel" oncommand="AbNewCard();"/>
<key id="key_newMessage" key="&newMessageCmd.key;" modifiers="accel" oncommand="AbNewMessage()"/>
#endif
<key id="key_newCard" key="&newCard.key;" modifiers="accel" oncommand="AbNewCard();"/>
<key id="key_printCard" key="&printCardViewCmd.key;" command="cmd_printcard" modifiers="accel"/>
<key id="key_close" key="&closeCmd.key;" modifiers="accel" oncommand="AbClose()"/>
@ -150,7 +149,13 @@
<key id="key_cut" key="&cutCmd.key;" modifiers="accel"/>
<key id="key_copy" key="&copyCmd.key;" modifiers="accel"/>
<key id="key_paste" key="&pasteCmd.key;" modifiers="accel"/>
#ifdef XP_MACOSX
<key id="key_delete" keycode="VK_BACK" command="cmd_delete"/>
<key id="key_delete2" keycode="VK_DELETE" command="cmd_delete"/>
#else
<key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
#endif
<key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
#ifdef MOZ_WIDGET_GTK2
<key id="key_searchAddresses" key="&searchAddressesCmd.key;" oncommand="onAdvancedAbSearch();" modifiers="shift"/>

View File

@ -135,7 +135,7 @@
<command id="cmd_print" oncommand="goDoCommand('cmd_print')"/>
<!-- Edit Menu -->
<!--command id="cmd_pasteQuote"/ DO NOT INCLUDE THOSE PBROCASTER ESLE THE EDIT MENU WILL BE BROKEN! -->
<!--command id="cmd_pasteQuote"/ DO NOT INCLUDE THOSE COMMANDS ELSE THE EDIT MENU WILL BE BROKEN! -->
<!--command id="cmd_find"/-->
<!--command id="cmd_findNext"/-->
<command id="cmd_undo" oncommand="goDoCommand('cmd_undo')" disabled="true"/>
@ -198,7 +198,12 @@
<key id="key_copy" key="&copyCmd.key;" modifiers="accel"/>
<key id="key_paste" key="&pasteCmd.key;" modifiers="accel"/>
<key id="key_rewrap" key="&editRewrapCmd.key;" modifiers="accel"/>
#ifdef XP_MACOSX
<key id="key_delete" keycode="VK_BACK"/>
<key id="key_delete2" keycode="VK_DELETE"/>
#else
<key id="key_delete" keycode="VK_DELETE"/>
#endif
<key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
<key id="key_find" key="&findCmd.key;" command="cmd_find" modifiers="accel"/>
<key id="key_findNext" key="&findAgainCmd.key;" command="cmd_findNext" modifiers="accel"/>