mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Add the Zotero icon to the add-on bar instead of the status bar in Fx4

Browse source 
- Make the add-on bar visible if the Zotero icon isn't set to hidden, which is an annoying way of dealing with https://bugzilla.mozilla.org/show_bug.cgi?id=616419 not yet landing -- people who use an upper toolbar button and don't want the add-on bar to show will need to set the Zotero icon to hidden

Addresses #1726, Firefox 4 Compatibility
This commit is contained in:
Dan Stillman 2011-01-07 06:36:31 +00:00
parent 5ceb3f4cf7
commit 78a92255d8
4 changed files with 94 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
chrome.manifest
View file

@ -44,6 +44,7 @@ locale zotero zh-TW chrome/locale/zh-TW/zotero/
skin zotero default chrome/skin/default/zotero/
overlay chrome://browser/content/browser.xul chrome://zotero/content/statusBarOverlay.xul appversion<4.0
overlay chrome://browser/content/browser.xul chrome://zotero/content/overlay.xul
overlay chrome://browser/content/browser.xul chrome://zotero/content/itemPane.xul

39
chrome/content/zotero/overlay.xul
View file

@ -467,18 +467,42 @@
<image src="chrome://zotero/skin/treeitem-book.png" id="zotero-status-image" onclick="Zotero_Browser.scrapeThisPage(ZoteroPane.getSelectedLibraryID(), ZoteroPane.getSelectedCollection(true))" position="1" hidden="true"/>
</hbox>
<statusbar id="status-bar">
<statusbarpanel id="zotero-status-bar-icon" hidden="true"
class="statusbarpanel-iconic" onclick="ZoteroPane.toggleDisplay();"/>
</statusbar>
<script>
<![CDATA[
window.addEventListener('load', function(e){
var iconPref = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService)
.getBranch('extensions.zotero.').getIntPref('statusBarIcon');
var isFx36 = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo)
.platformVersion.indexOf('1.9') === 0;
// Status bar in Fx3.6
if (isFx36) {
var icon = document.getElementById('zotero-status-bar-icon');
if(icon) {
}
// In >=Fx4, add to add-on bar
else {
var icon = document.createElement('toolbarbutton');
icon.id = 'zotero-addon-bar-icon';
icon.setAttribute('oncommand', 'ZoteroPane.toggleDisplay()');
icon.setAttribute('hidden', true);
var addonBar = document.getElementById('addon-bar');
addonBar.appendChild(icon);
if (addonBar.collapsed) {
// If no Zotero or icon isn't set to hidden, show add-on bar
if (iconPref != 0) {
setToolbarVisibility(addonBar, true);
}
}
}
if (!icon) {
return;
}
if (Zotero && Zotero.initialized){
switch (Zotero.Prefs.get('statusBarIcon')) {
switch (iconPref) {
case 2:
icon.setAttribute('hidden', false);
break;
@ -523,7 +547,6 @@
if (Zotero.initialURL) {
setTimeout("gBrowser.selectedTab = gBrowser.addTab(Zotero.initialURL); Zotero.initialURL = null;", 1);
}
}
}, false);
document.getElementById('appcontent').addEventListener('keydown', ZoteroPane.handleKeyDown, true);

9
chrome/content/zotero/statusBarOverlay.xul Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<overlay id="zotero-status-bar"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<statusbar id="status-bar">
<statusbarpanel id="zotero-status-bar-icon" hidden="true"
class="statusbarpanel-iconic" onclick="ZoteroPane.toggleDisplay();"/>
</statusbar>
</overlay>

21
chrome/skin/default/zotero/overlay.css
View file

@ -1,18 +1,25 @@
#zotero-status-bar-icon
#zotero-status-bar-icon, #zotero-addon-bar-icon
{
width: 55px;
margin: 0 0 -1px; /* For Fitts's law (on OS X, at least) */
padding: 0 0 1px;
list-style-image: url(chrome://zotero/skin/zotero_status_bar.png);
}
#zotero-status-bar-icon[compact="true"]
#zotero-status-bar-icon
{
margin: 0 0 -1px; /* For Fitts's law (on OS X, at least) */
padding: 0 0 1px;
}
#zotero-addon-bar-icon
{
margin-left: 10px;
margin-right: 10px;
padding-bottom: 4px;
}
#zotero-status-bar-icon[compact="true"], #zotero-addon-bar-icon[compact="true"]
{
width: 20px;
margin: 0 0 -1px;
padding: 0 0 1px;
list-style-image: url(chrome://zotero/skin/zotero_status_bar_compact.png);
}
#zotero-status-bar-icon[error="true"]
#zotero-status-bar-icon[error="true"], #zotero-addon-bar-icon[error="true"]
{
list-style-image: url(chrome://zotero/skin/zotero_status_bar_error.png);
}