mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 330139 - "Change 'Remove' in download manager to 'Remove From List'" [p=supernova_00@yahoo.com (Kurt [supernova_00]) r=sdwilsh ui-r=madhava a1.9=schrep]

This commit is contained in:
reed@reedloden.com 2007-11-13 12:12:38 -08:00
Родитель 94ec31f6ef
Коммит f707ff79ef
3 изменённых файлов: 15 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
toolkit/locales/en-US/chrome/mozapps/downloads/downloads.dtd
Просмотреть файл

@ -24,8 +24,8 @@
<!ENTITY cmd.retry.accesskey "R"> <!ENTITY cmd.retry.accesskey "R">
<!ENTITY cmd.copyLocation.label "Copy Source Location"> <!ENTITY cmd.copyLocation.label "Copy Source Location">
<!ENTITY cmd.copyLocation.accesskey "L"> <!ENTITY cmd.copyLocation.accesskey "L">
<!ENTITY cmd.remove.label "Remove"> <!ENTITY cmd.removeFromList.label "Remove From List">
<!ENTITY cmd.remove.accesskey "e"> <!ENTITY cmd.removeFromList.accesskey "e">
<!ENTITY cmd.info.label "Information"> <!ENTITY cmd.info.label "Information">
<!ENTITY cmd.info.accesskey "i"> <!ENTITY cmd.info.accesskey "i">
<!ENTITY cmd.info.commandKey "i"> <!ENTITY cmd.info.commandKey "i">

12
toolkit/mozapps/downloads/content/downloads.js
Просмотреть файл

@ -520,13 +520,13 @@ var gContextMenus = [
["menuitem_pause", "menuitem_cancel", "menuseparator_copy_location", ["menuitem_pause", "menuitem_cancel", "menuseparator_copy_location",
"menuitem_copyLocation"], "menuitem_copyLocation"],
// DOWNLOAD_FINISHED // DOWNLOAD_FINISHED
["menuitem_open", "menuitem_show", "menuitem_remove", "menuitem_clearList", ["menuitem_open", "menuitem_show", "menuitem_removeFromList", "menuitem_clearList",
"menuseparator_copy_location", "menuitem_copyLocation"], "menuseparator_copy_location", "menuitem_copyLocation"],
// DOWNLOAD_FAILED // DOWNLOAD_FAILED
["menuitem_retry", "menuitem_remove", "menuitem_clearList", ["menuitem_retry", "menuitem_removeFromList", "menuitem_clearList",
"menuseparator_copy_location", "menuitem_copyLocation"], "menuseparator_copy_location", "menuitem_copyLocation"],
// DOWNLOAD_CANCELED // DOWNLOAD_CANCELED
["menuitem_retry", "menuitem_remove", "menuitem_clearList", ["menuitem_retry", "menuitem_removeFromList", "menuitem_clearList",
"menuseparator_copy_location", "menuitem_copyLocation"], "menuseparator_copy_location", "menuitem_copyLocation"],
// DOWNLOAD_PAUSED // DOWNLOAD_PAUSED
["menuitem_resume", "menuitem_cancel", "menuseparator_copy_location", ["menuitem_resume", "menuitem_cancel", "menuseparator_copy_location",
@ -535,7 +535,7 @@ var gContextMenus = [
["menuitem_cancel", "menuseparator_copy_location", ["menuitem_cancel", "menuseparator_copy_location",
"menuitem_copyLocation"], "menuitem_copyLocation"],
// DOWNLOAD_BLOCKED // DOWNLOAD_BLOCKED
["menuitem_retry", "menuitem_remove", "menuitem_clearList", ["menuitem_retry", "menuitem_removeFromList", "menuitem_clearList",
"menuseparator_copy_location", "menuitem_copyLocation"], "menuseparator_copy_location", "menuitem_copyLocation"],
// DOWNLOAD_SCANNING // DOWNLOAD_SCANNING
["menuitem_copyLocation"] ["menuitem_copyLocation"]
@ -636,7 +636,7 @@ var gDownloadViewController = {
case "cmd_resume": case "cmd_resume":
return dl.paused; return dl.paused;
case "cmd_openReferrer": case "cmd_openReferrer":
case "cmd_remove": case "cmd_removeFromList":
case "cmd_retry": case "cmd_retry":
return dl.removable; return dl.removable;
case "cmd_showInfo": case "cmd_showInfo":
@ -686,7 +686,7 @@ var gDownloadViewController = {
else else
this.commands.cmd_resume(aSelectedItem); this.commands.cmd_resume(aSelectedItem);
}, },
cmd_remove: function(aSelectedItem) { cmd_removeFromList: function(aSelectedItem) {
removeDownload(aSelectedItem); removeDownload(aSelectedItem);
}, },
cmd_resume: function(aSelectedItem) { cmd_resume: function(aSelectedItem) {

15
toolkit/mozapps/downloads/content/downloads.xul
Просмотреть файл

@ -88,8 +88,8 @@
oncommand="gDownloadViewController.doCommand('cmd_pause');"/> oncommand="gDownloadViewController.doCommand('cmd_pause');"/>
<command id="cmd_pauseResume" <command id="cmd_pauseResume"
oncommand="gDownloadViewController.doCommand('cmd_pauseResume');"/> oncommand="gDownloadViewController.doCommand('cmd_pauseResume');"/>
<command id="cmd_remove" <command id="cmd_removeFromList"
oncommand="gDownloadViewController.doCommand('cmd_remove');"/> oncommand="gDownloadViewController.doCommand('cmd_removeFromList');"/>
<command id="cmd_resume" <command id="cmd_resume"
oncommand="gDownloadViewController.doCommand('cmd_resume');"/> oncommand="gDownloadViewController.doCommand('cmd_resume');"/>
<command id="cmd_retry" <command id="cmd_retry"
@ -106,9 +106,9 @@
<keyset id="downloadKeys"> <keyset id="downloadKeys">
<key id="key_pauseResume" key=" " command="cmd_pauseResume"/> <key id="key_pauseResume" key=" " command="cmd_pauseResume"/>
<key id="key_remove" keycode="VK_DELETE" command="cmd_remove"/> <key id="key_removeFromList" keycode="VK_DELETE" command="cmd_removeFromList"/>
#ifdef XP_MACOSX #ifdef XP_MACOSX
<key id="key_remove2" keycode="VK_BACK" command="cmd_remove"/> <key id="key_removeFromList2" keycode="VK_BACK" command="cmd_removeFromList"/>
#endif #endif
<key id="key_close" key="&cmd.close.commandKey;" oncommand="closeWindow(true);" modifiers="accel"/> <key id="key_close" key="&cmd.close.commandKey;" oncommand="closeWindow(true);" modifiers="accel"/>
#ifdef XP_GNOME #ifdef XP_GNOME
@ -148,9 +148,9 @@
label="&cmd.retry.label;" accesskey="&cmd.retry.accesskey;" label="&cmd.retry.label;" accesskey="&cmd.retry.accesskey;"
command="cmd_retry"/> command="cmd_retry"/>
<menuitem id="menuitem_remove" <menuitem id="menuitem_removeFromList"
label="&cmd.remove.label;" accesskey="&cmd.remove.accesskey;" label="&cmd.removeFromList.label;" accesskey="&cmd.removeFromList.accesskey;"
command="cmd_remove"/> command="cmd_removeFromList"/>
<menuseparator id="menuseparator_copy_location"/> <menuseparator id="menuseparator_copy_location"/>
@ -195,4 +195,3 @@
</hbox> </hbox>
</window> </window>