From a93c801d0e2ced5c71b9fba62236255526773834 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 16 Feb 2007 08:44:09 +0000
Subject: [PATCH] Remove enableMacClipboard pref and just display a warning
 message ("Some formatting may be lost.") on OS X.

---
 chrome/content/zotero/bibliography.js  | 4 ++--
 chrome/content/zotero/bibliography.xul | 6 +++++-
 chrome/locale/en-US/zotero/zotero.dtd  | 1 +
 defaults/preferences/zotero.js         | 1 -
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/chrome/content/zotero/bibliography.js b/chrome/content/zotero/bibliography.js
index e76732a9b..435dd4a16 100644
--- a/chrome/content/zotero/bibliography.js
+++ b/chrome/content/zotero/bibliography.js
@@ -82,8 +82,8 @@ var Zotero_File_Interface_Bibliography = new function() {
 			
 			// disable clipboard on the Mac, because it can't support formatted
 			// output
-			if(Zotero.isMac && !Zotero.Prefs.get("enableMacClipboard")) {
-				document.getElementById("copy-to-clipboard").hidden = "true";
+			if(Zotero.isMac) {
+				document.getElementById("mac-clipboard-warning").hidden = false;
 			}
 		}
 		
diff --git a/chrome/content/zotero/bibliography.xul b/chrome/content/zotero/bibliography.xul
index ad65dac6f..ef57ff023 100644
--- a/chrome/content/zotero/bibliography.xul
+++ b/chrome/content/zotero/bibliography.xul
@@ -23,7 +23,11 @@
 			<radiogroup id="output-radio">
 				<radio id="save-as-rtf" label="&zotero.bibliography.saveAsRTF.label;"/>
 				<radio id="save-as-html" label="&zotero.bibliography.saveAsHTML.label;"/>
-				<radio id="copy-to-clipboard" label="&zotero.bibliography.copyToClipboard.label;"/>
+				<hbox align="center">
+					<radio id="copy-to-clipboard" label="&zotero.bibliography.copyToClipboard.label;"/>
+					<label id="mac-clipboard-warning" value="&zotero.bibliography.macClipboardWarning;"
+						hidden="true" style="margin-left:1em; font-size:0.95em"/>
+				</hbox>
 				<radio id="print" label="&zotero.bibliography.print.label;"/>
 			</radiogroup>
 		</groupbox>
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index d76a3c79b..7a08ac938 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -77,6 +77,7 @@
 <!ENTITY zotero.bibliography.saveAsRTF.label			"Save as RTF">
 <!ENTITY zotero.bibliography.saveAsHTML.label			"Save as HTML">
 <!ENTITY zotero.bibliography.copyToClipboard.label		"Copy to Clipboard">
+<!ENTITY zotero.bibliography.macClipboardWarning		"(Some formatting may be lost.)">
 <!ENTITY zotero.bibliography.print.label				"Print">
 
 <!ENTITY zotero.integration.docPrefs.title				"Document Preferences">
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index 4104ecd6d..26a3302fd 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -13,7 +13,6 @@ pref("extensions.zotero.parseEndNoteMIMETypes",true);
 pref("extensions.zotero.automaticSnapshots",true);
 pref("extensions.zotero.downloadAssociatedFiles",false);
 pref("extensions.zotero.reportTranslationFailure",true);
-pref("extensions.zotero.enableMacClipboard",false);
 pref("extensions.zotero.automaticTags",true);
 pref("extensions.zotero.fontSize", "1.0");