commit 69cb928d6c138032edf53020284bdb6ce1068173
parent 7bc19c0cd35ef493cfc9e788be4a67750ac69545
Author: Dan Stillman <dstillman@zotero.org>
Date: Tue, 19 Feb 2013 16:58:38 -0500
Move zotero.org version header pref to Advanced
Translator updates and broken translator reporting both make automatic
requests to zotero.org, but the version pref is just adding a header
with the Zotero version on existing requests.
Diffstat:
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
@@ -726,15 +726,15 @@ To add a new preference:
<preference id="pref-openURL-version" name="extensions.zotero.openURL.version" type="string"/>
</preferences>
- <tabbox>
+ <tabbox id="zotero-prefpane-advanced-tabs">
<tabs>
<!-- TODO: localize -->
<tab label="General"/>
<tab label="Files and Folders"/>
</tabs>
- <tabpanels>
- <tabpanel orient="vertical">
+ <tabpanels id="zotero-prefpane-advanced-tabpanels">
+ <tabpanel id="zotero-prefpane-advanced-general-tab" orient="vertical">
<groupbox>
<caption label="&zotero.preferences.debugOutputLogging;"/>
@@ -790,9 +790,9 @@ To add a new preference:
</hbox>
</groupbox>
- <groupbox>
+ <groupbox id="zotero-prefpane-advanced-miscellaneous">
<caption label="&zotero.preferences.miscellaneous;"/>
- <hbox align="center">
+ <hbox id="zotero-prefpane-advanced-openbuttons" align="center">
<button id="openAboutConfig" label="&zotero.preferences.openAboutConfig;" oncommand="openInViewer('about:config')"/>
<button id="openCSLEdit" label="&zotero.preferences.openCSLEdit;" oncommand="openInViewer('chrome://zotero/content/tools/csledit.xul', true)"/>
<button id="openCSLPreview" label="&zotero.preferences.openCSLPreview;" oncommand="openInViewer('chrome://zotero/content/tools/cslpreview.xul', true)"/>
diff --git a/chrome/content/zotero/preferences/preferences_firefox.xul b/chrome/content/zotero/preferences/preferences_firefox.xul
@@ -49,9 +49,6 @@ To add a new preference:
<preference id="pref-showIn" name="extensions.zotero.showIn" type="int"/>
<preference id="pref-statusBarIcon" name="extensions.zotero.statusBarIcon" type="int"/>
<preference id="pref-launchNonNativeFiles" name="extensions.zotero.launchNonNativeFiles" type="bool"/>
- <preference id="pref-zoteroDotOrgVersionHeader"
- name="extensions.zotero.zoteroDotOrgVersionHeader"
- type="bool"/>
<preference id="pref-parseEndNoteMIMETypes"
name="extensions.zotero.parseEndNoteMIMETypes"
type="bool" onchange="Zotero.MIMETypeHandler.init()"/>
@@ -83,10 +80,6 @@ To add a new preference:
</grid>
</groupbox>
<groupbox id="zotero-prefpane-miscellaneous-groupbox">
- <checkbox label="&zotero.preferences.zoteroDotOrgVersionHeader;"
- tooltiptext="&zotero.preferences.zoteroDotOrgVersionHeader.tooltip;"
- preference="pref-zoteroDotOrgVersionHeader"
- insertbefore="automaticSnapshots-checkbox"/>
<checkbox id="launchNonNativeFiles-checkbox"
preference="pref-launchNonNativeFiles"
onsyncfrompreference="return !document.getElementById(this.getAttribute('preference')).value"
@@ -171,5 +164,28 @@ To add a new preference:
<separator/>
</prefpane>
+
+ <prefpane id="zotero-prefpane-advanced">
+ <preferences id="zotero-prefpane-general-preferences">
+ <preference id="pref-zoteroDotOrgVersionHeader"
+ name="extensions.zotero.zoteroDotOrgVersionHeader"
+ type="bool"/>
+ </preferences>
+
+ <tabbox id="zotero-prefpane-advanced-tabs">
+ <tabpanels id="zotero-prefpane-advanced-tabpanels">
+ <tabpanel id="zotero-prefpane-advanced-general-tab">
+ <groupbox id="zotero-prefpane-advanced-miscellaneous">
+ <checkbox label="&zotero.preferences.zoteroDotOrgVersionHeader;"
+ tooltiptext="&zotero.preferences.zoteroDotOrgVersionHeader.tooltip;"
+ preference="pref-zoteroDotOrgVersionHeader"
+ insertbefore="zotero-prefpane-advanced-openbuttons"/>
+ <separator class="thin"
+ insertbefore="zotero-prefpane-advanced-openbuttons"/>
+ </groupbox>
+ </tabpanel>
+ </tabpanels>
+ </tabbox>
+ </prefpane>
</prefwindow>
</overlay>
