summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix-panel.xul57
-rw-r--r--content/fireflix.js53
-rw-r--r--locale/en-US/fireflix.dtd3
3 files changed, 72 insertions, 41 deletions
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index aa3dbd6..405804c 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -213,96 +213,103 @@
<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>
<groupbox id="set_photo_props" orient="horizontal" hidden="true">
<vbox width="100" pack="center">
<hbox pack="center">
<image id="set_photo"
ondblclick="fireflix.photoset.on_cmd_open(event)" />
</hbox>
</vbox>
<spacer flex="1"/>
</groupbox>
</vbox>
</tabpanel>
<tabpanel id="tabpanel_tags">
<listbox id="tagslist" rows="8" flex="1">
<listhead>
<listheader label="&panel.tagslist.tag.label;"/>
</listhead>
<listcols>
<listcol flex="1"/>
</listcols>
</listbox>
</tabpanel>
<tabpanel id="tabpanel_upload">
<vbox flex="1">
<tree id="uploadlist" rows="2" flex="1"
onselect="fireflix.uploads.selectionChanged()"
context="uploads_menu">
<treecols>
<treecol id="up_file" label="&panel.uploadlist.file.label;" flex="4" crop="start" align="start"/>
<splitter class="tree-splitter" />
<treecol id="up_title" label="&panel.uploadlist.title.label;" flex="5" crop="end" align="start" />
<splitter class="tree-splitter" />
<treecol id="up_status" label="&panel.uploadlist.status.label;" flex="1" crop="end" align="start" />
</treecols>
<treechildren/>
</tree>
<progressmeter id="upload_progress" mode="undetermined" hidden="true" />
<groupbox id="upload_file_props" orient="vertical" hidden="true">
<hbox>
<image id="upload_file_preview" width="100" height="100" />
- <grid flex="1">
- <columns>
- <column/>
- <column flex="1"/>
- </columns>
- <rows>
- <row>
- <label control="upload_filename"
- value="&panel.upload_props.filename.label;" />
- <textbox id="upload_filename"
- oninput="fireflix.uploads.propsToSel('filename')"/>
- </row>
- <row>
- <label control="upload_title" value="&panel.upload_props.title.label;" />
- <textbox id="upload_title"
- oninput="fireflix.uploads.propsToSel('title')"/>
- </row>
- <row>
- <label control="upload_tags" value="&panel.upload_props.tags.label;" />
- <textbox id="upload_tags"
- oninput="fireflix.uploads.propsToSel('tags')"/>
- </row>
- <!-- TODO: description, public, friend, family -->
- </rows>
- </grid>
+ <vbox flex="1">
+ <grid>
+ <columns>
+ <column/>
+ <column flex="1"/>
+ </columns>
+ <rows>
+ <row>
+ <label control="upload_filename"
+ value="&panel.upload_props.filename.label;" />
+ <textbox id="upload_filename"
+ oninput="fireflix.uploads.propsToSel('filename')"/>
+ </row>
+ <row>
+ <label control="upload_title" value="&panel.upload_props.title.label;" />
+ <textbox id="upload_title"
+ oninput="fireflix.uploads.propsToSel('title')"/>
+ </row>
+ <row>
+ <label control="upload_tags" value="&panel.upload_props.tags.label;" />
+ <textbox id="upload_tags"
+ oninput="fireflix.uploads.propsToSel('tags')"/>
+ </row>
+ <!-- TODO: description, public, friend, family -->
+ </rows>
+ </grid>
+ <hbox>
+ <checkbox id="upload_is_public" label="&panel.upload_props.is_public;"/>
+ <checkbox id="upload_is_friends" label="&panel.upload_props.is_friend;"/>
+ <checkbox id="upload_is_family" label="&panel.upload_props.is_family;"/>
+ </hbox>
+ </vbox>
</hbox>
<description id="upload_failure" hidden="true"/>
</groupbox>
<hbox>
<button class="lean" command="cmd_uploads_add" />
<spacer flex="1"/>
<button class="lean" command="cmd_uploads_remove" />
<spacer flex="1"/>
<button class="lean" command="cmd_uploads_clear" />
</hbox>
<hbox pack="center">
<button command="cmd_uploads_upload" flex="1"/>
</hbox>
</vbox>
</tabpanel>
</tabpanels>
</tabbox>
</vbox>
</page>
diff --git a/content/fireflix.js b/content/fireflix.js
index 7291b68..78e56c2 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -287,329 +287,350 @@ var fireflix = {
for(var i in dd.dataList) {
var di = dd.dataList[i];
var dif = di.first;
if(
ldf==null
|| ldf.flavour.contentType!=dif.flavour.contentType
|| ldf.contentLength!=dif.contentLength
|| ldf.data!=dif.data )
this.drop_item(ev,di,s);
ldf = dif;
}
},
drop_item: function(ev,di,s) {
var d = di.first;
switch(d.flavour.contentType) {
case 'text/unicode':
this.drop_urilist(ev,d.data,s);
break;
case 'application/x-moz-file':
this.fireflix.uploads.add(d.data.path);
document.getElementById('fireflix_tabs').selectedTab
= document.getElementById('tab_upload');
break;
case 'text/uri-list':
// is it ascii or could it be utf8?
this.drop_urilist(ev,splitascii(d.data),s);
break;
default: alert(d.flavour.contentType+':'+d.data); break;
};
},
drop_urilist: function(ev,ul,s) {
// TODO: check for being a file?
var us = decodeURIComponent(ul).split(/[\r\n]/);
for(var ui in us)
if(/\S/.test(us[ui]))
this.fireflix.uploads.add(us[ui]);
document.getElementById('fireflix_tabs').selectedTab
= document.getElementById('tab_upload');
}
},
uploads: {
fireflix: null,
init: function(f) {
this.fireflix=f;
pull_elements(this,document,[
'upload_filename','upload_title','upload_file_preview',
'upload_file_props','upload_progress','upload_tags',
- 'cmd_uploads_upload', 'upload_failure'
+ 'cmd_uploads_upload', 'upload_failure', 'upload_is_public',
+ 'upload_is_friends', 'upload_is_family'
]);
document.getElementById('uploadlist').view = this;
+ this.upload_is_public.addEventListener(
+ 'CheckboxStateChange', { that: this,
+ handleEvent: function(ev) { this.that.propsToSel('is_public'); }
+ }, false );
+ this.upload_is_friends.addEventListener(
+ 'CheckboxStateChange', { that: this,
+ handleEvent: function(ev) { this.that.propsToSel('is_friends'); }
+ }, false );
+ this.upload_is_family.addEventListener(
+ 'CheckboxStateChange', { that: this,
+ handleEvent: function(ev) { this.that.propsToSel('is_family'); }
+ }, false );
},
files: new Array(),
rowCount: 0,
getCellText: function(r,c) {
var f = this.files[r];
if(c.id=='up_file') return f.file;
if(c.id=='up_title') return f.title;
if(c.id=='up_status') return f.state;
return c.id;
},
setTree: function(t) { this.tree = t },
isContainer: function(r) { return false; },
isSeparator: function(r) { return false; },
isSorted: function(r) { return false; },
getLevel: function(r) { return 0; },
getImageSrc: function(r,c) { return null },
getRowProperties: function(r,p) {
try {
if(!Components) return;
}catch(e) { return }
var f = this.files[r];
var as = Components.classes['@mozilla.org/atom-service;1'].
getService(Components.interfaces.nsIAtomService);
p.AppendElement(as.getAtom(f.state));
},
getCellProperties: function(r,c,p) { this.getRowProperties(r,p); },
getColumnProperties: function(c,p) { },
cycleHeader: function(cid,e) { },
getParentIndex: function(r) { return -1; },
drop: function(r,o) { },
canDropBeforeAfter: function(r,b) { return false },
add: function(f) {
if(f.indexOf('file:/')==0) {
f = f.substr(5);
while(f.substr(0,2)=='//') { // XXX: not very performant, is it? ;-)
f = f.substr(1);
}
}
var t = f;
var ls = t.lastIndexOf('/');
if(ls>0) t = t.substr(ls+1);
ls = t.lastIndexOf('\\');
if(ls>0) t = t.substr(ls+1);
var ld = t.lastIndexOf('.');
if(ld>0) t = t.substr(0,ld);
this.files.push( {
file: f,
title: t,
tags: '',
+ is_public: true, is_friend: false, is_family: false,
state: 'pending'
} );
this.rowCount = this.files.length;
this.tree.rowCountChanged(this.rowCount-1,1);
},
upload_worker: function() {
for(var f in this.files) {
if(this.files[f].state=='pending') {
var ff = this.files[f];
this.on_file_upload(ff);
ff.state='uploading';
this.tree.invalidate();
var _this = this;
this.fireflix.flickr.upload_file(
- ff.file, { title: ff.title, tags: ff.tags },
- function(x,p) {
+ ff.file, {
+ title: ff.title, tags: ff.tags,
+ is_public: ff.is_public?'1':'0',
+ is_friend: ff.is_friend?'1':'0',
+ is_family: ff.is_family?'1':'0'
+ }, function(x,p) {
ff.photoid = p;
_this.batch_ids.push(p);
ff.state='completed';
_this.tree.invalidate();
window.setTimeout(_this.upload_to,0,_this);
}, function(x,s,c,m) {
ff.state='failed';
ff.flickr_errcode = c;
ff.flickr_errmsg = m;
_this.tree.invalidate();
window.setTimeout(_this.upload_to,0,_this);
}
);
return;
}
}
this.on_finish_upload();
},
upload_to: function(_this) { _this.upload_worker(); },
on_file_upload: function(f) {
this.cmd_uploads_upload.setAttribute('disabled','true');
for(var fi in this.files) {
if(this.files[fi].file==f.file) {
this.tree.ensureRowIsVisible(fi);
this.selection.rangedSelect(fi,fi,false);
this.selection.currentIndex = fi;
this.selToProps();
break;
}
}
},
on_finish_upload: function() {
if(this.batch_ids.length) {
var psn = prompt(this.fireflix.loc_strings.getString('postUploadPhotoset'));
if(psn!=null) {
var pids = this.batch_ids.join(',');
var ppid = this.batch_ids[0];
var _this = this;
this.fireflix.flickr.api_call(
{
method: 'flickr.photosets.create',
auth_token: 'default',
title: psn,
primary_photo_id: ppid
}, function(x) {
var npid =
x.responseXML.getElementsByTagName('photoset').item(0).getAttribute('id');
_this.fireflix.flickr.api_call(
{
method: 'flickr.photosets.editPhotos',
auth_token: 'default',
photoset_id: npid,
primary_photo_id: ppid,
photo_ids: pids
}, function(x) {
_this.fireflix.refresh_sets();
}, function(x,s,c,m) {
_this.fireflix.flickr_failure(x,s,c,m);
}
);
}, function(x,s,c,m) {
_this.fireflix.flickr_failure(x,s,c,m);
}
);
}
}
this.selection.clearSelection();
this.cmd_uploads_upload.setAttribute('disabled','false');
this.upload_progress.setAttribute('hidden','true');
},
clear_list: function() {
this.tree.beginUpdateBatch();
this.rowCount = 0;
this.files = new Array();
this.tree.endUpdateBatch();
this.selToProps();
},
selectionChanged: function() {
this.selToProps();
},
disableProps: function() {
this.upload_filename.value='';
this.upload_filename.disabled = true;
this.upload_title.value='';
this.upload_title.disabled = true;
this.upload_file_preview.src = null;
this.upload_tags.value='';
this.upload_tags.disabled = true;
+ this.upload_is_public.disabled = true;
+ this.upload_is_friends.disabled = true;
+ this.upload_is_family.disabled = true;
/* this.upload_file_props.hidden = true; */
},
selToProps: function() {
if(!this.selection.count) {
this.disableProps();
this.upload_file_props.hidden = true;
}else if(this.selection.count==1) {
var f=this.files[this.selection.currentIndex];
if(f==null) {
this.disableProps();
this.upload_file_props.hidden = true;
}else{
var inactives = f.state!='pending';
- this.upload_filename.value = f.file;
- this.upload_filename.disabled = inactives;
- this.upload_title.value = f.title;
- this.upload_title.disabled = inactives;
+ this.upload_filename.value = f.file; this.upload_filename.disabled = inactives;
+ this.upload_title.value = f.title; this.upload_title.disabled = inactives;
this.upload_file_preview.src = 'file:///'+f.file;
- this.upload_tags.value = f.tags;
- this.upload_tags.disabled = inactives;
+ this.upload_tags.value = f.tags; this.upload_tags.disabled = inactives;
+ this.upload_is_public.checked = f.is_public; this.upload_is_public.disabled = inactives;
+ this.upload_is_friends.checked = f.is_friend; this.upload_is_friends.disabled = inactives;
+ this.upload_is_family.checked = f.is_family; this.upload_is_family.disabled = inactives;
if(f.state=='failed') {
- this.upload_failure.textContent=f.flickr_errcode+': '+f.flickr_errmsg;
+ this.upload_failure.textContent=((f.flickr_errcode<0)?'':f.flickr_errcode+': ')+f.flickr_errmsg;
this.upload_failure.hidden = false;
}else{
this.upload_failure.hidden = true;
}
this.upload_file_props.hidden = false;
}
}else{
var ftitle = null; var onetitle = true;
var ftags = null; var onetag = true;
var fs = 0;
for(var ff in this.files) {
if(this.selection.isSelected(ff) && this.files[ff].state=='pending' ) {
++fs;
if(ftitle==null) {
ftitle = this.files[ff].title;
}else if(ftitle!=this.files[ff].title) {
onetitle = false;
}
if(ftags==null) {
ftags = this.files[ff].tags;
}else if(ftags!=this.files[ff].tags) {
onetag = false;
}
}
}
if(fs) {
this.upload_filename.value='';
this.upload_filename.disabled = true;
if(onetitle)
this.upload_title.value = ftitle;
this.upload_title.disabled = false;
if(onetag)
this.upload_tags.value = ftags;
this.upload_tags.disabled = false;
this.upload_file_preview.src = null;
this.upload_failure.hidden = true;
this.upload_file_props.hidden = false;
}else
this.disableProps();
this.upload_file_props.hidden = true;
}
},
propsToSel: function(prop) {
if(this.selection.count<=0) return;
for(var ff in this.files) {
if(this.selection.isSelected(ff) && this.files[ff].state=='pending') {
- if(prop=='filename')
- this.files[ff].file = this.upload_filename.value;
- if(prop=='title')
- this.files[ff].title = this.upload_title.value;
- if(prop=='tags')
- this.files[ff].tags = this.upload_tags.value;
+ if(prop=='filename') this.files[ff].file = this.upload_filename.value;
+ if(prop=='title') this.files[ff].title = this.upload_title.value;
+ if(prop=='tags') this.files[ff].tags = this.upload_tags.value;
+ if(prop=='is_public') this.files[ff].is_public = this.upload_is_public.checked;
+ if(prop=='is_friends') this.files[ff].is_friend = this.upload_is_friends.checked;
+ if(prop=='is_family') this.files[ff].is_family = this.upload_is_family.checked;
this.tree.invalidateRow(ff);
}
}
},
on_upload: function() {
this.selToProps();
this.batch_ids = new Array();
this.upload_progress.value=0;
this.upload_progress.setAttribute('hidden','false');
this.upload_worker();
},
on_clear: function() {
this.clear_list();
},
on_remove: function() {
if(this.selection.count) {
this.tree.beginUpdateBatch();
for(var i=this.files.length-1;i>=0;--i) {
if(this.selection.isSelected(i)) {
this.files.splice(i,1);
this.rowCount--;
}
}
this.tree.endUpdateBatch();
this.selection.clearSelection();
}
},
on_add: function() {
var ifp = Components.interfaces.nsIFilePicker;
var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(ifp);
fp.init(window, "Select a File", ifp.modeOpenMultiple);
fp.appendFilters(ifp.filterImages);
var rv = fp.show();
if(rv==ifp.returnOK) {
var ff = fp.files;
while(ff.hasMoreElements()) {
var f = ff.getNext();
f.QueryInterface(Components.interfaces.nsIFile);
this.add(f.path);
}
}
}
},
on_set_props: function() {
var pset = this.photosets.sets[this.photosets.selection.currentIndex];
window.openDialog(
diff --git a/locale/en-US/fireflix.dtd b/locale/en-US/fireflix.dtd
index 3380078..d975031 100644
--- a/locale/en-US/fireflix.dtd
+++ b/locale/en-US/fireflix.dtd
@@ -24,67 +24,70 @@
<!ENTITY panel.auth.done.label "Authorization complete">
<!ENTITY panel.auth.flickr.label "Flickr">
<!ENTITY panel.auth.flickr.tip "Open Flickr in new tab">
<!ENTITY panel.auth.unauth.label "Sign off">
<!ENTITY panel.tabs.search "Search" >
<!ENTITY panel.tabs.sets "Sets" >
<!ENTITY panel.tabs.tags "Tags" >
<!ENTITY panel.tabs.upload "Upload" >
<!ENTITY panel.search.cmd_search.label "Search" >
<!ENTITY panel.search.search_for.label "Search for:" >
<!ENTITY panel.search.mode.tagsonly.label "tags">
<!ENTITY panel.search.mode.tagsonly.tip "Search tags only">
<!ENTITY panel.search.mode.mine.label "mine">
<!ENTITY panel.search.col.title.label "Title">
<!ENTITY panel.search.cmd_search_open.label "Open">
<!ENTITY panel.search.cmd_search_prev_page.label " « ">
<!ENTITY panel.search.cmd_search_next_page.label " » ">
<!ENTITY panel.sets.name.label "Set">
<!ENTITY panel.sets.name.tip "Photoset name">
<!ENTITY panel.sets.photos.label "Photos">
<!ENTITY panel.sets.photos.tip "Number of photos in set">
<!ENTITY panel.sets.cmd_refresh_sets "Refresh">
<!ENTITY panel.sets.cmd_properties "Properties">
<!ENTITY panel.sets.generate_html "Generate HTML">
<!ENTITY panel.setphotos.title.label "Title">
<!ENTITY panel.setphotos.title.tip "Picture title">
<!ENTITY panel.setphotos.taken.label "Taken">
<!ENTITY panel.setphotos.taken.tip "When the picture was taken">
<!ENTITY panel.setphotos.upload.label "Uploaded">
<!ENTITY panel.setphotos.upload.tip "When the picure was uploaded">
<!ENTITY panel.setphotos.generate_html "Generate HTML">
<!ENTITY panel.tagslist.tag.label "Tag">
<!ENTITY panel.uploadlist.file.label "File name">
<!ENTITY panel.uploadlist.title.label "Title">
<!ENTITY panel.uploadlist.status.label "Status">
<!ENTITY panel.upload_props.filename.label "File:">
<!ENTITY panel.upload_props.title.label "Title:">
<!ENTITY panel.upload_props.tags.label "Tags:">
+<!ENTITY panel.upload_props.is_public "Public">
+<!ENTITY panel.upload_props.is_friend "Friends">
+<!ENTITY panel.upload_props.is_family "Family">
<!ENTITY panel.uploads.upload.label "Upload">
<!ENTITY panel.uploads.clear.label "Clear">
<!ENTITY panel.uploads.remove.label "Remove">
<!ENTITY panel.uploads.add.label "Add">
<!ENTITY panel.uploads.generate_html "Generate HTML">
<!ENTITY generated.title "Fireflix: Generated content">
<!ENTITY generated.copy "copy">
<!ENTITY generated.nolf "remove linebreaks">
<!ENTITY browser.sidebar.label "Fireflix">
<!ENTITY browser.sidebar.title "Fireflix">
<!ENTITY browser.sidebar.tooltip "Fireflix">
<!ENTITY photosetprops.title "Photoset properties">
<!ENTITY photosetprops.set_title.label "Photoset title:">
<!ENTITY photosetprops.set_desc.label "Photoset description:">