Bug 1703164 - convert mail/components/preferences/applicationManager.xhtml to top level <html>. r=aleca
Settings | Files & Attachments | Select a type, choose Application Details in the menu for it. Differential Revision: https://phabricator.services.mozilla.com/D194493 --HG-- extra : rebase_source : bd662127ca9b9317d5efacadcfd22d2b36805b1f extra : amend_source : edf218161b9e673d77fcdceee05f9261329a1141
This commit is contained in:
Magnus Melin
Родитель
714b50c47f
Коммит
cbb00a72cd
|
|
@ -5,6 +5,10 @@
|
|||
// applications.js
|
||||
/* globals gGeneralPane */
|
||||
|
||||
window.addEventListener("load", event => {
|
||||
gAppManagerDialog.init();
|
||||
});
|
||||
|
||||
var gAppManagerDialog = {
|
||||
_removed: [],
|
||||
|
||||
|
|
|
|||
|
|
@ -3,80 +3,87 @@
|
|||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<!DOCTYPE window>
|
||||
|
||||
<window
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
<!DOCTYPE html>
|
||||
<html
|
||||
xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
onload="gAppManagerDialog.init();"
|
||||
data-l10n-id="app-manager-window-dialog2"
|
||||
scrolling="false"
|
||||
style="min-width: 30em"
|
||||
>
|
||||
<dialog id="appManager" buttons="accept,cancel">
|
||||
<script src="chrome://global/content/preferencesBindings.js" />
|
||||
<script src="chrome://messenger/content/preferences/general.js" />
|
||||
<script src="chrome://messenger/content/preferences/applicationManager.js" />
|
||||
|
||||
<commandset id="appManagerCommandSet">
|
||||
<command
|
||||
id="cmd_delete"
|
||||
oncommand="gAppManagerDialog.remove();"
|
||||
disabled="true"
|
||||
/>
|
||||
</commandset>
|
||||
|
||||
<keyset id="appManagerKeyset">
|
||||
<key id="delete" keycode="VK_DELETE" command="cmd_delete" />
|
||||
</keyset>
|
||||
|
||||
<stringbundle
|
||||
id="appManagerBundle"
|
||||
src="chrome://messenger/locale/preferences/applicationManager.properties"
|
||||
<head>
|
||||
<title data-l10n-id="app-manager-dialog-title"></title>
|
||||
<link rel="stylesheet" href="chrome://global/skin/global.css" />
|
||||
<link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="chrome://messenger/skin/preferences/applications.css"
|
||||
/>
|
||||
<stringbundle
|
||||
id="bundlePreferences"
|
||||
src="chrome://messenger/locale/preferences/preferences.properties"
|
||||
<link
|
||||
rel="localization"
|
||||
href="messenger/preferences/application-manager.ftl"
|
||||
/>
|
||||
|
||||
<linkset>
|
||||
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
|
||||
<html:link
|
||||
rel="stylesheet"
|
||||
href="chrome://messenger/skin/input-fields.css"
|
||||
/>
|
||||
<html:link
|
||||
rel="stylesheet"
|
||||
href="chrome://messenger/skin/preferences/applications.css"
|
||||
/>
|
||||
|
||||
<html:link
|
||||
rel="localization"
|
||||
href="messenger/preferences/application-manager.ftl"
|
||||
/>
|
||||
</linkset>
|
||||
|
||||
<description id="appDescription" />
|
||||
<separator class="thin" />
|
||||
<hbox flex="1">
|
||||
<richlistbox
|
||||
id="appList"
|
||||
onselect="gAppManagerDialog.onSelect();"
|
||||
flex="1"
|
||||
style="min-height: 150px"
|
||||
/>
|
||||
<vbox>
|
||||
<button
|
||||
id="remove"
|
||||
data-l10n-id="remove-app-button"
|
||||
command="cmd_delete"
|
||||
<script
|
||||
defer="defer"
|
||||
src="chrome://global/content/preferencesBindings.js"
|
||||
></script>
|
||||
<script
|
||||
defer="defer"
|
||||
src="chrome://messenger/content/preferences/general.js"
|
||||
></script>
|
||||
<script
|
||||
defer="defer"
|
||||
src="chrome://messenger/content/preferences/applicationManager.js"
|
||||
></script>
|
||||
</head>
|
||||
<html:body
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
>
|
||||
<dialog id="appManager" buttons="accept,cancel">
|
||||
<commandset id="appManagerCommandSet">
|
||||
<command
|
||||
id="cmd_delete"
|
||||
oncommand="gAppManagerDialog.remove();"
|
||||
disabled="true"
|
||||
/>
|
||||
<spacer flex="1" />
|
||||
</vbox>
|
||||
</hbox>
|
||||
<vbox id="appDetails">
|
||||
</commandset>
|
||||
|
||||
<keyset id="appManagerKeyset">
|
||||
<key id="delete" keycode="VK_DELETE" command="cmd_delete" />
|
||||
</keyset>
|
||||
|
||||
<stringbundle
|
||||
id="appManagerBundle"
|
||||
src="chrome://messenger/locale/preferences/applicationManager.properties"
|
||||
/>
|
||||
<stringbundle
|
||||
id="bundlePreferences"
|
||||
src="chrome://messenger/locale/preferences/preferences.properties"
|
||||
/>
|
||||
|
||||
<description id="appDescription" />
|
||||
<separator class="thin" />
|
||||
<label id="appType" />
|
||||
<html:input id="appLocation" type="text" readonly="readonly" />
|
||||
</vbox>
|
||||
</dialog>
|
||||
</window>
|
||||
<hbox flex="1">
|
||||
<richlistbox
|
||||
id="appList"
|
||||
onselect="gAppManagerDialog.onSelect();"
|
||||
flex="1"
|
||||
style="min-height: 150px"
|
||||
/>
|
||||
<vbox>
|
||||
<button
|
||||
id="remove"
|
||||
data-l10n-id="remove-app-button"
|
||||
command="cmd_delete"
|
||||
/>
|
||||
<spacer flex="1" />
|
||||
</vbox>
|
||||
</hbox>
|
||||
<vbox id="appDetails">
|
||||
<separator class="thin" />
|
||||
<label id="appType" />
|
||||
<html:input id="appLocation" type="text" readonly="readonly" />
|
||||
</vbox>
|
||||
</dialog>
|
||||
</html:body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -537,7 +537,8 @@
|
|||
oncommand="gGeneralPane._rebuildView();"/>
|
||||
<separator class="thin"/>
|
||||
<html:div id="handlersView"
|
||||
preference="pref.downloads.disable_button.edit_actions">
|
||||
preference="pref.downloads.disable_button.edit_actions"
|
||||
search-l10n-ids="app-manager-dialog-title">
|
||||
<html:table id="handlersTable">
|
||||
<html:thead>
|
||||
<html:tr>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@
|
|||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
app-manager-window-dialog2 =
|
||||
.title = Application Details
|
||||
app-manager-dialog-title = Application Details
|
||||
|
||||
remove-app-button =
|
||||
.label = Remove
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
# Any copyright is dedicated to the Public Domain.
|
||||
# http://creativecommons.org/publicdomain/zero/1.0/
|
||||
|
||||
from fluent.migratetb import COPY_PATTERN
|
||||
from fluent.migratetb.helpers import transforms_from
|
||||
|
||||
|
||||
def migrate(ctx):
|
||||
"""Bug 1703164 - mail/components/preferences/applicationManager.xhtml to top level html part {index}"""
|
||||
|
||||
target = reference = "mail/messenger/preferences/application-manager.ftl"
|
||||
ctx.add_transforms(
|
||||
target,
|
||||
reference,
|
||||
transforms_from(
|
||||
"""
|
||||
app-manager-dialog-title = {{COPY_PATTERN(from_path, "app-manager-window-dialog2.title")}}
|
||||
""",
|
||||
from_path="mail/messenger/preferences/application-manager.ftl",
|
||||
),
|
||||
)
|
||||
Загрузка…
Ссылка в новой задаче