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
@@ -258,31 +258,38 @@
       <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>
diff --git a/content/fireflix.js b/content/fireflix.js
index 7291b68..78e56c2 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -332,9 +332,22 @@ var fireflix = {
    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,
@@ -385,6 +398,7 @@ var fireflix = {
     file: f,
     title: t,
     tags: '',
+    is_public: true, is_friend: false, is_family: false,
     state: 'pending'
    } );
    this.rowCount = this.files.length;
@@ -400,8 +414,12 @@ var fireflix = {
      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';
@@ -491,6 +509,9 @@ var fireflix = {
    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() {
@@ -504,15 +525,15 @@ var fireflix = {
      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;
@@ -559,12 +580,12 @@ var fireflix = {
    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);
     }
    }
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
@@ -69,6 +69,9 @@
 <!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">