From fbef301fe07b0bd5289c84268e7085d708b195b6 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 28 Feb 2012 15:25:05 -0500
Subject: [PATCH] Add citation/footnote instructions to Quick Copy prefs

---
 chrome/content/zotero/preferences/preferences.js  | 11 +++++++++--
 chrome/content/zotero/preferences/preferences.xul |  2 ++
 chrome/locale/en-US/zotero/zotero.properties      |  3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js
index df1a9aa1b..a1e8857d0 100644
--- a/chrome/content/zotero/preferences/preferences.js
+++ b/chrome/content/zotero/preferences/preferences.js
@@ -762,11 +762,18 @@ function deleteSelectedQuickCopySite() {
 
 function updateQuickCopyInstructions() {
 	var prefix = Zotero.isMac ? 'Cmd+Shift+' : 'Ctrl+Alt+';
+	
 	var key = Zotero.Prefs.get('keys.copySelectedItemsToClipboard');
-	
-	var instr = document.getElementById('quickCopy-instructions');
 	var str = Zotero.getString('zotero.preferences.export.quickCopy.instructions', prefix + key);
+	var instr = document.getElementById('quickCopy-instructions');
+	while (instr.hasChildNodes()) {
+		instr.removeChild(instr.firstChild);
+	}
+	instr.appendChild(document.createTextNode(str));
 	
+	var key = Zotero.Prefs.get('keys.copySelectedItemCitationsToClipboard');
+	var str = Zotero.getString('zotero.preferences.export.quickCopy.citationInstructions', prefix + key);
+	var instr = document.getElementById('quickCopy-citationInstructions');
 	while (instr.hasChildNodes()) {
 		instr.removeChild(instr.firstChild);
 	}
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index d28b31ef4..d73f0ad6d 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -507,6 +507,8 @@ To add a new preference:
 			<caption label="&zotero.preferences.quickCopy.caption;"/>
 			
 			<label id="quickCopy-instructions"/>
+			<separator class="thin"/>
+			<label id="quickCopy-citationInstructions"/>
 			
 			<separator/>
 			
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 3a993479f..be1acc096 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -467,7 +467,8 @@ zotero.preferences.search.pdf.toolsDownloadError 			= An error occurred while at
 zotero.preferences.search.pdf.tryAgainOrViewManualInstructions	 = Please try again later, or view the documentation for manual installation instructions.
 zotero.preferences.export.quickCopy.bibStyles				= Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats			= Export Formats
-zotero.preferences.export.quickCopy.instructions			= Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.
+zotero.preferences.export.quickCopy.instructions			= Quick Copy allows you to copy selected items to the clipboard by pressing %S or dragging items into a text box on a web page.
+zotero.preferences.export.quickCopy.citationInstructions  = For bibliography styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
 zotero.preferences.styles.addStyle							= Add Style
 
 zotero.preferences.advanced.resetTranslatorsAndStyles					= Reset Translators and Styles