From 3364a533c520ed3484abd92d9254e0572376d97c Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 2 Oct 2011 15:50:54 +0000
Subject: [PATCH] Add "Restore to Library" context menu option

---
 chrome/content/zotero/itemPane.xul    |  3 +--
 chrome/content/zotero/zoteroPane.js   | 17 +++++++++++------
 chrome/content/zotero/zoteroPane.xul  |  1 +
 chrome/locale/en-US/zotero/zotero.dtd |  1 +
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/chrome/content/zotero/itemPane.xul b/chrome/content/zotero/itemPane.xul
index 19619399e..4bc781bbf 100644
--- a/chrome/content/zotero/itemPane.xul
+++ b/chrome/content/zotero/itemPane.xul
@@ -34,9 +34,8 @@
 	
 	<vbox id="zotero-item-pane" zotero-persist="width">
 		<!-- Trash -->
-		<!-- TODO: localize -->
 		<!-- TODO: Make look less awful -->
-		<button id="zotero-item-restore-button" label="Restore to Library"
+		<button id="zotero-item-restore-button" label="&zotero.items.menu.restoreToLibrary;" 
 			oncommand="ZoteroPane_Local.restoreSelectedItems()" hidden="true"/>
 		
 		<!-- Commons -->
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index bec8cf757..19d6d9642 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -2142,6 +2142,7 @@ var ZoteroPane = new function()
 			'duplicateItem',
 			'deleteItem',
 			'deleteFromLibrary',
+			'restoreToLibrary',
 			'mergeItems',
 			'sep3',
 			'exportItems',
@@ -2175,7 +2176,13 @@ var ZoteroPane = new function()
 		
 		var itemGroup = this.getItemGroup();
 		
-		show.push(m.deleteFromLibrary, m.sep3, m.exportItems, m.createBib, m.loadReport);
+		if(itemGroup.isTrash()) {
+			show.push(m.restoreToLibrary);
+		} else {
+			show.push(m.deleteFromLibrary);
+		}
+		
+		show.push(m.sep3, m.exportItems, m.createBib, m.loadReport);
 		
 		if (this.itemsView.selection.count > 0) {
 			// Multiple items selected
@@ -2252,10 +2259,7 @@ var ZoteroPane = new function()
 						}
 					}
 					if (hasImportedAttachment) {
-						var d = [m.deleteFromLibrary, m.createParent, m.renameAttachments];
-						for each(var val in d) {
-							disable.push(val);
-						}
+						disable.push(m.deleteFromLibrary, m.createParent, m.renameAttachments);
 					}
 				}
 			}
@@ -2274,7 +2278,7 @@ var ZoteroPane = new function()
 				
 				// Disable actions in the trash
 				if (itemGroup.isTrash()) {
-					disable.push(m.deleteItem, m.deleteFromLibrary);
+					disable.push(m.deleteItem);
 				}
 				
 				if (item.isRegularItem()) {
@@ -2351,6 +2355,7 @@ var ZoteroPane = new function()
 						case 'exportItems':
 						case 'createBib':
 						case 'loadReport':
+						case 'restoreToLibrary':
 							continue;
 					}
 				}
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index b96d52bdc..1ba2c6134 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -271,6 +271,7 @@
 					<menuitem label="&zotero.items.menu.duplicateItem;" oncommand="ZoteroPane_Local.duplicateSelectedItem();"/>
 					<menuitem oncommand="ZoteroPane_Local.deleteSelectedItems();"/>
 					<menuitem oncommand="ZoteroPane_Local.deleteSelectedItems(true);"/>
+					<menuitem label="&zotero.items.menu.restoreToLibrary;" oncommand="ZoteroPane_Local.restoreSelectedItems();"/>
 					<!-- TODO: localize -->
 					<menuitem oncommand="ZoteroPane_Local.mergeSelectedItems();" label="Merge Items…"/>
 					<menuseparator/>
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 55e3d0ba8..ae7cf602d 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -67,6 +67,7 @@
 <!ENTITY zotero.items.menu.attach.file					"Attach Stored Copy of File…">
 <!ENTITY zotero.items.menu.attach.fileLink				"Attach Link to File…">
 
+<!ENTITY zotero.items.menu.restoreToLibrary				"Restore to Library">
 <!ENTITY zotero.items.menu.duplicateItem					"Duplicate Selected Item">
 
 <!ENTITY zotero.toolbar.newItem.label					"New Item">