Rename/reorganize Advanced prefs buttons

- Move csledit and cslpreview to a Tools section of the Cite pane as
  Style Editor and Style Preview
- Rename "Open about:config" to "Config Editor"
- Hide about:memory unless devtools.errorconsole.enabled is enabled,
  which isn't particularly appropriate and maybe we can find something
  better, but about:memory doesn't really need to be visible by default

Closes #1264
This commit is contained in:
Dan Stillman 2017-07-21 07:47:32 -04:00
parent 33b40829b8
commit faecefa375
7 changed files with 34 additions and 50 deletions

View file

@ -58,7 +58,6 @@ overlay chrome://zotero/content/preferences/preferences_general.xul chrome://zot
overlay chrome://zotero/content/preferences/preferences_export.xul chrome://zotero/content/preferences/preferences_export_firefox.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
overlay chrome://zotero/content/preferences/preferences_keys.xul chrome://zotero/content/preferences/preferences_keys_firefox.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
overlay chrome://zotero/content/preferences/preferences_advanced.xul chrome://zotero/content/preferences/preferences_advanced_firefox.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
overlay chrome://zotero/content/preferences/preferences_advanced.xul chrome://zotero/content/preferences/preferences_advanced_standalone.xul application=zotero@chnm.gmu.edu
overlay chrome://mozapps/content/downloads/unknownContentType.xul chrome://zotero/content/downloadOverlay.xul

View file

@ -33,6 +33,11 @@ Zotero_Preferences.Advanced = {
Zotero_Preferences.Debug_Output.init();
Zotero_Preferences.Keys.init();
// Show Memory Info button if the Error Console menu option is enabled
if (Zotero.Prefs.get('devtools.errorconsole.enabled', true)) {
document.getElementById('memory-info').hidden = false;
}
this.onDataDirLoad();
this.refreshLocale();
},

View file

@ -145,15 +145,13 @@
<separator/>
<hbox id="zotero-prefpane-advanced-openbuttons" align="center" style="display: block">
<button id="openAboutConfig"
label="&zotero.preferences.openAboutConfig;"
<button id="config-editor"
label="&zotero.preferences.configEditor;"
oncommand="Zotero_Preferences.openInViewer('about:config')"/>
<button id="openCSLEdit"
label="&zotero.preferences.openCSLEdit;"
oncommand="Zotero_Preferences.openInViewer('chrome://zotero/content/tools/csledit.xul', true)"/>
<button id="openCSLPreview"
label="&zotero.preferences.openCSLPreview;"
oncommand="Zotero_Preferences.openInViewer('chrome://zotero/content/tools/cslpreview.xul', true)"/>
<button id="memory-info"
label="Memory Info"
oncommand="Zotero_Preferences.openInViewer('about:memory')"
hidden="true"/>
</hbox>
</groupbox>
</tabpanel>

View file

@ -1,36 +0,0 @@
<?xml version="1.0"?>
<!--
***** BEGIN LICENSE BLOCK *****
Copyright © 2013 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 Affero 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 Affero General Public License for more details.
You should have received a copy of the GNU Affero 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">
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<groupbox id="zotero-prefpane-advanced-miscellaneous">
<hbox id="zotero-standalone-buttons">
<button id="openAboutMemory"
label="&zotero.preferences.openAboutMemory;"
oncommand="Zotero_Preferences.openInViewer('about:memory')"/>
</hbox>
</groupbox>
</overlay>

View file

@ -23,7 +23,12 @@
***** END LICENSE BLOCK *****
-->
<!DOCTYPE prefwindow SYSTEM "chrome://zotero/locale/preferences.dtd">
<!DOCTYPE window [
<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd">
%zoteroDTD;
<!ENTITY % preferencesDTD SYSTEM "chrome://zotero/locale/preferences.dtd">
%preferencesDTD;
]>
<overlay id="zotero-prefpane-cite-overlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@ -76,6 +81,19 @@
&zotero.preferences.export.citePaperJournalArticleURL.description;
</label>
</groupbox>
<groupbox>
<caption label="&zotero.general.tools;"/>
<hbox>
<button id="openCSLEdit"
label="&zotero.preferences.styleEditor;"
oncommand="Zotero_Preferences.openInViewer('chrome://zotero/content/tools/csledit.xul', true)"/>
<button id="openCSLPreview"
label="&zotero.preferences.stylePreview;"
oncommand="Zotero_Preferences.openInViewer('chrome://zotero/content/tools/cslpreview.xul', true)"/>
</hbox>
</groupbox>
</tabpanel>
<tabpanel orient="vertical" id="wordProcessors">
<label id="wordProcessors-noWordProcessorPluginsInstalled" width="45em" hidden="true">

View file

@ -125,6 +125,8 @@
<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "Get word processor plug-ins…">
<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation_for_zotero_2.1">
<!ENTITY zotero.preferences.cite.wordProcessors.useClassicAddCitationDialog "Use classic Add Citation dialog">
<!ENTITY zotero.preferences.styleEditor "Style Editor">
<!ENTITY zotero.preferences.stylePreview "Style Preview">
<!ENTITY zotero.preferences.cite.styles.styleManager "Style Manager">
<!ENTITY zotero.preferences.cite.styles.styleManager.title "Title">
@ -212,7 +214,4 @@
<!ENTITY zotero.preferences.debugOutputLogging.clearOutput "Clear Output">
<!ENTITY zotero.preferences.debugOutputLogging.submitToServer "Submit to Zotero Server">
<!ENTITY zotero.preferences.openAboutConfig "Open about:config">
<!ENTITY zotero.preferences.openCSLEdit "Open Style Editor">
<!ENTITY zotero.preferences.openCSLPreview "Open Style Preview">
<!ENTITY zotero.preferences.openAboutMemory "Open about:memory">
<!ENTITY zotero.preferences.configEditor "Config Editor">

View file

@ -11,6 +11,7 @@
<!ENTITY zotero.general.refresh "Refresh">
<!ENTITY zotero.general.saveAs "Save As…">
<!ENTITY zotero.general.advancedOptions.label "Advanced Options">
<!ENTITY zotero.general.tools "Tools">
<!ENTITY zotero.general.more "More">
<!ENTITY zotero.general.loading "Loading…">