4 files changed, 16 insertions, 0 deletions
diff --git a/content/browser.xul b/content/browser.xul
index aaff443..0c699d9 100644
--- a/content/browser.xul
+++ b/content/browser.xul
@@ -1,19 +1,30 @@
 <?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" />
 </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>
 </overlay>
diff --git a/content/help.xml b/content/help.xml
index 51e4ce5..ab4f4e2 100644
--- a/content/help.xml
+++ b/content/help.xml
@@ -1,53 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <html id="help" xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
  <title>Fireflix</title>
  <link rel="stylesheet" href="fireflix.css" type="text/css"/>
 </head>
 <body>
  <p>This is a brief overview of things you can do with <a href="http://kin.klever.net/fireflix/">fireflix</a>.</p>
 
  <p>First, you should proceed with authorization. If you haven't done it yet,
  it should happen automatically once you open fireflix sidebar. To clear
  authorization token off of the preferences, right-click on the 'Authorization
  info' part of the sidebar and select 'Sign off' from the pop up menu.</p>
  <h1>In the 'Search' tab</h1>
  <p>Basically, you can search flickr photos here. Either all or yours (keep
  'mine' checked to search your own photos).</p>
  <p>Once you have acquired search results you can browse through them. To open
  any particular picture in a new tab either doubleclick it or hit ENTER.</p>
  <p>While moving through the list of pictures found you should have a little
  preview at the bottom of the window.</p>
  <h1>In the 'Sets' tab</h1>
  <p>This is where you can browse your sets. You can edit some sets properties
  here and, most importantly, you can generate HTML of linked thumbnails for
  sets contents. Use your right mouse button on the photoset.</p>
  <h1>In The 'Uploads' tab</h1>
  <p>To upload pictures you don't even have to select this tab. Drag'n'drop into
  fireflix sidebar should do. There is nothing wrong with going into the tab and
  using 'Add' button either.</p>
  <p>You can add photos to the list, edit their titles and/or tags and once
  you're done with it, trigger upload procedure. Once your images have been
  uploaded, you will be prompted to create a photoset for newly uploaded photos.
  You don't have to, though.</p>
+  <h1>Beyond that</h1>
+  <p>You can also add the <img src="chrome://fireflix/content/icons/16x16/toolbar-button.png" alt="Fireflix" title="Fireflix"/> button to your toolbar. Just go to View/Toolbars/Customize and drag it to wherever you want it to be.</p>
  <h1>Feedback</h1>
  <p>As the extension is at the very early stage of development, feel free to
  provide feedback at <a href="http://kin.klever.net/fireflix/feedback" title="click here to proceed to feedback form">http://kin.klever.net/fireflix/feedback/</a>.</p>
  <div class="copyright">
   <a href="http://www.klever.net/">© Klever Group</a>
  </div>
 </body>
 </html>
diff --git a/content/icons/16x16/toolbar-button.png b/content/icons/16x16/toolbar-button.png
new file mode 100644
index 0000000..8d95411
--- a/dev/null
+++ b/content/icons/16x16/toolbar-button.png
Binary files differ
diff --git a/locale/en-US/fireflix.dtd b/locale/en-US/fireflix.dtd
index 46409ed..09112dc 100644
--- a/locale/en-US/fireflix.dtd
+++ b/locale/en-US/fireflix.dtd
@@ -1,84 +1,85 @@
 <!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 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.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:">