-rw-r--r-- | content/fireflix-panel.xul | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul index 62862a9..0e511c5 100644 --- a/content/fireflix-panel.xul +++ b/content/fireflix-panel.xul | |||
@@ -29,96 +29,105 @@ | |||
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_setphotos"> | ||
78 | </commandset> | ||
79 | |||
80 | <popupset> | ||
81 | <popup id="setphotos_menu"> | ||
82 | <menu label="&panel.setphotos.generate_html;" id="setphotos_html_menu"/> | ||
83 | </popup> | ||
84 | </popupset> | ||
85 | |||
77 | <commandset id="cmdset_uploads"> | 86 | <commandset id="cmdset_uploads"> |
78 | <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;" | 87 | <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;" |
79 | oncommand="fireflix.uploads.on_clear()" /> | 88 | oncommand="fireflix.uploads.on_clear()" /> |
80 | <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;" | 89 | <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;" |
81 | oncommand="fireflix.uploads.on_upload()" /> | 90 | oncommand="fireflix.uploads.on_upload()" /> |
82 | <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;" | 91 | <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;" |
83 | oncommand="fireflix.uploads.on_remove()" /> | 92 | oncommand="fireflix.uploads.on_remove()" /> |
84 | <command id="cmd_uploads_add" label="&panel.uploads.add.label;" | 93 | <command id="cmd_uploads_add" label="&panel.uploads.add.label;" |
85 | oncommand="fireflix.uploads.on_add()" /> | 94 | oncommand="fireflix.uploads.on_add()" /> |
86 | </commandset> | 95 | </commandset> |
87 | 96 | ||
88 | <popupset> | 97 | <popupset> |
89 | <popup id="uploads_menu"> | 98 | <popup id="uploads_menu"> |
90 | <menuitem command="cmd_uploads_add"/> | 99 | <menuitem command="cmd_uploads_add"/> |
91 | <menuitem command="cmd_uploads_clear"/> | 100 | <menuitem command="cmd_uploads_clear"/> |
92 | <menuitem command="cmd_uploads_remove"/> | 101 | <menuitem command="cmd_uploads_remove"/> |
93 | <menuseparator/> | 102 | <menuseparator/> |
94 | <menuitem command="cmd_uploads_upload"/> | 103 | <menuitem command="cmd_uploads_upload"/> |
95 | <menuseparator/> | 104 | <menuseparator/> |
96 | <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/> | 105 | <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/> |
97 | </popup> | 106 | </popup> |
98 | </popupset> | 107 | </popupset> |
99 | 108 | ||
100 | <vbox class="wholething" flex="1"> | 109 | <vbox class="wholething" flex="1"> |
101 | 110 | ||
102 | <groupbox context="auth_menu"> | 111 | <groupbox context="auth_menu"> |
103 | <caption label="&panel.auth_info;"/> | 112 | <caption label="&panel.auth_info;"/> |
104 | <hbox> | 113 | <hbox> |
105 | <vbox pack="center" flex="1"> | 114 | <vbox pack="center" flex="1"> |
106 | <label id="auth_info" value="&panel.no_auth_info;" disabled="true" crop="end"/> | 115 | <label id="auth_info" value="&panel.no_auth_info;" disabled="true" crop="end"/> |
107 | </vbox> | 116 | </vbox> |
108 | <button class="lean" id="b_auth" command="cmd_auth_auth"/> | 117 | <button class="lean" id="b_auth" command="cmd_auth_auth"/> |
109 | <button class="lean" id="b_auth_done" command="cmd_auth_done" hidden="true"/> | 118 | <button class="lean" id="b_auth_done" command="cmd_auth_done" hidden="true"/> |
110 | <button class="lean" command="cmd_auth_open_flickr" | 119 | <button class="lean" command="cmd_auth_open_flickr" |
111 | tooltiptext="&panel.auth.flickr.tip;"/> | 120 | tooltiptext="&panel.auth.flickr.tip;"/> |
112 | <button class="lean" command="cmd_help"/> | 121 | <button class="lean" command="cmd_help"/> |
113 | </hbox> | 122 | </hbox> |
114 | </groupbox> | 123 | </groupbox> |
115 | 124 | ||
116 | <tabbox flex="1" id="fireflix_tabs"> | 125 | <tabbox flex="1" id="fireflix_tabs"> |
117 | 126 | ||
118 | <tabs> | 127 | <tabs> |
119 | <tab label="&panel.tabs.search;"/> | 128 | <tab label="&panel.tabs.search;"/> |
120 | <tab label="&panel.tabs.sets;"/> | 129 | <tab label="&panel.tabs.sets;"/> |
121 | <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: --> | 130 | <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: --> |
122 | <tab id="tab_upload" label="&panel.tabs.upload;"/> | 131 | <tab id="tab_upload" label="&panel.tabs.upload;"/> |
123 | </tabs> | 132 | </tabs> |
124 | 133 | ||
@@ -154,97 +163,97 @@ | |||
154 | ondblclick="fireflix.foundphotos.on_cmd_open(event)" | 163 | ondblclick="fireflix.foundphotos.on_cmd_open(event)" |
155 | onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.on_cmd_open(event)"> | 164 | onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.on_cmd_open(event)"> |
156 | <treecols> | 165 | <treecols> |
157 | <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" /> | 166 | <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" /> |
158 | </treecols> | 167 | </treecols> |
159 | <treechildren/> | 168 | <treechildren/> |
160 | </tree> | 169 | </tree> |
161 | <groupbox id="searchresult_props" orient="horizontal" hidden="true"> | 170 | <groupbox id="searchresult_props" orient="horizontal" hidden="true"> |
162 | <vbox width="100" pack="center"> | 171 | <vbox width="100" pack="center"> |
163 | <hbox pack="center"> | 172 | <hbox pack="center"> |
164 | <image id="search_photo" | 173 | <image id="search_photo" |
165 | ondblclick="fireflix.foundphotos.on_cmd_open(event)"/> | 174 | ondblclick="fireflix.foundphotos.on_cmd_open(event)"/> |
166 | </hbox> | 175 | </hbox> |
167 | </vbox> | 176 | </vbox> |
168 | <vbox flex="1"> | 177 | <vbox flex="1"> |
169 | <label id="searchresult_title" crop="end"/> | 178 | <label id="searchresult_title" crop="end"/> |
170 | <hbox flex="1" pack="center"> | 179 | <hbox flex="1" pack="center"> |
171 | <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/> | 180 | <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/> |
172 | </hbox> | 181 | </hbox> |
173 | <hbox pack="end"> | 182 | <hbox pack="end"> |
174 | <button command="cmd_search_open"/> | 183 | <button command="cmd_search_open"/> |
175 | </hbox> | 184 | </hbox> |
176 | </vbox> | 185 | </vbox> |
177 | </groupbox> | 186 | </groupbox> |
178 | </vbox> | 187 | </vbox> |
179 | </tabpanel> | 188 | </tabpanel> |
180 | 189 | ||
181 | <tabpanel id="tabpanel_sets" flex="1" | 190 | <tabpanel id="tabpanel_sets" flex="1" |
182 | onkeypress="if(event.keyCode==event.DOM_VK_RETURN) | 191 | onkeypress="if(event.keyCode==event.DOM_VK_RETURN) |
183 | document.getElementById('setphotos').focus()"> | 192 | document.getElementById('setphotos').focus()"> |
184 | <vbox flex="1"> | 193 | <vbox flex="1"> |
185 | <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()" | 194 | <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()" |
186 | flex="1" context="sets_menu" | 195 | flex="1" context="sets_menu" |
187 | ondblclick="fireflix.photosets.on_cmd_open_in_flickr(event)" | 196 | ondblclick="fireflix.photosets.on_cmd_open_in_flickr(event)" |
188 | > | 197 | > |
189 | <treecols> | 198 | <treecols> |
190 | <treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/> | 199 | <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" /> | 200 | <splitter class="tree-splitter" /> |
192 | <treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" /> | 201 | <treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" /> |
193 | </treecols> | 202 | </treecols> |
194 | <treechildren/> | 203 | <treechildren/> |
195 | </tree> | 204 | </tree> |
196 | <hbox> | 205 | <hbox> |
197 | <button command="cmd_refresh_sets" /> | 206 | <button command="cmd_refresh_sets" /> |
198 | <button command="cmd_set_props" /> | 207 | <button command="cmd_set_props" /> |
199 | </hbox> | 208 | </hbox> |
200 | <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()" | 209 | <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()" |
201 | flex="1" ondblclick="fireflix.photoset.on_cmd_open(event)" | 210 | flex="1" ondblclick="fireflix.photoset.on_cmd_open(event)" |
202 | onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.photoset.on_cmd_open(event)"> | 211 | onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.photoset.on_cmd_open(event)" context="setphotos_menu"> |
203 | <treecols> | 212 | <treecols> |
204 | <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" /> | 213 | <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" /> | 214 | <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" /> | 215 | <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" /> | 216 | <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" /> |
208 | </treecols> | 217 | </treecols> |
209 | <treechildren/> | 218 | <treechildren/> |
210 | </tree> | 219 | </tree> |
211 | <groupbox id="set_photo_props" orient="horizontal" hidden="true"> | 220 | <groupbox id="set_photo_props" orient="horizontal" hidden="true"> |
212 | <vbox width="100" pack="center"> | 221 | <vbox width="100" pack="center"> |
213 | <hbox pack="center"> | 222 | <hbox pack="center"> |
214 | <image id="set_photo" | 223 | <image id="set_photo" |
215 | ondblclick="fireflix.photoset.on_cmd_open(event)" /> | 224 | ondblclick="fireflix.photoset.on_cmd_open(event)" /> |
216 | </hbox> | 225 | </hbox> |
217 | </vbox> | 226 | </vbox> |
218 | <spacer flex="1"/> | 227 | <spacer flex="1"/> |
219 | </groupbox> | 228 | </groupbox> |
220 | </vbox> | 229 | </vbox> |
221 | </tabpanel> | 230 | </tabpanel> |
222 | 231 | ||
223 | <tabpanel id="tabpanel_tags"> | 232 | <tabpanel id="tabpanel_tags"> |
224 | <listbox id="tagslist" rows="8" flex="1"> | 233 | <listbox id="tagslist" rows="8" flex="1"> |
225 | <listhead> | 234 | <listhead> |
226 | <listheader label="&panel.tagslist.tag.label;"/> | 235 | <listheader label="&panel.tagslist.tag.label;"/> |
227 | </listhead> | 236 | </listhead> |
228 | <listcols> | 237 | <listcols> |
229 | <listcol flex="1"/> | 238 | <listcol flex="1"/> |
230 | </listcols> | 239 | </listcols> |
231 | </listbox> | 240 | </listbox> |
232 | </tabpanel> | 241 | </tabpanel> |
233 | 242 | ||
234 | <tabpanel id="tabpanel_upload"> | 243 | <tabpanel id="tabpanel_upload"> |
235 | <vbox flex="1"> | 244 | <vbox flex="1"> |
236 | <tree id="uploadlist" rows="2" flex="1" | 245 | <tree id="uploadlist" rows="2" flex="1" |
237 | onselect="fireflix.uploads.selectionChanged()" | 246 | onselect="fireflix.uploads.selectionChanged()" |
238 | context="uploads_menu"> | 247 | context="uploads_menu"> |
239 | <treecols> | 248 | <treecols> |
240 | <treecol id="up_file" label="&panel.uploadlist.file.label;" flex="4" crop="start" align="start"/> | 249 | <treecol id="up_file" label="&panel.uploadlist.file.label;" flex="4" crop="start" align="start"/> |
241 | <splitter class="tree-splitter" /> | 250 | <splitter class="tree-splitter" /> |
242 | <treecol id="up_title" label="&panel.uploadlist.title.label;" flex="5" crop="end" align="start" /> | 251 | <treecol id="up_title" label="&panel.uploadlist.title.label;" flex="5" crop="end" align="start" /> |
243 | <splitter class="tree-splitter" /> | 252 | <splitter class="tree-splitter" /> |
244 | <treecol id="up_status" label="&panel.uploadlist.status.label;" flex="1" crop="end" align="start" /> | 253 | <treecol id="up_status" label="&panel.uploadlist.status.label;" flex="1" crop="end" align="start" /> |
245 | </treecols> | 254 | </treecols> |
246 | <treechildren/> | 255 | <treechildren/> |
247 | </tree> | 256 | </tree> |
248 | <progressmeter id="upload_progress" mode="undetermined" hidden="true" /> | 257 | <progressmeter id="upload_progress" mode="undetermined" hidden="true" /> |
249 | <groupbox id="upload_file_props" orient="horizontal" hidden="true"> | 258 | <groupbox id="upload_file_props" orient="horizontal" hidden="true"> |
250 | <image id="upload_file_preview" width="100" height="100" /> | 259 | <image id="upload_file_preview" width="100" height="100" /> |