From 428eab6a95ae56c54b33a3973a8490bbae2cd024 Mon Sep 17 00:00:00 2001
From: David Norton <david@nortoncrew.com>
Date: Thu, 22 Jun 2006 00:13:21 +0000
Subject: [PATCH] A cog menu each for collections and items (the same as the
 contextual menu, for now) Moved the capture icon into the URL bar (invisible
 until you visit a scrapable page. Currently just displays a Book, but will
 change to the correct item types in the future?)

---
 .../content/scholar/ingester/browser.js           |   5 +++--
 .../content/scholar/ingester/browser.xul          |   9 +++------
 chrome/chromeFiles/content/scholar/overlay.xul    |   3 +++
 chrome/chromeFiles/skin/default/scholar/cog.png   | Bin 0 -> 512 bytes
 .../chromeFiles/skin/default/scholar/overlay.css  |  10 ++++++++++
 5 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 chrome/chromeFiles/skin/default/scholar/cog.png

diff --git a/chrome/chromeFiles/content/scholar/ingester/browser.js b/chrome/chromeFiles/content/scholar/ingester/browser.js
index 76cb44a58..baf76dab4 100644
--- a/chrome/chromeFiles/content/scholar/ingester/browser.js
+++ b/chrome/chromeFiles/content/scholar/ingester/browser.js
@@ -73,9 +73,10 @@ Scholar_Ingester_Interface.scrapeThisPage = function() {
 Scholar_Ingester_Interface.updateStatus = function(browser) {
 	var documentObject = Scholar_Ingester_Interface._getDocument(browser);
 	if(documentObject && documentObject.scraper) {
-		Scholar_Ingester_Interface.statusImage.src = "chrome://scholar/skin/capture_colored.png";
+		//Scholar_Ingester_Interface.statusImage.src = "chrome://scholar/skin/treeitem-"+TYPE+".png";
+		Scholar_Ingester_Interface.statusImage.hidden = false;
 	} else {
-		Scholar_Ingester_Interface.statusImage.src = "chrome://scholar/skin/capture_gray.png";
+		Scholar_Ingester_Interface.statusImage.hidden = true;
 	}
 }
 
diff --git a/chrome/chromeFiles/content/scholar/ingester/browser.xul b/chrome/chromeFiles/content/scholar/ingester/browser.xul
index 1c68a1ca3..9e5e80e80 100755
--- a/chrome/chromeFiles/content/scholar/ingester/browser.xul
+++ b/chrome/chromeFiles/content/scholar/ingester/browser.xul
@@ -13,12 +13,9 @@
 		Scholar_Ingester_Interface.init();
 	</script>
     
-    <statusbar id="status-bar">
-        <statusbarpanel id="schlar-status" insertafter="livemark-button">
-            <label id="scholar-status-label" collapsed="true" crop="end" style="width:0px" />
-            <image id="scholar-status-image" width="16" height="16" onclick="Scholar_Ingester_Interface.scrapeThisPage()" src="chrome://scholar/skin/capture_gray.png" />
-         </statusbarpanel>
-    </statusbar>
+	<hbox id="urlbar-icons">
+		<image src="chrome://scholar/skin/treeitem-book.png" id="scholar-status-image" onclick="Scholar_Ingester_Interface.scrapeThisPage()" position="1" hidden="true"/>
+	</hbox>
     
 	<window id="main-window">
 		<box style="visibility: collapse">
diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul
index be263b3c9..0e7da257e 100644
--- a/chrome/chromeFiles/content/scholar/overlay.xul
+++ b/chrome/chromeFiles/content/scholar/overlay.xul
@@ -45,6 +45,8 @@
 					<toolbar>
 						<toolbarbutton id="tb-collection-add" tooltiptext="&toolbar.newCollection.label;" command="cmd_scholar_newCollection"/>
 						<toolbarbutton id="tb-collection-rename" tooltiptext="&toolbar.renameCollection.label;" oncommand="ScholarPane.renameSelectedCollection();" disabled="true"/>
+						<spacer flex="1"/>
+						<toolbarbutton id="tb-collection-menu" type="menu" menu="scholar-collectionmenu"/>
 					</toolbar>
 					<tree id="collections-tree" hidecolumnpicker="true" context="scholar-collectionmenu"
 						onselect="ScholarPane.onCollectionSelected();" seltype="single"
@@ -69,6 +71,7 @@
 							<menupopup/>
 						</toolbarbutton>
 						<spacer flex="1"/>
+						<toolbarbutton id="tb-item-menu" type="menu" menu="scholar-itemmenu"/>
 						<label value="&toolbar.search.label;" control="tb-search"/>
 						<textbox id="tb-search" type="timed" timeout="250" command="cmd_scholar_search"/>
 					</toolbar>
diff --git a/chrome/chromeFiles/skin/default/scholar/cog.png b/chrome/chromeFiles/skin/default/scholar/cog.png
new file mode 100644
index 0000000000000000000000000000000000000000..67de2c6ccbeac17742f56cf7391e72b2bf5033ba
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzl1W5CR4C6?
zQB6w%VGv&Y0p9%y{*S$M5weR^mokV7i!Mcpk=YVa(4jh%5k+ND8>CQDsH?WF>AIFt
zQuJ}i;w2$ZUU#3SZ6RY0Gw;kZ&ol1~2ky^QZ(fom$=jN<T*X<otG0ao1Md*)XSSIA
z*x3T8gv)x7DUK|A#S3CA>JZt!z7w_pH~wdQ;R)Gh%BbQFCx+Nm!4SuS-vkr`vhhrX
zM*>w%e+v~?m@q~ImPAgtLkR_3U<2F8LP3W5=LJ*ZN|S5p#sf4YFr$p~Q~Z*0Ngxf2
zjk#J#<7EAlhzlrV53~GF&pIzcCN_lz9@05Ue<MwWI-*!M0jvB0F~pIke2>oUXiK%N
z#x+4o*i_c|6_Uu1+&TIho?3@y4k-#b8Y_o94zW*B3a1ne2-Y5s0uke$$|@=}OP-i=
zNYZQA=>PrZu0MfSL=b8UhD_={W4IY1{b{)U)*gc45xtL%IYLY&hF;d`@GzI&7H&D#
zh;z_BX$#hqh@q?AY3sJTod2%*Yd)_>YM0#q&ixGuh+PQsneK)F0000<MNUMnLSTXw
CAKTXe

literal 0
HcmV?d00001

diff --git a/chrome/chromeFiles/skin/default/scholar/overlay.css b/chrome/chromeFiles/skin/default/scholar/overlay.css
index 6893d5bb7..e91b3cce4 100644
--- a/chrome/chromeFiles/skin/default/scholar/overlay.css
+++ b/chrome/chromeFiles/skin/default/scholar/overlay.css
@@ -70,11 +70,21 @@ vbox #scholar-pane
 	list-style-image: url('chrome://scholar/skin/toolbar-collection-edit-gray.png');
 }
 
+#tb-collection-menu
+{
+	list-style-image: url('chrome://scholar/skin/cog.png');
+}
+
 #tb-add
 {
 	list-style-image: url('chrome://scholar/skin/toolbar-item-add.png');
 }
 
+#tb-item-menu
+{
+	list-style-image: url('chrome://scholar/skin/cog.png');
+}
+
 #tb-search
 {
 	width: 150px;