author | Michael Krelin <hacker@klever.net> | 2006-11-12 13:09:02 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2006-11-12 13:09:02 (UTC) |
commit | ec1da6246b3bc428b22ef7bb9c7becb37682a8a4 (patch) (side-by-side diff) | |
tree | 3d060891fee2952cb3d885e40b349b540c784642 | |
parent | ffd3d21bea4a1684ad33dc91564180648a74b447 (diff) | |
download | fireflix-ec1da6246b3bc428b22ef7bb9c7becb37682a8a4.zip fireflix-ec1da6246b3bc428b22ef7bb9c7becb37682a8a4.tar.gz fireflix-ec1da6246b3bc428b22ef7bb9c7becb37682a8a4.tar.bz2 |
UI polishing: made most buttons leaner
git-svn-id: http://svn.klever.net/kin/fireflix/trunk@211 fe716a7a-6dde-0310-88d9-d003556173a8
-rw-r--r-- | content/fireflix-panel.xul | 29 | ||||
-rw-r--r-- | content/fireflix.css | 4 | ||||
-rw-r--r-- | locale/en-US/fireflix.dtd | 4 |
3 files changed, 22 insertions, 15 deletions
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul index b961edb..2356c82 100644 --- a/content/fireflix-panel.xul +++ b/content/fireflix-panel.xul @@ -9,283 +9,286 @@ orient="vertical" ondragover="nsDragAndDrop.dragOver(event,fireflix.uploadObserver)" ondragdrop="nsDragAndDrop.drop(event,fireflix.uploadObserver)" > <script src="chrome://global/content/nsDragAndDrop.js"/> <script src="chrome://global/content/nsTransferable.js"/> <script type="application/x-javascript" src="md5.js" /> <script type="application/x-javascript" src="util.js" /> <script type="application/x-javascript" src="flickr.js" /> <script type="application/x-javascript" src="fireflix.js" /> <stringbundleset> <stringbundle id="loc_strings" src="chrome://fireflix/locale/fireflix.properties" /> </stringbundleset> <commandset> <command id="cmd_auth_auth" label="&panel.auth.auth.label;" oncommand="fireflix.on_cmd_auth()"/> <command id="cmd_auth_done" label="&panel.auth.done.label;" oncommand="fireflix.on_cmd_auth_done()" disabled="true"/> <command id="cmd_auth_open_flickr" label="&panel.auth.flickr.label;" oncommand="fireflix.openTab('http://www.flickr.com/')" /> <command id="cmd_auth_unauth" label="&panel.auth.unauth.label;" oncommand="fireflix.on_cmd_auth_unauth()" /> <command id="cmd_help" label="?" oncommand="fireflix.openTab('chrome://fireflix/content/help.xml')" /> </commandset> <popupset> <popup id="auth_menu"> <menuitem command="cmd_auth_auth"/> <menuitem command="cmd_auth_done" hidden="true" id="menu_auth_done"/> <menuitem command="cmd_auth_unauth" /> <menuseparator/> <menuitem command="cmd_auth_open_flickr"/> </popup> </popupset> <commandset id="cmdset_search"> <command id="cmd_search" label="&panel.search.cmd_search.label;" oncommand="fireflix.foundphotos.search_photos()"/> <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;" oncommand="fireflix.foundphotos.on_cmd_open(event)" /> <command id="cmd_search_prev_page" label="&panel.search.cmd_search_prev_page.label;" oncommand="fireflix.foundphotos.on_cmd_prev(event)" disabled="true"/> <command id="cmd_search_next_page" label="&panel.search.cmd_search_next_page.label;" oncommand="fireflix.foundphotos.on_cmd_next(event)" disabled="true"/> </commandset> <commandset id="cmdset_sets"> <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;" oncommand="fireflix.on_refresh_sets()" /> <command id="cmd_set_props" label="&panel.sets.cmd_properties;" oncommand="fireflix.on_set_props()" disabled="true" /> </commandset> <popupset> <popup id="sets_menu"> <menuitem command="cmd_set_props"/> <menuitem command="cmd_refresh_sets"/> <menuseparator/> <menu label="&panel.sets.generate_html;" id="sets_html_menu"/> </popup> </popupset> <commandset id="cmdset_uploads"> <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;" oncommand="fireflix.uploads.on_clear()" /> <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;" oncommand="fireflix.uploads.on_upload()" /> <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;" oncommand="fireflix.uploads.on_remove()" /> <command id="cmd_uploads_add" label="&panel.uploads.add.label;" oncommand="fireflix.uploads.on_add()" /> </commandset> <popupset> <popup id="uploads_menu"> <menuitem command="cmd_uploads_add"/> <menuitem command="cmd_uploads_clear"/> <menuitem command="cmd_uploads_remove"/> <menuseparator/> <menuitem command="cmd_uploads_upload"/> <menuseparator/> <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/> </popup> </popupset> <vbox class="wholething" flex="1"> <groupbox context="auth_menu"> <caption label="&panel.auth_info;"/> <hbox> - <label id="auth_info" value="&panel.no_auth_info;" flex="1" disabled="true" crop="end"/> - <button id="b_auth" command="cmd_auth_auth"/> - <button id="b_auth_done" command="cmd_auth_done" hidden="true"/> - <button command="cmd_auth_open_flickr" + <vbox pack="center" flex="1"> + <label id="auth_info" value="&panel.no_auth_info;" disabled="true" crop="end"/> + </vbox> + <button class="lean" id="b_auth" command="cmd_auth_auth"/> + <button class="lean" id="b_auth_done" command="cmd_auth_done" hidden="true"/> + <button class="lean" command="cmd_auth_open_flickr" tooltiptext="&panel.auth.flickr.tip;"/> - <button command="cmd_help"/> + <button class="lean" command="cmd_help"/> </hbox> </groupbox> <tabbox flex="1" id="fireflix_tabs"> <tabs> <tab label="&panel.tabs.search;"/> <tab label="&panel.tabs.sets;"/> <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: --> <tab id="tab_upload" label="&panel.tabs.upload;"/> </tabs> <tabpanels flex="1"> <tabpanel id="tabpanel_search" flex="1"> <vbox flex="1"> <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()"> <hbox> - <label control="search_for" value="&panel.search.search_for.label;" - accesskey="s"/> + <vbox pack="center"> + <label control="search_for" value="&panel.search.search_for.label;" accesskey="s"/> + </vbox> <textbox id="search_for" flex="1"/> </hbox> <hbox> <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;" tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false" accesskey="t" /> <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/> <spacer flex="1"/> - <button command="cmd_search"/> + <button class="lean" command="cmd_search"/> </hbox> </groupbox> <hbox> - <button command="cmd_search_prev_page"/> + <button class="lean" command="cmd_search_prev_page"/> <spacer flex="1"/> <label id="search_page" hidden="true"/> <spacer flex="1"/> - <button command="cmd_search_next_page"/> + <button class="lean" command="cmd_search_next_page"/> </hbox> <tree id="searchresults" rows="2" flex="1" onselect="fireflix.foundphotos.on_select()" ondblclick="fireflix.foundphotos.on_cmd_open(event)" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.on_cmd_open(event)"> <treecols> <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" /> </treecols> <treechildren/> </tree> <groupbox id="searchresult_props" orient="horizontal" hidden="true"> <vbox width="100" pack="center"> <hbox pack="center"> <image id="search_photo" ondblclick="fireflix.foundphotos.on_cmd_open(event)"/> </hbox> </vbox> <vbox flex="1"> <label id="searchresult_title" crop="end"/> <hbox flex="1" pack="center"> <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/> </hbox> <hbox pack="end"> <button command="cmd_search_open"/> </hbox> </vbox> </groupbox> </vbox> </tabpanel> <tabpanel id="tabpanel_sets" flex="1" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) document.getElementById('setphotos').focus()"> <vbox flex="1"> <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()" flex="1" context="sets_menu" > <treecols> <treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/> <splitter class="tree-splitter" /> <treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" /> </treecols> <treechildren/> </tree> <hbox> <button command="cmd_refresh_sets" /> <button command="cmd_set_props" /> </hbox> <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()" flex="1"> <treecols> <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" /> <splitter class="tree-splitter" /> <treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" /> <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" /> </treecols> <treechildren/> </tree> <groupbox id="set_photo_props" orient="horizontal"> <vbox width="100" pack="center"> <hbox pack="center"> <image id="set_photo" hidden="true"/> </hbox> </vbox> <spacer flex="1"/> </groupbox> </vbox> </tabpanel> <tabpanel id="tabpanel_tags"> <listbox id="tagslist" rows="8" flex="1"> <listhead> <listheader label="&panel.tagslist.tag.label;"/> </listhead> <listcols> <listcol flex="1"/> </listcols> </listbox> </tabpanel> <tabpanel id="tabpanel_upload"> <vbox flex="1"> <tree id="uploadlist" rows="2" flex="1" onselect="fireflix.uploads.selectionChanged()" context="uploads_menu"> <treecols> <treecol id="up_file" label="&panel.uploadlist.file.label;" flex="4" crop="start" align="start"/> <splitter class="tree-splitter" /> <treecol id="up_title" label="&panel.uploadlist.title.label;" flex="5" crop="end" align="start" /> <splitter class="tree-splitter" /> <treecol id="up_status" label="&panel.uploadlist.status.label;" flex="1" crop="end" align="start" /> </treecols> <treechildren/> </tree> <progressmeter id="upload_progress" mode="undetermined" hidden="true" /> <groupbox id="upload_file_props" orient="horizontal" hidden="true"> <image id="upload_file_preview" width="100" height="100" /> <grid flex="1"> <columns> <column/> <column flex="1"/> </columns> <rows> <row> <label control="upload_filename" value="&panel.upload_props.filename.label;" /> <textbox id="upload_filename" oninput="fireflix.uploads.propsToSel('filename')"/> </row> <row> <label control="upload_title" value="&panel.upload_props.title.label;" /> <textbox id="upload_title" oninput="fireflix.uploads.propsToSel('title')"/> </row> <row> <label control="uplod_tags" value="&panel.upload_props.tags.label;" /> <textbox id="upload_tags" oninput="fireflix.uploads.propsToSel('tags')"/> </row> <!-- TODO: description, public, friend, family --> </rows> </grid> </groupbox> <hbox> - <button command="cmd_uploads_add" /> + <button class="lean" command="cmd_uploads_add" /> <spacer flex="1"/> - <button command="cmd_uploads_remove" /> + <button class="lean" command="cmd_uploads_remove" /> <spacer flex="1"/> - <button command="cmd_uploads_clear" /> + <button class="lean" command="cmd_uploads_clear" /> </hbox> <hbox pack="center"> <button command="cmd_uploads_upload" flex="1"/> </hbox> </vbox> </tabpanel> </tabpanels> </tabbox> </vbox> </page> diff --git a/content/fireflix.css b/content/fireflix.css index 47455f6..4fba5d3 100644 --- a/content/fireflix.css +++ b/content/fireflix.css @@ -27,96 +27,100 @@ tree#uploadlist treechildren::-moz-tree-row(failed) { } tree#uploadlist treechildren::-moz-tree-cell-text(failed) { color: red; } tree#uploadlist treechildren::-moz-tree-cell-text(uploading) { font-weight: bold; } groupbox#searchresult_props, groupbox.search_params, groupbox#upload_file_props, groupbox#set_props, groupbox#set_photo_props { background: white; } groupbox#upload_file_props label { text-align: right; } image#search_photo, image#set_photo, image#set_primary { border: black 1px solid; } .about .insides { margin: 1ex; } .about .text { border: yellow solid 1px; background: green; } .about .title { font-size: 300%; font-weight: bold; color: yellow; } .about .link { text-decoration: underline; color: white; cursor: pointer; } menuitem.menuhead { background: gray; color: black; font-weight: bold; } div#searchresult_description { min-height: 5em; max-height: 8em; overflow: auto; font-size: 90%; margin: 0.1ex 0.5ex; } #copying div { margin: 1ex 1em; font-family: courier, monospace; font-size: 9pt; padding: 2px; border: dotted 1px gray; background: white; } label#search_page { font-weight: bold; background: white; color: #404040; border-color: #c0c0c0 #404040 #404040 #c0c0c0; border-style: solid; border-width: 1px; -moz-border-radius: 1em; padding: 0.5ex 1ex; } html body { font-family: arial, sans-serif; font-size: 11pt; margin: 1em 4em; padding: 1em 4em; border: double 3px gray; background: #ffffc0; } html h1 { font-size: 130%; color: maroon; } html p { text-align: justify; } html div.copyright { font-size: 60%; text-align: right; } html div.copyright a { text-decoration: none; } + +button.lean { + min-width: 1ex; +} diff --git a/locale/en-US/fireflix.dtd b/locale/en-US/fireflix.dtd index 88ec6fb..0e158c3 100644 --- a/locale/en-US/fireflix.dtd +++ b/locale/en-US/fireflix.dtd @@ -1,83 +1,83 @@ <!ENTITY % autoconf SYSTEM "chrome://fireflix/content/autoconf.dtd"> %autoconf; <!-- About Box --> <!ENTITY aboutFireflix "About Fireflix" > <!ENTITY about.ok.label "OK"> <!ENTITY about.license.label "License"> <!ENTITY about.license.tip "Show copying policy"> <!-- COPYING --> <!ENTITY copying.title "Filreflix: copying policy"> <!-- Sidebar --> <!ENTITY panel.auth_info "Authorization info"> <!ENTITY panel.no_auth_info "No auth info available"> <!ENTITY panel.auth.auth.label "Authorize"> <!ENTITY panel.auth.done.label "Authorization complete"> <!ENTITY panel.auth.flickr.label "Flickr"> <!ENTITY panel.auth.flickr.tip "Open Flickr in new tab"> <!ENTITY panel.auth.unauth.label "Sign off"> <!ENTITY panel.tabs.search "Search" > <!ENTITY panel.tabs.sets "Sets" > <!ENTITY panel.tabs.tags "Tags" > <!ENTITY panel.tabs.upload "Upload" > <!ENTITY panel.search.cmd_search.label "Search" > <!ENTITY panel.search.search_for.label "Search for:" > <!ENTITY panel.search.mode.tagsonly.label "tags"> <!ENTITY panel.search.mode.tagsonly.tip "Search tags only"> <!ENTITY panel.search.mode.mine.label "mine"> <!ENTITY panel.search.col.title.label "Title"> <!ENTITY panel.search.cmd_search_open.label "Open"> -<!ENTITY panel.search.cmd_search_prev_page.label "«"> -<!ENTITY panel.search.cmd_search_next_page.label "»"> +<!ENTITY panel.search.cmd_search_prev_page.label " « "> +<!ENTITY panel.search.cmd_search_next_page.label " » "> <!ENTITY panel.sets.name.label "Set"> <!ENTITY panel.sets.name.tip "Photoset name"> <!ENTITY panel.sets.photos.label "Photos"> <!ENTITY panel.sets.photos.tip "Number of photos in set"> <!ENTITY panel.sets.cmd_refresh_sets "Refresh"> <!ENTITY panel.sets.cmd_properties "Properties"> <!ENTITY panel.sets.generate_html "Generate HTML"> <!ENTITY panel.setphotos.title.label "Title"> <!ENTITY panel.setphotos.title.tip "Picture title"> <!ENTITY panel.setphotos.taken.label "Taken"> <!ENTITY panel.setphotos.taken.tip "When the picture was taken"> <!ENTITY panel.setphotos.upload.label "Uploaded"> <!ENTITY panel.setphotos.upload.tip "When the picure was uploaded"> <!ENTITY panel.tagslist.tag.label "Tag"> <!ENTITY panel.uploadlist.file.label "File name"> <!ENTITY panel.uploadlist.title.label "Title"> <!ENTITY panel.uploadlist.status.label "Status"> <!ENTITY panel.upload_props.filename.label "File:"> <!ENTITY panel.upload_props.title.label "Title:"> <!ENTITY panel.upload_props.tags.label "Tags:"> <!ENTITY panel.uploads.upload.label "Upload"> <!ENTITY panel.uploads.clear.label "Clear"> <!ENTITY panel.uploads.remove.label "Remove"> <!ENTITY panel.uploads.add.label "Add"> <!ENTITY panel.uploads.generate_html "Generate HTML"> <!ENTITY generated.title "Fireflix: Generated content"> <!ENTITY generated.copy "copy"> <!ENTITY browser.sidebar.label "Fireflix"> <!ENTITY browser.sidebar.title "Fireflix"> <!ENTITY photosetprops.title "Photoset properties"> <!ENTITY photosetprops.set_title.label "Photoset title:"> <!ENTITY photosetprops.set_desc.label "Photoset description:"> |