summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--content/fireflix-panel.xul29
-rw-r--r--content/fireflix.css4
-rw-r--r--locale/en-US/fireflix.dtd0
3 files changed, 20 insertions, 13 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
@@ -81,91 +81,94 @@
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">
@@ -249,43 +252,43 @@
<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
@@ -99,24 +99,28 @@ label#search_page {
}
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