From d4da080967d9a96270baf9b44b7bca9e35b8ca1f Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Fri, 15 Oct 2010 05:36:37 +0000
Subject: [PATCH] Styles->Cite section in Zotero preferences and split to "Word
 Processors" and "Styles" tabs also change "Shortcut Keys" to just "Shortcuts"
 (since the icon is a key anyway)

---
 .../content/zotero/preferences/preferences.js | 10 +++
 .../zotero/preferences/preferences.xul        | 80 +++++++++++--------
 chrome/locale/en-US/zotero/preferences.dtd    | 17 ++--
 3 files changed, 67 insertions(+), 40 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js
index 605ad5622..934fb8cbd 100644
--- a/chrome/content/zotero/preferences/preferences.js
+++ b/chrome/content/zotero/preferences/preferences.js
@@ -46,6 +46,7 @@ function init()
 	}
 	
 	updateStorageSettings(null, null, true);
+	updateWordProcessorInstructions();
 	refreshStylesList();
 	refreshProxyList();
 	populateQuickCopyList();
@@ -1813,3 +1814,12 @@ function updateProxyPrefs() {
 		document.getElementById('zotero-proxies-disableByDomain-checkbox').disabled = 
 		document.getElementById('zotero-proxies-disableByDomain-textbox').disabled = !transparent;
 }
+
+/**
+ * Determines if there are word processors, and if not, enables no word processor message
+ */
+function updateWordProcessorInstructions() {
+	if(document.getElementById("wordProcessors").childNodes.length == 2) {
+		document.getElementById("wordProcessors-noWordProcessorPluginsInstalled").hidden = undefined;
+	}
+}
\ No newline at end of file
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index a66ce091f..a6ea68900 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -564,45 +564,59 @@ To add a new preference:
 	
 	
 	<prefpane id="zotero-prefpane-styles"
-						label="&zotero.preferences.prefpane.styles;"
+						label="&zotero.preferences.prefpane.cite;"
 						image="chrome://zotero/skin/prefs-styles.png">
 		
 		<preferences>
 			<preference id="pref-styles-citePaperJournalArticleURL" name="extensions.zotero.export.citePaperJournalArticleURL" type="bool"/>
 		</preferences>
 		
-		<groupbox flex="1">
-			<caption label="&zotero.preferences.styles.styleManager;"/>
-			
-			<tree flex="1" id="styleManager" hidecolumnpicker="true" rows="6"
-					onselect="document.getElementById('styleManager-delete').disabled = undefined"
-					onkeypress="if (event.keyCode == event.DOM_VK_DELETE) { deleteSelectedStyle(); }">
-				<treecols>
-					<treecol id="styleManager-title" label="&zotero.preferences.styles.styleManager.title;" flex="3"/>
-					<treecol id="styleManager-updated" label="&zotero.preferences.styles.styleManager.updated;" flex="1"/>
-					<treecol id="styleManager-csl" label="&zotero.preferences.styles.styleManager.csl;"/>
-				</treecols>
-				<treechildren id="styleManager-rows"/>
-			</tree>
-			<separator class="thin"/>
-			<hbox align="center" flex="1">
-				<label class="text-link" href="http://www.zotero.org/styles/" value="&zotero.preferences.export.getAdditionalStyles;" flex="1"/>
-				<button disabled="true" id="styleManager-delete" label="-" onclick="deleteStyle()"/>
-				<button label="+" onclick="addStyle()"/>
-			</hbox>
-		</groupbox>
-		
-		<groupbox>
-			<caption label="&zotero.preferences.citationOptions.caption;"/>
-			
-			<checkbox label="&zotero.preferences.export.citePaperJournalArticleURL;" preference="pref-styles-citePaperJournalArticleURL"/>
-			<!-- This doesn't wrap without an explicit width, for some reason -->
-			<label id="export-citePaperJournalArticleURL" width="45em">
-				&zotero.preferences.export.citePaperJournalArticleURL.description;
-			</label>
-		</groupbox>
-		
-		<separator/>
+		<tabbox>
+			<tabs>
+				<tab label="&zotero.preferences.cite.wordProcessors;"/>
+				<tab label="&zotero.preferences.cite.styles;"/>
+			</tabs>
+			<tabpanels>
+				<tabpanel orient="vertical" id="wordProcessors">
+					<label id="wordProcessors-noWordProcessorPluginsInstalled" width="45em" hidden="true">
+							&zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled;
+					</label>
+					<label class="text-link" href="http://www.zotero.org/support/word_processor_plugin_installation#word_processor_plugins_for_zotero_2.0" value="&zotero.preferences.cite.wordProcessors.getPlugins;"/>
+				</tabpanel>
+				<tabpanel orient="vertical" id="styles">
+					<groupbox flex="1">
+						<caption label="&zotero.preferences.cite.styles.styleManager;"/>
+						
+						<tree flex="1" id="styleManager" hidecolumnpicker="true" rows="6"
+								onselect="document.getElementById('styleManager-delete').disabled = undefined"
+								onkeypress="if (event.keyCode == event.DOM_VK_DELETE) { deleteSelectedStyle(); }">
+							<treecols>
+								<treecol id="styleManager-title" label="&zotero.preferences.cite.styles.styleManager.title;" flex="3"/>
+								<treecol id="styleManager-updated" label="&zotero.preferences.cite.styles.styleManager.updated;" flex="1"/>
+								<treecol id="styleManager-csl" label="&zotero.preferences.cite.styles.styleManager.csl;"/>
+							</treecols>
+							<treechildren id="styleManager-rows"/>
+						</tree>
+						<separator class="thin"/>
+						<hbox align="center" flex="1" height="40">
+							<label class="text-link" href="http://www.zotero.org/styles/" value="&zotero.preferences.export.getAdditionalStyles;" flex="1"/>
+							<button disabled="true" id="styleManager-delete" label="-" onclick="deleteStyle()"/>
+							<button label="+" onclick="addStyle()"/>
+						</hbox>
+					</groupbox>
+					
+					<groupbox>
+						<caption label="&zotero.preferences.citationOptions.caption;"/>
+						
+						<checkbox label="&zotero.preferences.export.citePaperJournalArticleURL;" preference="pref-styles-citePaperJournalArticleURL"/>
+						<!-- This doesn't wrap without an explicit width, for some reason -->
+						<label id="export-citePaperJournalArticleURL" width="45em">
+							&zotero.preferences.export.citePaperJournalArticleURL.description;
+						</label>
+					</groupbox>
+				</tabpanel>
+			</tabpanels>
+		</tabbox>
 	</prefpane>
 	
 	
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index 4b3755d9a..e982721de 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -94,16 +94,19 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 <!ENTITY zotero.preferences.quickCopy.dragLimit			 "Disable Quick Copy when dragging more than">
 
+<!ENTITY zotero.preferences.prefpane.cite					"Cite">
+<!ENTITY zotero.preferences.cite.styles			"Styles">
+<!ENTITY zotero.preferences.cite.wordProcessors	"Word Processors">
+<!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "No word processor plug-ins are currently installed.">
+<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins	"Get word processor plug-ins...">
 
-<!ENTITY zotero.preferences.prefpane.styles					"Styles">
-
-<!ENTITY zotero.preferences.styles.styleManager				"Style Manager">
-<!ENTITY zotero.preferences.styles.styleManager.title		"Title">
-<!ENTITY zotero.preferences.styles.styleManager.updated		"Updated">
-<!ENTITY zotero.preferences.styles.styleManager.csl		"CSL">
+<!ENTITY zotero.preferences.cite.styles.styleManager				"Style Manager">
+<!ENTITY zotero.preferences.cite.styles.styleManager.title		"Title">
+<!ENTITY zotero.preferences.cite.styles.styleManager.updated		"Updated">
+<!ENTITY zotero.preferences.cite.styles.styleManager.csl		"CSL">
 <!ENTITY zotero.preferences.export.getAdditionalStyles			"Get additional styles...">
 
-<!ENTITY zotero.preferences.prefpane.keys				"Shortcut Keys">
+<!ENTITY zotero.preferences.prefpane.keys				"Shortcuts">
 
 <!ENTITY zotero.preferences.keys.openZotero				"Open/Close Zotero Pane">
 <!ENTITY zotero.preferences.keys.toggleFullscreen			"Toggle Fullscreen Mode">