double click on photoset opens photoset in flickr now

git-svn-id: http://svn.klever.net/kin/fireflix/trunk@229 fe716a7a-6dde-0310-88d9-d003556173a8

5 files changed, 15 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index b44ece1..219a07f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,12 @@
 0.0.5 ()
   - Added toolbar button
   - Enter or double click on photo in set now opens photo in flickr
+  - Double click on photoset opens photoset in flickr
 0.0.4 (November 13th, 2006)
   - Added button to remove linebreaks from generated HTML
   - Added the word 'sidebar' to the extension name so that you don't have to look hard for it
   - UI polishing, including making it more boring
   - code cosmetics
 0.0.3 (November 6th, 2006)
   - Firefox 2.0 compatibility
 0.0.2 (October 17th, 2006)
diff --git a/NEWS.xml b/NEWS.xml
index 79ccf1a..b8f1cf4 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="us-ascii"?>
 <news>
  <version version="0.0.5">
   <ni>Added toolbar button</ni>
   <ni>Enter or double click on photo in set now opens photo in flickr</ni>
+  <ni>Double click on photoset opens photoset in flickr</ni>
  </version>
  <version version="0.0.4" date="November 13th, 2006">
   <ni>Added button to remove linebreaks from generated HTML</ni>
   <ni>Added the word 'sidebar' to the extension name so that you don't have to look hard for it</ni>
   <ni>UI polishing, including making it more boring</ni>
   <ni>code cosmetics</ni>
  </version>
  <version version="0.0.3" date="November 6th, 2006">
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index b2ca7dc..af92d22 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -179,16 +179,17 @@
     </tabpanel>
 
     <tabpanel id="tabpanel_sets" flex="1"
      onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
      document.getElementById('setphotos').focus()">
      <vbox flex="1">
       <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()"
       flex="1" context="sets_menu"
+      ondblclick="fireflix.photosets.on_cmd_open_in_flickr(event)"
       >
        <treecols>
 	<treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/>
 	<splitter class="tree-splitter" />
 	<treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" />
        </treecols>
        <treechildren/>
       </tree>
diff --git a/content/fireflix.js b/content/fireflix.js
index 24894df..48053c5 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -159,21 +159,19 @@ var fireflix = {
     this.set_photo.src =
      this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t');
     this.set_photo.hidden = false;
    }else{
     this.set_photo.hidden = true;
    }
   },
   on_cmd_open: function(ev) {
-   if(this.selection.currentIndex<0)
-    return;
+   if(this.selection.currentIndex<0) return;
    var p = this.photos[this.selection.currentIndex];
-   if(!p.id)
-    return;
+   if(!p.id) return;
    this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p'));
   }
  },
 
  /* photosets treeview */
  photosets: {
   sets: new Array(),
   fireflix: null,
@@ -231,16 +229,22 @@ var fireflix = {
   on_select: function() {
    if(this.selection.count==1) {
     this.fireflix.cmd_set_props.setAttribute('disabled','false');
     var s = this.sets[this.selection.currentIndex];
     this.fireflix.photoset.load_photos(s.id);
    }else{
     this.fireflix.cmd_set_props.setAttribute('disabled','true');
    }
+  },
+  on_cmd_open_in_flickr: function(ev) {
+   if(this.selection.currentIndex<0) return;
+   var p = this.sets[this.selection.currentIndex];
+   if(!p.id) return;
+   this.fireflix.openTab(this.fireflix.flickr.make_photoset_url(p));
   }
  },
 
  refresh_user_tags: function() {
   var lb = document.getElementById('tagslist');
   var _this = this;
   this.flickr.api_call(
    {
diff --git a/content/flickr.js b/content/flickr.js
index 75d1a72..b8360c1 100644
--- a/content/flickr.js
+++ b/content/flickr.js
@@ -266,16 +266,20 @@ Flickr.prototype = {
    return this.photos_url + this.user.nsid + '/' + p;
  },
  make_photo_url: function(p,sfx) {
   if(sfx=='p')
    return this.get_photo_page_url(p);
   else
    return this.get_image_url(p,sfx);
  },
+ make_photoset_url: function(ps) {
+  // TODO: allow for using someone else's photoset?
+  return this.photos_url+this.user.nsid+'/sets/'+ps.id;
+ },
 
  upload_file: function(f,fa,on_success,on_failure) {
   try {
    var fi = Components.classes["@mozilla.org/file/local;1"]
     .createInstance(Components.interfaces.nsILocalFile);
    fi.initWithPath( f );
    var st = Components.classes["@mozilla.org/network/file-input-stream;1"]
     .createInstance(Components.interfaces.nsIFileInputStream);