www

commit 9f1cbf31770155aa0c10a3e94ac689b362887515
parent c983a8e7e40bfb34c7798f7c8b4d484b61732f6c
Author: David Norton <david@nortoncrew.com>
Date:   Tue, 20 Jun 2006 13:59:59 +0000

Added back the Add menu with itemTypes.
Minor text changes

Diffstat:
M
chrome/chromeFiles/content/scholar/overlay.js
 | 
17
++++++++++++++++-
M
chrome/chromeFiles/content/scholar/overlay.xul
 | 
6
++++--

2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/chrome/chromeFiles/content/scholar/overlay.js b/chrome/chromeFiles/content/scholar/overlay.js
@@ -35,6 +35,17 @@ var ScholarPane = new function()
 
 		//select Library
 		collectionsView.selection.select(0);
+		
+		//Create the add menu with each item type
+		var addMenu = document.getElementById('tb-add').firstChild;
+		var itemTypes = Scholar.ItemTypes.getTypes();
+		for(var i = 0; i<itemTypes.length; i++)
+		{
+			var menuitem = document.createElement("menuitem");
+			menuitem.setAttribute("label", Scholar.getString("itemTypes."+itemTypes[i]['name']));
+			menuitem.setAttribute("oncommand","ScholarPane.newItem("+itemTypes[i]['id']+")");
+			addMenu.appendChild(menuitem);
+		}
 	}
 	
 	/*
@@ -122,7 +133,11 @@ var ScholarPane = new function()
 			document.getElementById('scholar-view-item').hidden = true;
 			var label = document.getElementById('scholar-view-selected-label');
 			label.hidden = false;
-			label.value = itemsView.selection.count + " items selected";	
+			
+			if(itemsView && itemsView.selection.count)
+				label.value = itemsView.selection.count + " items selected";	
+			else
+				label.value = "No items selected";
 		}
 
 	}
diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul
@@ -35,7 +35,7 @@
 				</popup>
 			</popupset>
 			<toolbar align="end">
-				<label value="Firefox Scholar" style="font-size: larger;"/>
+				<label value="Scholar" style="font-size: larger;"/>
 				<label value="1.0 Alpha"/>
 				<spacer flex="1"/>
 				<toolbarbutton class="tabs-closebutton" oncommand="ScholarPane.toggleDisplay()"/>
@@ -65,7 +65,9 @@
 				<splitter id="scholar-tree-splitter" resizebefore="closest" resizeafter="closest"/>
 				<vbox persist="width" flex="1" style="min-width: 300px;">
 					<toolbar align="center">
-						<toolbarbutton id="tb-add" label="&toolbar.newItem.label;" command="cmd_scholar_newItem"/>
+						<toolbarbutton id="tb-add" label="&toolbar.newItem.label;" type="menu">
+							<menupopup/>
+						</toolbarbutton>
 						<spacer flex="1"/>
 						<label value="&toolbar.search.label;" control="tb-search"/>
 						<textbox id="tb-search" type="timed" timeout="500" command="cmd_scholar_search"/>