commit 428eab6a95ae56c54b33a3973a8490bbae2cd024 parent 718d613cdcc5ce778c0ad398692c583a32af2680 Author: David Norton <david@nortoncrew.com> Date: Thu, 22 Jun 2006 00:13:21 +0000 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?) Diffstat:
5 files changed, 19 insertions(+), 8 deletions(-)
diff --git 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 @@ -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 @@ -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 Binary files differ. diff --git 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;
