summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2006-11-16 22:33:43 (UTC)
committer Michael Krelin <hacker@klever.net>2006-11-16 22:33:43 (UTC)
commit77bede81381ed1adbda91a119128712a3688b4bd (patch) (side-by-side diff)
treeb4021f71605bf4cee254684377759873c7967375
parentd98dfeb112f9db06c5e642e14ee9bbda4d90d0cb (diff)
downloadfireflix-77bede81381ed1adbda91a119128712a3688b4bd.zip
fireflix-77bede81381ed1adbda91a119128712a3688b4bd.tar.gz
fireflix-77bede81381ed1adbda91a119128712a3688b4bd.tar.bz2
hiding photo properties completely in photoset browser when no photo selected
git-svn-id: http://svn.klever.net/kin/fireflix/trunk@230 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS.xml2
-rw-r--r--content/fireflix-panel.xul4
-rw-r--r--content/fireflix.js6
3 files changed, 7 insertions, 5 deletions
diff --git a/NEWS.xml b/NEWS.xml
index b8f1cf4..6d17c53 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="us-ascii"?>
<news>
<version version="0.0.5">
<ni>Added toolbar button</ni>
<ni>Enter or double click on photo in set now opens photo in flickr</ni>
<ni>Double click on photoset opens photoset in flickr</ni>
+ <ni>Hiding completely photo properties in sets browser when no photo
+ selected</ni>
</version>
<version version="0.0.4" date="November 13th, 2006">
<ni>Added button to remove linebreaks from generated HTML</ni>
<ni>Added the word 'sidebar' to the extension name so that you don't have to look hard for it</ni>
<ni>UI polishing, including making it more boring</ni>
<ni>code cosmetics</ni>
</version>
<version version="0.0.3" date="November 6th, 2006">
<ni>Firefox 2.0 compatibility</ni>
</version>
<version version="0.0.2" date="October 17th, 2006">
<ni>Added brief help file</ni>
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index af92d22..62862a9 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -199,28 +199,28 @@
</hbox>
<tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()"
flex="1" ondblclick="fireflix.photoset.on_cmd_open(event)"
onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.photoset.on_cmd_open(event)">
<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">
+ <groupbox id="set_photo_props" orient="horizontal" hidden="true">
<vbox width="100" pack="center">
<hbox pack="center">
- <image id="set_photo" hidden="true"
+ <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;"/>
diff --git a/content/fireflix.js b/content/fireflix.js
index 48053c5..328e9e2 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -84,25 +84,25 @@ var fireflix = {
refresh_sets: function() { this.photosets.refresh_sets(); },
refresh_stuff: function() {
this.refresh_sets();
this.refresh_user_tags();
},
/* photoset treeview */
photoset: {
photos: new Array(),
fireflix: null,
init: function(f) {
this.fireflix = f;
- pull_elements(this,document,[ 'set_photo' ]);
+ pull_elements(this,document,[ 'set_photo', 'set_photo_props' ]);
document.getElementById('setphotos').view = this;
},
rowCount: 0,
getCellText: function(r,c) {
var p = this.photos[r];
if(c.id=='sp_title') return p.title;
if(c.id=='sp_taken') return p.datetaken;
if(c.id=='sp_upload') {
var du = new Date(p.dateupload*1000);
var rv = du.getFullYear()+'-'+(du.getMonth()+1)+'-'+du.getDate()
+' '+
du.getHours()+':'+du.getMinutes()+':'+du.getSeconds();
@@ -149,27 +149,27 @@ var fireflix = {
XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
_this.importXPR(xp);
}, function(x,s,c,m) {
_this.fireflix.flickr_failure(x,s,c,m);
}
);
},
on_select: function() {
if(this.selection.count==1) {
var p = this.photos[this.selection.currentIndex];
this.set_photo.src =
this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t');
- this.set_photo.hidden = false;
+ this.set_photo_props.hidden = false;
}else{
- this.set_photo.hidden = true;
+ this.set_photo_props.hidden = true;
}
},
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'));
}
},
/* photosets treeview */
photosets: {