summaryrefslogtreecommitdiffabout
path: root/content
authorMichael Krelin <hacker@klever.net>2006-11-16 21:54:55 (UTC)
committer Michael Krelin <hacker@klever.net>2006-11-16 21:54:55 (UTC)
commit8db8cc953a91ccba910228bdaf2563ffd92f3d61 (patch) (unidiff)
treecce7bfe83b5273f309f8b3a47ae0373bc029910d /content
parent26b7e66a091703dab249ca11f00a1cb49987c393 (diff)
downloadfireflix-8db8cc953a91ccba910228bdaf2563ffd92f3d61.zip
fireflix-8db8cc953a91ccba910228bdaf2563ffd92f3d61.tar.gz
fireflix-8db8cc953a91ccba910228bdaf2563ffd92f3d61.tar.bz2
open flickr page on enter or dblclicking photo in set browser
git-svn-id: http://svn.klever.net/kin/fireflix/trunk@226 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (limited to 'content') (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix-panel.xul9
-rw-r--r--content/fireflix.js8
2 files changed, 13 insertions, 4 deletions
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index 2356c82..b2ca7dc 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -149,14 +149,13 @@
149 <spacer flex="1"/> 149 <spacer flex="1"/>
150 <button class="lean" command="cmd_search_next_page"/> 150 <button class="lean" command="cmd_search_next_page"/>
151 </hbox> 151 </hbox>
152 <tree id="searchresults" rows="2" flex="1" 152 <tree id="searchresults" rows="2" flex="1"
153 onselect="fireflix.foundphotos.on_select()" 153 onselect="fireflix.foundphotos.on_select()"
154 ondblclick="fireflix.foundphotos.on_cmd_open(event)" 154 ondblclick="fireflix.foundphotos.on_cmd_open(event)"
155 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) 155 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.on_cmd_open(event)">
156 fireflix.foundphotos.on_cmd_open(event)">
157 <treecols> 156 <treecols>
158 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" /> 157 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" />
159 </treecols> 158 </treecols>
160 <treechildren/> 159 <treechildren/>
161 </tree> 160 </tree>
162 <groupbox id="searchresult_props" orient="horizontal" hidden="true"> 161 <groupbox id="searchresult_props" orient="horizontal" hidden="true">
@@ -195,25 +194,27 @@
195 </tree> 194 </tree>
196 <hbox> 195 <hbox>
197 <button command="cmd_refresh_sets" /> 196 <button command="cmd_refresh_sets" />
198 <button command="cmd_set_props" /> 197 <button command="cmd_set_props" />
199 </hbox> 198 </hbox>
200 <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()" 199 <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()"
201 flex="1"> 200 flex="1" ondblclick="fireflix.photoset.on_cmd_open(event)"
201 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.photoset.on_cmd_open(event)">
202 <treecols> 202 <treecols>
203 <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" /> 203 <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" />
204 <splitter class="tree-splitter" /> 204 <splitter class="tree-splitter" />
205 <treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" /> 205 <treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" />
206 <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" /> 206 <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" />
207 </treecols> 207 </treecols>
208 <treechildren/> 208 <treechildren/>
209 </tree> 209 </tree>
210 <groupbox id="set_photo_props" orient="horizontal"> 210 <groupbox id="set_photo_props" orient="horizontal">
211 <vbox width="100" pack="center"> 211 <vbox width="100" pack="center">
212 <hbox pack="center"> 212 <hbox pack="center">
213 <image id="set_photo" hidden="true"/> 213 <image id="set_photo" hidden="true"
214 ondblclick="fireflix.photoset.on_cmd_open(event)" />
214 </hbox> 215 </hbox>
215 </vbox> 216 </vbox>
216 <spacer flex="1"/> 217 <spacer flex="1"/>
217 </groupbox> 218 </groupbox>
218 </vbox> 219 </vbox>
219 </tabpanel> 220 </tabpanel>
diff --git a/content/fireflix.js b/content/fireflix.js
index 0f51397..2ee408f 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -158,12 +158,20 @@ var fireflix = {
158 this.set_photo.src = 158 this.set_photo.src =
159 this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t'); 159 this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t');
160 this.set_photo.hidden = false; 160 this.set_photo.hidden = false;
161 }else{ 161 }else{
162 this.set_photo.hidden = true; 162 this.set_photo.hidden = true;
163 } 163 }
164 },
165 on_cmd_open: function(ev) {
166 if(this.selection.currentIndex<0)
167 return;
168 var p = this.photos[this.selection.currentIndex];
169 if(!p.id)
170 return;
171 this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p'));
164 } 172 }
165 }, 173 },
166 174
167 /* photosets treeview */ 175 /* photosets treeview */
168 photosets: { 176 photosets: {
169 sets: new Array(), 177 sets: new Array(),