Bug 733469 - Move the applications preferences to in-content UI. r=jaws r=bmcbride

This commit is contained in:
Jon Rietveld 2012-05-08 19:19:58 -07:00
Родитель 648cb0fb2f
Коммит ce61db5b10
8 изменённых файлов: 1950 добавлений и 1 удалений

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -0,0 +1,88 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- 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/. -->
<script type="application/javascript"
src="chrome://browser/content/preferences/in-content/applications.js"/>
<preferences id="feedsPreferences">
<preference id="browser.feeds.handler"
name="browser.feeds.handler"
type="string"/>
<preference id="browser.feeds.handler.default"
name="browser.feeds.handler.default"
type="string"/>
<preference id="browser.feeds.handlers.application"
name="browser.feeds.handlers.application"
type="file"/>
<preference id="browser.feeds.handlers.webservice"
name="browser.feeds.handlers.webservice"
type="string"/>
<preference id="browser.videoFeeds.handler"
name="browser.videoFeeds.handler"
type="string"/>
<preference id="browser.videoFeeds.handler.default"
name="browser.videoFeeds.handler.default"
type="string"/>
<preference id="browser.videoFeeds.handlers.application"
name="browser.videoFeeds.handlers.application"
type="file"/>
<preference id="browser.videoFeeds.handlers.webservice"
name="browser.videoFeeds.handlers.webservice"
type="string"/>
<preference id="browser.audioFeeds.handler"
name="browser.audioFeeds.handler"
type="string"/>
<preference id="browser.audioFeeds.handler.default"
name="browser.audioFeeds.handler.default"
type="string"/>
<preference id="browser.audioFeeds.handlers.application"
name="browser.audioFeeds.handlers.application"
type="file"/>
<preference id="browser.audioFeeds.handlers.webservice"
name="browser.audioFeeds.handlers.webservice"
type="string"/>
<preference id="pref.downloads.disable_button.edit_actions"
name="pref.downloads.disable_button.edit_actions"
type="bool"/>
</preferences>
<keyset>
<key key="&focusSearch1.key;" modifiers="accel" oncommand="gApplicationsPane.focusFilterBox();"/>
<key key="&focusSearch2.key;" modifiers="accel" oncommand="gApplicationsPane.focusFilterBox();"/>
</keyset>
<hbox class="heading" data-category="paneApplications" hidden="true">
<image class="preference-icon" type="applications"/>
<html:h1>&paneApplications.title;</html:h1>
</hbox>
<vbox data-category="paneApplications" hidden="true" flex="1">
<hbox>
<textbox id="filter" flex="1"
type="search"
placeholder="&filter.emptytext;"
aria-controls="handlersView"
oncommand="gApplicationsPane.filter();"/>
</hbox>
<separator class="thin"/>
<richlistbox id="handlersView" orient="vertical" persist="lastSelectedType"
preference="pref.downloads.disable_button.edit_actions"
flex="1"
onselect="gApplicationsPane.onSelectionChanged();">
<listheader equalsize="always" style="border: 0; padding: 0; -moz-appearance: none;">
<treecol id="typeColumn" label="&typeColumn.label;" value="type"
accesskey="&typeColumn.accesskey;" persist="sortDirection"
flex="1" onclick="gApplicationsPane.sort(event);"
sortDirection="ascending"/>
<treecol id="actionColumn" label="&actionColumn2.label;" value="action"
accesskey="&actionColumn2.accesskey;" persist="sortDirection"
flex="1" onclick="gApplicationsPane.sort(event);"/>
</listheader>
</richlistbox>
</vbox>

Просмотреть файл

@ -9,4 +9,6 @@ browser.jar:
content/browser/preferences/in-content/privacy.xul
content/browser/preferences/in-content/privacy.js
* content/browser/preferences/in-content/advanced.xul
* content/browser/preferences/in-content/advanced.js
* content/browser/preferences/in-content/advanced.js
* content/browser/preferences/in-content/applications.xul
* content/browser/preferences/in-content/applications.js

Просмотреть файл

@ -23,6 +23,7 @@ function init_all() {
#endif
gPrivacyPane.init();
gAdvancedPane.init();
gApplicationsPane.init();
var initFinished = document.createEvent("Event");
initFinished.initEvent("Initialized", true, true);
document.dispatchEvent(initFinished);

Просмотреть файл

@ -94,6 +94,7 @@
#include tabs.xul
#include privacy.xul
#include advanced.xul
#include applications.xul
</prefpane>
</hbox>

Просмотреть файл

@ -100,6 +100,18 @@ prefpane > .content-box {
overflow: auto;
}
/* Applications Pane Styles */
#applications-content {
padding: 15px;
}
#handlersView {
-moz-appearance: none;
border: 1px solid ThreeDShadow;
overflow-y: auto;
}
/* XXX This style is for bug 740213 and should be removed once that
bug has a solution. */
description > html|a {

Просмотреть файл

@ -103,6 +103,18 @@ prefpane > .content-box {
overflow: auto;
}
/* Applications Pane Styles */
#applications-content {
padding: 15px;
}
#handlersView {
-moz-appearance: none;
border: 1px solid rgba(60,73,97,0.5);
overflow-y: auto;
}
/* XXX This style is for bug 740213 and should be removed once that
bug has a solution. */
description > html|a {

Просмотреть файл

@ -103,6 +103,18 @@ prefpane > .content-box {
overflow: auto;
}
/* Applications Pane Styles */
#applications-content {
padding: 15px;
}
#handlersView {
-moz-appearance: none;
border: 1px solid rgba(31,64,100,0.4);
overflow-y: auto;
}
/* XXX This style is for bug 740213 and should be removed once that
bug has a solution. */
description > html|a {