From cc516005c01591661b5e744ce95d8d85fd1e96c4 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 19 Jan 2017 15:20:42 -0500
Subject: [PATCH] "Import"/"Import from Clipboard" shortcut key changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add Cmd/Ctrl-Shift-I for "Import…"
- Cmd/Ctrl-Shift-V apparently pastes without formatting, so don't override it.
  Instead, add a shortcut key to the menu option, defaulting to
  Cmd-Option-Shift-I/Ctrl-Alt-Shift-I
- The I in both is now localizable
---
 .../zotero/preferences/preferences_advanced.xul  |  7 -------
 chrome/content/zotero/standalone/standalone.xul  | 16 ++++++++++++----
 chrome/content/zotero/zoteroPane.js              |  3 ---
 chrome/locale/en-US/zotero/standalone.dtd        |  3 +++
 defaults/preferences/zotero.js                   |  1 -
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences_advanced.xul b/chrome/content/zotero/preferences/preferences_advanced.xul
index 05f5de473..65398bc21 100644
--- a/chrome/content/zotero/preferences/preferences_advanced.xul
+++ b/chrome/content/zotero/preferences/preferences_advanced.xul
@@ -52,7 +52,6 @@
 			<preference id="pref-keys-newNote" name="extensions.zotero.keys.newNote" type="string"/>
 			<preference id="pref-keys-toggleRead" name="extensions.zotero.keys.toggleRead" type="string"/>
 			<preference id="pref-keys-toggleAllRead" name="extensions.zotero.keys.toggleAllRead" type="string"/>
-			<preference id="pref-keys-importFromClipboard" name="extensions.zotero.keys.importFromClipboard" type="string"/>
 			<preference id="pref-keys-copySelectedItemCitationsToClipboard" name="extensions.zotero.keys.copySelectedItemCitationsToClipboard" type="string"/>
 			<preference id="pref-keys-copySelectedItemsToClipboard" name="extensions.zotero.keys.copySelectedItemsToClipboard" type="string"/>
 
@@ -241,12 +240,6 @@
 								<textbox id="textbox-newNote" maxlength="1" size="1" preference="pref-keys-newNote"/>
 							</row>
 				
-							<row>
-								<label value="&zotero.preferences.keys.importFromClipboard;" control="textbox-importFromClipboard"/>
-								<label class="modifier"/>
-								<textbox id="textbox-importFromClipboard" maxlength="1" size="1" preference="pref-keys-importFromClipboard"/>
-							</row>
-				
 							<row id="zotero-keys-focus-libraries-pane">
 								<label value="&zotero.preferences.keys.focusLibrariesPane;" control="textbox-library"/>
 								<label class="modifier"/>
diff --git a/chrome/content/zotero/standalone/standalone.xul b/chrome/content/zotero/standalone/standalone.xul
index 6c38497d6..42c8752ea 100644
--- a/chrome/content/zotero/standalone/standalone.xul
+++ b/chrome/content/zotero/standalone/standalone.xul
@@ -65,6 +65,14 @@
 	
 	<keyset id="mainKeyset">
 		<key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
+		<key id="key_import"
+				key="&importCmd.key;"
+				command="cmd_zotero_import"
+				modifiers="accel shift"/>
+		<key id="key_importFromClipboard"
+				key="&importCmd.key;"
+				command="cmd_zotero_importFromClipboard"
+				modifiers="accel shift alt"/>
 	</keyset>
 	<keyset id="editMenuKeys"/>
 	
@@ -119,10 +127,10 @@
 							<menuitem id="menu_close" label="&closeCmd.label;" key="key_close"
 									accesskey="&closeCmd.accesskey;" command="cmd_close"/>
 							<menuseparator/>
-							<menuitem id="menu_import" label="&zotero.toolbar.import.label;"
-									command="cmd_zotero_import"/>
-							<menuitem id="menu_importFromClipboard" label="&zotero.toolbar.importFromClipboard;"
-									command="cmd_zotero_importFromClipboard"/>
+							<menuitem id="menu_import" label="&importCmd.label;"
+									command="cmd_zotero_import" key="key_import"/>
+							<menuitem id="menu_importFromClipboard" label="&importFromClipboardCmd.label;"
+									command="cmd_zotero_importFromClipboard" key="key_importFromClipboard"/>
 							<menuitem id="menu_exportLibrary" label="&zotero.toolbar.export.label;"
 									command="cmd_zotero_exportLibrary"/>
 						</menupopup>
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 13518d82f..c802c7515 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -737,9 +737,6 @@ var ZoteroPane = new function()
 				case 'copySelectedItemsToClipboard':
 					ZoteroPane_Local.copySelectedItemsToClipboard();
 					break;
-				case 'importFromClipboard':
-					Zotero_File_Interface.importFromClipboard();
-					break;
 				case 'sync':
 					Zotero.Sync.Runner.sync();
 					break;
diff --git a/chrome/locale/en-US/zotero/standalone.dtd b/chrome/locale/en-US/zotero/standalone.dtd
index d45d8d02d..a4f8af25d 100644
--- a/chrome/locale/en-US/zotero/standalone.dtd
+++ b/chrome/locale/en-US/zotero/standalone.dtd
@@ -24,6 +24,9 @@
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
+<!ENTITY importCmd.label "Import…">
+<!ENTITY importCmd.key "I">
+<!ENTITY importFromClipboardCmd.label "Import from Clipboard">
 <!ENTITY quitApplicationCmdWin.label "Exit">
 <!ENTITY quitApplicationCmdWin.accesskey "x">
 <!ENTITY quitApplicationCmd.label "Quit">
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index 73274b10c..2286c8e7e 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -77,7 +77,6 @@ pref("extensions.zotero.keys.toggleFullscreen", 'F');
 pref("extensions.zotero.keys.saveToZotero", 'S');
 pref("extensions.zotero.keys.newItem", 'N');
 pref("extensions.zotero.keys.newNote", 'O');
-pref("extensions.zotero.keys.importFromClipboard", 'V');
 pref("extensions.zotero.keys.library", 'L');
 pref("extensions.zotero.keys.quicksearch", 'K');
 pref("extensions.zotero.keys.copySelectedItemCitationsToClipboard", 'A');