-rw-r--r-- | NEWS.xml | 2 | ||||
-rw-r--r-- | content/fireflix-panel.xul | 4 | ||||
-rw-r--r-- | content/fireflix.js | 6 |
3 files changed, 7 insertions, 5 deletions
@@ -1,18 +1,20 @@ | |||
1 | <?xml version="1.0" encoding="us-ascii"?> | 1 | <?xml version="1.0" encoding="us-ascii"?> |
2 | <news> | 2 | <news> |
3 | <version version="0.0.5"> | 3 | <version version="0.0.5"> |
4 | <ni>Added toolbar button</ni> | 4 | <ni>Added toolbar button</ni> |
5 | <ni>Enter or double click on photo in set now opens photo in flickr</ni> | 5 | <ni>Enter or double click on photo in set now opens photo in flickr</ni> |
6 | <ni>Double click on photoset opens photoset in flickr</ni> | 6 | <ni>Double click on photoset opens photoset in flickr</ni> |
7 | <ni>Hiding completely photo properties in sets browser when no photo | ||
8 | selected</ni> | ||
7 | </version> | 9 | </version> |
8 | <version version="0.0.4" date="November 13th, 2006"> | 10 | <version version="0.0.4" date="November 13th, 2006"> |
9 | <ni>Added button to remove linebreaks from generated HTML</ni> | 11 | <ni>Added button to remove linebreaks from generated HTML</ni> |
10 | <ni>Added the word 'sidebar' to the extension name so that you don't have to look hard for it</ni> | 12 | <ni>Added the word 'sidebar' to the extension name so that you don't have to look hard for it</ni> |
11 | <ni>UI polishing, including making it more boring</ni> | 13 | <ni>UI polishing, including making it more boring</ni> |
12 | <ni>code cosmetics</ni> | 14 | <ni>code cosmetics</ni> |
13 | </version> | 15 | </version> |
14 | <version version="0.0.3" date="November 6th, 2006"> | 16 | <version version="0.0.3" date="November 6th, 2006"> |
15 | <ni>Firefox 2.0 compatibility</ni> | 17 | <ni>Firefox 2.0 compatibility</ni> |
16 | </version> | 18 | </version> |
17 | <version version="0.0.2" date="October 17th, 2006"> | 19 | <version version="0.0.2" date="October 17th, 2006"> |
18 | <ni>Added brief help file</ni> | 20 | <ni>Added brief help file</ni> |
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul index af92d22..62862a9 100644 --- a/content/fireflix-panel.xul +++ b/content/fireflix-panel.xul | |||
@@ -199,28 +199,28 @@ | |||
199 | </hbox> | 199 | </hbox> |
200 | <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()" | 200 | <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()" |
201 | flex="1" ondblclick="fireflix.photoset.on_cmd_open(event)" | 201 | flex="1" ondblclick="fireflix.photoset.on_cmd_open(event)" |
202 | onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.photoset.on_cmd_open(event)"> | 202 | onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.photoset.on_cmd_open(event)"> |
203 | <treecols> | 203 | <treecols> |
204 | <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" /> | 204 | <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" /> |
205 | <splitter class="tree-splitter" /> | 205 | <splitter class="tree-splitter" /> |
206 | <treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" /> | 206 | <treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" /> |
207 | <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" /> | 207 | <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" /> |
208 | </treecols> | 208 | </treecols> |
209 | <treechildren/> | 209 | <treechildren/> |
210 | </tree> | 210 | </tree> |
211 | <groupbox id="set_photo_props" orient="horizontal"> | 211 | <groupbox id="set_photo_props" orient="horizontal" hidden="true"> |
212 | <vbox width="100" pack="center"> | 212 | <vbox width="100" pack="center"> |
213 | <hbox pack="center"> | 213 | <hbox pack="center"> |
214 | <image id="set_photo" hidden="true" | 214 | <image id="set_photo" |
215 | ondblclick="fireflix.photoset.on_cmd_open(event)" /> | 215 | ondblclick="fireflix.photoset.on_cmd_open(event)" /> |
216 | </hbox> | 216 | </hbox> |
217 | </vbox> | 217 | </vbox> |
218 | <spacer flex="1"/> | 218 | <spacer flex="1"/> |
219 | </groupbox> | 219 | </groupbox> |
220 | </vbox> | 220 | </vbox> |
221 | </tabpanel> | 221 | </tabpanel> |
222 | 222 | ||
223 | <tabpanel id="tabpanel_tags"> | 223 | <tabpanel id="tabpanel_tags"> |
224 | <listbox id="tagslist" rows="8" flex="1"> | 224 | <listbox id="tagslist" rows="8" flex="1"> |
225 | <listhead> | 225 | <listhead> |
226 | <listheader label="&panel.tagslist.tag.label;"/> | 226 | <listheader label="&panel.tagslist.tag.label;"/> |
diff --git a/content/fireflix.js b/content/fireflix.js index 48053c5..328e9e2 100644 --- a/content/fireflix.js +++ b/content/fireflix.js | |||
@@ -84,25 +84,25 @@ var fireflix = { | |||
84 | refresh_sets: function() { this.photosets.refresh_sets(); }, | 84 | refresh_sets: function() { this.photosets.refresh_sets(); }, |
85 | refresh_stuff: function() { | 85 | refresh_stuff: function() { |
86 | this.refresh_sets(); | 86 | this.refresh_sets(); |
87 | this.refresh_user_tags(); | 87 | this.refresh_user_tags(); |
88 | }, | 88 | }, |
89 | 89 | ||
90 | /* photoset treeview */ | 90 | /* photoset treeview */ |
91 | photoset: { | 91 | photoset: { |
92 | photos: new Array(), | 92 | photos: new Array(), |
93 | fireflix: null, | 93 | fireflix: null, |
94 | init: function(f) { | 94 | init: function(f) { |
95 | this.fireflix = f; | 95 | this.fireflix = f; |
96 | pull_elements(this,document,[ 'set_photo' ]); | 96 | pull_elements(this,document,[ 'set_photo', 'set_photo_props' ]); |
97 | document.getElementById('setphotos').view = this; | 97 | document.getElementById('setphotos').view = this; |
98 | }, | 98 | }, |
99 | rowCount: 0, | 99 | rowCount: 0, |
100 | getCellText: function(r,c) { | 100 | getCellText: function(r,c) { |
101 | var p = this.photos[r]; | 101 | var p = this.photos[r]; |
102 | if(c.id=='sp_title') return p.title; | 102 | if(c.id=='sp_title') return p.title; |
103 | if(c.id=='sp_taken') return p.datetaken; | 103 | if(c.id=='sp_taken') return p.datetaken; |
104 | if(c.id=='sp_upload') { | 104 | if(c.id=='sp_upload') { |
105 | var du = new Date(p.dateupload*1000); | 105 | var du = new Date(p.dateupload*1000); |
106 | var rv = du.getFullYear()+'-'+(du.getMonth()+1)+'-'+du.getDate() | 106 | var rv = du.getFullYear()+'-'+(du.getMonth()+1)+'-'+du.getDate() |
107 | +' '+ | 107 | +' '+ |
108 | du.getHours()+':'+du.getMinutes()+':'+du.getSeconds(); | 108 | du.getHours()+':'+du.getMinutes()+':'+du.getSeconds(); |
@@ -149,27 +149,27 @@ var fireflix = { | |||
149 | XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); | 149 | XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); |
150 | _this.importXPR(xp); | 150 | _this.importXPR(xp); |
151 | }, function(x,s,c,m) { | 151 | }, function(x,s,c,m) { |
152 | _this.fireflix.flickr_failure(x,s,c,m); | 152 | _this.fireflix.flickr_failure(x,s,c,m); |
153 | } | 153 | } |
154 | ); | 154 | ); |
155 | }, | 155 | }, |
156 | on_select: function() { | 156 | on_select: function() { |
157 | if(this.selection.count==1) { | 157 | if(this.selection.count==1) { |
158 | var p = this.photos[this.selection.currentIndex]; | 158 | var p = this.photos[this.selection.currentIndex]; |
159 | this.set_photo.src = | 159 | this.set_photo.src = |
160 | this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t'); | 160 | this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t'); |
161 | this.set_photo.hidden = false; | 161 | this.set_photo_props.hidden = false; |
162 | }else{ | 162 | }else{ |
163 | this.set_photo.hidden = true; | 163 | this.set_photo_props.hidden = true; |
164 | } | 164 | } |
165 | }, | 165 | }, |
166 | on_cmd_open: function(ev) { | 166 | on_cmd_open: function(ev) { |
167 | if(this.selection.currentIndex<0) return; | 167 | if(this.selection.currentIndex<0) return; |
168 | var p = this.photos[this.selection.currentIndex]; | 168 | var p = this.photos[this.selection.currentIndex]; |
169 | if(!p.id) return; | 169 | if(!p.id) return; |
170 | this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p')); | 170 | this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p')); |
171 | } | 171 | } |
172 | }, | 172 | }, |
173 | 173 | ||
174 | /* photosets treeview */ | 174 | /* photosets treeview */ |
175 | photosets: { | 175 | photosets: { |