prevent overflowing in sidebar again

git-svn-id: http://svn.klever.net/kin/fireflix/trunk@177 fe716a7a-6dde-0310-88d9-d003556173a8

2 files changed, 5 insertions, 2 deletions

diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index e5e1742..398dd78 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -1,272 +1,274 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="fireflix.css" type="text/css"?>
 <!DOCTYPE page SYSTEM "chrome://fireflix/locale/fireflix.dtd">
 <page
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  id="fireflixwindow" title="Fireflix"
  onload="fireflix.init()"
  orient="vertical"
  ondragover="nsDragAndDrop.dragOver(event,fireflix.uploadObserver)"
  ondragdrop="nsDragAndDrop.drop(event,fireflix.uploadObserver)"
  >
 
  <script src="chrome://global/content/nsDragAndDrop.js"/>
  <script src="chrome://global/content/nsTransferable.js"/>
  <script type="application/x-javascript" src="md5.js" />
  <script type="application/x-javascript" src="util.js" />
  <script type="application/x-javascript" src="flickr.js" />
  <script type="application/x-javascript" src="fireflix.js" />
 
  <stringbundleset>
   <stringbundle id="loc_strings" src="chrome://fireflix/locale/fireflix.properties" />
  </stringbundleset>
 
  <commandset>
   <command id="cmd_auth_auth" label="&panel.auth.auth.label;"
   oncommand="fireflix.on_cmd_auth()"/>
   <command id="cmd_auth_done" label="&panel.auth.done.label;"
   oncommand="fireflix.on_cmd_auth_done()" disabled="true"/>
   <command id="cmd_auth_open_flickr" label="&panel.auth.flickr.label;"
   oncommand="fireflix.openTab('htp://www.flickr.com/')" />
   <command id="cmd_auth_unauth" label="&panel.auth.unauth.label;"
   oncommand="fireflix.on_cmd_auth_unauth()" />
  </commandset>
  
  <popupset>
   <popup id="auth_menu">
    <menuitem command="cmd_auth_auth"/>
    <menuitem command="cmd_auth_done" hidden="true" id="menu_auth_done"/>
    <menuitem command="cmd_auth_unauth" />
    <menuseparator/>
    <menuitem command="cmd_auth_open_flickr"/>
   </popup>
  </popupset>
 
  <commandset id="cmdset_search">
   <command id="cmd_search" label="&panel.search.cmd_search.label;"
   oncommand="fireflix.foundphotos.search_photos()"/>
   <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;"
   oncommand="fireflix.foundphotos.on_cmd_open(event)" />
  </commandset>
 
  <commandset id="cmdset_sets">
   <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;"
   oncommand="fireflix.on_refresh_sets()" />
   <command id="cmd_set_props" label="&panel.sets.cmd_properties;"
   oncommand="fireflix.on_set_props()" disabled="true" />
  </commandset>
 
  <popupset>
   <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_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;"
   oncommand="fireflix.uploads.on_add()" />
  </commandset>
 
  <popupset>
   <popup id="uploads_menu">
    <menuitem command="cmd_uploads_add"/>
    <menuitem command="cmd_uploads_clear"/>
    <menuitem command="cmd_uploads_remove"/>
    <menuseparator/>
    <menuitem command="cmd_uploads_upload"/>
    <menuseparator/>
    <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/>
   </popup>
  </popupset>
 
  <vbox class="wholething" flex="1">
 
   <groupbox context="auth_menu">
    <caption label="&panel.auth_info;"/>
    <hbox>
     <label id="auth_info" value="&panel.no_auth_info;" flex="1" disabled="true" crop="end"/>
     <button id="b_auth" command="cmd_auth_auth"/>
     <button id="b_auth_done" command="cmd_auth_done" hidden="true"/>
     <button command="cmd_auth_open_flickr" 
     tooltiptext="&panel.auth.flickr.tip;"/>
    </hbox>
   </groupbox>
 
   <tabbox flex="1" id="fireflix_tabs">
 
    <tabs>
     <tab label="&panel.tabs.search;"/>
     <tab label="&panel.tabs.sets;"/>
     <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: -->
     <tab id="tab_upload" label="&panel.tabs.upload;"/>
    </tabs>
 
    <tabpanels flex="1">
 
     <tabpanel id="tabpanel_search" flex="1">
      <vbox flex="1">
       <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()">
        <hbox>
 	<label control="search_for" value="&panel.search.search_for.label;"
 	accesskey="s"/>
 	<textbox id="search_for" flex="1"/>
        </hbox>
        <hbox>
         <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;"
 	tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false"
 	accesskey="t" />
 	<checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/>
 	<spacer flex="1"/>
 	<button command="cmd_search"/>
        </hbox>
       </groupbox>
       <tree id="searchresults" rows="2" flex="1"
       onselect="fireflix.foundphotos.on_select()"
       ondblclick="fireflix.foundphotos.on_cmd_open(event)"
       onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
       fireflix.foundphotos.on_cmd_open(event)">
        <treecols>
         <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" />
        </treecols>
        <treechildren/>
       </tree>
       <groupbox id="searchresult_props" orient="horizontal" hidden="true">
        <vbox width="100" pack="center">
         <hbox pack="center">
          <image id="search_photo"/>
 	</hbox>
        </vbox>
        <vbox flex="1">
-        <label id="searchresult_title"/>
-	<div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/>
+        <label id="searchresult_title" crop="end"/>
+	<hbox flex="1" pack="center">
+	 <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/>
+	</hbox>
 	<hbox pack="end">
 	 <button command="cmd_search_open"/>
 	</hbox>
        </vbox>
       </groupbox>
      </vbox>
     </tabpanel>
 
     <tabpanel id="tabpanel_sets" flex="1"
      onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
      document.getElementById('setphotos').focus()">
      <vbox flex="1">
       <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()"
       flex="1" context="sets_menu"
       >
        <treecols>
 	<treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/>
 	<splitter class="tree-splitter" />
 	<treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" />
        </treecols>
        <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">
        <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>
       <groupbox id="set_photo_props" orient="horizontal">
        <vbox width="100" pack="center">
         <hbox pack="center">
 	 <image id="set_photo" hidden="true"/>
 	</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="horizontal" hidden="true">
        <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="uplod_tags" value="&panel.upload_props.tags.label;" />
 	  <textbox id="upload_tags"
 	  oninput="fireflix.uploads.propsToSel('tags')"/>
 	 </row>
 	 <!-- TODO: description, public, friend, family -->
 	</rows>
        </grid>
       </groupbox>
       <hbox>
        <button command="cmd_uploads_add" />
        <spacer flex="1"/>
        <button command="cmd_uploads_remove" />
        <spacer flex="1"/>
        <button 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 f180379..e144aae 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -589,318 +589,319 @@ var fireflix = {
    null, "dependent,modal,dialog,chrome", this,
    pset );
   if(pset.dirty) {
    var _this = this;
    this.flickr.api_call(
     {
      method: 'flickr.photosets.editMeta',
      auth_token: 'default',
      photoset_id: pset.id,
      title: pset.title,
      description: pset.description
     }, function(xr) {
      pset.dirty = false;
      _this.flickr.api_call(
       {
        method: 'flickr.photosets.getPhotos',
        auth_token: 'default',
        photoset_id: pset.id
       }, function(xr) {
        var x = xr.responseXML;
        var xp = x.evaluate(
         '/rsp/photoset/photo', x, null,
 	XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
        var phids = new Array();
        var priph = null;
        var n; while(n=xp.iterateNext()) {
         var pid = n.getAttribute('id');
         phids.push( pid );
 	if(pid==pset.primary && n.getAttribute('isprimary')!='1')
 	 priph = pid;
        }
        if(priph) {
 	_this.flickr.api_call(
 	 {
 	  method: 'flickr.photosets.editPhotos',
 	  auth_token: 'default',
 	  photoset_id: pset.id,
 	  primary_photo_id: priph,
 	  photo_ids: phids.join(',')
 	 }, function() { }, function(x,s,c,m) { /* flickr.photosets.editPhotos */
 	  _this.flickr_failure(x,s,c,m);
 	 }
 	);
        }
       }, function(x,s,c,m) { /* flickr.photosets.getPhotos */
        _this.flickr_failure(x,s,c,m);
       }
      );
     }, function(x,s,c,m) { /* flickr.photosets.editMeta */
      _this.flickr_failure(x,s,c,m);
     }
    );
   }
  },
  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_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);
   }
   var pp = this.uploads.rowCount*2; if(pp>500) pp = 500;
   var _this = this;
   this.flickr.api_call(
    {
     method: 'flickr.photos.search',
     auth_token: 'default',
     extras: 'original_format',
     user_id: 'me',
     per_page: pp
    },
    function(xr) {
     var x = xr.responseXML;
     var rv = '';
     for(var pn in pids) {
      var p = pids[pn];
      var pp = new Photo(xp_node('/rsp/photos/photo[@id='+p+']',x));
      rv += _this.photo_html(pp,uti,utl)+'\n';
     }
     _this.popup_content(rv);
    }, function(x,s,c,m) {
     _this.flickr_failure(x,s,c,m);
    }
   );
  },
 
  /*
   *
   */
  foundphotos: {
   fireflix: null,
   init: function(f) {
    this.fireflix = f;
    pull_elements(this,document,[
     'search_for','search_tags','search_mine',
     'searchresult_props','search_photo',
     'searchresult_title','searchresult_description'
    ]);
    document.getElementById('searchresults').view = this;
   },
   photos: new Array(),
   rowCount: 0,
   getCellText: function(r,c) {
    var p = this.photos[r];
    if(c.id=='sr_title') return p.title;
    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) { },
   getCellProperties: function(cid,cel,p) { },
   getColumnProperties: function(cid,cel,p) { },
   cycleHeader: function(cid,e) { },
   getParentIndex: function(r) { return -1 },
   drop: function(r,o) { },
   canDropBeforeAfter: function(r,b) { return false },
 
   importXPR: function(xp) {
    this.selection.clearSelection();
    this.selection.currentIndex = -1;
    this.searchresult_props.hidden = true;
    this.tree.beginUpdateBatch();
    this.photos = new Array();
    var n; while(n=xp.iterateNext()) {
     this.photos.push(new Photo(n));
    }
    this.rowCount = this.photos.length;
    this.tree.endUpdateBatch();
   },
   search_photos: function() {
    var pars = {
     method: 'flickr.photos.search',
     auth_token: 'default',
     extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo'
    };
    if(this.search_mine.checked)
     pars.user_id='me';
    if(this.search_tags.checked) {
     pars.tags=this.search_for.value.split(/ +/).join(',');
    }else{
     pars.text=this.search_for.value;
    }
    var _this = this;
    this.fireflix.flickr.api_call( pars,
     function(xr) {
      var x = xr.responseXML;
      var xp = x.evaluate(
       '/rsp/photos/photo', x, null,
       XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
      _this.importXPR(xp);
      _this.tree.ensureRowIsVisible(0);
      _this.on_select();
     }, function(x,s,c,m) {
      _this.fireflix.flickr_failure(x,s,c,m);
     }
    );
   },
   render_description_frame: function(content) {
    if(!content) {
     this.searchresult_description.innerHTML = '';
    }else{
     this.searchresult_description.innerHTML = content?content:'';
     /* of all linking elements flickr only allows a */
     var as = this.searchresult_description.getElementsByTagName('a');
     for(var a=0;a<as.length;++a)
      as.item(a).setAttribute('target','_blank');
    }
   },
   on_select: function() {
    if(this.selection.currentIndex<0) {
     this.searchresult_props.hidden = true;
    }else{
     var p = this.photos[this.selection.currentIndex];
     if(!p) {
      this.searchresult_props.hidden = true;
     }else{
      this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t');
      this.searchresult_title.value = p.title;
+     this.searchresult_title.tooltipText = p.title;
      this.render_description_frame(null);
      if(p.description==null && p.description==undefined) {
       var pid = p.id;
       var ci = this.selection.currentIndex;
       var _this = this;
       this.fireflix.flickr.api_call(
        {
 	method: 'flickr.photos.getInfo',
 	auth_token: 'default',
 	photo_id: p.id,
 	secret: p.secret
        }, function(xr) {
 	var pp = _this.photos[ci];
 	if(ci==_this.selection.currentIndex && pp.id==pid) {
 	 var n = xp_node('/rsp/photo',xr.responseXML);
 	 pp.fromNode_(n);
 	 _this.render_description_frame(pp.description);
 	}
        }, function(x,s,c,m) {
 	_this.fireflix.flickr_failure(x,s,c,m);
        }
       );
       this.searchresult_props.hidden = false;
      }else{
       this.render_description_frame(p.description);
      }
     }
    }
   },
   on_cmd_open: function(ev) {
    if(this.selection.currentIndex<0)
     return;
    var p = this.photos[this.selection.currentIndex];
    if(!p.id)
     return;
    this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p'));
   }
  },
 
  photo_html: function(p,i,l) {
   // TODO: add alt/title when possible
   var rv = 
    '<a href="'+this.flickr.make_photo_url(p,l)+'">' +
    '<img src="'+this.flickr.make_photo_url(p,i)+'" />'+
    '</a>';
   return rv;
  },
  build_html: function(photos,uti,utl) {
   var rv = '';
   for(var i in photos) {
    var p = photos[i];
    rv += this.photo_html(p,utl,uti)+'\n';
   }
   return rv;
  },
 
  popup_content: function(s) {
   window.openDialog(
    "chrome://fireflix/content/generated-content.xul",
    null, "dialog,chrome", this, s );
  },
  copy_to_clipboard: function(s) {
   var ch = Components.classes["@mozilla.org/widget/clipboardhelper;1"]
    .getService(Components.interfaces.nsIClipboardHelper);
   ch.copyString(s); 
  },
  openTab: function(l) {
   var wm = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(
    Components.interfaces.nsIWindowMediator );
   var bw = wm.getMostRecentWindow('navigator:browser');
   var b = bw.getBrowser();
   var t = b.addTab(l);
   b.selectedTab = t;
  },
 
  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('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;
   t=mp.appendChild(document.createElement('menuitem'));
   t.setAttribute('label',this.loc_strings.getString('menutitle_Images'));
   t.setAttribute('class','menuhead');t.setAttribute('disabled','true');
   mp.appendChild(document.createElement('menuseparator'));
   var cs = document.getElementById(csid);
   for(var iti=0;iti<imgt.length;++iti) {
    t = mp.appendChild(document.createElement('menu'));
    t.setAttribute('label',this.loc_strings.getString('urltype_'+imgt.charAt(iti)));
    var smp = t.appendChild(document.createElement('menupopup'));
    t=smp.appendChild(document.createElement('menuitem'));
    t.setAttribute('label',this.loc_strings.getString('menutitle_Links'));
    t.setAttribute('class','menuhead');t.setAttribute('disabled','true');
    smp.appendChild(document.createElement('menuseparator'));
    for(var lti=0;lti<lnkt.length;++lti) {
     var csfx = imgt.charAt(iti)+lnkt.charAt(lti);
     t=smp.appendChild(document.createElement('menuitem'));
     t.setAttribute('label',this.loc_strings.getString('urltype_'+lnkt.charAt(lti)));
     t.setAttribute('command',cpfx+'_'+csfx);
     t=cs.appendChild(document.createElement('command'));
     t.setAttribute('id',cpfx+'_'+csfx);
     t.setAttribute('oncommand','fireflix.on_'+cpfx+"('"+csfx+"',event)");
    }
   }
   return mp;
  },
 
  flickr_failure: function(x,s,c,m) {
   if(c==98) { // Invalid auth token
    this.flickr.reset_token();
    this.set_auth_state(false,false);
    return;
   }
   // TODO: is that beauty?
   alert('flickr api call failed\n'+c+' '+m);
  }
 
 };