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?)
This commit is contained in:
David Norton 2006-06-22 00:13:21 +00:00
parent 718d613cdc
commit 428eab6a95
5 changed files with 19 additions and 8 deletions

View File

@ -73,9 +73,10 @@ Scholar_Ingester_Interface.scrapeThisPage = function() {
Scholar_Ingester_Interface.updateStatus = function(browser) { Scholar_Ingester_Interface.updateStatus = function(browser) {
var documentObject = Scholar_Ingester_Interface._getDocument(browser); var documentObject = Scholar_Ingester_Interface._getDocument(browser);
if(documentObject && documentObject.scraper) { 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 { } else {
Scholar_Ingester_Interface.statusImage.src = "chrome://scholar/skin/capture_gray.png"; Scholar_Ingester_Interface.statusImage.hidden = true;
} }
} }

View File

@ -13,12 +13,9 @@
Scholar_Ingester_Interface.init(); Scholar_Ingester_Interface.init();
</script> </script>
<statusbar id="status-bar"> <hbox id="urlbar-icons">
<statusbarpanel id="schlar-status" insertafter="livemark-button"> <image src="chrome://scholar/skin/treeitem-book.png" id="scholar-status-image" onclick="Scholar_Ingester_Interface.scrapeThisPage()" position="1" hidden="true"/>
<label id="scholar-status-label" collapsed="true" crop="end" style="width:0px" /> </hbox>
<image id="scholar-status-image" width="16" height="16" onclick="Scholar_Ingester_Interface.scrapeThisPage()" src="chrome://scholar/skin/capture_gray.png" />
</statusbarpanel>
</statusbar>
<window id="main-window"> <window id="main-window">
<box style="visibility: collapse"> <box style="visibility: collapse">

View File

@ -45,6 +45,8 @@
<toolbar> <toolbar>
<toolbarbutton id="tb-collection-add" tooltiptext="&toolbar.newCollection.label;" command="cmd_scholar_newCollection"/> <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"/> <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> </toolbar>
<tree id="collections-tree" hidecolumnpicker="true" context="scholar-collectionmenu" <tree id="collections-tree" hidecolumnpicker="true" context="scholar-collectionmenu"
onselect="ScholarPane.onCollectionSelected();" seltype="single" onselect="ScholarPane.onCollectionSelected();" seltype="single"
@ -69,6 +71,7 @@
<menupopup/> <menupopup/>
</toolbarbutton> </toolbarbutton>
<spacer flex="1"/> <spacer flex="1"/>
<toolbarbutton id="tb-item-menu" type="menu" menu="scholar-itemmenu"/>
<label value="&toolbar.search.label;" control="tb-search"/> <label value="&toolbar.search.label;" control="tb-search"/>
<textbox id="tb-search" type="timed" timeout="250" command="cmd_scholar_search"/> <textbox id="tb-search" type="timed" timeout="250" command="cmd_scholar_search"/>
</toolbar> </toolbar>

Binary file not shown.

After

Width:  |  Height:  |  Size: 512 B

View File

@ -70,11 +70,21 @@ vbox #scholar-pane
list-style-image: url('chrome://scholar/skin/toolbar-collection-edit-gray.png'); 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 #tb-add
{ {
list-style-image: url('chrome://scholar/skin/toolbar-item-add.png'); 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 #tb-search
{ {
width: 150px; width: 150px;