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) (unidiff)
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,30 +1,32 @@
1<?xml version="1.0" encoding="us-ascii"?> 1<?xml version="1.0" encoding="us-ascii"?>
2<news> 2<news>
3 <version version="0.0.5"> 3 <version version="0.0.5">
4 <ni>Added toolbar button</ni> 4 <ni>Added toolbar button</ni>
5 <ni>Enter or double click on photo in set now opens photo in flickr</ni> 5 <ni>Enter or double click on photo in set now opens photo in flickr</ni>
6 <ni>Double click on photoset opens photoset in flickr</ni> 6 <ni>Double click on photoset opens photoset in flickr</ni>
7 <ni>Hiding completely photo properties in sets browser when no photo
8 selected</ni>
7 </version> 9 </version>
8 <version version="0.0.4" date="November 13th, 2006"> 10 <version version="0.0.4" date="November 13th, 2006">
9 <ni>Added button to remove linebreaks from generated HTML</ni> 11 <ni>Added button to remove linebreaks from generated HTML</ni>
10 <ni>Added the word 'sidebar' to the extension name so that you don't have to look hard for it</ni> 12 <ni>Added the word 'sidebar' to the extension name so that you don't have to look hard for it</ni>
11 <ni>UI polishing, including making it more boring</ni> 13 <ni>UI polishing, including making it more boring</ni>
12 <ni>code cosmetics</ni> 14 <ni>code cosmetics</ni>
13 </version> 15 </version>
14 <version version="0.0.3" date="November 6th, 2006"> 16 <version version="0.0.3" date="November 6th, 2006">
15 <ni>Firefox 2.0 compatibility</ni> 17 <ni>Firefox 2.0 compatibility</ni>
16 </version> 18 </version>
17 <version version="0.0.2" date="October 17th, 2006"> 19 <version version="0.0.2" date="October 17th, 2006">
18 <ni>Added brief help file</ni> 20 <ni>Added brief help file</ni>
19 <ni>Fixed HTML generation code</ni> 21 <ni>Fixed HTML generation code</ni>
20 <ni>Fixed a mistyped flickr url so that the 'Flickr' button works now</ni> 22 <ni>Fixed a mistyped flickr url so that the 'Flickr' button works now</ni>
21 </version> 23 </version>
22 <version version="0.0.1" date="October 3rd, 2006"> 24 <version version="0.0.1" date="October 3rd, 2006">
23 <ni>Added ability to paginate through search results</ni> 25 <ni>Added ability to paginate through search results</ni>
24 <ni>Fixed packaging bug that omitted packaging license dialog</ni> 26 <ni>Fixed packaging bug that omitted packaging license dialog</ni>
25 <ni>A lot of code cleanup and UI polishing</ni> 27 <ni>A lot of code cleanup and UI polishing</ni>
26 </version> 28 </version>
27 <version version="0.0" date="September 26th, 2006"> 29 <version version="0.0" date="September 26th, 2006">
28 <ni>Initial release</ni> 30 <ni>Initial release</ni>
29 </version> 31 </version>
30</news> 32</news>
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
@@ -1,296 +1,296 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 2<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
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('http://www.flickr.com/')" /> 31 oncommand="fireflix.openTab('http://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 <command id="cmd_help" label="?" 34 <command id="cmd_help" label="?"
35 oncommand="fireflix.openTab('chrome://fireflix/content/help.xml')" /> 35 oncommand="fireflix.openTab('chrome://fireflix/content/help.xml')" />
36 </commandset> 36 </commandset>
37 37
38 <popupset> 38 <popupset>
39 <popup id="auth_menu"> 39 <popup id="auth_menu">
40 <menuitem command="cmd_auth_auth"/> 40 <menuitem command="cmd_auth_auth"/>
41 <menuitem command="cmd_auth_done" hidden="true" id="menu_auth_done"/> 41 <menuitem command="cmd_auth_done" hidden="true" id="menu_auth_done"/>
42 <menuitem command="cmd_auth_unauth" /> 42 <menuitem command="cmd_auth_unauth" />
43 <menuseparator/> 43 <menuseparator/>
44 <menuitem command="cmd_auth_open_flickr"/> 44 <menuitem command="cmd_auth_open_flickr"/>
45 </popup> 45 </popup>
46 </popupset> 46 </popupset>
47 47
48 <commandset id="cmdset_search"> 48 <commandset id="cmdset_search">
49 <command id="cmd_search" label="&panel.search.cmd_search.label;" 49 <command id="cmd_search" label="&panel.search.cmd_search.label;"
50 oncommand="fireflix.foundphotos.search_photos()"/> 50 oncommand="fireflix.foundphotos.search_photos()"/>
51 <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;" 51 <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;"
52 oncommand="fireflix.foundphotos.on_cmd_open(event)" /> 52 oncommand="fireflix.foundphotos.on_cmd_open(event)" />
53 <command id="cmd_search_prev_page" 53 <command id="cmd_search_prev_page"
54 label="&panel.search.cmd_search_prev_page.label;" 54 label="&panel.search.cmd_search_prev_page.label;"
55 oncommand="fireflix.foundphotos.on_cmd_prev(event)" disabled="true"/> 55 oncommand="fireflix.foundphotos.on_cmd_prev(event)" disabled="true"/>
56 <command id="cmd_search_next_page" 56 <command id="cmd_search_next_page"
57 label="&panel.search.cmd_search_next_page.label;" 57 label="&panel.search.cmd_search_next_page.label;"
58 oncommand="fireflix.foundphotos.on_cmd_next(event)" disabled="true"/> 58 oncommand="fireflix.foundphotos.on_cmd_next(event)" disabled="true"/>
59 </commandset> 59 </commandset>
60 60
61 <commandset id="cmdset_sets"> 61 <commandset id="cmdset_sets">
62 <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;" 62 <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;"
63 oncommand="fireflix.on_refresh_sets()" /> 63 oncommand="fireflix.on_refresh_sets()" />
64 <command id="cmd_set_props" label="&panel.sets.cmd_properties;" 64 <command id="cmd_set_props" label="&panel.sets.cmd_properties;"
65 oncommand="fireflix.on_set_props()" disabled="true" /> 65 oncommand="fireflix.on_set_props()" disabled="true" />
66 </commandset> 66 </commandset>
67 67
68 <popupset> 68 <popupset>
69 <popup id="sets_menu"> 69 <popup id="sets_menu">
70 <menuitem command="cmd_set_props"/> 70 <menuitem command="cmd_set_props"/>
71 <menuitem command="cmd_refresh_sets"/> 71 <menuitem command="cmd_refresh_sets"/>
72 <menuseparator/> 72 <menuseparator/>
73 <menu label="&panel.sets.generate_html;" id="sets_html_menu"/> 73 <menu label="&panel.sets.generate_html;" id="sets_html_menu"/>
74 </popup> 74 </popup>
75 </popupset> 75 </popupset>
76 76
77 <commandset id="cmdset_uploads"> 77 <commandset id="cmdset_uploads">
78 <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;" 78 <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;"
79 oncommand="fireflix.uploads.on_clear()" /> 79 oncommand="fireflix.uploads.on_clear()" />
80 <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;" 80 <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;"
81 oncommand="fireflix.uploads.on_upload()" /> 81 oncommand="fireflix.uploads.on_upload()" />
82 <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;" 82 <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;"
83 oncommand="fireflix.uploads.on_remove()" /> 83 oncommand="fireflix.uploads.on_remove()" />
84 <command id="cmd_uploads_add" label="&panel.uploads.add.label;" 84 <command id="cmd_uploads_add" label="&panel.uploads.add.label;"
85 oncommand="fireflix.uploads.on_add()" /> 85 oncommand="fireflix.uploads.on_add()" />
86 </commandset> 86 </commandset>
87 87
88 <popupset> 88 <popupset>
89 <popup id="uploads_menu"> 89 <popup id="uploads_menu">
90 <menuitem command="cmd_uploads_add"/> 90 <menuitem command="cmd_uploads_add"/>
91 <menuitem command="cmd_uploads_clear"/> 91 <menuitem command="cmd_uploads_clear"/>
92 <menuitem command="cmd_uploads_remove"/> 92 <menuitem command="cmd_uploads_remove"/>
93 <menuseparator/> 93 <menuseparator/>
94 <menuitem command="cmd_uploads_upload"/> 94 <menuitem command="cmd_uploads_upload"/>
95 <menuseparator/> 95 <menuseparator/>
96 <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/> 96 <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/>
97 </popup> 97 </popup>
98 </popupset> 98 </popupset>
99 99
100 <vbox class="wholething" flex="1"> 100 <vbox class="wholething" flex="1">
101 101
102 <groupbox context="auth_menu"> 102 <groupbox context="auth_menu">
103 <caption label="&panel.auth_info;"/> 103 <caption label="&panel.auth_info;"/>
104 <hbox> 104 <hbox>
105 <vbox pack="center" flex="1"> 105 <vbox pack="center" flex="1">
106 <label id="auth_info" value="&panel.no_auth_info;" disabled="true" crop="end"/> 106 <label id="auth_info" value="&panel.no_auth_info;" disabled="true" crop="end"/>
107 </vbox> 107 </vbox>
108 <button class="lean" id="b_auth" command="cmd_auth_auth"/> 108 <button class="lean" id="b_auth" command="cmd_auth_auth"/>
109 <button class="lean" id="b_auth_done" command="cmd_auth_done" hidden="true"/> 109 <button class="lean" id="b_auth_done" command="cmd_auth_done" hidden="true"/>
110 <button class="lean" command="cmd_auth_open_flickr" 110 <button class="lean" command="cmd_auth_open_flickr"
111 tooltiptext="&panel.auth.flickr.tip;"/> 111 tooltiptext="&panel.auth.flickr.tip;"/>
112 <button class="lean" command="cmd_help"/> 112 <button class="lean" command="cmd_help"/>
113 </hbox> 113 </hbox>
114 </groupbox> 114 </groupbox>
115 115
116 <tabbox flex="1" id="fireflix_tabs"> 116 <tabbox flex="1" id="fireflix_tabs">
117 117
118 <tabs> 118 <tabs>
119 <tab label="&panel.tabs.search;"/> 119 <tab label="&panel.tabs.search;"/>
120 <tab label="&panel.tabs.sets;"/> 120 <tab label="&panel.tabs.sets;"/>
121 <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: --> 121 <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: -->
122 <tab id="tab_upload" label="&panel.tabs.upload;"/> 122 <tab id="tab_upload" label="&panel.tabs.upload;"/>
123 </tabs> 123 </tabs>
124 124
125 <tabpanels flex="1"> 125 <tabpanels flex="1">
126 126
127 <tabpanel id="tabpanel_search" flex="1"> 127 <tabpanel id="tabpanel_search" flex="1">
128 <vbox flex="1"> 128 <vbox flex="1">
129 <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()"> 129 <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()">
130 <hbox> 130 <hbox>
131 <vbox pack="center"> 131 <vbox pack="center">
132 <label control="search_for" value="&panel.search.search_for.label;" accesskey="s"/> 132 <label control="search_for" value="&panel.search.search_for.label;" accesskey="s"/>
133 </vbox> 133 </vbox>
134 <textbox id="search_for" flex="1"/> 134 <textbox id="search_for" flex="1"/>
135 </hbox> 135 </hbox>
136 <hbox> 136 <hbox>
137 <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;" 137 <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;"
138 tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false" 138 tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false"
139 accesskey="t" /> 139 accesskey="t" />
140 <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/> 140 <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/>
141 <spacer flex="1"/> 141 <spacer flex="1"/>
142 <button class="lean" command="cmd_search"/> 142 <button class="lean" command="cmd_search"/>
143 </hbox> 143 </hbox>
144 </groupbox> 144 </groupbox>
145 <hbox> 145 <hbox>
146 <button class="lean" command="cmd_search_prev_page"/> 146 <button class="lean" command="cmd_search_prev_page"/>
147 <spacer flex="1"/> 147 <spacer flex="1"/>
148 <label id="search_page" hidden="true"/> 148 <label id="search_page" hidden="true"/>
149 <spacer flex="1"/> 149 <spacer flex="1"/>
150 <button class="lean" command="cmd_search_next_page"/> 150 <button class="lean" command="cmd_search_next_page"/>
151 </hbox> 151 </hbox>
152 <tree id="searchresults" rows="2" flex="1" 152 <tree id="searchresults" rows="2" flex="1"
153 onselect="fireflix.foundphotos.on_select()" 153 onselect="fireflix.foundphotos.on_select()"
154 ondblclick="fireflix.foundphotos.on_cmd_open(event)" 154 ondblclick="fireflix.foundphotos.on_cmd_open(event)"
155 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.on_cmd_open(event)"> 155 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.on_cmd_open(event)">
156 <treecols> 156 <treecols>
157 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" /> 157 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" />
158 </treecols> 158 </treecols>
159 <treechildren/> 159 <treechildren/>
160 </tree> 160 </tree>
161 <groupbox id="searchresult_props" orient="horizontal" hidden="true"> 161 <groupbox id="searchresult_props" orient="horizontal" hidden="true">
162 <vbox width="100" pack="center"> 162 <vbox width="100" pack="center">
163 <hbox pack="center"> 163 <hbox pack="center">
164 <image id="search_photo" 164 <image id="search_photo"
165 ondblclick="fireflix.foundphotos.on_cmd_open(event)"/> 165 ondblclick="fireflix.foundphotos.on_cmd_open(event)"/>
166 </hbox> 166 </hbox>
167 </vbox> 167 </vbox>
168 <vbox flex="1"> 168 <vbox flex="1">
169 <label id="searchresult_title" crop="end"/> 169 <label id="searchresult_title" crop="end"/>
170 <hbox flex="1" pack="center"> 170 <hbox flex="1" pack="center">
171 <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/> 171 <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/>
172 </hbox> 172 </hbox>
173 <hbox pack="end"> 173 <hbox pack="end">
174 <button command="cmd_search_open"/> 174 <button command="cmd_search_open"/>
175 </hbox> 175 </hbox>
176 </vbox> 176 </vbox>
177 </groupbox> 177 </groupbox>
178 </vbox> 178 </vbox>
179 </tabpanel> 179 </tabpanel>
180 180
181 <tabpanel id="tabpanel_sets" flex="1" 181 <tabpanel id="tabpanel_sets" flex="1"
182 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) 182 onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
183 document.getElementById('setphotos').focus()"> 183 document.getElementById('setphotos').focus()">
184 <vbox flex="1"> 184 <vbox flex="1">
185 <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()" 185 <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()"
186 flex="1" context="sets_menu" 186 flex="1" context="sets_menu"
187 ondblclick="fireflix.photosets.on_cmd_open_in_flickr(event)" 187 ondblclick="fireflix.photosets.on_cmd_open_in_flickr(event)"
188 > 188 >
189 <treecols> 189 <treecols>
190 <treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/> 190 <treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/>
191 <splitter class="tree-splitter" /> 191 <splitter class="tree-splitter" />
192 <treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" /> 192 <treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" />
193 </treecols> 193 </treecols>
194 <treechildren/> 194 <treechildren/>
195 </tree> 195 </tree>
196 <hbox> 196 <hbox>
197 <button command="cmd_refresh_sets" /> 197 <button command="cmd_refresh_sets" />
198 <button command="cmd_set_props" /> 198 <button command="cmd_set_props" />
199 </hbox> 199 </hbox>
200 <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()" 200 <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()"
201 flex="1" ondblclick="fireflix.photoset.on_cmd_open(event)" 201 flex="1" ondblclick="fireflix.photoset.on_cmd_open(event)"
202 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.photoset.on_cmd_open(event)"> 202 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.photoset.on_cmd_open(event)">
203 <treecols> 203 <treecols>
204 <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" /> 204 <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" />
205 <splitter class="tree-splitter" /> 205 <splitter class="tree-splitter" />
206 <treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" /> 206 <treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" />
207 <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" /> 207 <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" />
208 </treecols> 208 </treecols>
209 <treechildren/> 209 <treechildren/>
210 </tree> 210 </tree>
211 <groupbox id="set_photo_props" orient="horizontal"> 211 <groupbox id="set_photo_props" orient="horizontal" hidden="true">
212 <vbox width="100" pack="center"> 212 <vbox width="100" pack="center">
213 <hbox pack="center"> 213 <hbox pack="center">
214 <image id="set_photo" hidden="true" 214 <image id="set_photo"
215 ondblclick="fireflix.photoset.on_cmd_open(event)" /> 215 ondblclick="fireflix.photoset.on_cmd_open(event)" />
216 </hbox> 216 </hbox>
217 </vbox> 217 </vbox>
218 <spacer flex="1"/> 218 <spacer flex="1"/>
219 </groupbox> 219 </groupbox>
220 </vbox> 220 </vbox>
221 </tabpanel> 221 </tabpanel>
222 222
223 <tabpanel id="tabpanel_tags"> 223 <tabpanel id="tabpanel_tags">
224 <listbox id="tagslist" rows="8" flex="1"> 224 <listbox id="tagslist" rows="8" flex="1">
225 <listhead> 225 <listhead>
226 <listheader label="&panel.tagslist.tag.label;"/> 226 <listheader label="&panel.tagslist.tag.label;"/>
227 </listhead> 227 </listhead>
228 <listcols> 228 <listcols>
229 <listcol flex="1"/> 229 <listcol flex="1"/>
230 </listcols> 230 </listcols>
231 </listbox> 231 </listbox>
232 </tabpanel> 232 </tabpanel>
233 233
234 <tabpanel id="tabpanel_upload"> 234 <tabpanel id="tabpanel_upload">
235 <vbox flex="1"> 235 <vbox flex="1">
236 <tree id="uploadlist" rows="2" flex="1" 236 <tree id="uploadlist" rows="2" flex="1"
237 onselect="fireflix.uploads.selectionChanged()" 237 onselect="fireflix.uploads.selectionChanged()"
238 context="uploads_menu"> 238 context="uploads_menu">
239 <treecols> 239 <treecols>
240 <treecol id="up_file" label="&panel.uploadlist.file.label;" flex="4" crop="start" align="start"/> 240 <treecol id="up_file" label="&panel.uploadlist.file.label;" flex="4" crop="start" align="start"/>
241 <splitter class="tree-splitter" /> 241 <splitter class="tree-splitter" />
242 <treecol id="up_title" label="&panel.uploadlist.title.label;" flex="5" crop="end" align="start" /> 242 <treecol id="up_title" label="&panel.uploadlist.title.label;" flex="5" crop="end" align="start" />
243 <splitter class="tree-splitter" /> 243 <splitter class="tree-splitter" />
244 <treecol id="up_status" label="&panel.uploadlist.status.label;" flex="1" crop="end" align="start" /> 244 <treecol id="up_status" label="&panel.uploadlist.status.label;" flex="1" crop="end" align="start" />
245 </treecols> 245 </treecols>
246 <treechildren/> 246 <treechildren/>
247 </tree> 247 </tree>
248 <progressmeter id="upload_progress" mode="undetermined" hidden="true" /> 248 <progressmeter id="upload_progress" mode="undetermined" hidden="true" />
249 <groupbox id="upload_file_props" orient="horizontal" hidden="true"> 249 <groupbox id="upload_file_props" orient="horizontal" hidden="true">
250 <image id="upload_file_preview" width="100" height="100" /> 250 <image id="upload_file_preview" width="100" height="100" />
251 <grid flex="1"> 251 <grid flex="1">
252 <columns> 252 <columns>
253 <column/> 253 <column/>
254 <column flex="1"/> 254 <column flex="1"/>
255 </columns> 255 </columns>
256 <rows> 256 <rows>
257 <row> 257 <row>
258 <label control="upload_filename" 258 <label control="upload_filename"
259 value="&panel.upload_props.filename.label;" /> 259 value="&panel.upload_props.filename.label;" />
260 <textbox id="upload_filename" 260 <textbox id="upload_filename"
261 oninput="fireflix.uploads.propsToSel('filename')"/> 261 oninput="fireflix.uploads.propsToSel('filename')"/>
262 </row> 262 </row>
263 <row> 263 <row>
264 <label control="upload_title" value="&panel.upload_props.title.label;" /> 264 <label control="upload_title" value="&panel.upload_props.title.label;" />
265 <textbox id="upload_title" 265 <textbox id="upload_title"
266 oninput="fireflix.uploads.propsToSel('title')"/> 266 oninput="fireflix.uploads.propsToSel('title')"/>
267 </row> 267 </row>
268 <row> 268 <row>
269 <label control="uplod_tags" value="&panel.upload_props.tags.label;" /> 269 <label control="uplod_tags" value="&panel.upload_props.tags.label;" />
270 <textbox id="upload_tags" 270 <textbox id="upload_tags"
271 oninput="fireflix.uploads.propsToSel('tags')"/> 271 oninput="fireflix.uploads.propsToSel('tags')"/>
272 </row> 272 </row>
273 <!-- TODO: description, public, friend, family --> 273 <!-- TODO: description, public, friend, family -->
274 </rows> 274 </rows>
275 </grid> 275 </grid>
276 </groupbox> 276 </groupbox>
277 <hbox> 277 <hbox>
278 <button class="lean" command="cmd_uploads_add" /> 278 <button class="lean" command="cmd_uploads_add" />
279 <spacer flex="1"/> 279 <spacer flex="1"/>
280 <button class="lean" command="cmd_uploads_remove" /> 280 <button class="lean" command="cmd_uploads_remove" />
281 <spacer flex="1"/> 281 <spacer flex="1"/>
282 <button class="lean" command="cmd_uploads_clear" /> 282 <button class="lean" command="cmd_uploads_clear" />
283 </hbox> 283 </hbox>
284 <hbox pack="center"> 284 <hbox pack="center">
285 <button command="cmd_uploads_upload" flex="1"/> 285 <button command="cmd_uploads_upload" flex="1"/>
286 </hbox> 286 </hbox>
287 </vbox> 287 </vbox>
288 </tabpanel> 288 </tabpanel>
289 289
290 </tabpanels> 290 </tabpanels>
291 291
292 </tabbox> 292 </tabbox>
293 293
294 </vbox> 294 </vbox>
295 295
296</page> 296</page>
diff --git a/content/fireflix.js b/content/fireflix.js
index 48053c5..328e9e2 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -1,547 +1,547 @@
1function splitascii(s) { 1function splitascii(s) {
2 var rv=''; 2 var rv='';
3 for(var i=0;i<s.length;++i) { 3 for(var i=0;i<s.length;++i) {
4 var w = s.charCodeAt(i); 4 var w = s.charCodeAt(i);
5 rv += String.fromCharCode( 5 rv += String.fromCharCode(
6 w&0xff, (w>>8)&0xff ); 6 w&0xff, (w>>8)&0xff );
7 } 7 }
8 return rv; 8 return rv;
9} 9}
10 10
11 11
12var fireflix = { 12var fireflix = {
13 flickr: new Flickr(), 13 flickr: new Flickr(),
14 init: function() { 14 init: function() {
15 pull_elements(this,document,[ 15 pull_elements(this,document,[
16 'cmd_auth_auth','cmd_auth_done','cmd_auth_unauth', 16 'cmd_auth_auth','cmd_auth_done','cmd_auth_unauth',
17 'menu_auth_done','b_auth','b_auth_done','auth_info', 17 'menu_auth_done','b_auth','b_auth_done','auth_info',
18 'loc_strings','cmd_set_props' 18 'loc_strings','cmd_set_props'
19 ]); 19 ]);
20 this.build_menus(); 20 this.build_menus();
21 this.foundphotos.init(this); 21 this.foundphotos.init(this);
22 this.photosets.init(this); 22 this.photosets.init(this);
23 this.photoset.init(this); 23 this.photoset.init(this);
24 this.uploads.init(this); 24 this.uploads.init(this);
25 this.uploadObserver.init(this); 25 this.uploadObserver.init(this);
26 this.flickr.api_key = '9c43cd66947a57e6f29db1a9da3f72e3'; 26 this.flickr.api_key = '9c43cd66947a57e6f29db1a9da3f72e3';
27 this.flickr.api_shs = '9c33c9e2f0f0cfd5'; 27 this.flickr.api_shs = '9c33c9e2f0f0cfd5';
28 this.flickr.prefs_root = 'net.klever.kin.fireflix'; 28 this.flickr.prefs_root = 'net.klever.kin.fireflix';
29 this.flickr.load_token(); 29 this.flickr.load_token();
30 this.no_auth_info_label = this.auth_info.value; 30 this.no_auth_info_label = this.auth_info.value;
31 this.set_auth_state(this.flickr.token,false); 31 this.set_auth_state(this.flickr.token,false);
32 if(this.flickr.token) { 32 if(this.flickr.token) {
33 this.refresh_stuff(); 33 this.refresh_stuff();
34 }else{ 34 }else{
35 this.on_cmd_auth(); 35 this.on_cmd_auth();
36 } 36 }
37 }, 37 },
38 set_auth_state: function(au,inp) { /* authorized, in progress */ 38 set_auth_state: function(au,inp) { /* authorized, in progress */
39 this.cmd_auth_unauth.disabled = !au; 39 this.cmd_auth_unauth.disabled = !au;
40 this.b_auth.hidden = au || inp; 40 this.b_auth.hidden = au || inp;
41 this.b_auth_done.hidden = !inp; 41 this.b_auth_done.hidden = !inp;
42 this.menu_auth_done.hidden = !inp; 42 this.menu_auth_done.hidden = !inp;
43 this.cmd_auth_done.setAttribute('disabled',!inp); 43 this.cmd_auth_done.setAttribute('disabled',!inp);
44 this.auth_info.disabled = !au; 44 this.auth_info.disabled = !au;
45 if(au) { 45 if(au) {
46 this.auth_info.value = this.flickr.user.fullname+' ['+this.flickr.user.username+']'; /* TODO: move to locale */ 46 this.auth_info.value = this.flickr.user.fullname+' ['+this.flickr.user.username+']'; /* TODO: move to locale */
47 }else{ 47 }else{
48 this.auth_info.value = this.no_auth_info_label; 48 this.auth_info.value = this.no_auth_info_label;
49 } 49 }
50 }, 50 },
51 on_cmd_auth: function() { 51 on_cmd_auth: function() {
52 var _this = this; 52 var _this = this;
53 this.flickr.authorize_0( 53 this.flickr.authorize_0(
54 'delete', 54 'delete',
55 function(x,f,u) { 55 function(x,f,u) {
56 _this.openTab(u); 56 _this.openTab(u);
57 _this.set_auth_state(_this.flickr.token,true); 57 _this.set_auth_state(_this.flickr.token,true);
58 }, function(x,s,c,m) { 58 }, function(x,s,c,m) {
59 _this.flickr_failure(x,s,c,m); 59 _this.flickr_failure(x,s,c,m);
60 } 60 }
61 ); 61 );
62 }, 62 },
63 on_cmd_auth_done: function() { 63 on_cmd_auth_done: function() {
64 this.set_auth_state(this.flickr.token,false); 64 this.set_auth_state(this.flickr.token,false);
65 var _this = this; 65 var _this = this;
66 this.flickr.authorize_1( 66 this.flickr.authorize_1(
67 function() { 67 function() {
68 _this.flickr.save_token(); 68 _this.flickr.save_token();
69 _this.refresh_stuff(); 69 _this.refresh_stuff();
70 _this.set_auth_state(_this.flickr.token,false); 70 _this.set_auth_state(_this.flickr.token,false);
71 _this.auth_info.value = 71 _this.auth_info.value =
72 _this.flickr.user.fullname+' ['+_this.flickr.user.username+']'; 72 _this.flickr.user.fullname+' ['+_this.flickr.user.username+']';
73 }, function(x,s,c,m) { 73 }, function(x,s,c,m) {
74 _this.set_auth_state(_this.flickr.token,false); /* XXX: no reset token? */ 74 _this.set_auth_state(_this.flickr.token,false); /* XXX: no reset token? */
75 _this.flickr_failure(x,s,c,m); 75 _this.flickr_failure(x,s,c,m);
76 } 76 }
77 ); 77 );
78 }, 78 },
79 on_cmd_auth_unauth: function() { 79 on_cmd_auth_unauth: function() {
80 this.flickr.reset_token(); 80 this.flickr.reset_token();
81 this.set_auth_state(false,false); 81 this.set_auth_state(false,false);
82 }, 82 },
83 83
84 refresh_sets: function() { this.photosets.refresh_sets(); }, 84 refresh_sets: function() { this.photosets.refresh_sets(); },
85 refresh_stuff: function() { 85 refresh_stuff: function() {
86 this.refresh_sets(); 86 this.refresh_sets();
87 this.refresh_user_tags(); 87 this.refresh_user_tags();
88 }, 88 },
89 89
90 /* photoset treeview */ 90 /* photoset treeview */
91 photoset: { 91 photoset: {
92 photos: new Array(), 92 photos: new Array(),
93 fireflix: null, 93 fireflix: null,
94 init: function(f) { 94 init: function(f) {
95 this.fireflix = f; 95 this.fireflix = f;
96 pull_elements(this,document,[ 'set_photo' ]); 96 pull_elements(this,document,[ 'set_photo', 'set_photo_props' ]);
97 document.getElementById('setphotos').view = this; 97 document.getElementById('setphotos').view = this;
98 }, 98 },
99 rowCount: 0, 99 rowCount: 0,
100 getCellText: function(r,c) { 100 getCellText: function(r,c) {
101 var p = this.photos[r]; 101 var p = this.photos[r];
102 if(c.id=='sp_title') return p.title; 102 if(c.id=='sp_title') return p.title;
103 if(c.id=='sp_taken') return p.datetaken; 103 if(c.id=='sp_taken') return p.datetaken;
104 if(c.id=='sp_upload') { 104 if(c.id=='sp_upload') {
105 var du = new Date(p.dateupload*1000); 105 var du = new Date(p.dateupload*1000);
106 var rv = du.getFullYear()+'-'+(du.getMonth()+1)+'-'+du.getDate() 106 var rv = du.getFullYear()+'-'+(du.getMonth()+1)+'-'+du.getDate()
107 +' '+ 107 +' '+
108 du.getHours()+':'+du.getMinutes()+':'+du.getSeconds(); 108 du.getHours()+':'+du.getMinutes()+':'+du.getSeconds();
109 return rv.replace(/(\D)(\d)(\D)/,'$10$2$3'); 109 return rv.replace(/(\D)(\d)(\D)/,'$10$2$3');
110 } 110 }
111 return c.id; 111 return c.id;
112 }, 112 },
113 setTree: function(t) { this.tree = t }, 113 setTree: function(t) { this.tree = t },
114 isContainer: function(r) { return false; }, 114 isContainer: function(r) { return false; },
115 isSeparator: function(r) { return false; }, 115 isSeparator: function(r) { return false; },
116 isSorted: function(r) { return false; }, 116 isSorted: function(r) { return false; },
117 getLevel: function(r) { return 0; }, 117 getLevel: function(r) { return 0; },
118 getImageSrc: function(r,c) { return null }, 118 getImageSrc: function(r,c) { return null },
119 getRowProperties: function(r,p) {}, 119 getRowProperties: function(r,p) {},
120 getCellProperties: function(cid,cel,p) {}, 120 getCellProperties: function(cid,cel,p) {},
121 getColumnProperties: function(cid,cel,p) { }, 121 getColumnProperties: function(cid,cel,p) { },
122 cycleHeader: function(cid,e) { }, 122 cycleHeader: function(cid,e) { },
123 getParentIndex: function(r) { return -1; }, 123 getParentIndex: function(r) { return -1; },
124 drop: function(r,o) { }, 124 drop: function(r,o) { },
125 canDropBeforeAfter: function(r,b) { return false }, 125 canDropBeforeAfter: function(r,b) { return false },
126 126
127 importXPR: function(xp) { 127 importXPR: function(xp) {
128 this.tree.beginUpdateBatch(); 128 this.tree.beginUpdateBatch();
129 this.photos = new Array(); 129 this.photos = new Array();
130 var n; while(n=xp.iterateNext()) { 130 var n; while(n=xp.iterateNext()) {
131 this.photos.push(new Photo(n)); 131 this.photos.push(new Photo(n));
132 } 132 }
133 this.rowCount = this.photos.length; 133 this.rowCount = this.photos.length;
134 this.tree.endUpdateBatch(); 134 this.tree.endUpdateBatch();
135 this.selection.clearSelection(); 135 this.selection.clearSelection();
136 }, 136 },
137 load_photos: function(psid) { 137 load_photos: function(psid) {
138 var _this = this; 138 var _this = this;
139 this.fireflix.flickr.api_call( 139 this.fireflix.flickr.api_call(
140 { 140 {
141 method: 'flickr.photosets.getPhotos', 141 method: 'flickr.photosets.getPhotos',
142 auth_token: 'default', 142 auth_token: 'default',
143 photoset_id: psid, 143 photoset_id: psid,
144 extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update' 144 extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update'
145 }, function(xr) { 145 }, function(xr) {
146 var x = xr.responseXML; 146 var x = xr.responseXML;
147 var xp = x.evaluate( 147 var xp = x.evaluate(
148 '/rsp/photoset/photo', x, null, 148 '/rsp/photoset/photo', x, null,
149 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); 149 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
150 _this.importXPR(xp); 150 _this.importXPR(xp);
151 }, function(x,s,c,m) { 151 }, function(x,s,c,m) {
152 _this.fireflix.flickr_failure(x,s,c,m); 152 _this.fireflix.flickr_failure(x,s,c,m);
153 } 153 }
154 ); 154 );
155 }, 155 },
156 on_select: function() { 156 on_select: function() {
157 if(this.selection.count==1) { 157 if(this.selection.count==1) {
158 var p = this.photos[this.selection.currentIndex]; 158 var p = this.photos[this.selection.currentIndex];
159 this.set_photo.src = 159 this.set_photo.src =
160 this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t'); 160 this.fireflix.flickr.get_photo_url(p.server,p.id,p.secret,'t');
161 this.set_photo.hidden = false; 161 this.set_photo_props.hidden = false;
162 }else{ 162 }else{
163 this.set_photo.hidden = true; 163 this.set_photo_props.hidden = true;
164 } 164 }
165 }, 165 },
166 on_cmd_open: function(ev) { 166 on_cmd_open: function(ev) {
167 if(this.selection.currentIndex<0) return; 167 if(this.selection.currentIndex<0) return;
168 var p = this.photos[this.selection.currentIndex]; 168 var p = this.photos[this.selection.currentIndex];
169 if(!p.id) return; 169 if(!p.id) return;
170 this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p')); 170 this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p'));
171 } 171 }
172 }, 172 },
173 173
174 /* photosets treeview */ 174 /* photosets treeview */
175 photosets: { 175 photosets: {
176 sets: new Array(), 176 sets: new Array(),
177 fireflix: null, 177 fireflix: null,
178 init: function(f) { 178 init: function(f) {
179 this.fireflix = f; 179 this.fireflix = f;
180 document.getElementById('setslist').view = this; 180 document.getElementById('setslist').view = this;
181 }, 181 },
182 rowCount: 0, 182 rowCount: 0,
183 getCellText: function(r,c) { 183 getCellText: function(r,c) {
184 var s = this.sets[r]; 184 var s = this.sets[r];
185 if(c.id=='sl_name') return s.title; 185 if(c.id=='sl_name') return s.title;
186 if(c.id=='sl_photos') return s.photos; 186 if(c.id=='sl_photos') return s.photos;
187 return c.id; 187 return c.id;
188 }, 188 },
189 setTree: function(t) { this.tree = t }, 189 setTree: function(t) { this.tree = t },
190 isContainer: function(r) { return false; }, 190 isContainer: function(r) { return false; },
191 isSeparator: function(r) { return false; }, 191 isSeparator: function(r) { return false; },
192 isSorted: function() { return false; }, 192 isSorted: function() { return false; },
193 getLevel: function(r) { return 0; }, 193 getLevel: function(r) { return 0; },
194 getImageSrc: function(r,c) { return null }, 194 getImageSrc: function(r,c) { return null },
195 getRowProperties: function(r,p) {}, 195 getRowProperties: function(r,p) {},
196 getCellProperties: function(cid,cel,p) { }, 196 getCellProperties: function(cid,cel,p) { },
197 getColumnProperties: function(cid,cel,p) { }, 197 getColumnProperties: function(cid,cel,p) { },
198 cycleHeader: function(cid,e) { }, 198 cycleHeader: function(cid,e) { },
199 getParentIndex: function(r) { return -1; }, 199 getParentIndex: function(r) { return -1; },
200 drop: function(r,o) { }, 200 drop: function(r,o) { },
201 canDropBeforeAfter: function(r,b) { return false }, 201 canDropBeforeAfter: function(r,b) { return false },
202 202
203 importXPR: function(xp) { 203 importXPR: function(xp) {
204 this.tree.beginUpdateBatch(); 204 this.tree.beginUpdateBatch();
205 this.sets = new Array(); 205 this.sets = new Array();
206 var n; while(n=xp.iterateNext()) { 206 var n; while(n=xp.iterateNext()) {
207 this.sets.push(new Photoset(n)); 207 this.sets.push(new Photoset(n));
208 } 208 }
209 this.rowCount = this.sets.length; 209 this.rowCount = this.sets.length;
210 this.tree.endUpdateBatch(); 210 this.tree.endUpdateBatch();
211 }, 211 },
212 refresh_sets: function() { 212 refresh_sets: function() {
213 var _this = this; 213 var _this = this;
214 this.fireflix.flickr.api_call( 214 this.fireflix.flickr.api_call(
215 { 215 {
216 method: 'flickr.photosets.getList', 216 method: 'flickr.photosets.getList',
217 auth_token: 'default' 217 auth_token: 'default'
218 }, function(xr) { 218 }, function(xr) {
219 var x = xr.responseXML; 219 var x = xr.responseXML;
220 var xp = x.evaluate( 220 var xp = x.evaluate(
221 '/rsp/photosets/photoset', x, null, 221 '/rsp/photosets/photoset', x, null,
222 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); 222 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
223 _this.importXPR(xp); 223 _this.importXPR(xp);
224 }, function(x,s,c,m) { 224 }, function(x,s,c,m) {
225 _this.fireflix.flickr_failure(x,s,c,m); 225 _this.fireflix.flickr_failure(x,s,c,m);
226 } 226 }
227 ); 227 );
228 }, 228 },
229 on_select: function() { 229 on_select: function() {
230 if(this.selection.count==1) { 230 if(this.selection.count==1) {
231 this.fireflix.cmd_set_props.setAttribute('disabled','false'); 231 this.fireflix.cmd_set_props.setAttribute('disabled','false');
232 var s = this.sets[this.selection.currentIndex]; 232 var s = this.sets[this.selection.currentIndex];
233 this.fireflix.photoset.load_photos(s.id); 233 this.fireflix.photoset.load_photos(s.id);
234 }else{ 234 }else{
235 this.fireflix.cmd_set_props.setAttribute('disabled','true'); 235 this.fireflix.cmd_set_props.setAttribute('disabled','true');
236 } 236 }
237 }, 237 },
238 on_cmd_open_in_flickr: function(ev) { 238 on_cmd_open_in_flickr: function(ev) {
239 if(this.selection.currentIndex<0) return; 239 if(this.selection.currentIndex<0) return;
240 var p = this.sets[this.selection.currentIndex]; 240 var p = this.sets[this.selection.currentIndex];
241 if(!p.id) return; 241 if(!p.id) return;
242 this.fireflix.openTab(this.fireflix.flickr.make_photoset_url(p)); 242 this.fireflix.openTab(this.fireflix.flickr.make_photoset_url(p));
243 } 243 }
244 }, 244 },
245 245
246 refresh_user_tags: function() { 246 refresh_user_tags: function() {
247 var lb = document.getElementById('tagslist'); 247 var lb = document.getElementById('tagslist');
248 var _this = this; 248 var _this = this;
249 this.flickr.api_call( 249 this.flickr.api_call(
250 { 250 {
251 method: 'flickr.tags.getListUser', 251 method: 'flickr.tags.getListUser',
252 auth_token: 'default', 252 auth_token: 'default',
253 }, function(xr) { 253 }, function(xr) {
254 var x = xr.responseXML; 254 var x = xr.responseXML;
255 var xp = x.evaluate( 255 var xp = x.evaluate(
256 '/rsp/who/tags/tag', x, null, 256 '/rsp/who/tags/tag', x, null,
257 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); 257 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
258 // TODO: clear list 258 // TODO: clear list
259 var n; while(n=xp.iterateNext()) { 259 var n; while(n=xp.iterateNext()) {
260 lb.appendItem(n.firstChild.nodeValue); 260 lb.appendItem(n.firstChild.nodeValue);
261 } 261 }
262 }, function(x,s,c,m) { 262 }, function(x,s,c,m) {
263 _this.flickr_failure(x,s,c,m); 263 _this.flickr_failure(x,s,c,m);
264 } 264 }
265 ); 265 );
266 }, 266 },
267 267
268 uploadObserver: { 268 uploadObserver: {
269 fireflix: null, 269 fireflix: null,
270 init: function(f) { 270 init: function(f) {
271 this.fireflix = f; 271 this.fireflix = f;
272 }, 272 },
273 getSupportedFlavours: function() { 273 getSupportedFlavours: function() {
274 var rv = new FlavourSet(); 274 var rv = new FlavourSet();
275 rv.appendFlavour('application/x-moz-file','nsIFile'); 275 rv.appendFlavour('application/x-moz-file','nsIFile');
276 rv.appendFlavour('application/x-moz-url'); 276 rv.appendFlavour('application/x-moz-url');
277 rv.appendFlavour('text/uri-list'); 277 rv.appendFlavour('text/uri-list');
278 rv.appendFlavour('text/unicode'); 278 rv.appendFlavour('text/unicode');
279 return rv; 279 return rv;
280 }, 280 },
281 canHandleMultipleItems: true, 281 canHandleMultipleItems: true,
282 onDragOver: function(ev,fl,sess) { 282 onDragOver: function(ev,fl,sess) {
283 return true; 283 return true;
284 }, 284 },
285 onDrop: function(ev,dd,s) { 285 onDrop: function(ev,dd,s) {
286 var ldf = null; 286 var ldf = null;
287 for(var i in dd.dataList) { 287 for(var i in dd.dataList) {
288 var di = dd.dataList[i]; 288 var di = dd.dataList[i];
289 var dif = di.first; 289 var dif = di.first;
290 if( 290 if(
291 ldf==null 291 ldf==null
292 || ldf.flavour.contentType!=dif.flavour.contentType 292 || ldf.flavour.contentType!=dif.flavour.contentType
293 || ldf.contentLength!=dif.contentLength 293 || ldf.contentLength!=dif.contentLength
294 || ldf.data!=dif.data ) 294 || ldf.data!=dif.data )
295 this.drop_item(ev,di,s); 295 this.drop_item(ev,di,s);
296 ldf = dif; 296 ldf = dif;
297 } 297 }
298 }, 298 },
299 drop_item: function(ev,di,s) { 299 drop_item: function(ev,di,s) {
300 var d = di.first; 300 var d = di.first;
301 switch(d.flavour.contentType) { 301 switch(d.flavour.contentType) {
302 case 'text/unicode': 302 case 'text/unicode':
303 this.drop_urilist(ev,d.data,s); 303 this.drop_urilist(ev,d.data,s);
304 break; 304 break;
305 case 'application/x-moz-file': 305 case 'application/x-moz-file':
306 this.fireflix.uploads.add(d.data.path); 306 this.fireflix.uploads.add(d.data.path);
307 document.getElementById('fireflix_tabs').selectedTab 307 document.getElementById('fireflix_tabs').selectedTab
308 = document.getElementById('tab_upload'); 308 = document.getElementById('tab_upload');
309 break; 309 break;
310 case 'text/uri-list': 310 case 'text/uri-list':
311 // is it ascii or could it be utf8? 311 // is it ascii or could it be utf8?
312 this.drop_urilist(ev,splitascii(d.data),s); 312 this.drop_urilist(ev,splitascii(d.data),s);
313 break; 313 break;
314 default: alert(d.flavour.contentType+':'+d.data); break; 314 default: alert(d.flavour.contentType+':'+d.data); break;
315 }; 315 };
316 }, 316 },
317 drop_urilist: function(ev,ul,s) { 317 drop_urilist: function(ev,ul,s) {
318 // TODO: check for being a file? 318 // TODO: check for being a file?
319 var us = decodeURIComponent(ul).split(/[\r\n]/); 319 var us = decodeURIComponent(ul).split(/[\r\n]/);
320 for(var ui in us) 320 for(var ui in us)
321 if(/\S/.test(us[ui])) 321 if(/\S/.test(us[ui]))
322 this.fireflix.uploads.add(us[ui]); 322 this.fireflix.uploads.add(us[ui]);
323 document.getElementById('fireflix_tabs').selectedTab 323 document.getElementById('fireflix_tabs').selectedTab
324 = document.getElementById('tab_upload'); 324 = document.getElementById('tab_upload');
325 } 325 }
326 }, 326 },
327 327
328 uploads: { 328 uploads: {
329 fireflix: null, 329 fireflix: null,
330 init: function(f) { 330 init: function(f) {
331 this.fireflix=f; 331 this.fireflix=f;
332 pull_elements(this,document,[ 332 pull_elements(this,document,[
333 'upload_filename','upload_title','upload_file_preview', 333 'upload_filename','upload_title','upload_file_preview',
334 'upload_file_props','upload_progress','upload_tags', 334 'upload_file_props','upload_progress','upload_tags',
335 'cmd_uploads_upload' 335 'cmd_uploads_upload'
336 ]); 336 ]);
337 document.getElementById('uploadlist').view = this; 337 document.getElementById('uploadlist').view = this;
338 }, 338 },
339 files: new Array(), 339 files: new Array(),
340 rowCount: 0, 340 rowCount: 0,
341 getCellText: function(r,c) { 341 getCellText: function(r,c) {
342 var f = this.files[r]; 342 var f = this.files[r];
343 if(c.id=='up_file') return f.file; 343 if(c.id=='up_file') return f.file;
344 if(c.id=='up_title') return f.title; 344 if(c.id=='up_title') return f.title;
345 if(c.id=='up_status') return f.state; 345 if(c.id=='up_status') return f.state;
346 return c.id; 346 return c.id;
347 }, 347 },
348 setTree: function(t) { this.tree = t }, 348 setTree: function(t) { this.tree = t },
349 isContainer: function(r) { return false; }, 349 isContainer: function(r) { return false; },
350 isSeparator: function(r) { return false; }, 350 isSeparator: function(r) { return false; },
351 isSorted: function(r) { return false; }, 351 isSorted: function(r) { return false; },
352 getLevel: function(r) { return 0; }, 352 getLevel: function(r) { return 0; },
353 getImageSrc: function(r,c) { return null }, 353 getImageSrc: function(r,c) { return null },
354 getRowProperties: function(r,p) { 354 getRowProperties: function(r,p) {
355 try { 355 try {
356 if(!Components) return; 356 if(!Components) return;
357 }catch(e) { return } 357 }catch(e) { return }
358 var f = this.files[r]; 358 var f = this.files[r];
359 var as = Components.classes['@mozilla.org/atom-service;1']. 359 var as = Components.classes['@mozilla.org/atom-service;1'].
360 getService(Components.interfaces.nsIAtomService); 360 getService(Components.interfaces.nsIAtomService);
361 p.AppendElement(as.getAtom(f.state)); 361 p.AppendElement(as.getAtom(f.state));
362 }, 362 },
363 getCellProperties: function(r,c,p) { this.getRowProperties(r,p); }, 363 getCellProperties: function(r,c,p) { this.getRowProperties(r,p); },
364 getColumnProperties: function(c,p) { }, 364 getColumnProperties: function(c,p) { },
365 cycleHeader: function(cid,e) { }, 365 cycleHeader: function(cid,e) { },
366 getParentIndex: function(r) { return -1; }, 366 getParentIndex: function(r) { return -1; },
367 drop: function(r,o) { }, 367 drop: function(r,o) { },
368 canDropBeforeAfter: function(r,b) { return false }, 368 canDropBeforeAfter: function(r,b) { return false },
369 369
370 add: function(f) { 370 add: function(f) {
371 if(f.indexOf('file:/')==0) { 371 if(f.indexOf('file:/')==0) {
372 f = f.substr(5); 372 f = f.substr(5);
373 while(f.substr(0,2)=='//') { // XXX: not very performant, is it? ;-) 373 while(f.substr(0,2)=='//') { // XXX: not very performant, is it? ;-)
374 f = f.substr(1); 374 f = f.substr(1);
375 } 375 }
376 } 376 }
377 var t = f; 377 var t = f;
378 var ls = t.lastIndexOf('/'); 378 var ls = t.lastIndexOf('/');
379 if(ls>0) t = t.substr(ls+1); 379 if(ls>0) t = t.substr(ls+1);
380 ls = t.lastIndexOf('\\'); 380 ls = t.lastIndexOf('\\');
381 if(ls>0) t = t.substr(ls+1); 381 if(ls>0) t = t.substr(ls+1);
382 var ld = t.lastIndexOf('.'); 382 var ld = t.lastIndexOf('.');
383 if(ld>0) t = t.substr(0,ld); 383 if(ld>0) t = t.substr(0,ld);
384 this.files.push( { 384 this.files.push( {
385 file: f, 385 file: f,
386 title: t, 386 title: t,
387 tags: '', 387 tags: '',
388 state: 'pending' 388 state: 'pending'
389 } ); 389 } );
390 this.rowCount = this.files.length; 390 this.rowCount = this.files.length;
391 this.tree.rowCountChanged(this.rowCount-1,1); 391 this.tree.rowCountChanged(this.rowCount-1,1);
392 }, 392 },
393 393
394 upload_worker: function() { 394 upload_worker: function() {
395 for(var f in this.files) { 395 for(var f in this.files) {
396 if(this.files[f].state=='pending') { 396 if(this.files[f].state=='pending') {
397 var ff = this.files[f]; 397 var ff = this.files[f];
398 this.on_file_upload(ff); 398 this.on_file_upload(ff);
399 ff.state='uploading'; 399 ff.state='uploading';
400 this.tree.invalidate(); 400 this.tree.invalidate();
401 var _this = this; 401 var _this = this;
402 this.fireflix.flickr.upload_file( 402 this.fireflix.flickr.upload_file(
403 ff.file, { title: ff.title, tags: ff.tags }, 403 ff.file, { title: ff.title, tags: ff.tags },
404 function(x,p) { 404 function(x,p) {
405 ff.photoid = p; 405 ff.photoid = p;
406 _this.batch_ids.push(p); 406 _this.batch_ids.push(p);
407 ff.state='completed'; 407 ff.state='completed';
408 _this.tree.invalidate(); 408 _this.tree.invalidate();
409 window.setTimeout(_this.upload_to,0,_this); 409 window.setTimeout(_this.upload_to,0,_this);
410 }, function(x,s,c,m) { 410 }, function(x,s,c,m) {
411 ff.state='failed'; 411 ff.state='failed';
412 ff.flickr_errcode = c; 412 ff.flickr_errcode = c;
413 ff.flickr_errmsg = m; 413 ff.flickr_errmsg = m;
414 _this.tree.invalidate(); 414 _this.tree.invalidate();
415 window.setTimeout(_this.upload_to,0,_this); 415 window.setTimeout(_this.upload_to,0,_this);
416 } 416 }
417 ); 417 );
418 return; 418 return;
419 } 419 }
420 } 420 }
421 this.on_finish_upload(); 421 this.on_finish_upload();
422 }, 422 },
423 upload_to: function(_this) { _this.upload_worker(); }, 423 upload_to: function(_this) { _this.upload_worker(); },
424 on_file_upload: function(f) { 424 on_file_upload: function(f) {
425 this.cmd_uploads_upload.setAttribute('disabled','true'); 425 this.cmd_uploads_upload.setAttribute('disabled','true');
426 for(var fi in this.files) { 426 for(var fi in this.files) {
427 if(this.files[fi].file==f.file) { 427 if(this.files[fi].file==f.file) {
428 this.tree.ensureRowIsVisible(fi); 428 this.tree.ensureRowIsVisible(fi);
429 this.selection.rangedSelect(fi,fi,false); 429 this.selection.rangedSelect(fi,fi,false);
430 this.selection.currentIndex = fi; 430 this.selection.currentIndex = fi;
431 this.selToProps(); 431 this.selToProps();
432 break; 432 break;
433 } 433 }
434 } 434 }
435 }, 435 },
436 on_finish_upload: function() { 436 on_finish_upload: function() {
437 if(this.batch_ids.length) { 437 if(this.batch_ids.length) {
438 var psn = prompt(this.fireflix.loc_strings.getString('postUploadPhotoset')); 438 var psn = prompt(this.fireflix.loc_strings.getString('postUploadPhotoset'));
439 if(psn!=null) { 439 if(psn!=null) {
440 var pids = this.batch_ids.join(','); 440 var pids = this.batch_ids.join(',');
441 var ppid = this.batch_ids[0]; 441 var ppid = this.batch_ids[0];
442 var _this = this; 442 var _this = this;
443 this.fireflix.flickr.api_call( 443 this.fireflix.flickr.api_call(
444 { 444 {
445 method: 'flickr.photosets.create', 445 method: 'flickr.photosets.create',
446 auth_token: 'default', 446 auth_token: 'default',
447 title: psn, 447 title: psn,
448 primary_photo_id: ppid 448 primary_photo_id: ppid
449 }, function(x) { 449 }, function(x) {
450 var npid = 450 var npid =
451 x.responseXML.getElementsByTagName('photoset').item(0).getAttribute('id'); 451 x.responseXML.getElementsByTagName('photoset').item(0).getAttribute('id');
452 _this.fireflix.flickr.api_call( 452 _this.fireflix.flickr.api_call(
453 { 453 {
454 method: 'flickr.photosets.editPhotos', 454 method: 'flickr.photosets.editPhotos',
455 auth_token: 'default', 455 auth_token: 'default',
456 photoset_id: npid, 456 photoset_id: npid,
457 primary_photo_id: ppid, 457 primary_photo_id: ppid,
458 photo_ids: pids 458 photo_ids: pids
459 }, function(x) { 459 }, function(x) {
460 _this.fireflix.refresh_sets(); 460 _this.fireflix.refresh_sets();
461 }, function(x,s,c,m) { 461 }, function(x,s,c,m) {
462 _this.fireflix.flickr_failure(x,s,c,m); 462 _this.fireflix.flickr_failure(x,s,c,m);
463 } 463 }
464 ); 464 );
465 }, function(x,s,c,m) { 465 }, function(x,s,c,m) {
466 _this.fireflix.flickr_failure(x,s,c,m); 466 _this.fireflix.flickr_failure(x,s,c,m);
467 } 467 }
468 ); 468 );
469 } 469 }
470 } 470 }
471 this.selection.clearSelection(); 471 this.selection.clearSelection();
472 this.cmd_uploads_upload.setAttribute('disabled','false'); 472 this.cmd_uploads_upload.setAttribute('disabled','false');
473 this.upload_progress.setAttribute('hidden','true'); 473 this.upload_progress.setAttribute('hidden','true');
474 }, 474 },
475 475
476 clear_list: function() { 476 clear_list: function() {
477 this.tree.beginUpdateBatch(); 477 this.tree.beginUpdateBatch();
478 this.rowCount = 0; 478 this.rowCount = 0;
479 this.files = new Array(); 479 this.files = new Array();
480 this.tree.endUpdateBatch(); 480 this.tree.endUpdateBatch();
481 this.selToProps(); 481 this.selToProps();
482 }, 482 },
483 selectionChanged: function() { 483 selectionChanged: function() {
484 this.selToProps(); 484 this.selToProps();
485 }, 485 },
486 disableProps: function() { 486 disableProps: function() {
487 this.upload_filename.value=''; 487 this.upload_filename.value='';
488 this.upload_filename.disabled = true; 488 this.upload_filename.disabled = true;
489 this.upload_title.value=''; 489 this.upload_title.value='';
490 this.upload_title.disabled = true; 490 this.upload_title.disabled = true;
491 this.upload_file_preview.src = null; 491 this.upload_file_preview.src = null;
492 this.upload_file_props.hidden = true; 492 this.upload_file_props.hidden = true;
493 this.upload_tags.value=''; 493 this.upload_tags.value='';
494 this.upload_tags.disabled = true; 494 this.upload_tags.disabled = true;
495 }, 495 },
496 selToProps: function() { 496 selToProps: function() {
497 if(!this.selection.count) { 497 if(!this.selection.count) {
498 this.disableProps(); 498 this.disableProps();
499 }else if(this.selection.count==1) { 499 }else if(this.selection.count==1) {
500 var f=this.files[this.selection.currentIndex]; 500 var f=this.files[this.selection.currentIndex];
501 if(f==null || f.state!='pending') { 501 if(f==null || f.state!='pending') {
502 this.disableProps(); 502 this.disableProps();
503 }else{ 503 }else{
504 this.upload_filename.value = f.file; 504 this.upload_filename.value = f.file;
505 this.upload_filename.disabled = false; 505 this.upload_filename.disabled = false;
506 this.upload_title.value = f.title; 506 this.upload_title.value = f.title;
507 this.upload_title.disabled = false; 507 this.upload_title.disabled = false;
508 this.upload_file_preview.src = 'file:///'+f.file; 508 this.upload_file_preview.src = 'file:///'+f.file;
509 this.upload_file_props.hidden = false; 509 this.upload_file_props.hidden = false;
510 this.upload_tags.value = f.tags; 510 this.upload_tags.value = f.tags;
511 this.upload_tags.disabled = false; 511 this.upload_tags.disabled = false;
512 } 512 }
513 }else{ 513 }else{
514 var ftitle = null; var onetitle = true; 514 var ftitle = null; var onetitle = true;
515 var ftags = null; var onetag = true; 515 var ftags = null; var onetag = true;
516 var fs = 0; 516 var fs = 0;
517 for(var ff in this.files) { 517 for(var ff in this.files) {
518 if(this.selection.isSelected(ff) && this.files[ff].state=='pending' ) { 518 if(this.selection.isSelected(ff) && this.files[ff].state=='pending' ) {
519 ++fs; 519 ++fs;
520 if(ftitle==null) { 520 if(ftitle==null) {
521 ftitle = this.files[ff].title; 521 ftitle = this.files[ff].title;
522 }else if(ftitle!=this.files[ff].title) { 522 }else if(ftitle!=this.files[ff].title) {
523 onetitle = false; 523 onetitle = false;
524 } 524 }
525 if(ftags==null) { 525 if(ftags==null) {
526 ftags = this.files[ff].tags; 526 ftags = this.files[ff].tags;
527 }else if(ftags!=this.files[ff].tags) { 527 }else if(ftags!=this.files[ff].tags) {
528 onetag = false; 528 onetag = false;
529 } 529 }
530 } 530 }
531 } 531 }
532 if(fs) { 532 if(fs) {
533 this.upload_filename.value=''; 533 this.upload_filename.value='';
534 this.upload_filename.disabled = true; 534 this.upload_filename.disabled = true;
535 if(onetitle) 535 if(onetitle)
536 this.upload_title.value = ftitle; 536 this.upload_title.value = ftitle;
537 this.upload_title.disabled = false; 537 this.upload_title.disabled = false;
538 if(onetag) 538 if(onetag)
539 this.upload_tags.value = ftags; 539 this.upload_tags.value = ftags;
540 this.upload_tags.disabled = false; 540 this.upload_tags.disabled = false;
541 this.upload_file_preview.src = null; 541 this.upload_file_preview.src = null;
542 this.upload_file_props.hidden = false; 542 this.upload_file_props.hidden = false;
543 }else 543 }else
544 this.disableProps(); 544 this.disableProps();
545 } 545 }
546 }, 546 },
547 propsToSel: function(prop) { 547 propsToSel: function(prop) {