зеркало из https://github.com/mozilla/pjs.git
Bug 121369 Should support Mozilla as default News client too, like Mail
p=me r=mnyromyr sr=neil.parkwaycc.co.uk a=asa
This commit is contained in:
bugzilla%arlen.demon.co.uk
Родитель
3ce206754c
Коммит
4a9d4ca327
|
|
@ -70,8 +70,6 @@
|
|||
accesskey="&confirmMove.accesskey;"/>
|
||||
</hbox>
|
||||
|
||||
<hbox align="start" id="mapi"/>
|
||||
|
||||
<hbox align="center">
|
||||
<checkbox id="mailRememberLastMsg" label="&rememberLastMsg.label;"
|
||||
prefstring="mailnews.remember_selected_message"
|
||||
|
|
@ -85,6 +83,8 @@
|
|||
prefstring="mailnews.thread_pane_column_unthreads"
|
||||
reversed="true" />
|
||||
</hbox>
|
||||
|
||||
<vbox id="mapi"/>
|
||||
</groupbox>
|
||||
|
||||
<groupbox>
|
||||
|
|
|
|||
|
|
@ -51,14 +51,14 @@
|
|||
<!ENTITY location.label "Location:">
|
||||
<!ENTITY location.accesskey "L">
|
||||
<!ENTITY useDefault.label "Restore Default">
|
||||
<!ENTITY useDefault.accesskey "R">
|
||||
<!ENTITY useDefault.accesskey "D">
|
||||
<!ENTITY rememberLastMsg.label "Remember the last selected message">
|
||||
<!ENTITY rememberLastMsg.accesskey "e">
|
||||
<!ENTITY toolbarIntro.label "Select the buttons you want to see in the toolbar">
|
||||
<!ENTITY fileButton.label "File">
|
||||
<!ENTITY fileButton.accesskey "F">
|
||||
<!ENTITY nextButton.label "Next">
|
||||
<!ENTITY nextButton.accesskey "N">
|
||||
<!ENTITY nextButton.accesskey "x">
|
||||
<!ENTITY junkMailButton.label "Junk">
|
||||
<!ENTITY junkMailButton.accesskey "J">
|
||||
<!ENTITY printButton.label "Print">
|
||||
|
|
|
|||
|
|
@ -1,156 +0,0 @@
|
|||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2001
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Srilatha Moturi <srilatha@netscape.com>
|
||||
* Rajiv Dayal <rdayal@netscape.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
function mailnewsOverlayStartup() {
|
||||
mailnewsOverlayInit();
|
||||
if (!("mapiPref" in parent)) {
|
||||
parent.mapiPref = new Object;
|
||||
parent.mapiPref.isDefaultMailClient =
|
||||
document.getElementById("mailnewsEnableMapi").checked;
|
||||
|
||||
var mailnewsEnableNews = document.getElementById("mailnewsEnableNews");
|
||||
if (mailnewsEnableNews)
|
||||
parent.mapiPref.isDefaultNewsClient = mailnewsEnableNews.checked;
|
||||
}
|
||||
else {
|
||||
// when we switch between different panes
|
||||
// set the checkbox based on the saved state
|
||||
var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
|
||||
var mailnewsEnableNews = document.getElementById("mailnewsEnableNews");
|
||||
|
||||
if (parent.mapiPref.isDefaultMailClient)
|
||||
mailnewsEnableMapi.setAttribute("checked", "true");
|
||||
else
|
||||
mailnewsEnableMapi.setAttribute("checked", "false");
|
||||
|
||||
if (mailnewsEnableNews)
|
||||
{
|
||||
if (parent.mapiPref.isDefaultNewsClient)
|
||||
mailnewsEnableNews.setAttribute("checked", "true");
|
||||
else
|
||||
mailnewsEnableNews.setAttribute("checked", "false");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function registerCallback(){
|
||||
if ("mapiCallback" in parent && parent.mapiCallback)
|
||||
return;
|
||||
if ("hPrefWindow" in parent && parent.hPrefWindow) {
|
||||
parent.hPrefWindow.registerOKCallbackFunc( onOK );
|
||||
parent.mapiCallback = true;
|
||||
}
|
||||
}
|
||||
|
||||
function mailnewsOverlayInit() {
|
||||
try {
|
||||
var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
|
||||
getService( Components.interfaces.nsIMapiRegistry );
|
||||
}
|
||||
catch(ex){
|
||||
mapiRegistry = null;
|
||||
}
|
||||
|
||||
const prefbase = "system.windows.lock_ui.";
|
||||
var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
|
||||
var mailnewsEnableNews = document.getElementById("mailnewsEnableNews");
|
||||
|
||||
if (mapiRegistry) {
|
||||
// initialise preference component.
|
||||
// While the data is coming from the system registry, we use a set
|
||||
// of parallel preferences to indicate if the ui should be locked.
|
||||
try {
|
||||
var prefService = Components.classes["@mozilla.org/preferences-service;1"]
|
||||
.getService()
|
||||
.QueryInterface(Components.interfaces.nsIPrefService);
|
||||
var prefBranch = prefService.getBranch(prefbase);
|
||||
if (prefBranch && prefBranch.prefIsLocked("defaultMailClient")) {
|
||||
mapiRegistry.isDefaultMailClient = prefBranch.getBoolPref("defaultMailClient") ;
|
||||
mailnewsEnableMapi.setAttribute("disabled", "true");
|
||||
}
|
||||
}
|
||||
catch(ex) {}
|
||||
|
||||
mailnewsEnableMapi.setAttribute("checked", mapiRegistry.isDefaultMailClient ? "true" : "false");
|
||||
if (mailnewsEnableNews)
|
||||
mailnewsEnableNews.setAttribute("checked", mapiRegistry.isDefaultNewsClient ? "true" : "false");
|
||||
}
|
||||
else
|
||||
{
|
||||
mailnewsEnableMapi.setAttribute("disabled", "true");
|
||||
if (mailnewsEnableNews)
|
||||
mailnewsEnableNews.setAttribute("disabled", "true");
|
||||
}
|
||||
}
|
||||
|
||||
function onEnableMapi() {
|
||||
// save the state of the checkbox
|
||||
if ("mapiPref" in parent)
|
||||
parent.mapiPref.isDefaultMailClient =
|
||||
document.getElementById("mailnewsEnableMapi").checked;
|
||||
}
|
||||
|
||||
function onEnableNews() {
|
||||
// save the state of the checkbox
|
||||
if ("mapiPref" in parent)
|
||||
parent.mapiPref.isDefaultNewsClient = document.getElementById("mailnewsEnableNews").checked;
|
||||
}
|
||||
|
||||
function onOK()
|
||||
{
|
||||
try {
|
||||
var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].getService( Components.interfaces.nsIMapiRegistry );
|
||||
}
|
||||
catch(ex){
|
||||
mapiRegistry = null;
|
||||
}
|
||||
|
||||
if (mapiRegistry && ("mapiPref" in parent)) {
|
||||
if (mapiRegistry.isDefaultMailClient != parent.mapiPref.isDefaultMailClient)
|
||||
mapiRegistry.isDefaultMailClient = parent.mapiPref.isDefaultMailClient ;
|
||||
|
||||
if ("isDefaultNewsClient" in parent.mapiPref)
|
||||
{
|
||||
if (mapiRegistry.isDefaultNewsClient != parent.mapiPref.isDefaultNewsClient)
|
||||
mapiRegistry.isDefaultNewsClient = parent.mapiPref.isDefaultNewsClient;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Install the onload handler
|
||||
addEventListener("load", mailnewsOverlayStartup, false);
|
||||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
Contributor(s):
|
||||
Srilatha Moturi <srilatha@netscape.com>
|
||||
Ian Neal <bugzilla@arlen.demon.co.uk>
|
||||
|
||||
Alternatively, the contents of this file may be used under the terms of
|
||||
either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
|
|
@ -45,16 +46,24 @@
|
|||
<overlay id="prefMailnewsOverlay"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
_elementIDs.push("mailnewsEnableMapi");
|
||||
]]>
|
||||
</script>
|
||||
<script type="application/x-javascript" src="chrome://messenger-mapi/content/pref-mailnewsOverlay.js"/>
|
||||
<hbox align="center" id="mapi">
|
||||
<checkbox id="mailnewsEnableMapi" label="&enableMapi.label;"
|
||||
accesskey="&enableMapi.accesskey;"
|
||||
oncommand="onEnableMapi();"
|
||||
startupFunc="registerCallback();"/>
|
||||
</hbox>
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
_elementIDs.push("mailnewsEnableMapi", "mailnewsEnableNews");
|
||||
]]>
|
||||
</script>
|
||||
<script type="application/x-javascript" src="chrome://messenger-mapi/content/pref-mailnewsOverlay.js"/>
|
||||
<vbox id="mapi">
|
||||
<separator class="thin"/>
|
||||
|
||||
<description>&defaultMailSettings.label;</description>
|
||||
<hbox class="indent" align="center">
|
||||
<checkbox id="mailnewsEnableMapi" label="&enableMapi.label;"
|
||||
accesskey="&enableMapi.accesskey;"
|
||||
oncommand="parent.mapiPref.isDefaultMailClient = this.checked;"
|
||||
startupFunc="mailnewsOverlayStartup();"/>
|
||||
<checkbox id="mailnewsEnableNews" label="&enableNews.label;"
|
||||
accesskey="&enableNews.accesskey;"
|
||||
oncommand="parent.mapiPref.isDefaultNewsClient = this.checked;"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</overlay>
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
<!ENTITY enableMapiTitle.label "When sending mail from other applications">
|
||||
<!ENTITY enableMapi.label "Use &vendorShortName; Mail as the default mail application">
|
||||
<!ENTITY enableMapi.accesskey "u">
|
||||
Загрузка…
Ссылка в новой задаче