summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix-panel.xul8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index 9953761..75d6c2d 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -1,252 +1,252 @@
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="flickr.js" /> 17 <script type="application/x-javascript" src="flickr.js" />
18 <script type="application/x-javascript" src="fireflix.js" /> 18 <script type="application/x-javascript" src="fireflix.js" />
19 19
20 <stringbundleset> 20 <stringbundleset>
21 <stringbundle id="loc_strings" src="chrome://fireflix/locale/fireflix.properties" /> 21 <stringbundle id="loc_strings" src="chrome://fireflix/locale/fireflix.properties" />
22 </stringbundleset> 22 </stringbundleset>
23 23
24 <commandset id="cmdset_search"> 24 <commandset id="cmdset_search">
25 <command id="cmd_search" label="&panel.search.cmd_search.label;" 25 <command id="cmd_search" label="&panel.search.cmd_search.label;"
26 oncommand="fireflix.foundphotos.search_photos()"/> 26 oncommand="fireflix.foundphotos.search_photos()"/>
27 <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;" 27 <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;"
28 oncommand="fireflix.foundphotos.on_cmd_open(event)" /> 28 oncommand="fireflix.foundphotos.on_cmd_open(event)" />
29 </commandset> 29 </commandset>
30 30
31 <commandset id="cmdset_sets"> 31 <commandset id="cmdset_sets">
32 <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;" 32 <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;"
33 oncommand="fireflix.on_refresh_sets()" /> 33 oncommand="fireflix.on_refresh_sets()" />
34 <command id="cmd_set_props" label="&panel.sets.cmd_properties;" 34 <command id="cmd_set_props" label="&panel.sets.cmd_properties;"
35 oncommand="fireflix.on_set_props()" disabled="true" /> 35 oncommand="fireflix.on_set_props()" disabled="true" />
36 </commandset> 36 </commandset>
37 37
38 <popupset> 38 <popupset>
39 <popup id="sets_menu"> 39 <popup id="sets_menu">
40 <menuitem command="cmd_set_props"/> 40 <menuitem command="cmd_set_props"/>
41 <menuitem command="cmd_refresh_sets"/> 41 <menuitem command="cmd_refresh_sets"/>
42 <menuseparator/> 42 <menuseparator/>
43 <menu label="&panel.sets.generate_html;" id="sets_html_menu"/> 43 <menu label="&panel.sets.generate_html;" id="sets_html_menu"/>
44 </popup> 44 </popup>
45 </popupset> 45 </popupset>
46 46
47 <commandset id="cmdset_uploads"> 47 <commandset id="cmdset_uploads">
48 <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;" 48 <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;"
49 oncommand="fireflix.uploads.on_clear()" /> 49 oncommand="fireflix.uploads.on_clear()" />
50 <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;" 50 <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;"
51 oncommand="fireflix.uploads.on_upload()" /> 51 oncommand="fireflix.uploads.on_upload()" />
52 <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;" 52 <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;"
53 oncommand="fireflix.uploads.on_remove()" /> 53 oncommand="fireflix.uploads.on_remove()" />
54 <command id="cmd_uploads_add" label="&panel.uploads.add.label;" 54 <command id="cmd_uploads_add" label="&panel.uploads.add.label;"
55 oncommand="fireflix.uploads.on_add()" /> 55 oncommand="fireflix.uploads.on_add()" />
56 </commandset> 56 </commandset>
57 57
58 <popupset> 58 <popupset>
59 <popup id="uploads_menu"> 59 <popup id="uploads_menu">
60 <menuitem command="cmd_uploads_add"/> 60 <menuitem command="cmd_uploads_add"/>
61 <menuitem command="cmd_uploads_clear"/> 61 <menuitem command="cmd_uploads_clear"/>
62 <menuitem command="cmd_uploads_remove"/> 62 <menuitem command="cmd_uploads_remove"/>
63 <menuseparator/> 63 <menuseparator/>
64 <menuitem command="cmd_uploads_upload"/> 64 <menuitem command="cmd_uploads_upload"/>
65 <menuseparator/> 65 <menuseparator/>
66 <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/> 66 <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/>
67 </popup> 67 </popup>
68 </popupset> 68 </popupset>
69 69
70 <vbox class="wholething" flex="1"> 70 <vbox class="wholething" flex="1">
71 71
72 <groupbox> 72 <groupbox>
73 <caption label="&panel.auth_info;"/> 73 <caption label="&panel.auth_info;"/>
74 <hbox> 74 <hbox>
75 <label id="auth_info" value="&panel.no_auth_info;" flex="1" disabled="true"/> 75 <label id="auth_info" value="&panel.no_auth_info;" flex="1" disabled="true"/>
76 <button id="b_auth" label="&panel.auth_button;" oncommand="fireflix.on_auth()"/> 76 <button id="b_auth" label="&panel.auth_button;" oncommand="fireflix.on_auth()"/>
77 <button id="b_auth_done" label="&panel.auth_complete_button;" hidden="true" 77 <button id="b_auth_done" label="&panel.auth_complete_button;" hidden="true"
78 oncommand="fireflix.on_auth_done()"/> 78 oncommand="fireflix.on_auth_done()"/>
79 <button label="&panel.flickr_button.label;" 79 <button label="&panel.flickr_button.label;"
80 tooltiptext="&panel.flickr_button.tip;" 80 tooltiptext="&panel.flickr_button.tip;"
81 oncommand="fireflix.openTab('http://www.flickr.com/')" /> 81 oncommand="fireflix.openTab('http://www.flickr.com/')" />
82 </hbox> 82 </hbox>
83 </groupbox> 83 </groupbox>
84 84
85 <tabbox flex="1" id="fireflix_tabs"> 85 <tabbox flex="1" id="fireflix_tabs">
86 86
87 <tabs> 87 <tabs>
88 <tab label="&panel.tabs.search;"/> 88 <tab label="&panel.tabs.search;"/>
89 <tab label="&panel.tabs.sets;"/> 89 <tab label="&panel.tabs.sets;"/>
90 <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: --> 90 <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: -->
91 <tab id="tab_upload" label="&panel.tabs.upload;"/> 91 <tab id="tab_upload" label="&panel.tabs.upload;"/>
92 </tabs> 92 </tabs>
93 93
94 <tabpanels flex="1"> 94 <tabpanels flex="1">
95 95
96 <tabpanel id="tabpanel_search" flex="1"> 96 <tabpanel id="tabpanel_search" flex="1">
97 <vbox flex="1"> 97 <vbox flex="1">
98 <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()"> 98 <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()">
99 <hbox> 99 <hbox>
100 <label control="search_for" value="&panel.search.search_for.label;" 100 <label control="search_for" value="&panel.search.search_for.label;"
101 accesskey="s"/> 101 accesskey="s"/>
102 <textbox id="search_for" flex="1"/> 102 <textbox id="search_for" flex="1"/>
103 </hbox> 103 </hbox>
104 <hbox> 104 <hbox>
105 <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;" 105 <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;"
106 tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false" 106 tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false"
107 accesskey="t" /> 107 accesskey="t" />
108 <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/> 108 <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/>
109 <spacer flex="1"/> 109 <spacer flex="1"/>
110 <button command="cmd_search"/> 110 <button command="cmd_search"/>
111 </hbox> 111 </hbox>
112 </groupbox> 112 </groupbox>
113 <tree id="searchresults" rows="4" flex="1" 113 <tree id="searchresults" rows="2" flex="1"
114 onselect="fireflix.foundphotos.on_select()" 114 onselect="fireflix.foundphotos.on_select()"
115 ondblclick="fireflix.foundphotos.on_cmd_open(event)" 115 ondblclick="fireflix.foundphotos.on_cmd_open(event)"
116 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) 116 onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
117 fireflix.foundphotos.on_cmd_open(event)"> 117 fireflix.foundphotos.on_cmd_open(event)">
118 <treecols> 118 <treecols>
119 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" /> 119 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" />
120 </treecols> 120 </treecols>
121 <treechildren/> 121 <treechildren/>
122 </tree> 122 </tree>
123 <groupbox id="searchresult_props" orient="horizontal" hidden="true"> 123 <groupbox id="searchresult_props" orient="horizontal" hidden="true">
124 <vbox width="100" pack="center"> 124 <vbox width="100" pack="center">
125 <hbox pack="center"> 125 <hbox pack="center">
126 <image id="search_photo"/> 126 <image id="search_photo"/>
127 </hbox> 127 </hbox>
128 </vbox> 128 </vbox>
129 <vbox flex="1"> 129 <vbox flex="1">
130 <label id="searchresult_title"/> 130 <label id="searchresult_title"/>
131 <textbox flex="1" multiline="true" class="plain" readonly="true" id="searchresult_description"/> 131 <textbox flex="1" multiline="true" class="plain" readonly="true" id="searchresult_description"/>
132 <hbox pack="end"> 132 <hbox pack="end">
133 <button command="cmd_search_open"/> 133 <button command="cmd_search_open"/>
134 </hbox> 134 </hbox>
135 </vbox> 135 </vbox>
136 </groupbox> 136 </groupbox>
137 </vbox> 137 </vbox>
138 </tabpanel> 138 </tabpanel>
139 139
140 <tabpanel id="tabpanel_sets" flex="1" 140 <tabpanel id="tabpanel_sets" flex="1"
141 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) 141 onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
142 document.getElementById('setphotos').focus()"> 142 document.getElementById('setphotos').focus()">
143 <vbox flex="1"> 143 <vbox flex="1">
144 <tree id="setslist" rows="4" onselect="fireflix.photosets.on_select()" 144 <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()"
145 flex="1" context="sets_menu" 145 flex="1" context="sets_menu"
146 > 146 >
147 <treecols> 147 <treecols>
148 <treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/> 148 <treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/>
149 <splitter class="tree-splitter" /> 149 <splitter class="tree-splitter" />
150 <treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" /> 150 <treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" />
151 </treecols> 151 </treecols>
152 <treechildren/> 152 <treechildren/>
153 </tree> 153 </tree>
154 <hbox> 154 <hbox>
155 <button command="cmd_refresh_sets" /> 155 <button command="cmd_refresh_sets" />
156 <button command="cmd_set_props" /> 156 <button command="cmd_set_props" />
157 </hbox> 157 </hbox>
158 <tree id="setphotos" rows="4" onselect="fireflix.photoset.on_select()" 158 <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()"
159 flex="1"> 159 flex="1">
160 <treecols> 160 <treecols>
161 <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" /> 161 <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" />
162 <splitter class="tree-splitter" /> 162 <splitter class="tree-splitter" />
163 <treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" /> 163 <treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" />
164 <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" /> 164 <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" />
165 </treecols> 165 </treecols>
166 <treechildren/> 166 <treechildren/>
167 </tree> 167 </tree>
168 <groupbox id="set_photo_props" orient="horizontal"> 168 <groupbox id="set_photo_props" orient="horizontal">
169 <vbox width="100" pack="center"> 169 <vbox width="100" pack="center">
170 <hbox pack="center"> 170 <hbox pack="center">
171 <image id="set_photo" hidden="true"/> 171 <image id="set_photo" hidden="true"/>
172 </hbox> 172 </hbox>
173 </vbox> 173 </vbox>
174 <spacer flex="1"/> 174 <spacer flex="1"/>
175 </groupbox> 175 </groupbox>
176 </vbox> 176 </vbox>
177 </tabpanel> 177 </tabpanel>
178 178
179 <tabpanel id="tabpanel_tags"> 179 <tabpanel id="tabpanel_tags">
180 <listbox id="tagslist" rows="8" flex="1"> 180 <listbox id="tagslist" rows="8" flex="1">
181 <listhead> 181 <listhead>
182 <listheader label="&panel.tagslist.tag.label;"/> 182 <listheader label="&panel.tagslist.tag.label;"/>
183 </listhead> 183 </listhead>
184 <listcols> 184 <listcols>
185 <listcol flex="1"/> 185 <listcol flex="1"/>
186 </listcols> 186 </listcols>
187 </listbox> 187 </listbox>
188 </tabpanel> 188 </tabpanel>
189 189
190 <tabpanel id="tabpanel_upload"> 190 <tabpanel id="tabpanel_upload">
191 <vbox flex="1"> 191 <vbox flex="1">
192 <tree id="uploadlist" rows="8" flex="1" 192 <tree id="uploadlist" rows="2" flex="1"
193 onselect="fireflix.uploads.selectionChanged()" 193 onselect="fireflix.uploads.selectionChanged()"
194 context="uploads_menu"> 194 context="uploads_menu">
195 <treecols> 195 <treecols>
196 <treecol id="up_file" label="&panel.uploadlist.file.label;" flex="4" crop="start" align="start"/> 196 <treecol id="up_file" label="&panel.uploadlist.file.label;" flex="4" crop="start" align="start"/>
197 <splitter class="tree-splitter" /> 197 <splitter class="tree-splitter" />
198 <treecol id="up_title" label="&panel.uploadlist.title.label;" flex="5" crop="end" align="start" /> 198 <treecol id="up_title" label="&panel.uploadlist.title.label;" flex="5" crop="end" align="start" />
199 <splitter class="tree-splitter" /> 199 <splitter class="tree-splitter" />
200 <treecol id="up_status" label="&panel.uploadlist.status.label;" flex="1" crop="end" align="start" /> 200 <treecol id="up_status" label="&panel.uploadlist.status.label;" flex="1" crop="end" align="start" />
201 </treecols> 201 </treecols>
202 <treechildren/> 202 <treechildren/>
203 </tree> 203 </tree>
204 <progressmeter id="upload_progress" mode="undetermined" hidden="true" /> 204 <progressmeter id="upload_progress" mode="undetermined" hidden="true" />
205 <groupbox id="upload_file_props" orient="horizontal" hidden="true"> 205 <groupbox id="upload_file_props" orient="horizontal" hidden="true">
206 <image id="upload_file_preview" width="100" height="100" /> 206 <image id="upload_file_preview" width="100" height="100" />
207 <grid flex="1"> 207 <grid flex="1">
208 <columns> 208 <columns>
209 <column/> 209 <column/>
210 <column flex="1"/> 210 <column flex="1"/>
211 </columns> 211 </columns>
212 <rows> 212 <rows>
213 <row> 213 <row>
214 <label control="upload_filename" 214 <label control="upload_filename"
215 value="&panel.upload_props.filename.label;" /> 215 value="&panel.upload_props.filename.label;" />
216 <textbox id="upload_filename" 216 <textbox id="upload_filename"
217 oninput="fireflix.uploads.propsToSel('filename')"/> 217 oninput="fireflix.uploads.propsToSel('filename')"/>
218 </row> 218 </row>
219 <row> 219 <row>
220 <label control="upload_title" value="&panel.upload_props.title.label;" /> 220 <label control="upload_title" value="&panel.upload_props.title.label;" />
221 <textbox id="upload_title" 221 <textbox id="upload_title"
222 oninput="fireflix.uploads.propsToSel('title')"/> 222 oninput="fireflix.uploads.propsToSel('title')"/>
223 </row> 223 </row>
224 <row> 224 <row>
225 <label control="uplod_tags" value="&panel.upload_props.tags.label;" /> 225 <label control="uplod_tags" value="&panel.upload_props.tags.label;" />
226 <textbox id="upload_tags" 226 <textbox id="upload_tags"
227 oninput="fireflix.uploads.propsToSel('tags')"/> 227 oninput="fireflix.uploads.propsToSel('tags')"/>
228 </row> 228 </row>
229 <!-- TODO: description, public, friend, family --> 229 <!-- TODO: description, public, friend, family -->
230 </rows> 230 </rows>
231 </grid> 231 </grid>
232 </groupbox> 232 </groupbox>
233 <hbox> 233 <hbox>
234 <button command="cmd_uploads_add" /> 234 <button command="cmd_uploads_add" />
235 <spacer flex="1"/> 235 <spacer flex="1"/>
236 <button command="cmd_uploads_remove" /> 236 <button command="cmd_uploads_remove" />
237 <spacer flex="1"/> 237 <spacer flex="1"/>
238 <button command="cmd_uploads_clear" /> 238 <button command="cmd_uploads_clear" />
239 </hbox> 239 </hbox>
240 <hbox pack="center"> 240 <hbox pack="center">
241 <button command="cmd_uploads_upload" flex="1"/> 241 <button command="cmd_uploads_upload" flex="1"/>
242 </hbox> 242 </hbox>
243 </vbox> 243 </vbox>
244 </tabpanel> 244 </tabpanel>
245 245
246 </tabpanels> 246 </tabpanels>
247 247
248 </tabbox> 248 </tabbox>
249 249
250 </vbox> 250 </vbox>
251 251
252</page> 252</page>