suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closes #398, add option to have a smaller Zotero logo or just a "Z" in the status bar

Browse Source 
And removed some old images
This commit is contained in:
Dan Stillman 2007-01-03 01:14:30 +00:00
parent 8218ef7ec4
commit 0db91db680
17 changed files with 80 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
chrome/content/zotero/overlay.xul
View File

@ -271,15 +271,28 @@
</vbox> </vbox>
<statusbar id="status-bar"> <statusbar id="status-bar">
<statusbarpanel id="zotero-status-bar-icon" <statusbarpanel id="zotero-status-bar-icon" hidden="true"
class="statusbarpanel-iconic" onclick="ZoteroPane.toggleDisplay();"/> class="statusbarpanel-iconic" onclick="ZoteroPane.toggleDisplay();"/>
</statusbar> </statusbar>
<script> <script>
window.addEventListener('load', function(e){ window.addEventListener('load', function(e){
if (!Zotero){ var icon = document.getElementById('zotero-status-bar-icon');
document.getElementById('zotero-status-bar-icon').setAttribute('error', 'true'); if (Zotero){
document.getElementById('zotero-status-bar-icon').setAttribute('tooltiptext', 'There was an error starting Zotero.'); switch (Zotero.Prefs.get('statusBarIcon')) {
case 2:
icon.setAttribute('hidden', false);
break;
case 1:
icon.setAttribute('hidden', false);
icon.setAttribute('compact', true);
break;
}
}
else {
icon.setAttribute('hidden', false);
icon.setAttribute('error', 'true');
icon.setAttribute('tooltiptext', 'There was an error starting Zotero.');
} }
}, false); }, false);

16
chrome/content/zotero/preferences.js
View File

@ -22,7 +22,6 @@
var openURLServerField; var openURLServerField;
var openURLVersionMenu; var openURLVersionMenu;
var zoteroPaneOnTopInitial;
function init() function init()
{ {
@ -31,8 +30,6 @@ function init()
for (var i=0; i<rows.length; i++) { for (var i=0; i<rows.length; i++) {
rows[i].firstChild.nextSibling.value = Zotero.isMac ? 'Cmd+Shift+' : 'Ctrl+Alt+'; rows[i].firstChild.nextSibling.value = Zotero.isMac ? 'Cmd+Shift+' : 'Ctrl+Alt+';
} }
zoteroPaneOnTopInitial = Zotero.Prefs.get('zoteroPaneOnTop') ? 0 : 1;
} }
@ -82,17 +79,4 @@ function onOpenURLSelected()
function onOpenURLCustomized() function onOpenURLCustomized()
{ {
document.getElementById('openURLMenu').value = "custom"; document.getElementById('openURLMenu').value = "custom";
}
function onPositionChange()
{
var statusLine = document.getElementById('statusLine');
if (document.getElementById('positionMenu').selectedIndex != zoteroPaneOnTopInitial)
{
statusLine.value = Zotero.getString('zotero.preferences.status.positionChange');
}
else
{
statusLine.value = '';
}
} }

57
chrome/content/zotero/preferences.xul
View File

@ -43,6 +43,7 @@ To add a new preference:
<prefpane id="zotero-prefpane-general" label="&zotero.preferences.prefpane.general;"> <prefpane id="zotero-prefpane-general" label="&zotero.preferences.prefpane.general;">
<preferences> <preferences>
<preference id="pref-zoteroPaneOnTop" name="extensions.zotero.zoteroPaneOnTop" type="bool"/> <preference id="pref-zoteroPaneOnTop" name="extensions.zotero.zoteroPaneOnTop" type="bool"/>
<preference id="pref-statusBarIcon" name="extensions.zotero.statusBarIcon" type="int"/>
<preference id="pref-automaticScraperUpdates" name="extensions.zotero.automaticScraperUpdates" type="bool"/> <preference id="pref-automaticScraperUpdates" name="extensions.zotero.automaticScraperUpdates" type="bool"/>
<preference id="pref-reportTranslationFailure" name="extensions.zotero.reportTranslationFailure" type="bool"/> <preference id="pref-reportTranslationFailure" name="extensions.zotero.reportTranslationFailure" type="bool"/>
<preference id="pref-parseEndNoteMIMETypes" name="extensions.zotero.parseEndNoteMIMETypes" type="bool" onchange="Zotero.Ingester.MIMEHandler.init()"/> <preference id="pref-parseEndNoteMIMETypes" name="extensions.zotero.parseEndNoteMIMETypes" type="bool" onchange="Zotero.Ingester.MIMEHandler.init()"/>
@ -52,26 +53,42 @@ To add a new preference:
<preference id="pref-openURL-version" name="extensions.zotero.openURL.version" type="string"/> <preference id="pref-openURL-version" name="extensions.zotero.openURL.version" type="string"/>
</preferences> </preferences>
<hbox align="center"> <groupbox>
<label value="&zotero.preferences.position;" control="positionMenu"/> <caption label="&zotero.preferences.userInterface;"/>
<menulist id="positionMenu" oncommand="onPositionChange()" preference="pref-zoteroPaneOnTop"> <hbox align="center">
<menupopup> <label value="&zotero.preferences.position;" control="positionMenu"/>
<menuitem label="&zotero.preferences.position.above;" value="true"/> <menulist id="positionMenu" preference="pref-zoteroPaneOnTop">
<menuitem label="&zotero.preferences.position.below;" value="false"/> <menupopup>
</menupopup> <menuitem label="&zotero.preferences.position.above;" value="true"/>
</menulist> <menuitem label="&zotero.preferences.position.below;" value="false"/>
<label value="&zotero.preferences.position.browser;"/> </menupopup>
</hbox> </menulist>
<label value="&zotero.preferences.position.browser;"/>
</hbox>
<hbox align="center">
<label value="&zotero.preferences.statusBarIcon;" control="statusBarIcon"/>
<radiogroup id="statusBarIcon" orient="horizontal" preference="pref-statusBarIcon">
<radio src="chrome://zotero/skin/zotero_status_bar.png" value="2"/>
<radio src="chrome://zotero/skin/zotero_status_bar_compact.png" value="1"/>
<radio label="None" value="0"/>
</radiogroup>
</hbox>
<label class="statusLine" value="&zotero.preferences.keys.changesTakeEffect;"/>
</groupbox>
<hbox align="center"> <groupbox>
<checkbox label="&zotero.preferences.autoUpdate;" preference="pref-automaticScraperUpdates"/> <hbox align="center">
<button id="updateButton" style="margin-top:0" label="&zotero.preferences.updateNow;" oncommand="Zotero.Schema.updateScrapersRemote(true)"/> <checkbox label="&zotero.preferences.autoUpdate;" preference="pref-automaticScraperUpdates"/>
</hbox> <button id="updateButton" style="margin-top:0" label="&zotero.preferences.updateNow;" oncommand="Zotero.Schema.updateScrapersRemote(true)"/>
</hbox>
<checkbox label="&zotero.preferences.reportTranslationFailure;" preference="pref-reportTranslationFailure"/>
<checkbox label="&zotero.preferences.parseEndnote;" preference="pref-parseEndNoteMIMETypes"/> <checkbox label="&zotero.preferences.reportTranslationFailure;" preference="pref-reportTranslationFailure"/>
<checkbox label="&zotero.preferences.automaticSnapshots;" preference="pref-automaticSnapshots"/> <checkbox label="&zotero.preferences.parseEndnote;" preference="pref-parseEndNoteMIMETypes"/>
<checkbox label="&zotero.preferences.downloadAssociatedFiles;" preference="pref-downloadAssociatedFiles"/> <checkbox label="&zotero.preferences.automaticSnapshots;" preference="pref-automaticSnapshots"/>
<checkbox label="&zotero.preferences.downloadAssociatedFiles;" preference="pref-downloadAssociatedFiles"/>
</groupbox>
<groupbox> <groupbox>
<caption label="&zotero.preferences.openurl.caption;"/> <caption label="&zotero.preferences.openurl.caption;"/>
@ -99,8 +116,6 @@ To add a new preference:
</menulist> </menulist>
</hbox> </hbox>
</groupbox> </groupbox>
<label id="statusLine" value=""/>
</prefpane> </prefpane>
<prefpane id="zotero-prefpane-keys" label="&zotero.preferences.prefpane.keys;"> <prefpane id="zotero-prefpane-keys" label="&zotero.preferences.prefpane.keys;">

8
chrome/locale/en-US/zotero/preferences.dtd
View File

@ -1,13 +1,15 @@
<!ENTITY zotero.preferences.title "Zotero Preferences"> <!ENTITY zotero.preferences.title "Zotero Preferences">
<!ENTITY zotero.preferences.prefpane.general "General"> <!ENTITY zotero.preferences.prefpane.general "General">
<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated scrapers"> <!ENTITY zotero.preferences.userInterface "User Interface">
<!ENTITY zotero.preferences.updateNow "Update now">
<!ENTITY zotero.preferences.reportTranslationFailure "Report broken site translators">
<!ENTITY zotero.preferences.position "Display Zotero"> <!ENTITY zotero.preferences.position "Display Zotero">
<!ENTITY zotero.preferences.position.above "above"> <!ENTITY zotero.preferences.position.above "above">
<!ENTITY zotero.preferences.position.below "below"> <!ENTITY zotero.preferences.position.below "below">
<!ENTITY zotero.preferences.position.browser "browser content"> <!ENTITY zotero.preferences.position.browser "browser content">
<!ENTITY zotero.preferences.statusBarIcon "Status bar icon:">
<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated scrapers">
<!ENTITY zotero.preferences.updateNow "Update now">
<!ENTITY zotero.preferences.reportTranslationFailure "Report broken site translators">
<!ENTITY zotero.preferences.parseEndnote "Use Zotero for downloaded EndNote files"> <!ENTITY zotero.preferences.parseEndnote "Use Zotero for downloaded EndNote files">
<!ENTITY zotero.preferences.automaticSnapshots "Automatically take snapshots when creating items from web pages"> <!ENTITY zotero.preferences.automaticSnapshots "Automatically take snapshots when creating items from web pages">
<!ENTITY zotero.preferences.downloadAssociatedFiles "Automatically attach associated PDFs and other files when saving items"> <!ENTITY zotero.preferences.downloadAssociatedFiles "Automatically attach associated PDFs and other files when saving items">

1
chrome/locale/en-US/zotero/zotero.properties
View File

@ -218,7 +218,6 @@ db.dbRestoreFailed = The Zotero database appears to have become corrupted, an
zotero.preferences.update.updated = Updated zotero.preferences.update.updated = Updated
zotero.preferences.update.upToDate = Up to date zotero.preferences.update.upToDate = Up to date
zotero.preferences.update.error = Error zotero.preferences.update.error = Error
zotero.preferences.status.positionChange = Position change will take effect in new windows only
zotero.preferences.openurl.resolversFound.zero = %S resolvers found zotero.preferences.openurl.resolversFound.zero = %S resolvers found
zotero.preferences.openurl.resolversFound.singular = %S resolver found zotero.preferences.openurl.resolversFound.singular = %S resolver found
zotero.preferences.openurl.resolversFound.plural = %S resolvers found zotero.preferences.openurl.resolversFound.plural = %S resolvers found

16
chrome/skin/default/zotero/overlay.css
View File

@ -1,13 +1,19 @@
#zotero-status-bar-icon #zotero-status-bar-icon
{ {
width: 49px; width: 47px;
margin:0 0 -1px; margin:0 0 -1px;
padding:0 5px 1px; padding:0 4px 1px;
list-style-image: url(chrome://zotero/skin/zotero_logo_18px.png); list-style-image: url(chrome://zotero/skin/zotero_status_bar.png);
} }
#zotero-status-bar-icon[error=true] #zotero-status-bar-icon[compact="true"]
{ {
list-style-image: url(chrome://zotero/skin/zotero_logo_18px_error.png); width: 9px;
padding:0 5px 1px;
list-style-image: url(chrome://zotero/skin/zotero_status_bar_compact.png);
}
#zotero-status-bar-icon[error="true"]
{
list-style-image: url(chrome://zotero/skin/zotero_status_bar_error.png);
} }
#zotero-pane #zotero-pane

11
chrome/skin/default/zotero/preferences.css
View File

@ -35,6 +35,15 @@ radio[pane=zotero-prefpane-keys][selected="true"]
color: red; color: red;
} }
#statusBarIcon radio
{
margin-right: 20px;
}
#statusBarIcon radio .radio-icon
{
margin-left: 6px;
}
/* Shortcut Keys pane */ /* Shortcut Keys pane */
#zotero-prefpane-keys row #zotero-prefpane-keys row
@ -52,7 +61,7 @@ radio[pane=zotero-prefpane-keys][selected="true"]
margin: .75em 0; margin: .75em 0;
} }
#zotero-prefpane-keys .statusLine .statusLine
{ {
margin: .75em 0; margin: .75em 0;
font-size: 10px; font-size: 10px;

BIN
chrome/skin/default/zotero/zotero_logo_14px.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 690 B

BIN
chrome/skin/default/zotero/zotero_logo_18px.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 502 B

BIN
chrome/skin/default/zotero/zotero_logo_18px_error.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
chrome/skin/default/zotero/zotero_logo_20px.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 662 B

BIN
chrome/skin/default/zotero/zotero_logo_20px_2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 493 B

BIN
chrome/skin/default/zotero/zotero_logo_20px_3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 523 B

BIN
chrome/skin/default/zotero/zotero_status_bar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 440 B

BIN
chrome/skin/default/zotero/zotero_status_bar_compact.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 246 B

BIN
chrome/skin/default/zotero/zotero_status_bar_error.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 941 B

1
defaults/preferences/zotero.js
View File

@ -6,6 +6,7 @@ pref("extensions.zotero.debug.level",5);
pref("extensions.zotero.automaticScraperUpdates",true); pref("extensions.zotero.automaticScraperUpdates",true);
pref("extensions.zotero.cacheTranslatorData",true); pref("extensions.zotero.cacheTranslatorData",true);
pref("extensions.zotero.zoteroPaneOnTop",false); pref("extensions.zotero.zoteroPaneOnTop",false);
pref("extensions.zotero.statusBarIcon", 2);
pref("extensions.zotero.openURL.resolver","http://athene.gmu.edu:8888/lfp/LinkFinderPlus/Display"); pref("extensions.zotero.openURL.resolver","http://athene.gmu.edu:8888/lfp/LinkFinderPlus/Display");
pref("extensions.zotero.openURL.version","0.1"); pref("extensions.zotero.openURL.version","0.1");
pref("extensions.zotero.parseEndNoteMIMETypes",true); pref("extensions.zotero.parseEndNoteMIMETypes",true);