| -rw-r--r-- | content/fireflix-panel.xul | 11 | ||||
| -rw-r--r-- | content/fireflix.js | 13 |
2 files changed, 23 insertions, 1 deletions
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul index 62862a9..0e511c5 100644 --- a/content/fireflix-panel.xul +++ b/content/fireflix-panel.xul @@ -69,16 +69,25 @@ <popup id="sets_menu"> <menuitem command="cmd_set_props"/> <menuitem command="cmd_refresh_sets"/> <menuseparator/> <menu label="&panel.sets.generate_html;" id="sets_html_menu"/> </popup> </popupset> + <commandset id="cmdset_setphotos"> + </commandset> + + <popupset> + <popup id="setphotos_menu"> + <menu label="&panel.setphotos.generate_html;" id="setphotos_html_menu"/> + </popup> + </popupset> + <commandset id="cmdset_uploads"> <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;" oncommand="fireflix.uploads.on_clear()" /> <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;" oncommand="fireflix.uploads.on_upload()" /> <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;" oncommand="fireflix.uploads.on_remove()" /> <command id="cmd_uploads_add" label="&panel.uploads.add.label;" @@ -194,17 +203,17 @@ <treechildren/> </tree> <hbox> <button command="cmd_refresh_sets" /> <button command="cmd_set_props" /> </hbox> <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()" flex="1" ondblclick="fireflix.photoset.on_cmd_open(event)" - onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.photoset.on_cmd_open(event)"> + onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.photoset.on_cmd_open(event)" context="setphotos_menu"> <treecols> <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" /> <splitter class="tree-splitter" /> <treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" /> <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" /> </treecols> <treechildren/> </tree> diff --git a/content/fireflix.js b/content/fireflix.js index 328e9e2..995ec5c 100644 --- a/content/fireflix.js +++ b/content/fireflix.js @@ -660,16 +660,25 @@ var fireflix = { on_refresh_sets: function() { this.refresh_sets(); }, on_cmd_sets_html: function(csfx,ev) { var uti = csfx.charAt(0); var utl = csfx.charAt(1); var rv = this.build_html(this.photoset.photos,uti,utl); this.popup_content(rv); }, + on_cmd_setphotos_html: function(csfx,ev) { + var uti = csfx.charAt(0); var utl = csfx.charAt(1); + var rv = ''; + for(var p in this.photoset.photos) { + if(this.photoset.selection.isSelected(p)) + rv += this.photo_html(this.photoset.photos[p],uti,utl)+'\n'; + } + this.popup_content(rv); + }, on_cmd_uploads_html: function(csfx,ev) { var uti = csfx.charAt(0); var utl = csfx.charAt(1); var pids = new Array(); for(var f in this.uploads.files) { if(this.uploads.selection.isSelected(f)) if(this.uploads.files[f].photoid) pids.push(this.uploads.files[f].photoid); @@ -918,16 +927,20 @@ var fireflix = { }, build_menus: function() { this.append_html_menu( document.getElementById('sets_html_menu'), 'stm_','m_bop','cmdset_sets','cmd_sets_html' ); this.append_html_menu( + document.getElementById('setphotos_html_menu'), + 'stm_','m_bop','cmdset_setphotos','cmd_setphotos_html' + ); + this.append_html_menu( document.getElementById('uploads_html_menu'), 'stm_','m_bop','cmdset_uploads','cmd_uploads_html' ); return; }, append_html_menu: function(m,imgt,lnkt,csid,cpfx) { var mp = m.appendChild(document.createElement('menupopup')); var t; |