commit f4ac1c0b55a369915da46d2fe1e27aeff944f872
parent efe3121805beaddf3898561fb62eaefb5f43b4a9
Author: Simon Kornblith <simon@simonster.com>
Date: Mon, 17 Jan 2011 17:14:58 +0000
don't show proxy options in standalone
Diffstat:
5 files changed, 95 insertions(+), 47 deletions(-)
diff --git a/chrome.manifest b/chrome.manifest
@@ -47,6 +47,8 @@ skin zotero default chrome/skin/default/zotero/
overlay chrome://browser/content/browser.xul chrome://zotero/content/statusBarOverlay.xul appversion<4.0
overlay chrome://browser/content/browser.xul chrome://zotero/content/overlay.xul
overlay chrome://browser/content/browser.xul chrome://zotero/content/itemPane.xul
+overlay chrome://zotero/content/preferences/preferences.xul chrome://zotero/content/preferences/preferences_firefox.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+overlay chrome://zotero/content/preferences/preferences.xul#cite chrome://zotero/content/preferences/preferences_firefox.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
style chrome://browser/content/browser.xul chrome://zotero/skin/zotero.css
style chrome://global/content/customizeToolbar.xul chrome://zotero/skin/zotero.css
diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js
@@ -1733,6 +1733,8 @@ function deleteProxy() {
* Refreshes the proxy pane
*/
function refreshProxyList() {
+ if(!document.getElementById("zotero-prefpane-proxies")) return;
+
// get and sort proxies
proxies = Zotero.Proxies.proxies.slice();
for(var i=0; i<proxies.length; i++) {
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
@@ -627,52 +627,6 @@ To add a new preference:
</prefpane>
- <prefpane id="zotero-prefpane-proxies"
- label="&zotero.preferences.prefpane.proxies;"
- image="chrome://zotero/skin/prefs-proxies.png">
- <description width="45em" style="font-size: 12px">
- &zotero.preferences.proxies.desc_before_link;
- <label class="text-link" href="http://www.zotero.org/support/proxies"
- value="&zotero.preferences.proxies.desc_link;"/>
- &zotero.preferences.proxies.desc_after_link;
- </description>
-
- <command id="zotero-proxies-update" oncommand="updateProxyPrefs()"/>
- <checkbox id="zotero-proxies-transparent" label="&zotero.preferences.proxies.transparent;"
- command="zotero-proxies-update"/>
- <vbox style="margin-left: 1em">
- <checkbox id="zotero-proxies-autoRecognize" label="&zotero.preferences.proxies.autoRecognize;"
- command="zotero-proxies-update"/>
- <hbox>
- <checkbox id="zotero-proxies-disableByDomain-checkbox" label="&zotero.preferences.proxies.disableByDomain;"
- command="zotero-proxies-update"/>
- <textbox id="zotero-proxies-disableByDomain-textbox" onchange="updateProxyPrefs()"/>
- </hbox>
- </vbox>
-
- <groupbox flex="1" id="proxyGroup">
- <caption label="&zotero.preferences.proxies.configured;"/>
-
- <tree flex="1" id="proxyTree" hidecolumnpicker="true" rows="6" seltype="single"
- ondblclick="showProxyEditor(this.currentIndex)" onselect="document.getElementById('proxyTree-delete').disabled = undefined"
- onkeypress="if (event.keyCode == event.DOM_VK_DELETE) { deleteProxy(); }">
- <treecols>
- <treecol id="proxyTree-hostname" label="&zotero.preferences.proxies.hostname;" flex="1"/>
- <treecol id="proxyTree-scheme" label="&zotero.preferences.proxies.scheme;" flex="3"/>
- </treecols>
- <treechildren id="proxyTree-rows"/>
- </tree>
- <separator class="thin"/>
- <hbox pack="end">
- <button disabled="true" id="proxyTree-delete" label="-" onclick="deleteProxy()"/>
- <button label="+" id="proxyTree-add" onclick="showProxyEditor()"/>
- </hbox>
- </groupbox>
-
- <separator/>
- </prefpane>
-
-
<prefpane id="zotero-prefpane-keys"
label="&zotero.preferences.prefpane.keys;"
image="chrome://zotero/skin/prefs-keys.png">
diff --git a/chrome/content/zotero/preferences/preferences_firefox.xul b/chrome/content/zotero/preferences/preferences_firefox.xul
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+ ***** BEGIN LICENSE BLOCK *****
+
+ Copyright © 2009 Center for History and New Media
+ George Mason University, Fairfax, Virginia, USA
+ http://zotero.org
+
+ This file is part of Zotero.
+
+ Zotero is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Zotero is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Zotero. If not, see <http://www.gnu.org/licenses/>.
+
+ ***** END LICENSE BLOCK *****
+-->
+<!DOCTYPE prefwindow SYSTEM "chrome://zotero/locale/preferences.dtd">
+
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
+<?xml-stylesheet href="chrome://zotero/skin/preferences.css"?>
+
+<!--
+
+To add a new preference:
+ 1) Add a new <preference> to <preferences>
+ 2) Add a XUL control with a 'preference' attribute
+ 3) (Optional) Add additional setup/change logic to preferences.js
+ 4) (Optional) To add an observer for a preference change,
+ add an appropriate case in the switch statement
+ in Zotero.Prefs.observe()
+
+-->
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ <prefwindow id="zotero-prefs">
+ <prefpane id="zotero-prefpane-proxies"
+ label="&zotero.preferences.prefpane.proxies;"
+ image="chrome://zotero/skin/prefs-proxies.png" position="6">
+ <description width="45em" style="font-size: 12px">
+ &zotero.preferences.proxies.desc_before_link;
+ <label class="text-link" href="http://www.zotero.org/support/proxies"
+ value="&zotero.preferences.proxies.desc_link;"/>
+ &zotero.preferences.proxies.desc_after_link;
+ </description>
+
+ <command id="zotero-proxies-update" oncommand="updateProxyPrefs()"/>
+ <checkbox id="zotero-proxies-transparent" label="&zotero.preferences.proxies.transparent;"
+ command="zotero-proxies-update"/>
+ <vbox style="margin-left: 1em">
+ <checkbox id="zotero-proxies-autoRecognize" label="&zotero.preferences.proxies.autoRecognize;"
+ command="zotero-proxies-update"/>
+ <hbox>
+ <checkbox id="zotero-proxies-disableByDomain-checkbox" label="&zotero.preferences.proxies.disableByDomain;"
+ command="zotero-proxies-update"/>
+ <textbox id="zotero-proxies-disableByDomain-textbox" onchange="updateProxyPrefs()"/>
+ </hbox>
+ </vbox>
+
+ <groupbox flex="1" id="proxyGroup">
+ <caption label="&zotero.preferences.proxies.configured;"/>
+
+ <tree flex="1" id="proxyTree" hidecolumnpicker="true" rows="6" seltype="single"
+ ondblclick="showProxyEditor(this.currentIndex)" onselect="document.getElementById('proxyTree-delete').disabled = undefined"
+ onkeypress="if (event.keyCode == event.DOM_VK_DELETE) { deleteProxy(); }">
+ <treecols>
+ <treecol id="proxyTree-hostname" label="&zotero.preferences.proxies.hostname;" flex="1"/>
+ <treecol id="proxyTree-scheme" label="&zotero.preferences.proxies.scheme;" flex="3"/>
+ </treecols>
+ <treechildren id="proxyTree-rows"/>
+ </tree>
+ <separator class="thin"/>
+ <hbox pack="end">
+ <button disabled="true" id="proxyTree-delete" label="-" onclick="deleteProxy()"/>
+ <button label="+" id="proxyTree-add" onclick="showProxyEditor()"/>
+ </hbox>
+ </groupbox>
+
+ <separator/>
+ </prefpane>
+ </prefwindow>
+</overlay>
diff --git a/chrome/content/zotero/xpcom/proxy.js b/chrome/content/zotero/xpcom/proxy.js
@@ -60,7 +60,7 @@ Zotero.Proxies = new function() {
}
}
- Zotero.Proxies.transparent = Zotero.Prefs.get("proxies.transparent");
+ Zotero.Proxies.transparent = !Zotero.isConnector && Zotero.Prefs.get("proxies.transparent");
Zotero.Proxies.autoRecognize = Zotero.Proxies.transparent && Zotero.Prefs.get("proxies.autoRecognize");
var disableByDomainPref = Zotero.Prefs.get("proxies.disableByDomain");
