summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix-panel.xul13
-rw-r--r--content/fireflix.css10
-rw-r--r--content/fireflix.js50
-rw-r--r--content/util.js7
-rw-r--r--locale/en-US/fireflix.dtd2
-rw-r--r--locale/en-US/fireflix.properties2
6 files changed, 79 insertions, 5 deletions
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index 398dd78..bf6df73 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -3,178 +3,191 @@
3<?xml-stylesheet href="fireflix.css" type="text/css"?> 3<?xml-stylesheet href="fireflix.css" type="text/css"?>
4<!DOCTYPE page SYSTEM "chrome://fireflix/locale/fireflix.dtd"> 4<!DOCTYPE page SYSTEM "chrome://fireflix/locale/fireflix.dtd">
5<page 5<page
6 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 6 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
7 id="fireflixwindow" title="Fireflix" 7 id="fireflixwindow" title="Fireflix"
8 onload="fireflix.init()" 8 onload="fireflix.init()"
9 orient="vertical" 9 orient="vertical"
10 ondragover="nsDragAndDrop.dragOver(event,fireflix.uploadObserver)" 10 ondragover="nsDragAndDrop.dragOver(event,fireflix.uploadObserver)"
11 ondragdrop="nsDragAndDrop.drop(event,fireflix.uploadObserver)" 11 ondragdrop="nsDragAndDrop.drop(event,fireflix.uploadObserver)"
12 > 12 >
13 13
14 <script src="chrome://global/content/nsDragAndDrop.js"/> 14 <script src="chrome://global/content/nsDragAndDrop.js"/>
15 <script src="chrome://global/content/nsTransferable.js"/> 15 <script src="chrome://global/content/nsTransferable.js"/>
16 <script type="application/x-javascript" src="md5.js" /> 16 <script type="application/x-javascript" src="md5.js" />
17 <script type="application/x-javascript" src="util.js" /> 17 <script type="application/x-javascript" src="util.js" />
18 <script type="application/x-javascript" src="flickr.js" /> 18 <script type="application/x-javascript" src="flickr.js" />
19 <script type="application/x-javascript" src="fireflix.js" /> 19 <script type="application/x-javascript" src="fireflix.js" />
20 20
21 <stringbundleset> 21 <stringbundleset>
22 <stringbundle id="loc_strings" src="chrome://fireflix/locale/fireflix.properties" /> 22 <stringbundle id="loc_strings" src="chrome://fireflix/locale/fireflix.properties" />
23 </stringbundleset> 23 </stringbundleset>
24 24
25 <commandset> 25 <commandset>
26 <command id="cmd_auth_auth" label="&panel.auth.auth.label;" 26 <command id="cmd_auth_auth" label="&panel.auth.auth.label;"
27 oncommand="fireflix.on_cmd_auth()"/> 27 oncommand="fireflix.on_cmd_auth()"/>
28 <command id="cmd_auth_done" label="&panel.auth.done.label;" 28 <command id="cmd_auth_done" label="&panel.auth.done.label;"
29 oncommand="fireflix.on_cmd_auth_done()" disabled="true"/> 29 oncommand="fireflix.on_cmd_auth_done()" disabled="true"/>
30 <command id="cmd_auth_open_flickr" label="&panel.auth.flickr.label;" 30 <command id="cmd_auth_open_flickr" label="&panel.auth.flickr.label;"
31 oncommand="fireflix.openTab('htp://www.flickr.com/')" /> 31 oncommand="fireflix.openTab('htp://www.flickr.com/')" />
32 <command id="cmd_auth_unauth" label="&panel.auth.unauth.label;" 32 <command id="cmd_auth_unauth" label="&panel.auth.unauth.label;"
33 oncommand="fireflix.on_cmd_auth_unauth()" /> 33 oncommand="fireflix.on_cmd_auth_unauth()" />
34 </commandset> 34 </commandset>
35 35
36 <popupset> 36 <popupset>
37 <popup id="auth_menu"> 37 <popup id="auth_menu">
38 <menuitem command="cmd_auth_auth"/> 38 <menuitem command="cmd_auth_auth"/>
39 <menuitem command="cmd_auth_done" hidden="true" id="menu_auth_done"/> 39 <menuitem command="cmd_auth_done" hidden="true" id="menu_auth_done"/>
40 <menuitem command="cmd_auth_unauth" /> 40 <menuitem command="cmd_auth_unauth" />
41 <menuseparator/> 41 <menuseparator/>
42 <menuitem command="cmd_auth_open_flickr"/> 42 <menuitem command="cmd_auth_open_flickr"/>
43 </popup> 43 </popup>
44 </popupset> 44 </popupset>
45 45
46 <commandset id="cmdset_search"> 46 <commandset id="cmdset_search">
47 <command id="cmd_search" label="&panel.search.cmd_search.label;" 47 <command id="cmd_search" label="&panel.search.cmd_search.label;"
48 oncommand="fireflix.foundphotos.search_photos()"/> 48 oncommand="fireflix.foundphotos.search_photos()"/>
49 <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;" 49 <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;"
50 oncommand="fireflix.foundphotos.on_cmd_open(event)" /> 50 oncommand="fireflix.foundphotos.on_cmd_open(event)" />
51 <command id="cmd_search_prev_page"
52 label="&panel.search.cmd_search_prev_page.label;"
53 oncommand="fireflix.foundphotos.on_cmd_prev(event)" disabled="true"/>
54 <command id="cmd_search_next_page"
55 label="&panel.search.cmd_search_next_page.label;"
56 oncommand="fireflix.foundphotos.on_cmd_next(event)" disabled="true"/>
51 </commandset> 57 </commandset>
52 58
53 <commandset id="cmdset_sets"> 59 <commandset id="cmdset_sets">
54 <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;" 60 <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;"
55 oncommand="fireflix.on_refresh_sets()" /> 61 oncommand="fireflix.on_refresh_sets()" />
56 <command id="cmd_set_props" label="&panel.sets.cmd_properties;" 62 <command id="cmd_set_props" label="&panel.sets.cmd_properties;"
57 oncommand="fireflix.on_set_props()" disabled="true" /> 63 oncommand="fireflix.on_set_props()" disabled="true" />
58 </commandset> 64 </commandset>
59 65
60 <popupset> 66 <popupset>
61 <popup id="sets_menu"> 67 <popup id="sets_menu">
62 <menuitem command="cmd_set_props"/> 68 <menuitem command="cmd_set_props"/>
63 <menuitem command="cmd_refresh_sets"/> 69 <menuitem command="cmd_refresh_sets"/>
64 <menuseparator/> 70 <menuseparator/>
65 <menu label="&panel.sets.generate_html;" id="sets_html_menu"/> 71 <menu label="&panel.sets.generate_html;" id="sets_html_menu"/>
66 </popup> 72 </popup>
67 </popupset> 73 </popupset>
68 74
69 <commandset id="cmdset_uploads"> 75 <commandset id="cmdset_uploads">
70 <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;" 76 <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;"
71 oncommand="fireflix.uploads.on_clear()" /> 77 oncommand="fireflix.uploads.on_clear()" />
72 <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;" 78 <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;"
73 oncommand="fireflix.uploads.on_upload()" /> 79 oncommand="fireflix.uploads.on_upload()" />
74 <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;" 80 <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;"
75 oncommand="fireflix.uploads.on_remove()" /> 81 oncommand="fireflix.uploads.on_remove()" />
76 <command id="cmd_uploads_add" label="&panel.uploads.add.label;" 82 <command id="cmd_uploads_add" label="&panel.uploads.add.label;"
77 oncommand="fireflix.uploads.on_add()" /> 83 oncommand="fireflix.uploads.on_add()" />
78 </commandset> 84 </commandset>
79 85
80 <popupset> 86 <popupset>
81 <popup id="uploads_menu"> 87 <popup id="uploads_menu">
82 <menuitem command="cmd_uploads_add"/> 88 <menuitem command="cmd_uploads_add"/>
83 <menuitem command="cmd_uploads_clear"/> 89 <menuitem command="cmd_uploads_clear"/>
84 <menuitem command="cmd_uploads_remove"/> 90 <menuitem command="cmd_uploads_remove"/>
85 <menuseparator/> 91 <menuseparator/>
86 <menuitem command="cmd_uploads_upload"/> 92 <menuitem command="cmd_uploads_upload"/>
87 <menuseparator/> 93 <menuseparator/>
88 <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/> 94 <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/>
89 </popup> 95 </popup>
90 </popupset> 96 </popupset>
91 97
92 <vbox class="wholething" flex="1"> 98 <vbox class="wholething" flex="1">
93 99
94 <groupbox context="auth_menu"> 100 <groupbox context="auth_menu">
95 <caption label="&panel.auth_info;"/> 101 <caption label="&panel.auth_info;"/>
96 <hbox> 102 <hbox>
97 <label id="auth_info" value="&panel.no_auth_info;" flex="1" disabled="true" crop="end"/> 103 <label id="auth_info" value="&panel.no_auth_info;" flex="1" disabled="true" crop="end"/>
98 <button id="b_auth" command="cmd_auth_auth"/> 104 <button id="b_auth" command="cmd_auth_auth"/>
99 <button id="b_auth_done" command="cmd_auth_done" hidden="true"/> 105 <button id="b_auth_done" command="cmd_auth_done" hidden="true"/>
100 <button command="cmd_auth_open_flickr" 106 <button command="cmd_auth_open_flickr"
101 tooltiptext="&panel.auth.flickr.tip;"/> 107 tooltiptext="&panel.auth.flickr.tip;"/>
102 </hbox> 108 </hbox>
103 </groupbox> 109 </groupbox>
104 110
105 <tabbox flex="1" id="fireflix_tabs"> 111 <tabbox flex="1" id="fireflix_tabs">
106 112
107 <tabs> 113 <tabs>
108 <tab label="&panel.tabs.search;"/> 114 <tab label="&panel.tabs.search;"/>
109 <tab label="&panel.tabs.sets;"/> 115 <tab label="&panel.tabs.sets;"/>
110 <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: --> 116 <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: -->
111 <tab id="tab_upload" label="&panel.tabs.upload;"/> 117 <tab id="tab_upload" label="&panel.tabs.upload;"/>
112 </tabs> 118 </tabs>
113 119
114 <tabpanels flex="1"> 120 <tabpanels flex="1">
115 121
116 <tabpanel id="tabpanel_search" flex="1"> 122 <tabpanel id="tabpanel_search" flex="1">
117 <vbox flex="1"> 123 <vbox flex="1">
118 <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()"> 124 <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()">
119 <hbox> 125 <hbox>
120 <label control="search_for" value="&panel.search.search_for.label;" 126 <label control="search_for" value="&panel.search.search_for.label;"
121 accesskey="s"/> 127 accesskey="s"/>
122 <textbox id="search_for" flex="1"/> 128 <textbox id="search_for" flex="1"/>
123 </hbox> 129 </hbox>
124 <hbox> 130 <hbox>
125 <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;" 131 <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;"
126 tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false" 132 tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false"
127 accesskey="t" /> 133 accesskey="t" />
128 <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/> 134 <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/>
129 <spacer flex="1"/> 135 <spacer flex="1"/>
130 <button command="cmd_search"/> 136 <button command="cmd_search"/>
131 </hbox> 137 </hbox>
132 </groupbox> 138 </groupbox>
139 <hbox>
140 <button command="cmd_search_prev_page"/>
141 <spacer flex="1"/>
142 <label id="search_page" hidden="true"/>
143 <spacer flex="1"/>
144 <button command="cmd_search_next_page"/>
145 </hbox>
133 <tree id="searchresults" rows="2" flex="1" 146 <tree id="searchresults" rows="2" flex="1"
134 onselect="fireflix.foundphotos.on_select()" 147 onselect="fireflix.foundphotos.on_select()"
135 ondblclick="fireflix.foundphotos.on_cmd_open(event)" 148 ondblclick="fireflix.foundphotos.on_cmd_open(event)"
136 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) 149 onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
137 fireflix.foundphotos.on_cmd_open(event)"> 150 fireflix.foundphotos.on_cmd_open(event)">
138 <treecols> 151 <treecols>
139 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" /> 152 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" />
140 </treecols> 153 </treecols>
141 <treechildren/> 154 <treechildren/>
142 </tree> 155 </tree>
143 <groupbox id="searchresult_props" orient="horizontal" hidden="true"> 156 <groupbox id="searchresult_props" orient="horizontal" hidden="true">
144 <vbox width="100" pack="center"> 157 <vbox width="100" pack="center">
145 <hbox pack="center"> 158 <hbox pack="center">
146 <image id="search_photo"/> 159 <image id="search_photo"/>
147 </hbox> 160 </hbox>
148 </vbox> 161 </vbox>
149 <vbox flex="1"> 162 <vbox flex="1">
150 <label id="searchresult_title" crop="end"/> 163 <label id="searchresult_title" crop="end"/>
151 <hbox flex="1" pack="center"> 164 <hbox flex="1" pack="center">
152 <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/> 165 <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/>
153 </hbox> 166 </hbox>
154 <hbox pack="end"> 167 <hbox pack="end">
155 <button command="cmd_search_open"/> 168 <button command="cmd_search_open"/>
156 </hbox> 169 </hbox>
157 </vbox> 170 </vbox>
158 </groupbox> 171 </groupbox>
159 </vbox> 172 </vbox>
160 </tabpanel> 173 </tabpanel>
161 174
162 <tabpanel id="tabpanel_sets" flex="1" 175 <tabpanel id="tabpanel_sets" flex="1"
163 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) 176 onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
164 document.getElementById('setphotos').focus()"> 177 document.getElementById('setphotos').focus()">
165 <vbox flex="1"> 178 <vbox flex="1">
166 <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()" 179 <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()"
167 flex="1" context="sets_menu" 180 flex="1" context="sets_menu"
168 > 181 >
169 <treecols> 182 <treecols>
170 <treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/> 183 <treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/>
171 <splitter class="tree-splitter" /> 184 <splitter class="tree-splitter" />
172 <treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" /> 185 <treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" />
173 </treecols> 186 </treecols>
174 <treechildren/> 187 <treechildren/>
175 </tree> 188 </tree>
176 <hbox> 189 <hbox>
177 <button command="cmd_refresh_sets" /> 190 <button command="cmd_refresh_sets" />
178 <button command="cmd_set_props" /> 191 <button command="cmd_set_props" />
179 </hbox> 192 </hbox>
180 <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()" 193 <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()"
diff --git a/content/fireflix.css b/content/fireflix.css
index 71080d1..9e7bf6b 100644
--- a/content/fireflix.css
+++ b/content/fireflix.css
@@ -42,48 +42,58 @@ groupbox#set_photo_props {
42 42
43groupbox#upload_file_props label { 43groupbox#upload_file_props label {
44 text-align: right; 44 text-align: right;
45} 45}
46 46
47image#search_photo, image#set_photo, image#set_primary { 47image#search_photo, image#set_photo, image#set_primary {
48 border: black 1px solid; 48 border: black 1px solid;
49} 49}
50 50
51.about .insides { 51.about .insides {
52 margin: 1ex; 52 margin: 1ex;
53} 53}
54.about .text { 54.about .text {
55 border: yellow solid 1px; 55 border: yellow solid 1px;
56 background: green; 56 background: green;
57} 57}
58.about .title { 58.about .title {
59 font-size: 300%; 59 font-size: 300%;
60 font-weight: bold; 60 font-weight: bold;
61 color: yellow; 61 color: yellow;
62} 62}
63.about .link { 63.about .link {
64 text-decoration: underline; 64 text-decoration: underline;
65 color: white; 65 color: white;
66 cursor: pointer; 66 cursor: pointer;
67} 67}
68 68
69menuitem.menuhead { 69menuitem.menuhead {
70 background: gray; 70 background: gray;
71 color: black; 71 color: black;
72 font-weight: bold; 72 font-weight: bold;
73} 73}
74 74
75div#searchresult_description { 75div#searchresult_description {
76 min-height: 5em; max-height: 8em; 76 min-height: 5em; max-height: 8em;
77 overflow: auto; 77 overflow: auto;
78 font-size: 90%; 78 font-size: 90%;
79 margin: 0.1ex 0.5ex; 79 margin: 0.1ex 0.5ex;
80} 80}
81 81
82#copying div { 82#copying div {
83 margin: 1ex 1em; 83 margin: 1ex 1em;
84 font-family: courier, monospace; 84 font-family: courier, monospace;
85 font-size: 9pt; 85 font-size: 9pt;
86 padding: 2px; 86 padding: 2px;
87 border: dotted 1px gray; 87 border: dotted 1px gray;
88 background: white; 88 background: white;
89} 89}
90
91label#search_page {
92 font-weight: bold;
93 background: white; color: #404040;
94 border-color: #c0c0c0 #404040 #404040 #c0c0c0;
95 border-style: solid;
96 border-width: 1px;
97 -moz-border-radius: 1em;
98 padding: 0.5ex 1ex;
99}
diff --git a/content/fireflix.js b/content/fireflix.js
index e144aae..92c42f4 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -647,161 +647,201 @@ var fireflix = {
647 var uti = csfx.charAt(0); var utl = csfx.charAt(1); 647 var uti = csfx.charAt(0); var utl = csfx.charAt(1);
648 var rv = this.build_html(this.photoset.photos,uti,utl); 648 var rv = this.build_html(this.photoset.photos,uti,utl);
649 this.popup_content(rv); 649 this.popup_content(rv);
650 }, 650 },
651 651
652 on_cmd_uploads_html: function(csfx,ev) { 652 on_cmd_uploads_html: function(csfx,ev) {
653 var uti = csfx.charAt(0); var utl = csfx.charAt(1); 653 var uti = csfx.charAt(0); var utl = csfx.charAt(1);
654 var pids = new Array(); 654 var pids = new Array();
655 for(var f in this.uploads.files) { 655 for(var f in this.uploads.files) {
656 if(this.uploads.selection.isSelected(f)) 656 if(this.uploads.selection.isSelected(f))
657 if(this.uploads.files[f].photoid) 657 if(this.uploads.files[f].photoid)
658 pids.push(this.uploads.files[f].photoid); 658 pids.push(this.uploads.files[f].photoid);
659 } 659 }
660 var pp = this.uploads.rowCount*2; if(pp>500) pp = 500; 660 var pp = this.uploads.rowCount*2; if(pp>500) pp = 500;
661 var _this = this; 661 var _this = this;
662 this.flickr.api_call( 662 this.flickr.api_call(
663 { 663 {
664 method: 'flickr.photos.search', 664 method: 'flickr.photos.search',
665 auth_token: 'default', 665 auth_token: 'default',
666 extras: 'original_format', 666 extras: 'original_format',
667 user_id: 'me', 667 user_id: 'me',
668 per_page: pp 668 per_page: pp
669 }, 669 },
670 function(xr) { 670 function(xr) {
671 var x = xr.responseXML; 671 var x = xr.responseXML;
672 var rv = ''; 672 var rv = '';
673 for(var pn in pids) { 673 for(var pn in pids) {
674 var p = pids[pn]; 674 var p = pids[pn];
675 var pp = new Photo(xp_node('/rsp/photos/photo[@id='+p+']',x)); 675 var pp = new Photo(xp_node('/rsp/photos/photo[@id='+p+']',x));
676 rv += _this.photo_html(pp,uti,utl)+'\n'; 676 rv += _this.photo_html(pp,uti,utl)+'\n';
677 } 677 }
678 _this.popup_content(rv); 678 _this.popup_content(rv);
679 }, function(x,s,c,m) { 679 }, function(x,s,c,m) {
680 _this.flickr_failure(x,s,c,m); 680 _this.flickr_failure(x,s,c,m);
681 } 681 }
682 ); 682 );
683 }, 683 },
684 684
685 /* 685 /*
686 * 686 *
687 */ 687 */
688 foundphotos: { 688 foundphotos: {
689 fireflix: null, 689 fireflix: null,
690 init: function(f) { 690 init: function(f) {
691 this.fireflix = f; 691 this.fireflix = f;
692 pull_elements(this,document,[ 692 pull_elements(this,document,[
693 'search_for','search_tags','search_mine', 693 'search_for','search_tags','search_mine',
694 'searchresult_props','search_photo', 694 'searchresult_props','search_photo',
695 'searchresult_title','searchresult_description' 695 'searchresult_title','searchresult_description',
696 'search_page','cmd_search_prev_page','cmd_search_next_page'
696 ]); 697 ]);
697 document.getElementById('searchresults').view = this; 698 document.getElementById('searchresults').view = this;
698 }, 699 },
699 photos: new Array(), 700 photos: new Array(),
700 rowCount: 0, 701 rowCount: 0,
701 getCellText: function(r,c) { 702 getCellText: function(r,c) {
702 var p = this.photos[r]; 703 var p = this.photos[r];
703 if(c.id=='sr_title') return p.title; 704 if(c.id=='sr_title') return p.title;
704 return c.id; 705 return c.id;
705 }, 706 },
706 setTree: function(t) { this.tree = t }, 707 setTree: function(t) { this.tree = t },
707 isContainer: function(r) { return false }, 708 isContainer: function(r) { return false },
708 isSeparator: function(r) { return false }, 709 isSeparator: function(r) { return false },
709 isSorted: function(r) { return false }, 710 isSorted: function(r) { return false },
710 getLevel: function(r) { return 0 }, 711 getLevel: function(r) { return 0 },
711 getImageSrc: function(r,c) { return null }, 712 getImageSrc: function(r,c) { return null },
712 getRowProperties: function(r,p) { }, 713 getRowProperties: function(r,p) { },
713 getCellProperties: function(cid,cel,p) { }, 714 getCellProperties: function(cid,cel,p) { },
714 getColumnProperties: function(cid,cel,p) { }, 715 getColumnProperties: function(cid,cel,p) { },
715 cycleHeader: function(cid,e) { }, 716 cycleHeader: function(cid,e) { },
716 getParentIndex: function(r) { return -1 }, 717 getParentIndex: function(r) { return -1 },
717 drop: function(r,o) { }, 718 drop: function(r,o) { },
718 canDropBeforeAfter: function(r,b) { return false }, 719 canDropBeforeAfter: function(r,b) { return false },
719 720
720 importXPR: function(xp) { 721 importXPR: function(xp) {
721 this.selection.clearSelection(); 722 this.selection.clearSelection();
722 this.selection.currentIndex = -1; 723 this.selection.currentIndex = -1;
723 this.searchresult_props.hidden = true; 724 this.searchresult_props.hidden = true;
724 this.tree.beginUpdateBatch(); 725 this.tree.beginUpdateBatch();
725 this.photos = new Array(); 726 this.photos = new Array();
726 var n; while(n=xp.iterateNext()) { 727 var n; while(n=xp.iterateNext()) {
727 this.photos.push(new Photo(n)); 728 this.photos.push(new Photo(n));
728 } 729 }
729 this.rowCount = this.photos.length; 730 this.rowCount = this.photos.length;
730 this.tree.endUpdateBatch(); 731 this.tree.endUpdateBatch();
731 }, 732 },
733 paging: {
734 pars: null,
735 page: null, pages: null, perpage: null, total: null
736 },
732 search_photos: function() { 737 search_photos: function() {
733 var pars = { 738 var pars = {
734 method: 'flickr.photos.search', 739 method: 'flickr.photos.search',
735 auth_token: 'default', 740 auth_token: 'default',
736 extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo' 741 extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo'
737 }; 742 };
738 if(this.search_mine.checked) 743 if(this.search_mine.checked)
739 pars.user_id='me'; 744 pars.user_id='me';
740 if(this.search_tags.checked) { 745 if(this.search_tags.checked) {
741 pars.tags=this.search_for.value.split(/ +/).join(','); 746 pars.tags=this.search_for.value.split(/ +/).join(',');
742 }else{ 747 }else{
743 pars.text=this.search_for.value; 748 pars.text=this.search_for.value;
744 } 749 }
750 this.paging.pars = new Object();
751 this.paging.page = null; this.paging.pages = null;
752 this.paging.perpage = null; this.paging.total = null;
753 for(var p in pars) this.paging.pars[p] = pars[p];
754 this.perform_search(pars);
755 },
756 perform_search: function(p) {
745 var _this = this; 757 var _this = this;
746 this.fireflix.flickr.api_call( pars, 758 this.fireflix.flickr.api_call( p,
747 function(xr) { 759 function(xr) {
748 var x = xr.responseXML; 760 var x = xr.responseXML;
749 var xp = x.evaluate( 761 var xp = xp_nodes('/rsp/photos/photo',x);
750 '/rsp/photos/photo', x, null,
751 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
752 _this.importXPR(xp); 762 _this.importXPR(xp);
753 _this.tree.ensureRowIsVisible(0); 763 _this.tree.ensureRowIsVisible(0);
764 xp = xp_node('/rsp/photos',x);
765 _this.paging.page = parseInt(xp.getAttribute('page'));
766 _this.paging.pages = parseInt(xp.getAttribute('pages'));
767 _this.paging.perpage = parseInt(xp.getAttribute('perpage'));
768 _this.paging.total = parseInt(xp.getAttribute('total'));
769 _this.update_paging();
754 _this.on_select(); 770 _this.on_select();
755 }, function(x,s,c,m) { 771 }, function(x,s,c,m) {
756 _this.fireflix.flickr_failure(x,s,c,m); 772 _this.fireflix.flickr_failure(x,s,c,m);
757 } 773 }
758 ); 774 );
759 }, 775 },
776 on_cmd_prev: function(ev) {
777 var pars = new Object();
778 for(var p in this.paging.pars) pars[p] = this.paging.pars[p];
779 pars.page=this.paging.page-1; pars.per_page=this.paging.perpage;
780 this.perform_search(pars);
781 },
782 on_cmd_next: function(ev) {
783 var pars = new Object();
784 for(var p in this.paging.pars) pars[p] = this.paging.pars[p];
785 pars.page=this.paging.page+1; pars.per_page=this.paging.perpage;
786 this.perform_search(pars);
787 },
788 update_paging: function() {
789 if(! (this.paging.pars && this.paging.page && this.paging.pages) ) {
790 this.search_page.value=''; this.search_page.hidden = true;
791 this.cmd_search_prev_page.setAttribute('disabled','true');
792 this.cmd_search_next_page.setAttribute('disabled','true');
793 }else{
794 this.search_page.value=this.fireflix.loc_strings.getFormattedString('search_page',[this.paging.page,this.paging.pages]);
795 this.search_page.hidden=false;
796 this.cmd_search_prev_page.setAttribute('disabled',(this.paging.page>1)?'false':'true');
797 this.cmd_search_next_page.setAttribute('disabled',(this.paging.page<this.paging.pages)?'false':'true');
798 }
799 },
760 render_description_frame: function(content) { 800 render_description_frame: function(content) {
761 if(!content) { 801 if(!content) {
762 this.searchresult_description.innerHTML = ''; 802 this.searchresult_description.innerHTML = '';
763 }else{ 803 }else{
764 this.searchresult_description.innerHTML = content?content:''; 804 this.searchresult_description.innerHTML = content?content:'';
765 /* of all linking elements flickr only allows a */ 805 /* of all linking elements flickr only allows a */
766 var as = this.searchresult_description.getElementsByTagName('a'); 806 var as = this.searchresult_description.getElementsByTagName('a');
767 for(var a=0;a<as.length;++a) 807 for(var a=0;a<as.length;++a)
768 as.item(a).setAttribute('target','_blank'); 808 as.item(a).setAttribute('target','_blank');
769 } 809 }
770 }, 810 },
771 on_select: function() { 811 on_select: function() {
772 if(this.selection.currentIndex<0) { 812 if(this.selection.currentIndex<0) {
773 this.searchresult_props.hidden = true; 813 this.searchresult_props.hidden = true;
774 }else{ 814 }else{
775 var p = this.photos[this.selection.currentIndex]; 815 var p = this.photos[this.selection.currentIndex];
776 if(!p) { 816 if(!p) {
777 this.searchresult_props.hidden = true; 817 this.searchresult_props.hidden = true;
778 }else{ 818 }else{
779 this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t'); 819 this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t');
780 this.searchresult_title.value = p.title; 820 this.searchresult_title.value = p.title;
781 this.searchresult_title.tooltipText = p.title; 821 this.searchresult_title.tooltipText = p.title;
782 this.render_description_frame(null); 822 this.render_description_frame(null);
783 if(p.description==null && p.description==undefined) { 823 if(p.description==null && p.description==undefined) {
784 var pid = p.id; 824 var pid = p.id;
785 var ci = this.selection.currentIndex; 825 var ci = this.selection.currentIndex;
786 var _this = this; 826 var _this = this;
787 this.fireflix.flickr.api_call( 827 this.fireflix.flickr.api_call(
788 { 828 {
789 method: 'flickr.photos.getInfo', 829 method: 'flickr.photos.getInfo',
790 auth_token: 'default', 830 auth_token: 'default',
791 photo_id: p.id, 831 photo_id: p.id,
792 secret: p.secret 832 secret: p.secret
793 }, function(xr) { 833 }, function(xr) {
794 var pp = _this.photos[ci]; 834 var pp = _this.photos[ci];
795 if(ci==_this.selection.currentIndex && pp.id==pid) { 835 if(ci==_this.selection.currentIndex && pp.id==pid) {
796 var n = xp_node('/rsp/photo',xr.responseXML); 836 var n = xp_node('/rsp/photo',xr.responseXML);
797 pp.fromNode_(n); 837 pp.fromNode_(n);
798 _this.render_description_frame(pp.description); 838 _this.render_description_frame(pp.description);
799 } 839 }
800 }, function(x,s,c,m) { 840 }, function(x,s,c,m) {
801 _this.fireflix.flickr_failure(x,s,c,m); 841 _this.fireflix.flickr_failure(x,s,c,m);
802 } 842 }
803 ); 843 );
804 this.searchresult_props.hidden = false; 844 this.searchresult_props.hidden = false;
805 }else{ 845 }else{
806 this.render_description_frame(p.description); 846 this.render_description_frame(p.description);
807 } 847 }
diff --git a/content/util.js b/content/util.js
index c4af09e..ccc61cf 100644
--- a/content/util.js
+++ b/content/util.js
@@ -13,58 +13,65 @@ function toutf8(ucode) {
13 0xc0|((cc>> 6)&0x1f), 13 0xc0|((cc>> 6)&0x1f),
14 0x80|( cc &0x3f) ); 14 0x80|( cc &0x3f) );
15 else if(cc<=0xffff) 15 else if(cc<=0xffff)
16 rv += String.fromCharCode( 16 rv += String.fromCharCode(
17 0xe0|((cc>>12)&0x0f), 17 0xe0|((cc>>12)&0x0f),
18 0x80|((cc>> 6)&0x3f), 18 0x80|((cc>> 6)&0x3f),
19 0x80|( cc &0x3f) ); 19 0x80|( cc &0x3f) );
20 else if(cc<=0x1fffff) 20 else if(cc<=0x1fffff)
21 rv += String.fromCharCode( 21 rv += String.fromCharCode(
22 0xf0|((cc>>18)&0x07), 22 0xf0|((cc>>18)&0x07),
23 0x80|((cc>>12)&0x3f), 23 0x80|((cc>>12)&0x3f),
24 0x80|((cc>> 6)&0x3f), 24 0x80|((cc>> 6)&0x3f),
25 0x80|( cc &0x3f) ); 25 0x80|( cc &0x3f) );
26 else if(cc<=0x03ffffff) 26 else if(cc<=0x03ffffff)
27 rv += String.fromCharCode( 27 rv += String.fromCharCode(
28 0xf8|((cc>>24)&0x03), 28 0xf8|((cc>>24)&0x03),
29 0x80|((cc>>18)&0x3f), 29 0x80|((cc>>18)&0x3f),
30 0x80|((cc>>12)&0x3f), 30 0x80|((cc>>12)&0x3f),
31 0x80|((cc>> 6)&0x3f), 31 0x80|((cc>> 6)&0x3f),
32 0x80|( cc &0x3f) ); 32 0x80|( cc &0x3f) );
33 else if(cc<=0x7fffffff) 33 else if(cc<=0x7fffffff)
34 rv += String.fromCharCode( 34 rv += String.fromCharCode(
35 0xfc|((cc>>30)&0x01), 35 0xfc|((cc>>30)&0x01),
36 0x80|((cc>>24)&0x3f), 36 0x80|((cc>>24)&0x3f),
37 0x80|((cc>>18)&0x3f), 37 0x80|((cc>>18)&0x3f),
38 0x80|((cc>>12)&0x3f), 38 0x80|((cc>>12)&0x3f),
39 0x80|((cc>> 6)&0x3f), 39 0x80|((cc>> 6)&0x3f),
40 0x80|( cc &0x3f) ); 40 0x80|( cc &0x3f) );
41 } 41 }
42 return rv; 42 return rv;
43} 43}
44 44
45/* 45/*
46 * extract xpath-specified string value 46 * extract xpath-specified string value
47 */ 47 */
48function xp_str(xp,x) { 48function xp_str(xp,x) {
49 var rv = x.evaluate( 49 var rv = x.evaluate(
50 xp, x, null, XPathResult.STRING_TYPE, null ); 50 xp, x, null, XPathResult.STRING_TYPE, null );
51 return rv.stringValue; 51 return rv.stringValue;
52} 52}
53/* 53/*
54 * extract xpath-specified node 54 * extract xpath-specified node
55 */ 55 */
56function xp_node(xp,x) { 56function xp_node(xp,x) {
57 var rv = x.evaluate( 57 var rv = x.evaluate(
58 xp, x, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null ); 58 xp, x, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null );
59 return rv.singleNodeValue; 59 return rv.singleNodeValue;
60} 60}
61/*
62 * extract xpath-specified ordered set of nodes
63 */
64function xp_nodes(xp,x) {
65 return x.evaluate(
66 xp, x, null, XPathResult.ORDERED_NODE_ITERATOR_TYPE, null);
67}
61 68
62/* 69/*
63 * pull in elements into documents as a member variables 70 * pull in elements into documents as a member variables
64 */ 71 */
65function pull_elements(th,d,els) { 72function pull_elements(th,d,els) {
66 for(var e in els) { 73 for(var e in els) {
67 var en=els[e]; 74 var en=els[e];
68 th[en] = d.getElementById(en); 75 th[en] = d.getElementById(en);
69 } 76 }
70} 77}
diff --git a/locale/en-US/fireflix.dtd b/locale/en-US/fireflix.dtd
index f4ceb79..88ec6fb 100644
--- a/locale/en-US/fireflix.dtd
+++ b/locale/en-US/fireflix.dtd
@@ -1,81 +1,83 @@
1<!ENTITY % autoconf SYSTEM "chrome://fireflix/content/autoconf.dtd"> 1<!ENTITY % autoconf SYSTEM "chrome://fireflix/content/autoconf.dtd">
2%autoconf; 2%autoconf;
3 3
4<!-- About Box --> 4<!-- About Box -->
5 5
6<!ENTITY aboutFireflix "About Fireflix" > 6<!ENTITY aboutFireflix "About Fireflix" >
7<!ENTITY about.ok.label "OK"> 7<!ENTITY about.ok.label "OK">
8<!ENTITY about.license.label "License"> 8<!ENTITY about.license.label "License">
9<!ENTITY about.license.tip "Show copying policy"> 9<!ENTITY about.license.tip "Show copying policy">
10 10
11<!-- COPYING --> 11<!-- COPYING -->
12 12
13<!ENTITY copying.title "Filreflix: copying policy"> 13<!ENTITY copying.title "Filreflix: copying policy">
14 14
15<!-- Sidebar --> 15<!-- Sidebar -->
16 16
17<!ENTITY panel.auth_info "Authorization info"> 17<!ENTITY panel.auth_info "Authorization info">
18<!ENTITY panel.no_auth_info "No auth info available"> 18<!ENTITY panel.no_auth_info "No auth info available">
19 19
20<!ENTITY panel.auth.auth.label "Authorize"> 20<!ENTITY panel.auth.auth.label "Authorize">
21<!ENTITY panel.auth.done.label "Authorization complete"> 21<!ENTITY panel.auth.done.label "Authorization complete">
22<!ENTITY panel.auth.flickr.label "Flickr"> 22<!ENTITY panel.auth.flickr.label "Flickr">
23<!ENTITY panel.auth.flickr.tip "Open Flickr in new tab"> 23<!ENTITY panel.auth.flickr.tip "Open Flickr in new tab">
24<!ENTITY panel.auth.unauth.label "Sign off"> 24<!ENTITY panel.auth.unauth.label "Sign off">
25 25
26<!ENTITY panel.tabs.search "Search" > 26<!ENTITY panel.tabs.search "Search" >
27<!ENTITY panel.tabs.sets "Sets" > 27<!ENTITY panel.tabs.sets "Sets" >
28<!ENTITY panel.tabs.tags "Tags" > 28<!ENTITY panel.tabs.tags "Tags" >
29<!ENTITY panel.tabs.upload "Upload" > 29<!ENTITY panel.tabs.upload "Upload" >
30 30
31<!ENTITY panel.search.cmd_search.label "Search" > 31<!ENTITY panel.search.cmd_search.label "Search" >
32<!ENTITY panel.search.search_for.label "Search for:" > 32<!ENTITY panel.search.search_for.label "Search for:" >
33<!ENTITY panel.search.mode.tagsonly.label "tags"> 33<!ENTITY panel.search.mode.tagsonly.label "tags">
34<!ENTITY panel.search.mode.tagsonly.tip "Search tags only"> 34<!ENTITY panel.search.mode.tagsonly.tip "Search tags only">
35<!ENTITY panel.search.mode.mine.label "mine"> 35<!ENTITY panel.search.mode.mine.label "mine">
36<!ENTITY panel.search.col.title.label "Title"> 36<!ENTITY panel.search.col.title.label "Title">
37<!ENTITY panel.search.cmd_search_open.label "Open"> 37<!ENTITY panel.search.cmd_search_open.label "Open">
38<!ENTITY panel.search.cmd_search_prev_page.label "«">
39<!ENTITY panel.search.cmd_search_next_page.label "»">
38 40
39<!ENTITY panel.sets.name.label "Set"> 41<!ENTITY panel.sets.name.label "Set">
40<!ENTITY panel.sets.name.tip "Photoset name"> 42<!ENTITY panel.sets.name.tip "Photoset name">
41<!ENTITY panel.sets.photos.label "Photos"> 43<!ENTITY panel.sets.photos.label "Photos">
42<!ENTITY panel.sets.photos.tip "Number of photos in set"> 44<!ENTITY panel.sets.photos.tip "Number of photos in set">
43 45
44<!ENTITY panel.sets.cmd_refresh_sets "Refresh"> 46<!ENTITY panel.sets.cmd_refresh_sets "Refresh">
45<!ENTITY panel.sets.cmd_properties "Properties"> 47<!ENTITY panel.sets.cmd_properties "Properties">
46 48
47<!ENTITY panel.sets.generate_html "Generate HTML"> 49<!ENTITY panel.sets.generate_html "Generate HTML">
48 50
49<!ENTITY panel.setphotos.title.label "Title"> 51<!ENTITY panel.setphotos.title.label "Title">
50<!ENTITY panel.setphotos.title.tip "Picture title"> 52<!ENTITY panel.setphotos.title.tip "Picture title">
51<!ENTITY panel.setphotos.taken.label "Taken"> 53<!ENTITY panel.setphotos.taken.label "Taken">
52<!ENTITY panel.setphotos.taken.tip "When the picture was taken"> 54<!ENTITY panel.setphotos.taken.tip "When the picture was taken">
53<!ENTITY panel.setphotos.upload.label "Uploaded"> 55<!ENTITY panel.setphotos.upload.label "Uploaded">
54<!ENTITY panel.setphotos.upload.tip "When the picure was uploaded"> 56<!ENTITY panel.setphotos.upload.tip "When the picure was uploaded">
55 57
56<!ENTITY panel.tagslist.tag.label "Tag"> 58<!ENTITY panel.tagslist.tag.label "Tag">
57 59
58<!ENTITY panel.uploadlist.file.label "File name"> 60<!ENTITY panel.uploadlist.file.label "File name">
59<!ENTITY panel.uploadlist.title.label "Title"> 61<!ENTITY panel.uploadlist.title.label "Title">
60<!ENTITY panel.uploadlist.status.label "Status"> 62<!ENTITY panel.uploadlist.status.label "Status">
61 63
62<!ENTITY panel.upload_props.filename.label "File:"> 64<!ENTITY panel.upload_props.filename.label "File:">
63<!ENTITY panel.upload_props.title.label "Title:"> 65<!ENTITY panel.upload_props.title.label "Title:">
64<!ENTITY panel.upload_props.tags.label "Tags:"> 66<!ENTITY panel.upload_props.tags.label "Tags:">
65 67
66<!ENTITY panel.uploads.upload.label "Upload"> 68<!ENTITY panel.uploads.upload.label "Upload">
67<!ENTITY panel.uploads.clear.label "Clear"> 69<!ENTITY panel.uploads.clear.label "Clear">
68<!ENTITY panel.uploads.remove.label "Remove"> 70<!ENTITY panel.uploads.remove.label "Remove">
69<!ENTITY panel.uploads.add.label "Add"> 71<!ENTITY panel.uploads.add.label "Add">
70<!ENTITY panel.uploads.generate_html "Generate HTML"> 72<!ENTITY panel.uploads.generate_html "Generate HTML">
71 73
72<!ENTITY generated.title "Fireflix: Generated content"> 74<!ENTITY generated.title "Fireflix: Generated content">
73<!ENTITY generated.copy "copy"> 75<!ENTITY generated.copy "copy">
74 76
75<!ENTITY browser.sidebar.label "Fireflix"> 77<!ENTITY browser.sidebar.label "Fireflix">
76<!ENTITY browser.sidebar.title "Fireflix"> 78<!ENTITY browser.sidebar.title "Fireflix">
77 79
78<!ENTITY photosetprops.title "Photoset properties"> 80<!ENTITY photosetprops.title "Photoset properties">
79<!ENTITY photosetprops.set_title.label "Photoset title:"> 81<!ENTITY photosetprops.set_title.label "Photoset title:">
80<!ENTITY photosetprops.set_desc.label "Photoset description:"> 82<!ENTITY photosetprops.set_desc.label "Photoset description:">
81 83
diff --git a/locale/en-US/fireflix.properties b/locale/en-US/fireflix.properties
index 7caa12f..18300ff 100644
--- a/locale/en-US/fireflix.properties
+++ b/locale/en-US/fireflix.properties
@@ -1,11 +1,13 @@
1postUploadPhotoset=Create a new photoset for uploaded photos (cancel if you don't want to create a photoset) 1postUploadPhotoset=Create a new photoset for uploaded photos (cancel if you don't want to create a photoset)
2 2
3menutitle_Images=Images 3menutitle_Images=Images
4menutitle_Links=Linked to… 4menutitle_Links=Linked to…
5urltype_s=Small square (75x75) 5urltype_s=Small square (75x75)
6urltype_t=Thumbnail (fits in 100x100) 6urltype_t=Thumbnail (fits in 100x100)
7urltype_m=Small (fits in 240x240) 7urltype_m=Small (fits in 240x240)
8urltype__=Medium (fits in 500x500) 8urltype__=Medium (fits in 500x500)
9urltype_b=Large (fits in 1024x1024) 9urltype_b=Large (fits in 1024x1024)
10urltype_o=Original image 10urltype_o=Original image
11urltype_p=Flickr photo URL 11urltype_p=Flickr photo URL
12
13search_page=Page %S of %S