summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix-panel.xul11
-rw-r--r--content/fireflix.js13
-rw-r--r--locale/en-US/fireflix.dtd2
3 files changed, 25 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
@@ -74,6 +74,15 @@
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()" />
@@ -199,7 +208,7 @@
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" />
diff --git a/content/fireflix.js b/content/fireflix.js
index 328e9e2..995ec5c 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -665,6 +665,15 @@ var fireflix = {
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);
@@ -923,6 +932,10 @@ var fireflix = {
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 );
diff --git a/locale/en-US/fireflix.dtd b/locale/en-US/fireflix.dtd
index 09112dc..668b684 100644
--- a/locale/en-US/fireflix.dtd
+++ b/locale/en-US/fireflix.dtd
@@ -55,6 +55,8 @@
55<!ENTITY panel.setphotos.upload.label "Uploaded"> 55<!ENTITY panel.setphotos.upload.label "Uploaded">
56<!ENTITY panel.setphotos.upload.tip "When the picure was uploaded"> 56<!ENTITY panel.setphotos.upload.tip "When the picure was uploaded">
57 57
58<!ENTITY panel.setphotos.generate_html "Generate HTML">
59
58<!ENTITY panel.tagslist.tag.label "Tag"> 60<!ENTITY panel.tagslist.tag.label "Tag">
59 61
60<!ENTITY panel.uploadlist.file.label "File name"> 62<!ENTITY panel.uploadlist.file.label "File name">