summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--content/browser.xul7
-rw-r--r--locale/en-US/fireflix.dtd3
2 files changed, 9 insertions, 1 deletions
diff --git a/content/browser.xul b/content/browser.xul
index 0c699d9..b535343 100644
--- a/content/browser.xul
+++ b/content/browser.xul
@@ -1,30 +1,35 @@
<?xml version="1.0"?>
<!DOCTYPE overlay SYSTEM "chrome://fireflix/locale/fireflix.dtd">
<overlay id="fireflixOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" >
<menupopup id="viewSidebarMenu">
- <menuitem observes="viewFireflixSidebar" />
+ <menuitem observes="viewFireflixSidebar" key="fireflix-key" />
</menupopup>
<broadcasterset id="mainBroadcasterSet">
<broadcaster id="viewFireflixSidebar"
autoCheck="false" label="&browser.sidebar.label;"
tooltiptext="&browser.sidebar.tooltip;"
type="checkbox" group="sidebar"
sidebarurl="chrome://fireflix/content/fireflix-panel.xul"
sidebartitle="&browser.sidebar.title;"
oncommand="toggleSidebar('viewFireflixSidebar')" />
</broadcasterset>
<toolbarpalette id="BrowserToolbarPalette">
<toolbarbutton id="fireflix-button"
oncommand="toggleSidebar('viewFireflixSidebar')"
image="chrome://fireflix/content/icons/16x16/toolbar-button.png" >
<observes element="viewFireflixSidebar" attribute="label"/>
<observes element="viewFireflixSidebar" attribute="tooltiptext"/>
</toolbarbutton>
</toolbarpalette>
+ <keyset id="mainKeyset">
+ <key id="fireflix-key" command="viewFireflixSidebar"
+ key="&sidekey.key;" modifiers="&sidekey.modifiers;" />
+ </keyset>
+
</overlay>
diff --git a/locale/en-US/fireflix.dtd b/locale/en-US/fireflix.dtd
index 668b684..3380078 100644
--- a/locale/en-US/fireflix.dtd
+++ b/locale/en-US/fireflix.dtd
@@ -1,87 +1,90 @@
<!ENTITY % autoconf SYSTEM "chrome://fireflix/content/autoconf.dtd">
%autoconf;
<!-- About Box -->
<!ENTITY aboutFireflix "About Fireflix" >
<!ENTITY about.ok.label "OK">
<!ENTITY about.license.label "License">
<!ENTITY about.license.tip "Show copying policy">
<!-- COPYING -->
<!ENTITY copying.title "Filreflix: copying policy">
<!-- Sidebar -->
+<!ENTITY sidekey.key "X">
+<!ENTITY sidekey.modifiers "control shift">
+
<!ENTITY panel.auth_info "Authorization info">
<!ENTITY panel.no_auth_info "No auth info available">
<!ENTITY panel.auth.auth.label "Authorize">
<!ENTITY panel.auth.done.label "Authorization complete">
<!ENTITY panel.auth.flickr.label "Flickr">
<!ENTITY panel.auth.flickr.tip "Open Flickr in new tab">
<!ENTITY panel.auth.unauth.label "Sign off">
<!ENTITY panel.tabs.search "Search" >
<!ENTITY panel.tabs.sets "Sets" >
<!ENTITY panel.tabs.tags "Tags" >
<!ENTITY panel.tabs.upload "Upload" >
<!ENTITY panel.search.cmd_search.label "Search" >
<!ENTITY panel.search.search_for.label "Search for:" >
<!ENTITY panel.search.mode.tagsonly.label "tags">
<!ENTITY panel.search.mode.tagsonly.tip "Search tags only">
<!ENTITY panel.search.mode.mine.label "mine">
<!ENTITY panel.search.col.title.label "Title">
<!ENTITY panel.search.cmd_search_open.label "Open">
<!ENTITY panel.search.cmd_search_prev_page.label " « ">
<!ENTITY panel.search.cmd_search_next_page.label " » ">
<!ENTITY panel.sets.name.label "Set">
<!ENTITY panel.sets.name.tip "Photoset name">
<!ENTITY panel.sets.photos.label "Photos">
<!ENTITY panel.sets.photos.tip "Number of photos in set">
<!ENTITY panel.sets.cmd_refresh_sets "Refresh">
<!ENTITY panel.sets.cmd_properties "Properties">
<!ENTITY panel.sets.generate_html "Generate HTML">
<!ENTITY panel.setphotos.title.label "Title">
<!ENTITY panel.setphotos.title.tip "Picture title">
<!ENTITY panel.setphotos.taken.label "Taken">
<!ENTITY panel.setphotos.taken.tip "When the picture was taken">
<!ENTITY panel.setphotos.upload.label "Uploaded">
<!ENTITY panel.setphotos.upload.tip "When the picure was uploaded">
<!ENTITY panel.setphotos.generate_html "Generate HTML">
<!ENTITY panel.tagslist.tag.label "Tag">
<!ENTITY panel.uploadlist.file.label "File name">
<!ENTITY panel.uploadlist.title.label "Title">
<!ENTITY panel.uploadlist.status.label "Status">
<!ENTITY panel.upload_props.filename.label "File:">
<!ENTITY panel.upload_props.title.label "Title:">
<!ENTITY panel.upload_props.tags.label "Tags:">
<!ENTITY panel.uploads.upload.label "Upload">
<!ENTITY panel.uploads.clear.label "Clear">
<!ENTITY panel.uploads.remove.label "Remove">
<!ENTITY panel.uploads.add.label "Add">
<!ENTITY panel.uploads.generate_html "Generate HTML">
<!ENTITY generated.title "Fireflix: Generated content">
<!ENTITY generated.copy "copy">
<!ENTITY generated.nolf "remove linebreaks">
<!ENTITY browser.sidebar.label "Fireflix">
<!ENTITY browser.sidebar.title "Fireflix">
<!ENTITY browser.sidebar.tooltip "Fireflix">
<!ENTITY photosetprops.title "Photoset properties">
<!ENTITY photosetprops.set_title.label "Photoset title:">
<!ENTITY photosetprops.set_desc.label "Photoset description:">