-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 | |||
@@ -71,12 +71,21 @@ | |||
71 | <menuitem command="cmd_refresh_sets"/> | 71 | <menuitem command="cmd_refresh_sets"/> |
72 | <menuseparator/> | 72 | <menuseparator/> |
73 | <menu label="&panel.sets.generate_html;" id="sets_html_menu"/> | 73 | <menu label="&panel.sets.generate_html;" id="sets_html_menu"/> |
74 | </popup> | 74 | </popup> |
75 | </popupset> | 75 | </popupset> |
76 | 76 | ||
77 | <commandset id="cmdset_setphotos"> | ||
78 | </commandset> | ||
79 | |||
80 | <popupset> | ||
81 | <popup id="setphotos_menu"> | ||
82 | <menu label="&panel.setphotos.generate_html;" id="setphotos_html_menu"/> | ||
83 | </popup> | ||
84 | </popupset> | ||
85 | |||
77 | <commandset id="cmdset_uploads"> | 86 | <commandset id="cmdset_uploads"> |
78 | <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;" | 87 | <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;" |
79 | oncommand="fireflix.uploads.on_clear()" /> | 88 | oncommand="fireflix.uploads.on_clear()" /> |
80 | <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;" | 89 | <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;" |
81 | oncommand="fireflix.uploads.on_upload()" /> | 90 | oncommand="fireflix.uploads.on_upload()" /> |
82 | <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;" | 91 | <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;" |
@@ -196,13 +205,13 @@ | |||
196 | <hbox> | 205 | <hbox> |
197 | <button command="cmd_refresh_sets" /> | 206 | <button command="cmd_refresh_sets" /> |
198 | <button command="cmd_set_props" /> | 207 | <button command="cmd_set_props" /> |
199 | </hbox> | 208 | </hbox> |
200 | <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()" | 209 | <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()" |
201 | flex="1" ondblclick="fireflix.photoset.on_cmd_open(event)" | 210 | flex="1" ondblclick="fireflix.photoset.on_cmd_open(event)" |
202 | onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.photoset.on_cmd_open(event)"> | 211 | onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.photoset.on_cmd_open(event)" context="setphotos_menu"> |
203 | <treecols> | 212 | <treecols> |
204 | <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" /> | 213 | <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" /> | 214 | <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" /> | 215 | <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" /> | 216 | <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" /> |
208 | </treecols> | 217 | </treecols> |
diff --git a/content/fireflix.js b/content/fireflix.js index 328e9e2..995ec5c 100644 --- a/content/fireflix.js +++ b/content/fireflix.js | |||
@@ -662,12 +662,21 @@ var fireflix = { | |||
662 | }, | 662 | }, |
663 | on_cmd_sets_html: function(csfx,ev) { | 663 | on_cmd_sets_html: function(csfx,ev) { |
664 | var uti = csfx.charAt(0); var utl = csfx.charAt(1); | 664 | var uti = csfx.charAt(0); var utl = csfx.charAt(1); |
665 | var rv = this.build_html(this.photoset.photos,uti,utl); | 665 | var rv = this.build_html(this.photoset.photos,uti,utl); |
666 | this.popup_content(rv); | 666 | this.popup_content(rv); |
667 | }, | 667 | }, |
668 | on_cmd_setphotos_html: function(csfx,ev) { | ||
669 | var uti = csfx.charAt(0); var utl = csfx.charAt(1); | ||
670 | var rv = ''; | ||
671 | for(var p in this.photoset.photos) { | ||
672 | if(this.photoset.selection.isSelected(p)) | ||
673 | rv += this.photo_html(this.photoset.photos[p],uti,utl)+'\n'; | ||
674 | } | ||
675 | this.popup_content(rv); | ||
676 | }, | ||
668 | 677 | ||
669 | on_cmd_uploads_html: function(csfx,ev) { | 678 | on_cmd_uploads_html: function(csfx,ev) { |
670 | var uti = csfx.charAt(0); var utl = csfx.charAt(1); | 679 | var uti = csfx.charAt(0); var utl = csfx.charAt(1); |
671 | var pids = new Array(); | 680 | var pids = new Array(); |
672 | for(var f in this.uploads.files) { | 681 | for(var f in this.uploads.files) { |
673 | if(this.uploads.selection.isSelected(f)) | 682 | if(this.uploads.selection.isSelected(f)) |
@@ -920,12 +929,16 @@ var fireflix = { | |||
920 | build_menus: function() { | 929 | build_menus: function() { |
921 | this.append_html_menu( | 930 | this.append_html_menu( |
922 | document.getElementById('sets_html_menu'), | 931 | document.getElementById('sets_html_menu'), |
923 | 'stm_','m_bop','cmdset_sets','cmd_sets_html' | 932 | 'stm_','m_bop','cmdset_sets','cmd_sets_html' |
924 | ); | 933 | ); |
925 | this.append_html_menu( | 934 | this.append_html_menu( |
935 | document.getElementById('setphotos_html_menu'), | ||
936 | 'stm_','m_bop','cmdset_setphotos','cmd_setphotos_html' | ||
937 | ); | ||
938 | this.append_html_menu( | ||
926 | document.getElementById('uploads_html_menu'), | 939 | document.getElementById('uploads_html_menu'), |
927 | 'stm_','m_bop','cmdset_uploads','cmd_uploads_html' | 940 | 'stm_','m_bop','cmdset_uploads','cmd_uploads_html' |
928 | ); | 941 | ); |
929 | return; | 942 | return; |
930 | }, | 943 | }, |
931 | append_html_menu: function(m,imgt,lnkt,csid,cpfx) { | 944 | append_html_menu: function(m,imgt,lnkt,csid,cpfx) { |